Mercurial > vim
annotate src/screen.c @ 10982:5e20c9f96cd5 v8.0.0380
patch 8.0.0380: with 'linebreak' double wide char wraps badly
commit https://github.com/vim/vim/commit/38632faf635f6434441827e136bceb5a930c59ad
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 26 19:40:59 2017 +0100
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Problem: With 'linebreak' set and 'breakat' includes ">" a double-wide
character results in "<<" displayed.
Solution: Check for the character not to be replaced. (Ozaki Kiichi,
closes #1456)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 26 Feb 2017 19:45:04 +0100 |
| parents | 5b3e671ef6a2 |
| children | 62bcadce6c82 |
| 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 |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
127 static int win_line(win_T *, linenr_T, int, int, int nochange); |
|
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 | |
| 188 /* | |
| 189 * Redraw the current window later, with update_screen(type). | |
| 190 * Set must_redraw only if not already set to a higher value. | |
| 191 * e.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. | |
| 192 */ | |
| 193 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
194 redraw_later(int type) |
| 7 | 195 { |
| 196 redraw_win_later(curwin, type); | |
| 197 } | |
| 198 | |
| 199 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
200 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
201 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
202 int type) |
| 7 | 203 { |
| 204 if (wp->w_redr_type < type) | |
| 205 { | |
| 206 wp->w_redr_type = type; | |
| 207 if (type >= NOT_VALID) | |
| 208 wp->w_lines_valid = 0; | |
| 209 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 210 must_redraw = type; | |
| 211 } | |
| 212 } | |
| 213 | |
| 214 /* | |
| 215 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 216 * after executing a shell command that messes up the screen. | |
| 217 */ | |
| 218 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
219 redraw_later_clear(void) |
| 7 | 220 { |
| 221 redraw_all_later(CLEAR); | |
| 826 | 222 #ifdef FEAT_GUI |
| 223 if (gui.in_use) | |
| 224 /* Use a code that will reset gui.highlight_mask in | |
| 225 * gui_stop_highlight(). */ | |
| 226 screen_attr = HL_ALL + 1; | |
| 227 else | |
| 228 #endif | |
| 229 /* Use attributes that is very unlikely to appear in text. */ | |
| 230 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE; | |
| 7 | 231 } |
| 232 | |
| 233 /* | |
| 234 * Mark all windows to be redrawn later. | |
| 235 */ | |
| 236 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
237 redraw_all_later(int type) |
| 7 | 238 { |
| 239 win_T *wp; | |
| 240 | |
| 241 FOR_ALL_WINDOWS(wp) | |
| 242 { | |
| 243 redraw_win_later(wp, type); | |
| 244 } | |
| 245 } | |
| 246 | |
| 247 /* | |
| 301 | 248 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 249 */ |
| 250 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
251 redraw_curbuf_later(int type) |
| 7 | 252 { |
| 253 redraw_buf_later(curbuf, type); | |
| 254 } | |
| 255 | |
| 256 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
257 redraw_buf_later(buf_T *buf, int type) |
| 7 | 258 { |
| 259 win_T *wp; | |
| 260 | |
| 261 FOR_ALL_WINDOWS(wp) | |
| 262 { | |
| 263 if (wp->w_buffer == buf) | |
| 264 redraw_win_later(wp, type); | |
| 265 } | |
| 266 } | |
| 267 | |
| 268 /* | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
269 * 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
|
270 * 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
|
271 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
272 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
273 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
274 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
275 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
276 int rows; |
| 6959 | 277 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
278 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
279 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
280 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
281 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
282 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
283 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
284 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
285 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
|
286 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
287 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
288 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
289 redraw_later(type); |
| 6959 | 290 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
|
291 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
292 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
293 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 294 rows = screen_Rows - cmdline_row; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
295 screenline = (schar_T *)lalloc( |
| 6959 | 296 (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
|
297 screenattr = (sattr_T *)lalloc( |
| 6959 | 298 (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
|
299 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
300 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
301 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
302 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
303 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
304 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 305 (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
|
306 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
309 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 311 (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
|
312 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
313 ret = 2; |
|
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 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
318 screenline2 = (schar_T *)lalloc( |
| 6959 | 319 (long_u)(rows * cols * sizeof(schar_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
320 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
321 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
323 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
326 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
327 /* 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
|
328 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
329 { |
| 6959 | 330 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 332 (size_t)cols * sizeof(schar_T)); |
| 333 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 335 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 { |
| 6959 | 339 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 341 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
342 for (i = 0; i < p_mco; ++i) |
| 6959 | 343 mch_memmove(screenlineC[i] + r * cols, |
| 344 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 345 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 348 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 350 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
359 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
361 /* 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
|
362 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
363 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
364 mch_memmove(current_ScreenLine, |
| 6959 | 365 screenline + r * cols, |
| 366 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
367 mch_memmove(ScreenAttrs + off, |
| 6959 | 368 screenattr + r * cols, |
| 369 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
371 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
373 mch_memmove(ScreenLinesUC + off, |
| 6959 | 374 screenlineUC + r * cols, |
| 375 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 378 screenlineC[i] + r * cols, |
| 379 (size_t)cols * sizeof(u8char_T)); | |
|
5090
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 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 mch_memmove(ScreenLines2 + off, |
| 6959 | 383 screenline2 + r * cols, |
| 384 (size_t)cols * sizeof(schar_T)); | |
| 385 #endif | |
| 386 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
|
387 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
388 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
392 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
393 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
395 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
396 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
397 vim_free(screenlineUC); |
|
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 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
400 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
401 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
402 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
405 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
406 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
407 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
408 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
409 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
410 return ret; |
|
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 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
414 * 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
|
415 * 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
|
416 * 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
|
417 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
418 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
419 redraw_after_callback(void) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
420 { |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
421 if (State == HITRETURN || State == ASKMORE) |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
422 ; /* do nothing */ |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
423 else if (State & CMDLINE) |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
424 redrawcmdline(); |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
425 else if (State & (NORMAL | INSERT)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
426 { |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
427 update_screen(0); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
428 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
429 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
430 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
431 out_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
432 #ifdef FEAT_GUI |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
433 if (gui.in_use) |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
434 { |
|
9428
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
435 /* 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
|
436 * flicker. */ |
|
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
437 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
|
438 gui_update_cursor(FALSE, FALSE); |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
439 gui_mch_flush(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
440 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
441 #endif |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
442 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
443 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
444 /* |
| 7 | 445 * Changed something in the current window, at buffer line "lnum", that |
| 446 * requires that line and possibly other lines to be redrawn. | |
| 447 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 448 * Used to remove the "$" from a change command. | |
| 449 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 450 * may become invalid and the whole window will have to be redrawn. | |
| 451 */ | |
| 452 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
453 redrawWinline( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
454 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
455 int invalid UNUSED) /* window line height is invalid now */ |
| 7 | 456 { |
| 457 #ifdef FEAT_FOLDING | |
| 458 int i; | |
| 459 #endif | |
| 460 | |
| 461 if (curwin->w_redraw_top == 0 || curwin->w_redraw_top > lnum) | |
| 462 curwin->w_redraw_top = lnum; | |
| 463 if (curwin->w_redraw_bot == 0 || curwin->w_redraw_bot < lnum) | |
| 464 curwin->w_redraw_bot = lnum; | |
| 465 redraw_later(VALID); | |
| 466 | |
| 467 #ifdef FEAT_FOLDING | |
| 468 if (invalid) | |
| 469 { | |
| 470 /* A w_lines[] entry for this lnum has become invalid. */ | |
| 471 i = find_wl_entry(curwin, lnum); | |
| 472 if (i >= 0) | |
| 473 curwin->w_lines[i].wl_valid = FALSE; | |
| 474 } | |
| 475 #endif | |
| 476 } | |
| 477 | |
| 478 /* | |
| 479 * update all windows that are editing the current buffer | |
| 480 */ | |
| 481 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
482 update_curbuf(int type) |
| 7 | 483 { |
| 484 redraw_curbuf_later(type); | |
| 485 update_screen(type); | |
| 486 } | |
| 487 | |
| 488 /* | |
| 489 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 490 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
| 491 */ | |
| 492 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
493 update_screen(int type) |
| 7 | 494 { |
| 495 win_T *wp; | |
| 496 static int did_intro = FALSE; | |
| 497 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 498 int did_one; | |
| 499 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
500 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
501 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
502 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
503 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
504 #endif |
| 7 | 505 |
| 2008 | 506 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 507 if (!screen_valid(TRUE)) |
| 508 return; | |
| 509 | |
| 510 if (must_redraw) | |
| 511 { | |
| 512 if (type < must_redraw) /* use maximal type */ | |
| 513 type = must_redraw; | |
| 1331 | 514 |
| 515 /* must_redraw is reset here, so that when we run into some weird | |
| 516 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 517 * scrolling), or update_topline() in win_update() will cause a | |
| 518 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 519 must_redraw = 0; |
| 520 } | |
| 521 | |
| 522 /* Need to update w_lines[]. */ | |
| 523 if (curwin->w_lines_valid == 0 && type < NOT_VALID) | |
| 524 type = NOT_VALID; | |
| 525 | |
| 2008 | 526 /* Postpone the redrawing when it's not needed and when being called |
| 527 * recursively. */ | |
| 528 if (!redrawing() || updating_screen) | |
| 7 | 529 { |
| 530 redraw_later(type); /* remember type for next time */ | |
| 531 must_redraw = type; | |
| 532 if (type > INVERTED_ALL) | |
| 533 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
| 534 return; | |
| 535 } | |
| 536 | |
| 537 updating_screen = TRUE; | |
| 538 #ifdef FEAT_SYN_HL | |
| 539 ++display_tick; /* let syntax code know we're in a next round of | |
| 540 * display updating */ | |
| 541 #endif | |
| 542 | |
| 543 /* | |
| 544 * if the screen was scrolled up when displaying a message, scroll it down | |
| 545 */ | |
| 546 if (msg_scrolled) | |
| 547 { | |
| 548 clear_cmdline = TRUE; | |
| 549 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 550 type = CLEAR; | |
| 551 else if (type != CLEAR) | |
| 552 { | |
| 553 check_for_delay(FALSE); | |
| 554 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, NULL) == FAIL) | |
| 555 type = CLEAR; | |
| 556 FOR_ALL_WINDOWS(wp) | |
| 557 { | |
| 558 if (W_WINROW(wp) < msg_scrolled) | |
| 559 { | |
| 560 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 561 && wp->w_redr_type < REDRAW_TOP | |
| 562 && wp->w_lines_valid > 0 | |
| 563 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 564 { | |
| 565 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 566 wp->w_redr_type = REDRAW_TOP; | |
| 567 } | |
| 568 else | |
| 569 { | |
| 570 wp->w_redr_type = NOT_VALID; | |
| 571 #ifdef FEAT_WINDOWS | |
| 572 if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp) | |
| 573 <= msg_scrolled) | |
| 574 wp->w_redr_status = TRUE; | |
| 575 #endif | |
| 576 } | |
| 577 } | |
| 578 } | |
| 579 redraw_cmdline = TRUE; | |
| 667 | 580 #ifdef FEAT_WINDOWS |
| 673 | 581 redraw_tabline = TRUE; |
| 667 | 582 #endif |
| 7 | 583 } |
| 584 msg_scrolled = 0; | |
| 585 need_wait_return = FALSE; | |
| 586 } | |
| 587 | |
| 588 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 589 compute_cmdrow(); | |
| 590 | |
| 591 /* Check for changed highlighting */ | |
| 592 if (need_highlight_changed) | |
| 593 highlight_changed(); | |
| 594 | |
| 595 if (type == CLEAR) /* first clear screen */ | |
| 596 { | |
| 597 screenclear(); /* will reset clear_cmdline */ | |
| 598 type = NOT_VALID; | |
| 599 } | |
| 600 | |
| 601 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 602 check_for_delay(FALSE); | |
| 603 | |
| 13 | 604 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
605 /* 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
|
606 * changes. */ |
| 13 | 607 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
608 && 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
|
609 ? number_width(curwin) : 0)) |
| 13 | 610 curwin->w_redr_type = NOT_VALID; |
| 611 #endif | |
| 612 | |
| 7 | 613 /* |
| 614 * Only start redrawing if there is really something to do. | |
| 615 */ | |
| 616 if (type == INVERTED) | |
| 617 update_curswant(); | |
| 618 if (curwin->w_redr_type < type | |
| 619 && !((type == VALID | |
| 620 && curwin->w_lines[0].wl_valid | |
| 621 #ifdef FEAT_DIFF | |
| 622 && curwin->w_topfill == curwin->w_old_topfill | |
| 623 && curwin->w_botfill == curwin->w_old_botfill | |
| 624 #endif | |
| 625 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 626 || (type == INVERTED | |
| 1043 | 627 && VIsual_active |
| 7 | 628 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 629 && curwin->w_old_visual_mode == VIsual_mode | |
| 630 && (curwin->w_valid & VALID_VIRTCOL) | |
| 631 && curwin->w_old_curswant == curwin->w_curswant) | |
| 632 )) | |
| 633 curwin->w_redr_type = type; | |
| 634 | |
| 849 | 635 #ifdef FEAT_WINDOWS |
| 636 /* Redraw the tab pages line if needed. */ | |
| 637 if (redraw_tabline || type >= NOT_VALID) | |
| 638 draw_tabline(); | |
| 639 #endif | |
| 640 | |
| 7 | 641 #ifdef FEAT_SYN_HL |
| 642 /* | |
| 643 * Correct stored syntax highlighting info for changes in each displayed | |
| 644 * buffer. Each buffer must only be done once. | |
| 645 */ | |
| 646 FOR_ALL_WINDOWS(wp) | |
| 647 { | |
| 648 if (wp->w_buffer->b_mod_set) | |
| 649 { | |
| 650 # ifdef FEAT_WINDOWS | |
| 651 win_T *wwp; | |
| 652 | |
| 653 /* Check if we already did this buffer. */ | |
| 654 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 655 if (wwp->w_buffer == wp->w_buffer) | |
| 656 break; | |
| 657 # endif | |
| 658 if ( | |
| 659 # ifdef FEAT_WINDOWS | |
| 660 wwp == wp && | |
| 661 # endif | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
662 syntax_present(wp)) |
| 7 | 663 syn_stack_apply_changes(wp->w_buffer); |
| 664 } | |
| 665 } | |
| 666 #endif | |
| 667 | |
| 668 /* | |
| 669 * Go from top to bottom through the windows, redrawing the ones that need | |
| 670 * it. | |
| 671 */ | |
| 672 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 673 did_one = FALSE; | |
| 674 #endif | |
| 675 #ifdef FEAT_SEARCH_EXTRA | |
| 676 search_hl.rm.regprog = NULL; | |
| 677 #endif | |
| 678 FOR_ALL_WINDOWS(wp) | |
| 679 { | |
| 680 if (wp->w_redr_type != 0) | |
| 681 { | |
| 682 cursor_off(); | |
| 683 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 684 if (!did_one) | |
| 685 { | |
| 686 did_one = TRUE; | |
| 687 # ifdef FEAT_SEARCH_EXTRA | |
| 688 start_search_hl(); | |
| 689 # endif | |
| 690 # ifdef FEAT_CLIPBOARD | |
| 691 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 692 if (clip_star.available && clip_isautosel_star()) |
| 693 clip_update_selection(&clip_star); | |
| 694 if (clip_plus.available && clip_isautosel_plus()) | |
| 695 clip_update_selection(&clip_plus); | |
| 7 | 696 # endif |
| 697 #ifdef FEAT_GUI | |
| 698 /* Remove the cursor before starting to do anything, because | |
| 699 * scrolling may make it difficult to redraw the text under | |
| 700 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
701 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
|
702 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
703 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
704 gui_cursor_row = gui.cursor_row; |
| 7 | 705 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
706 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
707 } |
| 7 | 708 #endif |
| 709 } | |
| 710 #endif | |
| 711 win_update(wp); | |
| 712 } | |
| 713 | |
| 714 #ifdef FEAT_WINDOWS | |
| 715 /* redraw status line after the window to minimize cursor movement */ | |
| 716 if (wp->w_redr_status) | |
| 717 { | |
| 718 cursor_off(); | |
| 719 win_redr_status(wp); | |
| 720 } | |
| 721 #endif | |
| 722 } | |
| 723 #if defined(FEAT_SEARCH_EXTRA) | |
| 724 end_search_hl(); | |
| 725 #endif | |
| 4107 | 726 #ifdef FEAT_INS_EXPAND |
| 727 /* May need to redraw the popup menu. */ | |
| 728 if (pum_visible()) | |
| 729 pum_redraw(); | |
| 730 #endif | |
| 7 | 731 |
| 732 #ifdef FEAT_WINDOWS | |
| 733 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 734 * 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
|
735 FOR_ALL_WINDOWS(wp) |
| 7 | 736 wp->w_buffer->b_mod_set = FALSE; |
| 737 #else | |
| 738 curbuf->b_mod_set = FALSE; | |
| 739 #endif | |
| 740 | |
| 741 updating_screen = FALSE; | |
| 742 #ifdef FEAT_GUI | |
| 743 gui_may_resize_shell(); | |
| 744 #endif | |
| 745 | |
| 746 /* Clear or redraw the command line. Done last, because scrolling may | |
| 747 * mess up the command line. */ | |
| 748 if (clear_cmdline || redraw_cmdline) | |
| 749 showmode(); | |
| 750 | |
| 751 /* 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
|
752 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
753 maybe_intro_message(); |
| 7 | 754 did_intro = TRUE; |
| 755 | |
| 756 #ifdef FEAT_GUI | |
| 757 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 758 * done. */ | |
| 759 if (gui.in_use) | |
| 760 { | |
| 761 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
|
762 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
|
763 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
764 /* 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
|
765 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
766 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
767 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
768 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
769 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
|
770 # endif |
| 7 | 771 gui_update_cursor(FALSE, FALSE); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
772 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
773 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
774 } |
| 7 | 775 gui_update_scrollbars(FALSE); |
| 776 } | |
| 777 #endif | |
| 778 } | |
| 779 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
780 #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
|
781 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
782 * 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
|
783 * 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
|
784 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
785 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
786 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
787 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
788 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
789 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
790 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
791 /* 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
|
792 * 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
|
793 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
794 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
795 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
796 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
797 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
798 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
799 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
800 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
801 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
802 * 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
|
803 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
804 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
805 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
806 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
807 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
808 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
809 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
810 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
811 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
812 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
813 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
814 updating_screen = FALSE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
815 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
816 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
817 gui_may_resize_shell(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
818 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
819 /* 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
|
820 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
821 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
822 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
823 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
|
824 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
|
825 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
826 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
827 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
828 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
829 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
830 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
831 #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
|
832 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
833 * 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
|
834 * 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
|
835 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
836 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
837 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
|
838 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
839 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
|
840 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
841 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
|
842 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
|
843 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
|
844 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
|
845 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
|
846 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
|
847 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
|
848 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
849 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
850 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
|
851 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
852 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
|
853 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
|
854 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
855 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
856 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
857 * 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
|
858 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
859 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
860 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
|
861 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
862 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
|
863 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
864 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
|
865 /* 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
|
866 * 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
|
867 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
|
868 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
869 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
870 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
871 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
872 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
|
873 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
874 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
875 int j; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
876 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
877 /* 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
|
878 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
|
879 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
880 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
881 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
|
882 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
883 { |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
884 update_prepare(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
886 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
887 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
|
888 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
889 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
|
890 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
891 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
|
892 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
893 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
894 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
895 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
896 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
897 win_line(wp, lnum, row, row + wp->w_lines[j].wl_size, FALSE); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
898 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
899 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
900 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
901 break; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
902 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
903 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
904 } |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
905 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
906 update_finish(); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
907 } |
|
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 need_cursor_line_redraw = FALSE; |
| 7 | 909 } |
| 910 #endif | |
| 911 | |
| 912 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 913 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
914 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 915 { |
| 916 win_T *wp; | |
| 917 int doit = FALSE; | |
| 918 | |
| 919 # ifdef FEAT_FOLDING | |
| 920 win_foldinfo.fi_level = 0; | |
| 921 # endif | |
| 922 | |
| 923 /* update/delete a specific mark */ | |
| 924 FOR_ALL_WINDOWS(wp) | |
| 925 { | |
| 926 if (buf != NULL && lnum > 0) | |
| 927 { | |
| 928 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 929 && lnum < wp->w_botline) | |
| 930 { | |
| 931 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 932 wp->w_redraw_top = lnum; | |
| 933 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 934 wp->w_redraw_bot = lnum; | |
| 935 redraw_win_later(wp, VALID); | |
| 936 } | |
| 937 } | |
| 938 else | |
| 939 redraw_win_later(wp, VALID); | |
| 940 if (wp->w_redr_type != 0) | |
| 941 doit = TRUE; | |
| 942 } | |
| 943 | |
| 3250 | 944 /* Return when there is nothing to do, screen updating is already |
| 945 * happening (recursive call) or still starting up. */ | |
| 946 if (!doit || updating_screen | |
| 947 #ifdef FEAT_GUI | |
| 948 || gui.starting | |
| 949 #endif | |
| 950 || starting) | |
| 7 | 951 return; |
| 952 | |
| 953 /* update all windows that need updating */ | |
| 954 update_prepare(); | |
| 955 | |
| 956 # ifdef FEAT_WINDOWS | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
957 FOR_ALL_WINDOWS(wp) |
| 7 | 958 { |
| 959 if (wp->w_redr_type != 0) | |
| 960 win_update(wp); | |
| 961 if (wp->w_redr_status) | |
| 962 win_redr_status(wp); | |
| 963 } | |
| 964 # else | |
| 965 if (curwin->w_redr_type != 0) | |
| 966 win_update(curwin); | |
| 967 # endif | |
| 968 | |
| 969 update_finish(); | |
| 970 } | |
| 971 #endif | |
| 972 | |
| 973 | |
| 974 #if defined(FEAT_GUI) || defined(PROTO) | |
| 975 /* | |
| 976 * Update a single window, its status line and maybe the command line msg. | |
| 977 * Used for the GUI scrollbar. | |
| 978 */ | |
| 979 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
980 updateWindow(win_T *wp) |
| 7 | 981 { |
| 2008 | 982 /* return if already busy updating */ |
| 983 if (updating_screen) | |
| 984 return; | |
| 985 | |
| 7 | 986 update_prepare(); |
| 987 | |
| 988 #ifdef FEAT_CLIPBOARD | |
| 989 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 990 if (clip_star.available && clip_isautosel_star()) |
| 991 clip_update_selection(&clip_star); | |
| 992 if (clip_plus.available && clip_isautosel_plus()) | |
| 993 clip_update_selection(&clip_plus); | |
| 7 | 994 #endif |
| 670 | 995 |
| 7 | 996 win_update(wp); |
| 670 | 997 |
| 7 | 998 #ifdef FEAT_WINDOWS |
| 670 | 999 /* When the screen was cleared redraw the tab pages line. */ |
| 673 | 1000 if (redraw_tabline) |
| 677 | 1001 draw_tabline(); |
| 670 | 1002 |
| 7 | 1003 if (wp->w_redr_status |
| 1004 # ifdef FEAT_CMDL_INFO | |
| 1005 || p_ru | |
| 1006 # endif | |
| 1007 # ifdef FEAT_STL_OPT | |
| 40 | 1008 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1009 # endif |
| 1010 ) | |
| 1011 win_redr_status(wp); | |
| 1012 #endif | |
| 1013 | |
| 1014 update_finish(); | |
| 1015 } | |
| 1016 #endif | |
| 1017 | |
| 1018 /* | |
| 1019 * Update a single window. | |
| 1020 * | |
| 1021 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1022 * screen or scrolling lines). | |
| 1023 * | |
| 1024 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1025 * implies the one below it. | |
| 1026 * NOT_VALID redraw the whole window | |
| 743 | 1027 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1028 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1029 * INVERTED redraw the changed part of the Visual area | |
| 1030 * INVERTED_ALL redraw the whole Visual area | |
| 1031 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1032 * 2. update lines at the top when scrolled down | |
| 1033 * 3. redraw changed text: | |
| 301 | 1034 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1035 * b_mod_top and b_mod_bot. |
| 1036 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1037 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1038 * - continue redrawing when syntax status is invalid. | |
| 1039 * 4. if scrolled up, update lines at the bottom. | |
| 1040 * This results in three areas that may need updating: | |
| 1041 * top: from first row to top_end (when scrolled down) | |
| 1042 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1043 * bot: from bot_start to last row (when scrolled up) | |
| 1044 */ | |
| 1045 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1046 win_update(win_T *wp) |
| 7 | 1047 { |
| 1048 buf_T *buf = wp->w_buffer; | |
| 1049 int type; | |
| 1050 int top_end = 0; /* Below last row of the top area that needs | |
| 1051 updating. 0 when no top area updating. */ | |
| 1052 int mid_start = 999;/* first row of the mid area that needs | |
| 1053 updating. 999 when no mid area updating. */ | |
| 1054 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1055 updating. 0 when no mid area updating. */ | |
| 1056 int bot_start = 999;/* first row of the bot area that needs | |
| 1057 updating. 999 when no bot area updating */ | |
| 1058 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1059 w_topline got smaller a bit */ | |
| 1060 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1061 matchitem_T *cur; /* points to the match list */ |
| 7 | 1062 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1063 #endif | |
| 1064 | |
| 1065 int row; /* current window row to display */ | |
| 1066 linenr_T lnum; /* current buffer lnum to display */ | |
| 1067 int idx; /* current index in w_lines[] */ | |
| 1068 int srow; /* starting row of the current line */ | |
| 1069 | |
| 1070 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1071 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1072 int i; | |
| 1073 long j; | |
| 1074 static int recursive = FALSE; /* being called recursively */ | |
| 1075 int old_botline = wp->w_botline; | |
| 1076 #ifdef FEAT_FOLDING | |
| 1077 long fold_count; | |
| 1078 #endif | |
| 1079 #ifdef FEAT_SYN_HL | |
| 1080 /* remember what happened to the previous line, to know if | |
| 1081 * check_visual_highlight() can be used */ | |
| 1082 #define DID_NONE 1 /* didn't update a line */ | |
| 1083 #define DID_LINE 2 /* updated a normal line */ | |
| 1084 #define DID_FOLD 3 /* updated a folded line */ | |
| 1085 int did_update = DID_NONE; | |
| 1086 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1087 #endif | |
| 1088 linenr_T mod_top = 0; | |
| 1089 linenr_T mod_bot = 0; | |
| 1090 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1091 int save_got_int; | |
| 1092 #endif | |
| 1093 | |
| 1094 type = wp->w_redr_type; | |
| 1095 | |
| 1096 if (type == NOT_VALID) | |
| 1097 { | |
| 1098 #ifdef FEAT_WINDOWS | |
| 1099 wp->w_redr_status = TRUE; | |
| 1100 #endif | |
| 1101 wp->w_lines_valid = 0; | |
| 1102 } | |
| 1103 | |
| 1104 /* Window is zero-height: nothing to draw. */ | |
| 1105 if (wp->w_height == 0) | |
| 1106 { | |
| 1107 wp->w_redr_type = 0; | |
| 1108 return; | |
| 1109 } | |
| 1110 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
1111 #ifdef FEAT_WINDOWS |
| 7 | 1112 /* Window is zero-width: Only need to draw the separator. */ |
| 1113 if (wp->w_width == 0) | |
| 1114 { | |
| 1115 /* draw the vertical separator right of this window */ | |
| 1116 draw_vsep_win(wp, 0); | |
| 1117 wp->w_redr_type = 0; | |
| 1118 return; | |
| 1119 } | |
| 1120 #endif | |
| 1121 | |
| 1122 #ifdef FEAT_SEARCH_EXTRA | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1123 init_search_hl(wp); |
| 7 | 1124 #endif |
| 1125 | |
| 13 | 1126 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1127 /* 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
|
1128 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1129 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1130 if (wp->w_nrwidth != i) |
| 13 | 1131 { |
| 1132 type = NOT_VALID; | |
| 677 | 1133 wp->w_nrwidth = i; |
| 13 | 1134 } |
| 1135 else | |
| 1136 #endif | |
| 1137 | |
| 7 | 1138 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1139 { | |
| 1140 /* | |
| 1141 * When there are both inserted/deleted lines and specific lines to be | |
| 1142 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1143 * everything (only happens when redrawing is off for while). | |
| 1144 */ | |
| 1145 type = NOT_VALID; | |
| 1146 } | |
| 1147 else | |
| 1148 { | |
| 1149 /* | |
| 1150 * Set mod_top to the first line that needs displaying because of | |
| 1151 * changes. Set mod_bot to the first line after the changes. | |
| 1152 */ | |
| 1153 mod_top = wp->w_redraw_top; | |
| 1154 if (wp->w_redraw_bot != 0) | |
| 1155 mod_bot = wp->w_redraw_bot + 1; | |
| 1156 else | |
| 1157 mod_bot = 0; | |
| 1158 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1159 wp->w_redraw_bot = 0; | |
| 1160 if (buf->b_mod_set) | |
| 1161 { | |
| 1162 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1163 { | |
| 1164 mod_top = buf->b_mod_top; | |
| 1165 #ifdef FEAT_SYN_HL | |
| 1166 /* Need to redraw lines above the change that may be included | |
| 1167 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1168 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1169 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1170 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1171 if (mod_top < 1) |
| 1172 mod_top = 1; | |
| 1173 } | |
| 1174 #endif | |
| 1175 } | |
| 1176 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1177 mod_bot = buf->b_mod_bot; | |
| 1178 | |
| 1179 #ifdef FEAT_SEARCH_EXTRA | |
| 1180 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1181 * change in one line may make the Search highlighting in a | |
| 1182 * previous line invalid. Simple solution: redraw all visible | |
| 1183 * lines above the change. | |
| 1326 | 1184 * Same for a match pattern. |
| 7 | 1185 */ |
| 699 | 1186 if (search_hl.rm.regprog != NULL |
| 1187 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1188 top_to_mod = TRUE; |
| 699 | 1189 else |
| 1326 | 1190 { |
| 1191 cur = wp->w_match_head; | |
| 1192 while (cur != NULL) | |
| 1193 { | |
| 1194 if (cur->match.regprog != NULL | |
| 1195 && re_multiline(cur->match.regprog)) | |
| 699 | 1196 { |
| 1197 top_to_mod = TRUE; | |
| 1198 break; | |
| 1199 } | |
| 1326 | 1200 cur = cur->next; |
| 1201 } | |
| 1202 } | |
| 7 | 1203 #endif |
| 1204 } | |
| 1205 #ifdef FEAT_FOLDING | |
| 1206 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1207 { | |
| 1208 linenr_T lnumt, lnumb; | |
| 1209 | |
| 1210 /* | |
| 1211 * A change in a line can cause lines above it to become folded or | |
| 1212 * unfolded. Find the top most buffer line that may be affected. | |
| 1213 * If the line was previously folded and displayed, get the first | |
| 1214 * line of that fold. If the line is folded now, get the first | |
| 1215 * folded line. Use the minimum of these two. | |
| 1216 */ | |
| 1217 | |
| 1218 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1219 * the line below it. If there is no valid entry, use w_topline. | |
| 1220 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1221 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1222 lnumt = wp->w_topline; | |
| 1223 lnumb = MAXLNUM; | |
| 1224 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1225 if (wp->w_lines[i].wl_valid) | |
| 1226 { | |
| 1227 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1228 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1229 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1230 { | |
| 1231 lnumb = wp->w_lines[i].wl_lnum; | |
| 1232 /* When there is a fold column it might need updating | |
| 1233 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1234 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1235 ++lnumb; |
| 1236 } | |
| 1237 } | |
| 1238 | |
| 1239 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1240 if (mod_top > lnumt) | |
| 1241 mod_top = lnumt; | |
| 1242 | |
| 1243 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1244 --mod_bot; | |
| 1245 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1246 ++mod_bot; | |
| 1247 if (mod_bot < lnumb) | |
| 1248 mod_bot = lnumb; | |
| 1249 } | |
| 1250 #endif | |
| 1251 | |
| 1252 /* When a change starts above w_topline and the end is below | |
| 1253 * w_topline, start redrawing at w_topline. | |
| 36 | 1254 * If the end of the change is above w_topline: do like no change was |
| 1255 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1256 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1257 { | |
| 1258 if (mod_bot > wp->w_topline) | |
| 1259 mod_top = wp->w_topline; | |
| 1260 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1261 else if (syntax_present(wp)) |
| 7 | 1262 top_end = 1; |
| 1263 #endif | |
| 1264 } | |
| 36 | 1265 |
| 1266 /* When line numbers are displayed need to redraw all lines below | |
| 1267 * inserted/deleted lines. */ | |
| 1268 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1269 mod_bot = MAXLNUM; | |
| 7 | 1270 } |
| 1271 | |
| 1272 /* | |
| 1273 * When only displaying the lines at the top, set top_end. Used when | |
| 1274 * window has scrolled down for msg_scrolled. | |
| 1275 */ | |
| 1276 if (type == REDRAW_TOP) | |
| 1277 { | |
| 1278 j = 0; | |
| 1279 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1280 { | |
| 1281 j += wp->w_lines[i].wl_size; | |
| 1282 if (j >= wp->w_upd_rows) | |
| 1283 { | |
| 1284 top_end = j; | |
| 1285 break; | |
| 1286 } | |
| 1287 } | |
| 1288 if (top_end == 0) | |
| 1289 /* not found (cannot happen?): redraw everything */ | |
| 1290 type = NOT_VALID; | |
| 1291 else | |
| 1292 /* top area defined, the rest is VALID */ | |
| 1293 type = VALID; | |
| 1294 } | |
| 1295 | |
| 1378 | 1296 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1297 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1298 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1299 * called. */ | |
| 1300 if (screen_cleared) | |
| 1301 screen_cleared = MAYBE; | |
| 1302 | |
| 7 | 1303 /* |
| 1304 * If there are no changes on the screen that require a complete redraw, | |
| 1305 * handle three cases: | |
| 1306 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1307 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1308 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1309 * w_lines[] that needs updating. | |
| 1310 */ | |
| 743 | 1311 if ((type == VALID || type == SOME_VALID |
| 1312 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1313 #ifdef FEAT_DIFF |
| 1314 && !wp->w_botfill && !wp->w_old_botfill | |
| 1315 #endif | |
| 1316 ) | |
| 1317 { | |
| 1318 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1319 { | |
| 1320 /* | |
| 1321 * w_topline is the first changed line, the scrolling will be done | |
| 1322 * further down. | |
| 1323 */ | |
| 1324 } | |
| 1325 else if (wp->w_lines[0].wl_valid | |
| 1326 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1327 #ifdef FEAT_DIFF | |
| 1328 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1329 && wp->w_topfill > wp->w_old_topfill) | |
| 1330 #endif | |
| 1331 )) | |
| 1332 { | |
| 1333 /* | |
| 1334 * New topline is above old topline: May scroll down. | |
| 1335 */ | |
| 1336 #ifdef FEAT_FOLDING | |
| 1337 if (hasAnyFolding(wp)) | |
| 1338 { | |
| 1339 linenr_T ln; | |
| 1340 | |
| 1341 /* count the number of lines we are off, counting a sequence | |
| 1342 * of folded lines as one */ | |
| 1343 j = 0; | |
| 1344 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1345 { | |
| 1346 ++j; | |
| 1347 if (j >= wp->w_height - 2) | |
| 1348 break; | |
| 1349 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1350 } | |
| 1351 } | |
| 1352 else | |
| 1353 #endif | |
| 1354 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1355 if (j < wp->w_height - 2) /* not too far off */ | |
| 1356 { | |
| 1357 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1358 #ifdef FEAT_DIFF | |
| 1359 /* insert extra lines for previously invisible filler lines */ | |
| 1360 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1361 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1362 - wp->w_old_topfill; | |
| 1363 #endif | |
| 1364 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1365 { | |
| 1366 /* | |
| 1367 * Try to insert the correct number of lines. | |
| 1368 * If not the last window, delete the lines at the bottom. | |
| 1369 * win_ins_lines may fail when the terminal can't do it. | |
| 1370 */ | |
| 1371 if (i > 0) | |
| 1372 check_for_delay(FALSE); | |
| 1373 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1374 { | |
| 1375 if (wp->w_lines_valid != 0) | |
| 1376 { | |
| 1377 /* Need to update rows that are new, stop at the | |
| 1378 * first one that scrolled down. */ | |
| 1379 top_end = i; | |
| 1380 scrolled_down = TRUE; | |
| 1381 | |
| 1382 /* Move the entries that were scrolled, disable | |
| 1383 * the entries for the lines to be redrawn. */ | |
| 1384 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1385 wp->w_lines_valid = wp->w_height; | |
| 1386 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1387 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1388 while (idx >= 0) | |
| 1389 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1390 } | |
| 1391 } | |
| 1392 else | |
| 1393 mid_start = 0; /* redraw all lines */ | |
| 1394 } | |
| 1395 else | |
| 1396 mid_start = 0; /* redraw all lines */ | |
| 1397 } | |
| 1398 else | |
| 1399 mid_start = 0; /* redraw all lines */ | |
| 1400 } | |
| 1401 else | |
| 1402 { | |
| 1403 /* | |
| 1404 * New topline is at or below old topline: May scroll up. | |
| 1405 * When topline didn't change, find first entry in w_lines[] that | |
| 1406 * needs updating. | |
| 1407 */ | |
| 1408 | |
| 1409 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1410 j = -1; | |
| 1411 row = 0; | |
| 1412 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1413 { | |
| 1414 if (wp->w_lines[i].wl_valid | |
| 1415 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1416 { | |
| 1417 j = i; | |
| 1418 break; | |
| 1419 } | |
| 1420 row += wp->w_lines[i].wl_size; | |
| 1421 } | |
| 1422 if (j == -1) | |
| 1423 { | |
| 1424 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1425 * lines */ | |
| 1426 mid_start = 0; | |
| 1427 } | |
| 1428 else | |
| 1429 { | |
| 1430 /* | |
| 1431 * Try to delete the correct number of lines. | |
| 1432 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1433 */ | |
| 1434 #ifdef FEAT_DIFF | |
| 1435 /* If the topline didn't change, delete old filler lines, | |
| 1436 * otherwise delete filler lines of the new topline... */ | |
| 1437 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1438 row += wp->w_old_topfill; | |
| 1439 else | |
| 1440 row += diff_check_fill(wp, wp->w_topline); | |
| 1441 /* ... but don't delete new filler lines. */ | |
| 1442 row -= wp->w_topfill; | |
| 1443 #endif | |
| 1444 if (row > 0) | |
| 1445 { | |
| 1446 check_for_delay(FALSE); | |
| 1447 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin) == OK) | |
| 1448 bot_start = wp->w_height - row; | |
| 1449 else | |
| 1450 mid_start = 0; /* redraw all lines */ | |
| 1451 } | |
| 1452 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1453 { | |
| 1454 /* | |
| 1455 * Skip the lines (below the deleted lines) that are still | |
| 1456 * valid and don't need redrawing. Copy their info | |
| 1457 * upwards, to compensate for the deleted lines. Set | |
| 1458 * bot_start to the first row that needs redrawing. | |
| 1459 */ | |
| 1460 bot_start = 0; | |
| 1461 idx = 0; | |
| 1462 for (;;) | |
| 1463 { | |
| 1464 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1465 /* stop at line that didn't fit, unless it is still | |
| 1466 * valid (no lines deleted) */ | |
| 1467 if (row > 0 && bot_start + row | |
| 1468 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1469 { | |
| 1470 wp->w_lines_valid = idx + 1; | |
| 1471 break; | |
| 1472 } | |
| 1473 bot_start += wp->w_lines[idx++].wl_size; | |
| 1474 | |
| 1475 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1476 if (++j >= wp->w_lines_valid) | |
| 1477 { | |
| 1478 wp->w_lines_valid = idx; | |
| 1479 break; | |
| 1480 } | |
| 1481 } | |
| 1482 #ifdef FEAT_DIFF | |
| 1483 /* Correct the first entry for filler lines at the top | |
| 1484 * when it won't get updated below. */ | |
| 1485 if (wp->w_p_diff && bot_start > 0) | |
| 1486 wp->w_lines[0].wl_size = | |
| 1487 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1488 + wp->w_topfill; | |
| 1489 #endif | |
| 1490 } | |
| 1491 } | |
| 1492 } | |
| 1493 | |
| 1494 /* When starting redraw in the first line, redraw all lines. When | |
| 1495 * there is only one window it's probably faster to clear the screen | |
| 1496 * first. */ | |
| 1497 if (mid_start == 0) | |
| 1498 { | |
| 1499 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1500 if (ONE_WINDOW) |
| 981 | 1501 { |
| 1331 | 1502 /* Clear the screen when it was not done by win_del_lines() or |
| 1503 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1504 * then. */ | |
| 1505 if (screen_cleared != TRUE) | |
| 1506 screenclear(); | |
| 981 | 1507 #ifdef FEAT_WINDOWS |
| 1508 /* The screen was cleared, redraw the tab pages line. */ | |
| 1509 if (redraw_tabline) | |
| 1510 draw_tabline(); | |
| 1511 #endif | |
| 1512 } | |
| 7 | 1513 } |
| 1331 | 1514 |
| 1515 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1516 * cleared (only happens for the first window) or when screenclear() | |
| 1517 * was called directly above, "must_redraw" will have been set to | |
| 1518 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1519 if (screen_cleared == TRUE) | |
| 1520 must_redraw = 0; | |
| 7 | 1521 } |
| 1522 else | |
| 1523 { | |
| 1524 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1525 mid_start = 0; | |
| 1526 mid_end = wp->w_height; | |
| 1527 } | |
| 1528 | |
| 743 | 1529 if (type == SOME_VALID) |
| 1530 { | |
| 1531 /* SOME_VALID: redraw all lines. */ | |
| 1532 mid_start = 0; | |
| 1533 mid_end = wp->w_height; | |
| 1534 type = NOT_VALID; | |
| 1535 } | |
| 1536 | |
| 7 | 1537 /* check if we are updating or removing the inverted part */ |
| 1538 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1539 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1540 { | |
| 1541 linenr_T from, to; | |
| 1542 | |
| 1543 if (VIsual_active) | |
| 1544 { | |
| 1545 if (VIsual_active | |
| 1546 && (VIsual_mode != wp->w_old_visual_mode | |
| 1547 || type == INVERTED_ALL)) | |
| 1548 { | |
| 1549 /* | |
| 1550 * If the type of Visual selection changed, redraw the whole | |
| 1551 * selection. Also when the ownership of the X selection is | |
| 1552 * gained or lost. | |
| 1553 */ | |
| 1554 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1555 { | |
| 1556 from = curwin->w_cursor.lnum; | |
| 1557 to = VIsual.lnum; | |
| 1558 } | |
| 1559 else | |
| 1560 { | |
| 1561 from = VIsual.lnum; | |
| 1562 to = curwin->w_cursor.lnum; | |
| 1563 } | |
| 1564 /* redraw more when the cursor moved as well */ | |
| 1565 if (wp->w_old_cursor_lnum < from) | |
| 1566 from = wp->w_old_cursor_lnum; | |
| 1567 if (wp->w_old_cursor_lnum > to) | |
| 1568 to = wp->w_old_cursor_lnum; | |
| 1569 if (wp->w_old_visual_lnum < from) | |
| 1570 from = wp->w_old_visual_lnum; | |
| 1571 if (wp->w_old_visual_lnum > to) | |
| 1572 to = wp->w_old_visual_lnum; | |
| 1573 } | |
| 1574 else | |
| 1575 { | |
| 1576 /* | |
| 1577 * Find the line numbers that need to be updated: The lines | |
| 1578 * between the old cursor position and the current cursor | |
| 1579 * position. Also check if the Visual position changed. | |
| 1580 */ | |
| 1581 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1582 { | |
| 1583 from = curwin->w_cursor.lnum; | |
| 1584 to = wp->w_old_cursor_lnum; | |
| 1585 } | |
| 1586 else | |
| 1587 { | |
| 1588 from = wp->w_old_cursor_lnum; | |
| 1589 to = curwin->w_cursor.lnum; | |
| 1590 if (from == 0) /* Visual mode just started */ | |
| 1591 from = to; | |
| 1592 } | |
| 1593 | |
| 422 | 1594 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1595 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1596 { |
| 1597 if (wp->w_old_visual_lnum < from | |
| 1598 && wp->w_old_visual_lnum != 0) | |
| 1599 from = wp->w_old_visual_lnum; | |
| 1600 if (wp->w_old_visual_lnum > to) | |
| 1601 to = wp->w_old_visual_lnum; | |
| 1602 if (VIsual.lnum < from) | |
| 1603 from = VIsual.lnum; | |
| 1604 if (VIsual.lnum > to) | |
| 1605 to = VIsual.lnum; | |
| 1606 } | |
| 1607 } | |
| 1608 | |
| 1609 /* | |
| 1610 * If in block mode and changed column or curwin->w_curswant: | |
| 1611 * update all lines. | |
| 1612 * First compute the actual start and end column. | |
| 1613 */ | |
| 1614 if (VIsual_mode == Ctrl_V) | |
| 1615 { | |
| 6266 | 1616 colnr_T fromc, toc; |
| 1617 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1618 int save_ve_flags = ve_flags; | |
| 1619 | |
| 1620 if (curwin->w_p_lbr) | |
| 1621 ve_flags = VE_ALL; | |
| 1622 #endif | |
| 7 | 1623 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1624 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1625 ve_flags = save_ve_flags; | |
| 1626 #endif | |
| 7 | 1627 ++toc; |
| 1628 if (curwin->w_curswant == MAXCOL) | |
| 1629 toc = MAXCOL; | |
| 1630 | |
| 1631 if (fromc != wp->w_old_cursor_fcol | |
| 1632 || toc != wp->w_old_cursor_lcol) | |
| 1633 { | |
| 1634 if (from > VIsual.lnum) | |
| 1635 from = VIsual.lnum; | |
| 1636 if (to < VIsual.lnum) | |
| 1637 to = VIsual.lnum; | |
| 1638 } | |
| 1639 wp->w_old_cursor_fcol = fromc; | |
| 1640 wp->w_old_cursor_lcol = toc; | |
| 1641 } | |
| 1642 } | |
| 1643 else | |
| 1644 { | |
| 1645 /* Use the line numbers of the old Visual area. */ | |
| 1646 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1647 { | |
| 1648 from = wp->w_old_cursor_lnum; | |
| 1649 to = wp->w_old_visual_lnum; | |
| 1650 } | |
| 1651 else | |
| 1652 { | |
| 1653 from = wp->w_old_visual_lnum; | |
| 1654 to = wp->w_old_cursor_lnum; | |
| 1655 } | |
| 1656 } | |
| 1657 | |
| 1658 /* | |
| 1659 * There is no need to update lines above the top of the window. | |
| 1660 */ | |
| 1661 if (from < wp->w_topline) | |
| 1662 from = wp->w_topline; | |
| 1663 | |
| 1664 /* | |
| 1665 * If we know the value of w_botline, use it to restrict the update to | |
| 1666 * the lines that are visible in the window. | |
| 1667 */ | |
| 1668 if (wp->w_valid & VALID_BOTLINE) | |
| 1669 { | |
| 1670 if (from >= wp->w_botline) | |
| 1671 from = wp->w_botline - 1; | |
| 1672 if (to >= wp->w_botline) | |
| 1673 to = wp->w_botline - 1; | |
| 1674 } | |
| 1675 | |
| 1676 /* | |
| 1677 * Find the minimal part to be updated. | |
| 1678 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1679 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1680 * top_end; need to redraw from top_end to the "to" line. | |
| 1681 * A middle mouse click with a Visual selection may change the text | |
| 1682 * above the Visual area and reset wl_valid, do count these for | |
| 1683 * mid_end (in srow). | |
| 1684 */ | |
| 1685 if (mid_start > 0) | |
| 1686 { | |
| 1687 lnum = wp->w_topline; | |
| 1688 idx = 0; | |
| 1689 srow = 0; | |
| 1690 if (scrolled_down) | |
| 1691 mid_start = top_end; | |
| 1692 else | |
| 1693 mid_start = 0; | |
| 1694 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1695 { | |
| 1696 if (wp->w_lines[idx].wl_valid) | |
| 1697 mid_start += wp->w_lines[idx].wl_size; | |
| 1698 else if (!scrolled_down) | |
| 1699 srow += wp->w_lines[idx].wl_size; | |
| 1700 ++idx; | |
| 1701 # ifdef FEAT_FOLDING | |
| 1702 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1703 lnum = wp->w_lines[idx].wl_lnum; | |
| 1704 else | |
| 1705 # endif | |
| 1706 ++lnum; | |
| 1707 } | |
| 1708 srow += mid_start; | |
| 1709 mid_end = wp->w_height; | |
| 1710 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1711 { | |
| 1712 if (wp->w_lines[idx].wl_valid | |
| 1713 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1714 { | |
| 1715 /* Only update until first row of this line */ | |
| 1716 mid_end = srow; | |
| 1717 break; | |
| 1718 } | |
| 1719 srow += wp->w_lines[idx].wl_size; | |
| 1720 } | |
| 1721 } | |
| 1722 } | |
| 1723 | |
| 1724 if (VIsual_active && buf == curwin->w_buffer) | |
| 1725 { | |
| 1726 wp->w_old_visual_mode = VIsual_mode; | |
| 1727 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1728 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1729 wp->w_old_visual_col = VIsual.col; |
| 7 | 1730 wp->w_old_curswant = curwin->w_curswant; |
| 1731 } | |
| 1732 else | |
| 1733 { | |
| 1734 wp->w_old_visual_mode = 0; | |
| 1735 wp->w_old_cursor_lnum = 0; | |
| 1736 wp->w_old_visual_lnum = 0; | |
| 422 | 1737 wp->w_old_visual_col = 0; |
| 7 | 1738 } |
| 1739 | |
| 1740 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1741 /* reset got_int, otherwise regexp won't work */ | |
| 1742 save_got_int = got_int; | |
| 1743 got_int = 0; | |
| 1744 #endif | |
| 1745 #ifdef FEAT_FOLDING | |
| 1746 win_foldinfo.fi_level = 0; | |
| 1747 #endif | |
| 1748 | |
| 1749 /* | |
| 1750 * Update all the window rows. | |
| 1751 */ | |
| 1752 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1753 row = 0; | |
| 1754 srow = 0; | |
| 1755 lnum = wp->w_topline; /* first line shown in window */ | |
| 1756 for (;;) | |
| 1757 { | |
| 1758 /* stop updating when reached the end of the window (check for _past_ | |
| 1759 * the end of the window is at the end of the loop) */ | |
| 1760 if (row == wp->w_height) | |
| 1761 { | |
| 1762 didline = TRUE; | |
| 1763 break; | |
| 1764 } | |
| 1765 | |
| 1766 /* stop updating when hit the end of the file */ | |
| 1767 if (lnum > buf->b_ml.ml_line_count) | |
| 1768 { | |
| 1769 eof = TRUE; | |
| 1770 break; | |
| 1771 } | |
| 1772 | |
| 1773 /* Remember the starting row of the line that is going to be dealt | |
| 1774 * with. It is used further down when the line doesn't fit. */ | |
| 1775 srow = row; | |
| 1776 | |
| 1777 /* | |
| 1778 * Update a line when it is in an area that needs updating, when it | |
| 1779 * has changes or w_lines[idx] is invalid. | |
| 1780 * bot_start may be halfway a wrapped line after using | |
| 1781 * win_del_lines(), check if the current line includes it. | |
| 1782 * When syntax folding is being used, the saved syntax states will | |
| 1783 * already have been updated, we can't see where the syntax state is | |
| 1784 * the same again, just update until the end of the window. | |
| 1785 */ | |
| 1786 if (row < top_end | |
| 1787 || (row >= mid_start && row < mid_end) | |
| 1788 #ifdef FEAT_SEARCH_EXTRA | |
| 1789 || top_to_mod | |
| 1790 #endif | |
| 1791 || idx >= wp->w_lines_valid | |
| 1792 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1793 || (mod_top != 0 | |
| 1794 && (lnum == mod_top | |
| 1795 || (lnum >= mod_top | |
| 1796 && (lnum < mod_bot | |
| 1797 #ifdef FEAT_SYN_HL | |
| 1798 || did_update == DID_FOLD | |
| 1799 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1800 && syntax_present(wp) |
| 7 | 1801 && ( |
| 1802 # ifdef FEAT_FOLDING | |
| 1803 (foldmethodIsSyntax(wp) | |
| 1804 && hasAnyFolding(wp)) || | |
| 1805 # endif | |
| 1806 syntax_check_changed(lnum))) | |
| 1807 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1808 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1809 /* match in fixed position might need redraw |
| 1810 * if lines were inserted or deleted */ | |
| 1811 || (wp->w_match_head != NULL | |
| 1812 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1813 #endif |
| 7 | 1814 ))))) |
| 1815 { | |
| 1816 #ifdef FEAT_SEARCH_EXTRA | |
| 1817 if (lnum == mod_top) | |
| 1818 top_to_mod = FALSE; | |
| 1819 #endif | |
| 1820 | |
| 1821 /* | |
| 1822 * When at start of changed lines: May scroll following lines | |
| 1823 * up or down to minimize redrawing. | |
| 1824 * Don't do this when the change continues until the end. | |
| 3318 | 1825 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1826 */ |
| 1827 if (lnum == mod_top | |
| 1828 && mod_bot != MAXLNUM | |
| 3318 | 1829 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1830 { |
| 1831 int old_rows = 0; | |
| 1832 int new_rows = 0; | |
| 1833 int xtra_rows; | |
| 1834 linenr_T l; | |
| 1835 | |
| 1836 /* Count the old number of window rows, using w_lines[], which | |
| 1837 * should still contain the sizes for the lines as they are | |
| 1838 * currently displayed. */ | |
| 1839 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1840 { | |
| 1841 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1842 * lines are part of the changed area. */ | |
| 1843 if (wp->w_lines[i].wl_valid | |
| 1844 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1845 break; | |
| 1846 old_rows += wp->w_lines[i].wl_size; | |
| 1847 #ifdef FEAT_FOLDING | |
| 1848 if (wp->w_lines[i].wl_valid | |
| 1849 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1850 { | |
| 1851 /* Must have found the last valid entry above mod_bot. | |
| 1852 * Add following invalid entries. */ | |
| 1853 ++i; | |
| 1854 while (i < wp->w_lines_valid | |
| 1855 && !wp->w_lines[i].wl_valid) | |
| 1856 old_rows += wp->w_lines[i++].wl_size; | |
| 1857 break; | |
| 1858 } | |
| 1859 #endif | |
| 1860 } | |
| 1861 | |
| 1862 if (i >= wp->w_lines_valid) | |
| 1863 { | |
| 1864 /* We can't find a valid line below the changed lines, | |
| 1865 * need to redraw until the end of the window. | |
| 1866 * Inserting/deleting lines has no use. */ | |
| 1867 bot_start = 0; | |
| 1868 } | |
| 1869 else | |
| 1870 { | |
| 1871 /* Able to count old number of rows: Count new window | |
| 1872 * rows, and may insert/delete lines */ | |
| 1873 j = idx; | |
| 1874 for (l = lnum; l < mod_bot; ++l) | |
| 1875 { | |
| 1876 #ifdef FEAT_FOLDING | |
| 1877 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1878 ++new_rows; | |
| 1879 else | |
| 1880 #endif | |
| 1881 #ifdef FEAT_DIFF | |
| 1882 if (l == wp->w_topline) | |
| 1883 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1884 + wp->w_topfill; | |
| 1885 else | |
| 1886 #endif | |
| 1887 new_rows += plines_win(wp, l, TRUE); | |
| 1888 ++j; | |
| 1889 if (new_rows > wp->w_height - row - 2) | |
| 1890 { | |
| 1891 /* it's getting too much, must redraw the rest */ | |
| 1892 new_rows = 9999; | |
| 1893 break; | |
| 1894 } | |
| 1895 } | |
| 1896 xtra_rows = new_rows - old_rows; | |
| 1897 if (xtra_rows < 0) | |
| 1898 { | |
| 1899 /* May scroll text up. If there is not enough | |
| 1900 * remaining text or scrolling fails, must redraw the | |
| 1901 * rest. If scrolling works, must redraw the text | |
| 1902 * below the scrolled text. */ | |
| 1903 if (row - xtra_rows >= wp->w_height - 2) | |
| 1904 mod_bot = MAXLNUM; | |
| 1905 else | |
| 1906 { | |
| 1907 check_for_delay(FALSE); | |
| 1908 if (win_del_lines(wp, row, | |
| 1909 -xtra_rows, FALSE, FALSE) == FAIL) | |
| 1910 mod_bot = MAXLNUM; | |
| 1911 else | |
| 1912 bot_start = wp->w_height + xtra_rows; | |
| 1913 } | |
| 1914 } | |
| 1915 else if (xtra_rows > 0) | |
| 1916 { | |
| 1917 /* May scroll text down. If there is not enough | |
| 1918 * remaining text of scrolling fails, must redraw the | |
| 1919 * rest. */ | |
| 1920 if (row + xtra_rows >= wp->w_height - 2) | |
| 1921 mod_bot = MAXLNUM; | |
| 1922 else | |
| 1923 { | |
| 1924 check_for_delay(FALSE); | |
| 1925 if (win_ins_lines(wp, row + old_rows, | |
| 1926 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1927 mod_bot = MAXLNUM; | |
| 1928 else if (top_end > row + old_rows) | |
| 1929 /* Scrolled the part at the top that requires | |
| 1930 * updating down. */ | |
| 1931 top_end += xtra_rows; | |
| 1932 } | |
| 1933 } | |
| 1934 | |
| 1935 /* When not updating the rest, may need to move w_lines[] | |
| 1936 * entries. */ | |
| 1937 if (mod_bot != MAXLNUM && i != j) | |
| 1938 { | |
| 1939 if (j < i) | |
| 1940 { | |
| 1941 int x = row + new_rows; | |
| 1942 | |
| 1943 /* move entries in w_lines[] upwards */ | |
| 1944 for (;;) | |
| 1945 { | |
| 1946 /* stop at last valid entry in w_lines[] */ | |
| 1947 if (i >= wp->w_lines_valid) | |
| 1948 { | |
| 1949 wp->w_lines_valid = j; | |
| 1950 break; | |
| 1951 } | |
| 1952 wp->w_lines[j] = wp->w_lines[i]; | |
| 1953 /* stop at a line that won't fit */ | |
| 1954 if (x + (int)wp->w_lines[j].wl_size | |
| 1955 > wp->w_height) | |
| 1956 { | |
| 1957 wp->w_lines_valid = j + 1; | |
| 1958 break; | |
| 1959 } | |
| 1960 x += wp->w_lines[j++].wl_size; | |
| 1961 ++i; | |
| 1962 } | |
| 1963 if (bot_start > x) | |
| 1964 bot_start = x; | |
| 1965 } | |
| 1966 else /* j > i */ | |
| 1967 { | |
| 1968 /* move entries in w_lines[] downwards */ | |
| 1969 j -= i; | |
| 1970 wp->w_lines_valid += j; | |
| 1971 if (wp->w_lines_valid > wp->w_height) | |
| 1972 wp->w_lines_valid = wp->w_height; | |
| 1973 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 1974 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 1975 | |
| 1976 /* The w_lines[] entries for inserted lines are | |
| 1977 * now invalid, but wl_size may be used above. | |
| 1978 * Reset to zero. */ | |
| 1979 while (i >= idx) | |
| 1980 { | |
| 1981 wp->w_lines[i].wl_size = 0; | |
| 1982 wp->w_lines[i--].wl_valid = FALSE; | |
| 1983 } | |
| 1984 } | |
| 1985 } | |
| 1986 } | |
| 1987 } | |
| 1988 | |
| 1989 #ifdef FEAT_FOLDING | |
| 1990 /* | |
| 1991 * When lines are folded, display one line for all of them. | |
| 1992 * Otherwise, display normally (can be several display lines when | |
| 1993 * 'wrap' is on). | |
| 1994 */ | |
| 1995 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 1996 if (fold_count != 0) | |
| 1997 { | |
| 1998 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 1999 ++row; | |
| 2000 --fold_count; | |
| 2001 wp->w_lines[idx].wl_folded = TRUE; | |
| 2002 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2003 # ifdef FEAT_SYN_HL | |
| 2004 did_update = DID_FOLD; | |
| 2005 # endif | |
| 2006 } | |
| 2007 else | |
| 2008 #endif | |
| 2009 if (idx < wp->w_lines_valid | |
| 2010 && wp->w_lines[idx].wl_valid | |
| 2011 && wp->w_lines[idx].wl_lnum == lnum | |
| 2012 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2013 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2014 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2015 #ifdef FEAT_DIFF | |
| 2016 && diff_check_fill(wp, lnum) == 0 | |
| 2017 #endif | |
| 2018 ) | |
| 2019 { | |
| 2020 /* This line is not going to fit. Don't draw anything here, | |
| 2021 * will draw "@ " lines below. */ | |
| 2022 row = wp->w_height + 1; | |
| 2023 } | |
| 2024 else | |
| 2025 { | |
| 2026 #ifdef FEAT_SEARCH_EXTRA | |
| 2027 prepare_search_hl(wp, lnum); | |
| 2028 #endif | |
| 2029 #ifdef FEAT_SYN_HL | |
| 2030 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2031 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
|
2032 && syntax_present(wp)) |
| 7 | 2033 syntax_end_parsing(syntax_last_parsed + 1); |
| 2034 #endif | |
| 2035 | |
| 2036 /* | |
| 2037 * Display one line. | |
| 2038 */ | |
| 625 | 2039 row = win_line(wp, lnum, srow, wp->w_height, mod_top == 0); |
| 7 | 2040 |
| 2041 #ifdef FEAT_FOLDING | |
| 2042 wp->w_lines[idx].wl_folded = FALSE; | |
| 2043 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2044 #endif | |
| 2045 #ifdef FEAT_SYN_HL | |
| 2046 did_update = DID_LINE; | |
| 2047 syntax_last_parsed = lnum; | |
| 2048 #endif | |
| 2049 } | |
| 2050 | |
| 2051 wp->w_lines[idx].wl_lnum = lnum; | |
| 2052 wp->w_lines[idx].wl_valid = TRUE; | |
| 2053 if (row > wp->w_height) /* past end of screen */ | |
| 2054 { | |
| 2055 /* we may need the size of that too long line later on */ | |
| 3318 | 2056 if (dollar_vcol == -1) |
| 7 | 2057 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2058 ++idx; | |
| 2059 break; | |
| 2060 } | |
| 3318 | 2061 if (dollar_vcol == -1) |
| 7 | 2062 wp->w_lines[idx].wl_size = row - srow; |
| 2063 ++idx; | |
| 2064 #ifdef FEAT_FOLDING | |
| 2065 lnum += fold_count + 1; | |
| 2066 #else | |
| 2067 ++lnum; | |
| 2068 #endif | |
| 2069 } | |
| 2070 else | |
| 2071 { | |
| 2072 /* This line does not need updating, advance to the next one */ | |
| 2073 row += wp->w_lines[idx++].wl_size; | |
| 2074 if (row > wp->w_height) /* past end of screen */ | |
| 2075 break; | |
| 2076 #ifdef FEAT_FOLDING | |
| 2077 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2078 #else | |
| 2079 ++lnum; | |
| 2080 #endif | |
| 2081 #ifdef FEAT_SYN_HL | |
| 2082 did_update = DID_NONE; | |
| 2083 #endif | |
| 2084 } | |
| 2085 | |
| 2086 if (lnum > buf->b_ml.ml_line_count) | |
| 2087 { | |
| 2088 eof = TRUE; | |
| 2089 break; | |
| 2090 } | |
| 2091 } | |
| 2092 /* | |
| 2093 * End of loop over all window lines. | |
| 2094 */ | |
| 2095 | |
| 2096 | |
| 2097 if (idx > wp->w_lines_valid) | |
| 2098 wp->w_lines_valid = idx; | |
| 2099 | |
| 2100 #ifdef FEAT_SYN_HL | |
| 2101 /* | |
| 2102 * Let the syntax stuff know we stop parsing here. | |
| 2103 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2104 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2105 syntax_end_parsing(syntax_last_parsed + 1); |
| 2106 #endif | |
| 2107 | |
| 2108 /* | |
| 2109 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2110 * line we were working on, then the line didn't fit. | |
| 2111 */ | |
| 2112 wp->w_empty_rows = 0; | |
| 2113 #ifdef FEAT_DIFF | |
| 2114 wp->w_filler_rows = 0; | |
| 2115 #endif | |
| 2116 if (!eof && !didline) | |
| 2117 { | |
| 2118 if (lnum == wp->w_topline) | |
| 2119 { | |
| 2120 /* | |
| 2121 * Single line that does not fit! | |
| 2122 * Don't overwrite it, it can be edited. | |
| 2123 */ | |
| 2124 wp->w_botline = lnum + 1; | |
| 2125 } | |
| 2126 #ifdef FEAT_DIFF | |
| 2127 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2128 { | |
| 2129 /* Window ends in filler lines. */ | |
| 2130 wp->w_botline = lnum; | |
| 2131 wp->w_filler_rows = wp->w_height - srow; | |
| 2132 } | |
| 2133 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2134 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
|
2135 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2136 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
|
2137 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2138 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2139 * 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
|
2140 */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2141 screen_puts_len((char_u *)"@@", 2, scr_row, W_WINCOL(wp), |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2142 hl_attr(HLF_AT)); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2143 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
|
2144 (int)W_WINCOL(wp) + 2, (int)W_ENDCOL(wp), |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2145 '@', ' ', hl_attr(HLF_AT)); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2146 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2147 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2148 } |
| 7 | 2149 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2150 { | |
| 2151 /* | |
| 2152 * Last line isn't finished: Display "@@@" at the end. | |
| 2153 */ | |
| 2154 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2155 W_WINROW(wp) + wp->w_height, | |
| 2156 (int)W_ENDCOL(wp) - 3, (int)W_ENDCOL(wp), | |
| 2157 '@', '@', hl_attr(HLF_AT)); | |
| 2158 set_empty_rows(wp, srow); | |
| 2159 wp->w_botline = lnum; | |
| 2160 } | |
| 2161 else | |
| 2162 { | |
| 2163 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2164 wp->w_botline = lnum; | |
| 2165 } | |
| 2166 } | |
| 2167 else | |
| 2168 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
2169 #ifdef FEAT_WINDOWS |
| 7 | 2170 draw_vsep_win(wp, row); |
| 2171 #endif | |
| 2172 if (eof) /* we hit the end of the file */ | |
| 2173 { | |
| 2174 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2175 #ifdef FEAT_DIFF | |
| 2176 j = diff_check_fill(wp, wp->w_botline); | |
| 2177 if (j > 0 && !wp->w_botfill) | |
| 2178 { | |
| 2179 /* | |
| 2180 * Display filler lines at the end of the file | |
| 2181 */ | |
| 2182 if (char2cells(fill_diff) > 1) | |
| 2183 i = '-'; | |
| 2184 else | |
| 2185 i = fill_diff; | |
| 2186 if (row + j > wp->w_height) | |
| 2187 j = wp->w_height - row; | |
| 2188 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2189 row += j; | |
| 2190 } | |
| 2191 #endif | |
| 2192 } | |
| 3318 | 2193 else if (dollar_vcol == -1) |
| 7 | 2194 wp->w_botline = lnum; |
| 2195 | |
| 2196 /* make sure the rest of the screen is blank */ | |
| 2197 /* 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
|
2198 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2199 } |
| 2200 | |
| 2201 /* Reset the type of redrawing required, the window has been updated. */ | |
| 2202 wp->w_redr_type = 0; | |
| 2203 #ifdef FEAT_DIFF | |
| 2204 wp->w_old_topfill = wp->w_topfill; | |
| 2205 wp->w_old_botfill = wp->w_botfill; | |
| 2206 #endif | |
| 2207 | |
| 3318 | 2208 if (dollar_vcol == -1) |
| 7 | 2209 { |
| 2210 /* | |
| 2211 * There is a trick with w_botline. If we invalidate it on each | |
| 2212 * change that might modify it, this will cause a lot of expensive | |
| 2213 * calls to plines() in update_topline() each time. Therefore the | |
| 2214 * value of w_botline is often approximated, and this value is used to | |
| 2215 * compute the value of w_topline. If the value of w_botline was | |
| 2216 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2217 * the visible part of the text). If it's not, we need to redraw | |
| 2218 * again. Mostly this just means scrolling up a few lines, so it | |
| 2219 * doesn't look too bad. Only do this for the current window (where | |
| 2220 * changes are relevant). | |
| 2221 */ | |
| 2222 wp->w_valid |= VALID_BOTLINE; | |
| 2223 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2224 { | |
| 2225 recursive = TRUE; | |
| 2226 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2227 update_topline(); /* may invalidate w_botline again */ | |
| 2228 if (must_redraw != 0) | |
| 2229 { | |
| 2230 /* Don't update for changes in buffer again. */ | |
| 2231 i = curbuf->b_mod_set; | |
| 2232 curbuf->b_mod_set = FALSE; | |
| 2233 win_update(curwin); | |
| 2234 must_redraw = 0; | |
| 2235 curbuf->b_mod_set = i; | |
| 2236 } | |
| 2237 recursive = FALSE; | |
| 2238 } | |
| 2239 } | |
| 2240 | |
| 2241 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2242 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2243 if (!got_int) | |
| 2244 got_int = save_got_int; | |
| 2245 #endif | |
| 2246 } | |
| 2247 | |
| 2248 /* | |
| 2249 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2250 * as the filler character. | |
| 2251 */ | |
| 2252 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2253 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2254 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2255 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2256 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2257 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2258 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2259 hlf_T hl) |
| 7 | 2260 { |
| 2261 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2262 int n = 0; | |
| 2263 # define FDC_OFF n | |
| 2264 #else | |
| 2265 # define FDC_OFF 0 | |
| 2266 #endif | |
| 6553 | 2267 #ifdef FEAT_FOLDING |
| 2268 int fdc = compute_foldcolumn(wp, 0); | |
| 2269 #endif | |
| 7 | 2270 |
| 2271 #ifdef FEAT_RIGHTLEFT | |
| 2272 if (wp->w_p_rl) | |
| 2273 { | |
| 2274 /* No check for cmdline window: should never be right-left. */ | |
| 2275 # ifdef FEAT_FOLDING | |
| 6553 | 2276 n = fdc; |
| 7 | 2277 |
| 2278 if (n > 0) | |
| 2279 { | |
| 2280 /* draw the fold column at the right */ | |
| 119 | 2281 if (n > W_WIDTH(wp)) |
| 2282 n = W_WIDTH(wp); | |
| 7 | 2283 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2284 W_ENDCOL(wp) - n, (int)W_ENDCOL(wp), | |
| 2285 ' ', ' ', hl_attr(HLF_FC)); | |
| 2286 } | |
| 2287 # endif | |
| 2288 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2289 if (signcolumn_on(wp)) |
| 7 | 2290 { |
| 2291 int nn = n + 2; | |
| 2292 | |
| 2293 /* draw the sign column left of the fold column */ | |
| 119 | 2294 if (nn > W_WIDTH(wp)) |
| 2295 nn = W_WIDTH(wp); | |
| 7 | 2296 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2297 W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n, | |
| 2298 ' ', ' ', hl_attr(HLF_SC)); | |
| 2299 n = nn; | |
| 2300 } | |
| 2301 # endif | |
| 2302 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2303 W_WINCOL(wp), W_ENDCOL(wp) - 1 - FDC_OFF, | |
| 2304 c2, c2, hl_attr(hl)); | |
| 2305 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2306 W_ENDCOL(wp) - 1 - FDC_OFF, W_ENDCOL(wp) - FDC_OFF, | |
| 2307 c1, c2, hl_attr(hl)); | |
| 2308 } | |
| 2309 else | |
| 2310 #endif | |
| 2311 { | |
| 2312 #ifdef FEAT_CMDWIN | |
| 2313 if (cmdwin_type != 0 && wp == curwin) | |
| 2314 { | |
| 2315 /* draw the cmdline character in the leftmost column */ | |
| 2316 n = 1; | |
| 2317 if (n > wp->w_width) | |
| 2318 n = wp->w_width; | |
| 2319 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2320 W_WINCOL(wp), (int)W_WINCOL(wp) + n, | |
| 2321 cmdwin_type, ' ', hl_attr(HLF_AT)); | |
| 2322 } | |
| 2323 #endif | |
| 2324 #ifdef FEAT_FOLDING | |
| 6553 | 2325 if (fdc > 0) |
| 2326 { | |
| 2327 int nn = n + fdc; | |
| 7 | 2328 |
| 2329 /* draw the fold column at the left */ | |
| 2330 if (nn > W_WIDTH(wp)) | |
| 2331 nn = W_WIDTH(wp); | |
| 2332 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2333 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
| 2334 ' ', ' ', hl_attr(HLF_FC)); | |
| 2335 n = nn; | |
| 2336 } | |
| 2337 #endif | |
| 2338 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2339 if (signcolumn_on(wp)) |
| 7 | 2340 { |
| 2341 int nn = n + 2; | |
| 2342 | |
| 2343 /* draw the sign column after the fold column */ | |
| 2344 if (nn > W_WIDTH(wp)) | |
| 2345 nn = W_WIDTH(wp); | |
| 2346 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2347 W_WINCOL(wp) + n, (int)W_WINCOL(wp) + nn, | |
| 2348 ' ', ' ', hl_attr(HLF_SC)); | |
| 2349 n = nn; | |
| 2350 } | |
| 2351 #endif | |
| 2352 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
| 2353 W_WINCOL(wp) + FDC_OFF, (int)W_ENDCOL(wp), | |
| 2354 c1, c2, hl_attr(hl)); | |
| 2355 } | |
| 2356 set_empty_rows(wp, row); | |
| 2357 } | |
| 2358 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2359 #ifdef FEAT_SYN_HL |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2360 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
|
2361 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2362 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2363 * 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
|
2364 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2365 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2366 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
|
2367 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2368 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2369 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2370 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2371 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2372 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2373 |
| 7 | 2374 #ifdef FEAT_FOLDING |
| 2375 /* | |
| 6553 | 2376 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2377 * space is available for window "wp", minus "col". | |
| 2378 */ | |
| 2379 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2380 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2381 { |
| 2382 int fdc = wp->w_p_fdc; | |
| 2383 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
| 2384 int wwidth = W_WIDTH(wp); | |
| 2385 | |
| 2386 if (fdc > wwidth - (col + wmw)) | |
| 2387 fdc = wwidth - (col + wmw); | |
| 2388 return fdc; | |
| 2389 } | |
| 2390 | |
| 2391 /* | |
| 7 | 2392 * Display one folded line. |
| 2393 */ | |
| 2394 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2395 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2396 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2397 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2398 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2399 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2400 int row) |
| 7 | 2401 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2402 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2403 pos_T *top, *bot; |
| 2404 linenr_T lnume = lnum + fold_count - 1; | |
| 2405 int len; | |
| 29 | 2406 char_u *text; |
| 7 | 2407 int fdc; |
| 2408 int col; | |
| 2409 int txtcol; | |
| 2410 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2411 int ri; |
| 7 | 2412 |
| 2413 /* Build the fold line: | |
| 2414 * 1. Add the cmdwin_type for the command-line window | |
| 2415 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2416 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2417 * 4. Compose the text |
| 2418 * 5. Add the text | |
| 2419 * 6. set highlighting for the Visual area an other text | |
| 2420 */ | |
| 2421 col = 0; | |
| 2422 | |
| 2423 /* | |
| 2424 * 1. Add the cmdwin_type for the command-line window | |
| 2425 * Ignores 'rightleft', this window is never right-left. | |
| 2426 */ | |
| 2427 #ifdef FEAT_CMDWIN | |
| 2428 if (cmdwin_type != 0 && wp == curwin) | |
| 2429 { | |
| 2430 ScreenLines[off] = cmdwin_type; | |
| 2431 ScreenAttrs[off] = hl_attr(HLF_AT); | |
| 2432 #ifdef FEAT_MBYTE | |
| 2433 if (enc_utf8) | |
| 2434 ScreenLinesUC[off] = 0; | |
| 2435 #endif | |
| 2436 ++col; | |
| 2437 } | |
| 2438 #endif | |
| 2439 | |
| 2440 /* | |
| 2441 * 2. Add the 'foldcolumn' | |
| 6553 | 2442 * Reduce the width when there is not enough space. |
| 7 | 2443 */ |
| 6553 | 2444 fdc = compute_foldcolumn(wp, col); |
| 7 | 2445 if (fdc > 0) |
| 2446 { | |
| 2447 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2448 #ifdef FEAT_RIGHTLEFT | |
| 2449 if (wp->w_p_rl) | |
| 2450 { | |
| 2451 int i; | |
| 2452 | |
| 2453 copy_text_attr(off + W_WIDTH(wp) - fdc - col, buf, fdc, | |
| 2454 hl_attr(HLF_FC)); | |
| 2455 /* reverse the fold column */ | |
| 2456 for (i = 0; i < fdc; ++i) | |
| 2457 ScreenLines[off + W_WIDTH(wp) - i - 1 - col] = buf[i]; | |
| 2458 } | |
| 2459 else | |
| 2460 #endif | |
| 2461 copy_text_attr(off + col, buf, fdc, hl_attr(HLF_FC)); | |
| 2462 col += fdc; | |
| 2463 } | |
| 2464 | |
| 2465 #ifdef FEAT_RIGHTLEFT | |
| 216 | 2466 # define RL_MEMSET(p, v, l) if (wp->w_p_rl) \ |
| 2467 for (ri = 0; ri < l; ++ri) \ | |
| 2468 ScreenAttrs[off + (W_WIDTH(wp) - (p) - (l)) + ri] = v; \ | |
| 2469 else \ | |
| 2470 for (ri = 0; ri < l; ++ri) \ | |
| 2471 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2472 #else |
| 216 | 2473 # define RL_MEMSET(p, v, l) for (ri = 0; ri < l; ++ri) \ |
| 2474 ScreenAttrs[off + (p) + ri] = v | |
| 7 | 2475 #endif |
| 2476 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2477 /* 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
|
2478 * text */ |
| 216 | 2479 RL_MEMSET(col, hl_attr(HLF_FL), W_WIDTH(wp) - col); |
| 7 | 2480 |
| 2481 #ifdef FEAT_SIGNS | |
| 2482 /* 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
|
2483 if (signcolumn_on(wp)) |
| 7 | 2484 { |
| 2485 len = W_WIDTH(wp) - col; | |
| 2486 if (len > 0) | |
| 2487 { | |
| 2488 if (len > 2) | |
| 2489 len = 2; | |
| 2490 # ifdef FEAT_RIGHTLEFT | |
| 2491 if (wp->w_p_rl) | |
| 2492 /* the line number isn't reversed */ | |
| 2493 copy_text_attr(off + W_WIDTH(wp) - len - col, | |
| 2494 (char_u *)" ", len, hl_attr(HLF_FL)); | |
| 2495 else | |
| 2496 # endif | |
| 2497 copy_text_attr(off + col, (char_u *)" ", len, hl_attr(HLF_FL)); | |
| 2498 col += len; | |
| 2499 } | |
| 2500 } | |
| 2501 #endif | |
| 2502 | |
| 2503 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2504 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2505 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2506 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2507 { |
| 2508 len = W_WIDTH(wp) - col; | |
| 2509 if (len > 0) | |
| 2510 { | |
| 13 | 2511 int w = number_width(wp); |
| 5905 | 2512 long num; |
| 2513 char *fmt = "%*ld "; | |
| 13 | 2514 |
| 2515 if (len > w + 1) | |
| 2516 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2517 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2518 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
|
2519 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2520 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2521 else |
| 4065 | 2522 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2523 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2524 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
|
2525 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
|
2526 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2527 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2528 * line number */ |
| 4065 | 2529 num = lnum; |
| 2530 fmt = "%-*ld "; | |
| 2531 } | |
| 2532 } | |
| 2533 | |
| 2534 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2535 #ifdef FEAT_RIGHTLEFT |
| 2536 if (wp->w_p_rl) | |
| 2537 /* the line number isn't reversed */ | |
| 2538 copy_text_attr(off + W_WIDTH(wp) - len - col, buf, len, | |
| 2539 hl_attr(HLF_FL)); | |
| 2540 else | |
| 2541 #endif | |
| 2542 copy_text_attr(off + col, buf, len, hl_attr(HLF_FL)); | |
| 2543 col += len; | |
| 2544 } | |
| 2545 } | |
| 2546 | |
| 2547 /* | |
| 2548 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2549 */ | |
| 29 | 2550 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2551 |
| 2552 txtcol = col; /* remember where text starts */ | |
| 2553 | |
| 2554 /* | |
| 2555 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2556 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2557 * in columns number-col - window-width. | |
| 2558 */ | |
| 2559 #ifdef FEAT_MBYTE | |
| 2560 if (has_mbyte) | |
| 2561 { | |
| 2562 int cells; | |
| 714 | 2563 int u8c, u8cc[MAX_MCO]; |
| 2564 int i; | |
| 7 | 2565 int idx; |
| 2566 int c_len; | |
| 33 | 2567 char_u *p; |
| 7 | 2568 # ifdef FEAT_ARABIC |
| 2569 int prev_c = 0; /* previous Arabic character */ | |
| 2570 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 2571 # endif | |
| 2572 | |
| 2573 # ifdef FEAT_RIGHTLEFT | |
| 2574 if (wp->w_p_rl) | |
| 2575 idx = off; | |
| 2576 else | |
| 2577 # endif | |
| 2578 idx = off + col; | |
| 2579 | |
| 2580 /* Store multibyte characters in ScreenLines[] et al. correctly. */ | |
| 2581 for (p = text; *p != NUL; ) | |
| 2582 { | |
| 2583 cells = (*mb_ptr2cells)(p); | |
| 474 | 2584 c_len = (*mb_ptr2len)(p); |
| 7 | 2585 if (col + cells > W_WIDTH(wp) |
| 2586 # ifdef FEAT_RIGHTLEFT | |
| 2587 - (wp->w_p_rl ? col : 0) | |
| 2588 # endif | |
| 2589 ) | |
| 2590 break; | |
| 2591 ScreenLines[idx] = *p; | |
| 2592 if (enc_utf8) | |
| 2593 { | |
| 714 | 2594 u8c = utfc_ptr2char(p, u8cc); |
| 2595 if (*p < 0x80 && u8cc[0] == 0) | |
| 7 | 2596 { |
| 2597 ScreenLinesUC[idx] = 0; | |
| 2598 #ifdef FEAT_ARABIC | |
| 2599 prev_c = u8c; | |
| 2600 #endif | |
| 2601 } | |
| 2602 else | |
| 2603 { | |
| 2604 #ifdef FEAT_ARABIC | |
| 2605 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 2606 { | |
| 2607 /* Do Arabic shaping. */ | |
| 714 | 2608 int pc, pc1, nc; |
| 2609 int pcc[MAX_MCO]; | |
| 7 | 2610 int firstbyte = *p; |
| 2611 | |
| 2612 /* The idea of what is the previous and next | |
| 2613 * character depends on 'rightleft'. */ | |
| 2614 if (wp->w_p_rl) | |
| 2615 { | |
| 2616 pc = prev_c; | |
| 2617 pc1 = prev_c1; | |
| 2618 nc = utf_ptr2char(p + c_len); | |
| 714 | 2619 prev_c1 = u8cc[0]; |
| 7 | 2620 } |
| 2621 else | |
| 2622 { | |
| 714 | 2623 pc = utfc_ptr2char(p + c_len, pcc); |
| 7 | 2624 nc = prev_c; |
| 714 | 2625 pc1 = pcc[0]; |
| 7 | 2626 } |
| 2627 prev_c = u8c; | |
| 2628 | |
| 714 | 2629 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
| 7 | 2630 pc, pc1, nc); |
| 2631 ScreenLines[idx] = firstbyte; | |
| 2632 } | |
| 2633 else | |
| 2634 prev_c = u8c; | |
| 2635 #endif | |
| 2636 /* Non-BMP character: display as ? or fullwidth ?. */ | |
| 1401 | 2637 #ifdef UNICODE16 |
| 7 | 2638 if (u8c >= 0x10000) |
| 2639 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; | |
| 2640 else | |
| 1401 | 2641 #endif |
| 7 | 2642 ScreenLinesUC[idx] = u8c; |
| 714 | 2643 for (i = 0; i < Screen_mco; ++i) |
| 2644 { | |
| 2645 ScreenLinesC[i][idx] = u8cc[i]; | |
| 2646 if (u8cc[i] == 0) | |
| 2647 break; | |
| 2648 } | |
| 7 | 2649 } |
| 2650 if (cells > 1) | |
| 2651 ScreenLines[idx + 1] = 0; | |
| 2652 } | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2653 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2654 /* double-byte single width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2655 ScreenLines2[idx] = p[1]; |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2656 else if (cells > 1) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2657 /* double-width character */ |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
2658 ScreenLines[idx + 1] = p[1]; |
| 7 | 2659 col += cells; |
| 2660 idx += cells; | |
| 2661 p += c_len; | |
| 2662 } | |
| 2663 } | |
| 2664 else | |
| 2665 #endif | |
| 2666 { | |
| 2667 len = (int)STRLEN(text); | |
| 2668 if (len > W_WIDTH(wp) - col) | |
| 2669 len = W_WIDTH(wp) - col; | |
| 2670 if (len > 0) | |
| 2671 { | |
| 2672 #ifdef FEAT_RIGHTLEFT | |
| 2673 if (wp->w_p_rl) | |
| 2674 STRNCPY(current_ScreenLine, text, len); | |
| 2675 else | |
| 2676 #endif | |
| 2677 STRNCPY(current_ScreenLine + col, text, len); | |
| 2678 col += len; | |
| 2679 } | |
| 2680 } | |
| 2681 | |
| 2682 /* Fill the rest of the line with the fold filler */ | |
| 2683 #ifdef FEAT_RIGHTLEFT | |
| 2684 if (wp->w_p_rl) | |
| 2685 col -= txtcol; | |
| 2686 #endif | |
| 2687 while (col < W_WIDTH(wp) | |
| 2688 #ifdef FEAT_RIGHTLEFT | |
| 2689 - (wp->w_p_rl ? txtcol : 0) | |
| 2690 #endif | |
| 2691 ) | |
| 2692 { | |
| 2693 #ifdef FEAT_MBYTE | |
| 2694 if (enc_utf8) | |
| 2695 { | |
| 2696 if (fill_fold >= 0x80) | |
| 2697 { | |
| 2698 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2699 ScreenLinesC[0][off + col] = 0; |
| 7 | 2700 } |
| 2701 else | |
| 2702 ScreenLinesUC[off + col] = 0; | |
| 2703 } | |
| 2704 #endif | |
| 2705 ScreenLines[off + col++] = fill_fold; | |
| 2706 } | |
| 2707 | |
| 2708 if (text != buf) | |
| 2709 vim_free(text); | |
| 2710 | |
| 2711 /* | |
| 2712 * 6. set highlighting for the Visual area an other text. | |
| 2713 * If all folded lines are in the Visual area, highlight the line. | |
| 2714 */ | |
| 2715 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2716 { | |
| 2717 if (ltoreq(curwin->w_cursor, VIsual)) | |
| 2718 { | |
| 2719 /* Visual is after curwin->w_cursor */ | |
| 2720 top = &curwin->w_cursor; | |
| 2721 bot = &VIsual; | |
| 2722 } | |
| 2723 else | |
| 2724 { | |
| 2725 /* Visual is before curwin->w_cursor */ | |
| 2726 top = &VIsual; | |
| 2727 bot = &curwin->w_cursor; | |
| 2728 } | |
| 2729 if (lnum >= top->lnum | |
| 2730 && lnume <= bot->lnum | |
| 2731 && (VIsual_mode != 'v' | |
| 2732 || ((lnum > top->lnum | |
| 2733 || (lnum == top->lnum | |
| 2734 && top->col == 0)) | |
| 2735 && (lnume < bot->lnum | |
| 2736 || (lnume == bot->lnum | |
| 2737 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2738 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2739 { |
| 2740 if (VIsual_mode == Ctrl_V) | |
| 2741 { | |
| 2742 /* Visual block mode: highlight the chars part of the block */ | |
| 2743 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)W_WIDTH(wp)) | |
| 2744 { | |
| 3040 | 2745 if (wp->w_old_cursor_lcol != MAXCOL |
| 2746 && wp->w_old_cursor_lcol + txtcol | |
| 2747 < (colnr_T)W_WIDTH(wp)) | |
| 7 | 2748 len = wp->w_old_cursor_lcol; |
| 2749 else | |
| 2750 len = W_WIDTH(wp) - txtcol; | |
| 2751 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, hl_attr(HLF_V), | |
| 230 | 2752 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2753 } |
| 2754 } | |
| 2755 else | |
| 216 | 2756 { |
| 7 | 2757 /* Set all attributes of the text */ |
| 216 | 2758 RL_MEMSET(txtcol, hl_attr(HLF_V), W_WIDTH(wp) - txtcol); |
| 2759 } | |
| 7 | 2760 } |
| 2761 } | |
| 2762 | |
| 743 | 2763 #ifdef FEAT_SYN_HL |
| 6685 | 2764 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2765 if (wp->w_p_cc_cols) | |
| 2766 { | |
| 2767 int i = 0; | |
| 2768 int j = wp->w_p_cc_cols[i]; | |
| 2769 int old_txtcol = txtcol; | |
| 2770 | |
| 2771 while (j > -1) | |
| 2772 { | |
| 2773 txtcol += j; | |
| 2774 if (wp->w_p_wrap) | |
| 2775 txtcol -= wp->w_skipcol; | |
| 2776 else | |
| 2777 txtcol -= wp->w_leftcol; | |
| 2778 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2779 ScreenAttrs[off + txtcol] = hl_combine_attr( | |
| 2780 ScreenAttrs[off + txtcol], hl_attr(HLF_MC)); | |
| 2781 txtcol = old_txtcol; | |
| 2782 j = wp->w_p_cc_cols[++i]; | |
| 2783 } | |
| 2784 } | |
| 2785 | |
| 743 | 2786 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2787 if (wp->w_p_cuc) |
| 2788 { | |
| 2789 txtcol += wp->w_virtcol; | |
| 2790 if (wp->w_p_wrap) | |
| 2791 txtcol -= wp->w_skipcol; | |
| 2792 else | |
| 2793 txtcol -= wp->w_leftcol; | |
| 2794 if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 2795 ScreenAttrs[off + txtcol] = hl_combine_attr( | |
| 2796 ScreenAttrs[off + txtcol], hl_attr(HLF_CUC)); | |
| 2797 } | |
| 743 | 2798 #endif |
| 7 | 2799 |
| 2800 SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), | |
| 2801 (int)W_WIDTH(wp), FALSE); | |
| 2802 | |
| 2803 /* | |
| 2804 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2805 * updated (saves a call to plines() later). | |
| 2806 */ | |
| 2807 if (wp == curwin | |
| 2808 && lnum <= curwin->w_cursor.lnum | |
| 2809 && lnume >= curwin->w_cursor.lnum) | |
| 2810 { | |
| 2811 curwin->w_cline_row = row; | |
| 2812 curwin->w_cline_height = 1; | |
| 2813 curwin->w_cline_folded = TRUE; | |
| 2814 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2815 } | |
| 2816 } | |
| 2817 | |
| 2818 /* | |
| 2819 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2820 */ | |
| 2821 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2822 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2823 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2824 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2825 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2826 int attr) |
| 7 | 2827 { |
| 216 | 2828 int i; |
| 2829 | |
| 7 | 2830 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2831 # ifdef FEAT_MBYTE | |
| 2832 if (enc_utf8) | |
| 2833 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2834 # endif | |
| 216 | 2835 for (i = 0; i < len; ++i) |
| 2836 ScreenAttrs[off + i] = attr; | |
| 7 | 2837 } |
| 2838 | |
| 2839 /* | |
| 2840 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2841 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2842 */ |
| 2843 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2844 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2845 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2846 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2847 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2848 linenr_T lnum) /* current line number */ |
| 7 | 2849 { |
| 2850 int i = 0; | |
| 2851 int level; | |
| 2852 int first_level; | |
| 519 | 2853 int empty; |
| 6553 | 2854 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2855 |
| 2856 /* Init to all spaces. */ | |
| 6929 | 2857 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2858 |
| 2859 level = win_foldinfo.fi_level; | |
| 2860 if (level > 0) | |
| 2861 { | |
| 519 | 2862 /* If there is only one column put more info in it. */ |
| 6553 | 2863 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2864 |
| 7 | 2865 /* If the column is too narrow, we start at the lowest level that |
| 2866 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2867 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2868 if (first_level < 1) |
| 2869 first_level = 1; | |
| 2870 | |
| 6553 | 2871 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2872 { |
| 2873 if (win_foldinfo.fi_lnum == lnum | |
| 2874 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2875 p[i] = '-'; | |
| 2876 else if (first_level == 1) | |
| 2877 p[i] = '|'; | |
| 2878 else if (first_level + i <= 9) | |
| 2879 p[i] = '0' + first_level + i; | |
| 2880 else | |
| 2881 p[i] = '>'; | |
| 2882 if (first_level + i == level) | |
| 2883 break; | |
| 2884 } | |
| 2885 } | |
| 2886 if (closed) | |
| 6553 | 2887 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 2888 } |
| 2889 #endif /* FEAT_FOLDING */ | |
| 2890 | |
| 2891 /* | |
| 2892 * Display line "lnum" of window 'wp' on the screen. | |
| 2893 * Start at row "startrow", stop when "endrow" is reached. | |
| 2894 * wp->w_virtcol needs to be valid. | |
| 2895 * | |
| 2896 * Return the number of last row the line occupies. | |
| 2897 */ | |
| 2898 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2899 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2900 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2901 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2902 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2903 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2904 int nochange UNUSED) /* not updating for changed text */ |
| 7 | 2905 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
2906 int col = 0; /* visual column on screen */ |
| 7 | 2907 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 2908 int c = 0; /* init for GCC */ | |
| 2909 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 2910 #ifdef FEAT_LINEBREAK |
| 2911 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 2912 #endif | |
| 7 | 2913 long vcol_prev = -1; /* "vcol" of previous character */ |
| 2914 char_u *line; /* current line */ | |
| 2915 char_u *ptr; /* current position in "line" */ | |
| 2916 int row; /* row in the window, excl w_winrow */ | |
| 2917 int screen_row; /* row on the screen, incl w_winrow */ | |
| 2918 | |
| 2919 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 2920 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 2921 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 2922 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 2923 int c_extra = NUL; /* extra chars, all the same */ |
| 2924 int extra_attr = 0; /* attributes when n_extra != 0 */ | |
| 2925 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 2926 displaying lcs_eol at end-of-line */ | |
| 2927 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 2928 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 2929 | |
| 2930 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 2931 int saved_n_extra = 0; | |
| 2932 char_u *saved_p_extra = NULL; | |
| 2933 int saved_c_extra = 0; | |
| 2934 int saved_char_attr = 0; | |
| 2935 | |
| 2936 int n_attr = 0; /* chars with special attr */ | |
| 2937 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 2938 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 2939 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 2940 | |
| 2941 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 2942 | |
| 2943 int fromcol, tocol; /* start/end of inverting */ | |
| 2944 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 2945 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 2946 pos_T *top, *bot; | |
| 1813 | 2947 int lnum_in_visual_area = FALSE; |
| 7 | 2948 pos_T pos; |
| 2949 long v; | |
| 2950 | |
| 2951 int char_attr = 0; /* attributes for next character */ | |
| 674 | 2952 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 2953 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 2954 in this line */ | |
| 2955 int attr = 0; /* attributes for area highlighting */ | |
| 2956 int area_attr = 0; /* attributes desired by highlighting */ | |
| 2957 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 2958 #ifdef FEAT_SYN_HL | |
| 743 | 2959 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 2960 int syntax_attr = 0; /* attributes desired by syntax */ |
| 2961 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 2962 int save_did_emsg; | |
| 1437 | 2963 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
|
2964 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2965 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 2966 #endif |
| 2967 #ifdef FEAT_SPELL | |
| 221 | 2968 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 2969 # define SPWORDLEN 150 |
| 2970 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 2971 int nextlinecol = 0; /* column where nextline[] starts */ |
| 2972 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 2973 starts */ |
| 221 | 2974 int spell_attr = 0; /* attributes desired by spelling */ |
| 2975 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 2976 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 2977 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 2978 * there are no spell errors */ |
| 386 | 2979 static int cap_col = -1; /* column to check for Cap word */ |
| 2980 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 2981 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 2982 #endif |
| 2983 int extra_check; /* has syntax or linebreak */ | |
| 2984 #ifdef FEAT_MBYTE | |
| 2985 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 2986 int mb_l = 1; /* multi-byte byte length */ | |
| 2987 int mb_c = 0; /* decoded multi-byte character */ | |
| 2988 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 2989 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 2990 #endif |
| 2991 #ifdef FEAT_DIFF | |
| 2992 int filler_lines; /* nr of filler lines to be drawn */ | |
| 2993 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 2994 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 2995 int change_start = MAXCOL; /* first col of changed area */ |
| 2996 int change_end = -1; /* last col of changed area */ | |
| 2997 #endif | |
| 2998 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 2999 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3000 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
|
3001 chars */ |
| 7 | 3002 #endif |
| 910 | 3003 #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ |
| 3004 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) | |
| 7 | 3005 # define LINE_ATTR |
| 1536 | 3006 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3007 #endif |
| 3008 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3009 matchitem_T *cur; /* points to the match list */ |
| 3010 match_T *shl; /* points to search_hl or a match */ | |
| 3011 int shl_flag; /* flag to indicate whether search_hl | |
| 3012 has been processed or not */ | |
| 5979 | 3013 int pos_inprogress; /* marks that position match search is |
| 3014 in progress */ | |
| 1326 | 3015 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3016 equals startcol of search_hl or one | |
| 3017 of the matches */ | |
| 7 | 3018 #endif |
| 3019 #ifdef FEAT_ARABIC | |
| 3020 int prev_c = 0; /* previous Arabic character */ | |
| 3021 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3022 #endif | |
| 910 | 3023 #if defined(LINE_ATTR) |
| 867 | 3024 int did_line_attr = 0; |
| 3025 #endif | |
| 7 | 3026 |
| 3027 /* draw_state: items that are drawn in sequence: */ | |
| 3028 #define WL_START 0 /* nothing done yet */ | |
| 3029 #ifdef FEAT_CMDWIN | |
| 3030 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3031 #else | |
| 3032 # define WL_CMDLINE WL_START | |
| 3033 #endif | |
| 3034 #ifdef FEAT_FOLDING | |
| 3035 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3036 #else | |
| 3037 # define WL_FOLD WL_CMDLINE | |
| 3038 #endif | |
| 3039 #ifdef FEAT_SIGNS | |
| 3040 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3041 #else | |
| 3042 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3043 #endif | |
| 3044 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3045 #ifdef FEAT_LINEBREAK |
| 3046 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3047 #else | |
| 3048 # define WL_BRI WL_NR | |
| 3049 #endif | |
| 7 | 3050 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3051 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3052 #else |
| 5995 | 3053 # define WL_SBR WL_BRI |
| 7 | 3054 #endif |
| 3055 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3056 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3057 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3058 int feedback_col = 0; |
| 3059 int feedback_old_attr = -1; | |
| 3060 #endif | |
| 3061 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3062 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3063 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
|
3064 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
|
3065 int prev_syntax_id = 0; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3066 int conceal_attr = hl_attr(HLF_CONCEAL); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3067 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3068 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
|
3069 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3070 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
|
3071 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3072 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
|
3073 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3074 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3075 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3076 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3077 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3078 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3079 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3080 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3081 col -= boguscols; \ |
| 6520 | 3082 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3083 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3084 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3085 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3086 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3087 #endif |
| 7 | 3088 |
| 3089 if (startrow > endrow) /* past the end already! */ | |
| 3090 return startrow; | |
| 3091 | |
| 3092 row = startrow; | |
| 3093 screen_row = row + W_WINROW(wp); | |
| 3094 | |
| 3095 /* | |
| 3096 * To speed up the loop below, set extra_check when there is linebreak, | |
| 3097 * trailing white space and/or syntax processing to be done. | |
| 3098 */ | |
| 3099 #ifdef FEAT_LINEBREAK | |
| 3100 extra_check = wp->w_p_lbr; | |
| 3101 #else | |
| 3102 extra_check = 0; | |
| 3103 #endif | |
| 3104 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3105 if (syntax_present(wp) && !wp->w_s->b_syn_error) |
| 7 | 3106 { |
| 3107 /* Prepare for syntax highlighting in this line. When there is an | |
| 3108 * error, stop syntax highlighting. */ | |
| 3109 save_did_emsg = did_emsg; | |
| 3110 did_emsg = FALSE; | |
| 3111 syntax_start(wp, lnum); | |
| 3112 if (did_emsg) | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3113 wp->w_s->b_syn_error = TRUE; |
| 7 | 3114 else |
| 3115 { | |
| 3116 did_emsg = save_did_emsg; | |
| 3117 has_syntax = TRUE; | |
| 3118 extra_check = TRUE; | |
| 3119 } | |
| 3120 } | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3121 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3122 /* Check for columns to display for 'colorcolumn'. */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3123 color_cols = wp->w_p_cc_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3124 if (color_cols != NULL) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3125 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3126 #endif |
| 3127 | |
| 3128 #ifdef FEAT_SPELL | |
| 258 | 3129 if (wp->w_p_spell |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3130 && *wp->w_s->b_p_spl != NUL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3131 && 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
|
3132 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
| 221 | 3133 { |
| 3134 /* Prepare for spell checking. */ | |
| 3135 has_spell = TRUE; | |
| 3136 extra_check = TRUE; | |
| 348 | 3137 |
| 3138 /* Get the start of the next line, so that words that wrap to the next | |
| 3139 * line are found too: "et<line-break>al.". | |
| 3140 * Trick: skip a few chars for C/shell/Vim comments */ | |
| 3141 nextline[SPWORDLEN] = NUL; | |
| 3142 if (lnum < wp->w_buffer->b_ml.ml_line_count) | |
| 3143 { | |
| 3144 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); | |
| 3145 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); | |
| 3146 } | |
| 3147 | |
| 3148 /* When a word wrapped from the previous line the start of the current | |
| 3149 * line is valid. */ | |
| 3150 if (lnum == checked_lnum) | |
| 3151 cur_checked_col = checked_col; | |
| 3152 checked_lnum = 0; | |
| 386 | 3153 |
| 3154 /* When there was a sentence end in the previous line may require a | |
| 3155 * word starting with capital in this line. In line 1 always check | |
| 3156 * the first word. */ | |
| 3157 if (lnum != capcol_lnum) | |
| 3158 cap_col = -1; | |
| 3159 if (lnum == 1) | |
| 3160 cap_col = 0; | |
| 3161 capcol_lnum = 0; | |
| 221 | 3162 } |
| 7 | 3163 #endif |
| 3164 | |
| 3165 /* | |
| 3166 * handle visual active in this window | |
| 3167 */ | |
| 3168 fromcol = -10; | |
| 3169 tocol = MAXCOL; | |
| 3170 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3171 { | |
| 3172 /* Visual is after curwin->w_cursor */ | |
| 3173 if (ltoreq(curwin->w_cursor, VIsual)) | |
| 3174 { | |
| 3175 top = &curwin->w_cursor; | |
| 3176 bot = &VIsual; | |
| 3177 } | |
| 3178 else /* Visual is before curwin->w_cursor */ | |
| 3179 { | |
| 3180 top = &VIsual; | |
| 3181 bot = &curwin->w_cursor; | |
| 3182 } | |
| 1813 | 3183 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
| 7 | 3184 if (VIsual_mode == Ctrl_V) /* block mode */ |
| 3185 { | |
| 1813 | 3186 if (lnum_in_visual_area) |
| 7 | 3187 { |
| 3188 fromcol = wp->w_old_cursor_fcol; | |
| 3189 tocol = wp->w_old_cursor_lcol; | |
| 3190 } | |
| 3191 } | |
| 3192 else /* non-block mode */ | |
| 3193 { | |
| 3194 if (lnum > top->lnum && lnum <= bot->lnum) | |
| 3195 fromcol = 0; | |
| 3196 else if (lnum == top->lnum) | |
| 3197 { | |
| 3198 if (VIsual_mode == 'V') /* linewise */ | |
| 3199 fromcol = 0; | |
| 3200 else | |
| 3201 { | |
| 3202 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); | |
| 3203 if (gchar_pos(top) == NUL) | |
| 3204 tocol = fromcol + 1; | |
| 3205 } | |
| 3206 } | |
| 3207 if (VIsual_mode != 'V' && lnum == bot->lnum) | |
| 3208 { | |
| 3209 if (*p_sel == 'e' && bot->col == 0 | |
| 3210 #ifdef FEAT_VIRTUALEDIT | |
| 3211 && bot->coladd == 0 | |
| 3212 #endif | |
| 3213 ) | |
| 3214 { | |
| 3215 fromcol = -10; | |
| 3216 tocol = MAXCOL; | |
| 3217 } | |
| 36 | 3218 else if (bot->col == MAXCOL) |
| 3219 tocol = MAXCOL; | |
| 7 | 3220 else |
| 3221 { | |
| 3222 pos = *bot; | |
| 3223 if (*p_sel == 'e') | |
| 3224 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3225 else | |
| 3226 { | |
| 3227 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); | |
| 3228 ++tocol; | |
| 3229 } | |
| 3230 } | |
| 3231 } | |
| 3232 } | |
| 3233 | |
| 3234 /* Check if the character under the cursor should not be inverted */ | |
| 3235 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
|
3236 #ifdef FEAT_GUI |
| 7 | 3237 && !gui.in_use |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3238 #endif |
| 7 | 3239 ) |
| 3240 noinvcur = TRUE; | |
| 3241 | |
| 3242 /* if inverting in this line set area_highlighting */ | |
| 3243 if (fromcol >= 0) | |
| 3244 { | |
| 3245 area_highlighting = TRUE; | |
| 3246 attr = hl_attr(HLF_V); | |
| 3247 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) | |
| 3674 | 3248 if ((clip_star.available && !clip_star.owned |
| 3249 && clip_isautosel_star()) | |
| 3250 || (clip_plus.available && !clip_plus.owned | |
| 3251 && clip_isautosel_plus())) | |
| 7 | 3252 attr = hl_attr(HLF_VNC); |
| 3253 #endif | |
| 3254 } | |
| 3255 } | |
| 3256 | |
| 3257 /* | |
| 674 | 3258 * handle 'incsearch' and ":s///c" highlighting |
| 7 | 3259 */ |
| 5735 | 3260 else if (highlight_match |
| 7 | 3261 && wp == curwin |
| 3262 && lnum >= curwin->w_cursor.lnum | |
| 3263 && lnum <= curwin->w_cursor.lnum + search_match_lines) | |
| 3264 { | |
| 3265 if (lnum == curwin->w_cursor.lnum) | |
| 3266 getvcol(curwin, &(curwin->w_cursor), | |
| 3267 (colnr_T *)&fromcol, NULL, NULL); | |
| 3268 else | |
| 3269 fromcol = 0; | |
| 3270 if (lnum == curwin->w_cursor.lnum + search_match_lines) | |
| 3271 { | |
| 3272 pos.lnum = lnum; | |
| 3273 pos.col = search_match_endcol; | |
| 3274 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3275 } | |
| 3276 else | |
| 3277 tocol = MAXCOL; | |
| 1850 | 3278 /* do at least one character; happens when past end of line */ |
| 3279 if (fromcol == tocol) | |
| 3280 tocol = fromcol + 1; | |
| 7 | 3281 area_highlighting = TRUE; |
| 3282 attr = hl_attr(HLF_I); | |
| 3283 } | |
| 3284 | |
| 3285 #ifdef FEAT_DIFF | |
| 3286 filler_lines = diff_check(wp, lnum); | |
| 3287 if (filler_lines < 0) | |
| 3288 { | |
| 3289 if (filler_lines == -1) | |
| 3290 { | |
| 3291 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3292 diff_hlf = HLF_ADD; /* added line */ | |
| 3293 else if (change_start == 0) | |
| 3294 diff_hlf = HLF_TXD; /* changed text */ | |
| 3295 else | |
| 3296 diff_hlf = HLF_CHD; /* changed line */ | |
| 3297 } | |
| 3298 else | |
| 3299 diff_hlf = HLF_ADD; /* added line */ | |
| 3300 filler_lines = 0; | |
| 3301 area_highlighting = TRUE; | |
| 3302 } | |
| 3303 if (lnum == wp->w_topline) | |
| 3304 filler_lines = wp->w_topfill; | |
| 3305 filler_todo = filler_lines; | |
| 3306 #endif | |
| 3307 | |
| 3308 #ifdef LINE_ATTR | |
| 3309 # ifdef FEAT_SIGNS | |
| 3310 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3311 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3312 if (v != 0) | |
| 3313 line_attr = sign_get_attr((int)v, TRUE); | |
| 3314 # endif | |
| 3315 # if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS) | |
| 3316 /* Highlight the current line in the quickfix window. */ | |
| 644 | 3317 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) |
| 7 | 3318 line_attr = hl_attr(HLF_L); |
| 3319 # endif | |
| 3320 if (line_attr != 0) | |
| 3321 area_highlighting = TRUE; | |
| 3322 #endif | |
| 3323 | |
| 3324 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3325 ptr = line; | |
| 3326 | |
| 743 | 3327 #ifdef FEAT_SPELL |
| 348 | 3328 if (has_spell) |
| 3329 { | |
| 386 | 3330 /* For checking first word with a capital skip white space. */ |
| 3331 if (cap_col == 0) | |
| 835 | 3332 cap_col = (int)(skipwhite(line) - line); |
| 386 | 3333 |
| 348 | 3334 /* To be able to spell-check over line boundaries copy the end of the |
| 3335 * current line into nextline[]. Above the start of the next line was | |
| 3336 * copied to nextline[SPWORDLEN]. */ | |
| 3337 if (nextline[SPWORDLEN] == NUL) | |
| 3338 { | |
| 3339 /* No next line or it is empty. */ | |
| 3340 nextlinecol = MAXCOL; | |
| 3341 nextline_idx = 0; | |
| 3342 } | |
| 3343 else | |
| 3344 { | |
| 835 | 3345 v = (long)STRLEN(line); |
| 348 | 3346 if (v < SPWORDLEN) |
| 3347 { | |
| 3348 /* Short line, use it completely and append the start of the | |
| 3349 * next line. */ | |
| 3350 nextlinecol = 0; | |
| 3351 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3352 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3353 nextline_idx = v + 1; |
| 3354 } | |
| 3355 else | |
| 3356 { | |
| 3357 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3358 nextlinecol = v - SPWORDLEN; | |
| 3359 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3360 nextline_idx = SPWORDLEN + 1; | |
| 3361 } | |
| 3362 } | |
| 3363 } | |
| 3364 #endif | |
| 3365 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3366 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3367 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3368 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3369 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3370 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3371 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3372 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3373 trailcol = (colnr_T)STRLEN(ptr); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3374 while (trailcol > (colnr_T)0 && vim_iswhite(ptr[trailcol - 1])) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3375 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3376 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3377 } |
| 7 | 3378 } |
| 3379 | |
| 3380 /* | |
| 3381 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3382 * first character to be displayed. | |
| 3383 */ | |
| 3384 if (wp->w_p_wrap) | |
| 3385 v = wp->w_skipcol; | |
| 3386 else | |
| 3387 v = wp->w_leftcol; | |
| 3388 if (v > 0) | |
| 3389 { | |
| 3390 #ifdef FEAT_MBYTE | |
| 3391 char_u *prev_ptr = ptr; | |
| 3392 #endif | |
| 3393 while (vcol < v && *ptr != NUL) | |
| 3394 { | |
| 5995 | 3395 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3396 vcol += c; |
| 3397 #ifdef FEAT_MBYTE | |
| 3398 prev_ptr = ptr; | |
| 39 | 3399 #endif |
| 3400 mb_ptr_adv(ptr); | |
| 7 | 3401 } |
| 3402 | |
| 1984 | 3403 /* When: |
| 3404 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3405 * - 'colorcolumn' is set, or |
| 1984 | 3406 * - 'virtualedit' is set, or |
| 3407 * - the visual mode is active, | |
| 3408 * the end of the line may be before the start of the displayed part. | |
| 3409 */ | |
| 3410 if (vcol < v && ( | |
| 5735 | 3411 #ifdef FEAT_SYN_HL |
| 3412 wp->w_p_cuc || draw_color_col || | |
| 3413 #endif | |
| 3414 #ifdef FEAT_VIRTUALEDIT | |
| 3415 virtual_active() || | |
| 3416 #endif | |
| 3417 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3418 { |
| 7 | 3419 vcol = v; |
| 1984 | 3420 } |
| 7 | 3421 |
| 3422 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3423 * that character but skip the first few screen characters. */ | |
| 3424 if (vcol > v) | |
| 3425 { | |
| 3426 vcol -= c; | |
| 3427 #ifdef FEAT_MBYTE | |
| 3428 ptr = prev_ptr; | |
| 3429 #else | |
| 3430 --ptr; | |
| 3431 #endif | |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3432 #ifdef FEAT_MBYTE |
|
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3433 /* character fits on the screen, don't need to skip it */ |
|
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3434 if ((*mb_ptr2cells)(ptr) >= c && col == 0) |
|
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3435 #endif |
|
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3436 n_skip = v - vcol; |
| 7 | 3437 } |
| 3438 | |
| 3439 /* | |
| 3440 * Adjust for when the inverted text is before the screen, | |
| 3441 * and when the start of the inverted text is before the screen. | |
| 3442 */ | |
| 3443 if (tocol <= vcol) | |
| 3444 fromcol = 0; | |
| 3445 else if (fromcol >= 0 && fromcol < vcol) | |
| 3446 fromcol = vcol; | |
| 3447 | |
| 3448 #ifdef FEAT_LINEBREAK | |
| 3449 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3450 if (wp->w_p_wrap) | |
| 3451 need_showbreak = TRUE; | |
| 3452 #endif | |
| 743 | 3453 #ifdef FEAT_SPELL |
| 499 | 3454 /* When spell checking a word we need to figure out the start of the |
| 3455 * word and if it's badly spelled or not. */ | |
| 3456 if (has_spell) | |
| 3457 { | |
| 3458 int len; | |
| 1536 | 3459 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3460 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3461 |
| 3462 pos = wp->w_cursor; | |
| 3463 wp->w_cursor.lnum = lnum; | |
| 1536 | 3464 wp->w_cursor.col = linecol; |
| 534 | 3465 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3466 |
| 3467 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3468 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3469 ptr = line + linecol; | |
| 3470 | |
| 530 | 3471 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3472 { |
| 3473 /* no bad word found at line start, don't check until end of a | |
| 3474 * word */ | |
| 534 | 3475 spell_hlf = HLF_COUNT; |
| 3572 | 3476 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3477 } |
| 3478 else | |
| 534 | 3479 { |
| 499 | 3480 /* bad word found, use attributes until end of word */ |
| 3481 word_end = wp->w_cursor.col + len + 1; | |
| 3482 | |
| 534 | 3483 /* Turn index into actual attributes. */ |
| 3484 if (spell_hlf != HLF_COUNT) | |
| 3485 spell_attr = highlight_attr[spell_hlf]; | |
| 3486 } | |
| 499 | 3487 wp->w_cursor = pos; |
| 501 | 3488 |
| 743 | 3489 # ifdef FEAT_SYN_HL |
| 501 | 3490 /* Need to restart syntax highlighting for this line. */ |
| 3491 if (has_syntax) | |
| 3492 syntax_start(wp, lnum); | |
| 743 | 3493 # endif |
| 499 | 3494 } |
| 3495 #endif | |
| 7 | 3496 } |
| 3497 | |
| 3498 /* | |
| 3499 * Correct highlighting for cursor that can't be disabled. | |
| 3500 * Avoids having to check this for each character. | |
| 3501 */ | |
| 3502 if (fromcol >= 0) | |
| 3503 { | |
| 3504 if (noinvcur) | |
| 3505 { | |
| 3506 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3507 { | |
| 3508 /* highlighting starts at cursor, let it start just after the | |
| 3509 * cursor */ | |
| 3510 fromcol_prev = fromcol; | |
| 3511 fromcol = -1; | |
| 3512 } | |
| 3513 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3514 /* restart highlighting after the cursor */ | |
| 3515 fromcol_prev = wp->w_virtcol; | |
| 3516 } | |
| 3517 if (fromcol >= tocol) | |
| 3518 fromcol = -1; | |
| 3519 } | |
| 3520 | |
| 3521 #ifdef FEAT_SEARCH_EXTRA | |
| 3522 /* | |
| 1326 | 3523 * Handle highlighting the last used search pattern and matches. |
| 3524 * Do this for both search_hl and the match list. | |
| 7 | 3525 */ |
| 1326 | 3526 cur = wp->w_match_head; |
| 3527 shl_flag = FALSE; | |
| 3528 while (cur != NULL || shl_flag == FALSE) | |
| 3529 { | |
| 3530 if (shl_flag == FALSE) | |
| 3531 { | |
| 3532 shl = &search_hl; | |
| 3533 shl_flag = TRUE; | |
| 3534 } | |
| 3535 else | |
| 3536 shl = &cur->hl; | |
| 36 | 3537 shl->startcol = MAXCOL; |
| 3538 shl->endcol = MAXCOL; | |
| 7 | 3539 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3540 shl->is_addpos = FALSE; |
| 5979 | 3541 v = (long)(ptr - line); |
| 3542 if (cur != NULL) | |
| 3543 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3544 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
|
3545 shl == &search_hl ? NULL : cur); |
| 5979 | 3546 |
| 3547 /* Need to get the line again, a multi-line regexp may have made it | |
| 3548 * invalid. */ | |
| 3549 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3550 ptr = line + v; | |
| 3551 | |
| 3552 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3553 { | |
| 3554 if (shl->lnum == lnum) | |
| 3555 shl->startcol = shl->rm.startpos[0].col; | |
| 3556 else | |
| 3557 shl->startcol = 0; | |
| 3558 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3559 - shl->rm.startpos[0].lnum) | |
| 3560 shl->endcol = shl->rm.endpos[0].col; | |
| 3561 else | |
| 3562 shl->endcol = MAXCOL; | |
| 3563 /* Highlight one character for an empty match. */ | |
| 3564 if (shl->startcol == shl->endcol) | |
| 3565 { | |
| 3566 #ifdef FEAT_MBYTE | |
| 3567 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3568 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3569 else |
| 5979 | 3570 #endif |
| 3571 ++shl->endcol; | |
| 3572 } | |
| 3573 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3574 { | |
| 3575 shl->attr_cur = shl->attr; | |
| 3576 search_attr = shl->attr; | |
| 3577 } | |
| 3578 area_highlighting = TRUE; | |
| 7 | 3579 } |
| 1326 | 3580 if (shl != &search_hl && cur != NULL) |
| 3581 cur = cur->next; | |
| 7 | 3582 } |
| 3583 #endif | |
| 3584 | |
| 743 | 3585 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3586 /* 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
|
3587 * 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
|
3588 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3589 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3590 && !(wp == curwin && VIsual_active)) |
| 743 | 3591 { |
| 3592 line_attr = hl_attr(HLF_CUL); | |
| 3593 area_highlighting = TRUE; | |
| 3594 } | |
| 3595 #endif | |
| 3596 | |
| 504 | 3597 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3598 col = 0; |
| 3599 #ifdef FEAT_RIGHTLEFT | |
| 3600 if (wp->w_p_rl) | |
| 3601 { | |
| 3602 /* Rightleft window: process the text in the normal direction, but put | |
| 3603 * it in current_ScreenLine[] from right to left. Start at the | |
| 3604 * rightmost column of the window. */ | |
| 3605 col = W_WIDTH(wp) - 1; | |
| 3606 off += col; | |
| 3607 } | |
| 3608 #endif | |
| 3609 | |
| 3610 /* | |
| 3611 * Repeat for the whole displayed line. | |
| 3612 */ | |
| 3613 for (;;) | |
| 3614 { | |
| 6947 | 3615 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3616 has_match_conc = 0; |
| 6947 | 3617 #endif |
| 7 | 3618 /* Skip this quickly when working on the text. */ |
| 3619 if (draw_state != WL_LINE) | |
| 3620 { | |
| 3621 #ifdef FEAT_CMDWIN | |
| 3622 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3623 { | |
| 3624 draw_state = WL_CMDLINE; | |
| 3625 if (cmdwin_type != 0 && wp == curwin) | |
| 3626 { | |
| 3627 /* Draw the cmdline character. */ | |
| 3628 n_extra = 1; | |
| 1340 | 3629 c_extra = cmdwin_type; |
| 7 | 3630 char_attr = hl_attr(HLF_AT); |
| 3631 } | |
| 3632 } | |
| 3633 #endif | |
| 3634 | |
| 3635 #ifdef FEAT_FOLDING | |
| 3636 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3637 { | |
| 6553 | 3638 int fdc = compute_foldcolumn(wp, 0); |
| 3639 | |
| 7 | 3640 draw_state = WL_FOLD; |
| 6553 | 3641 if (fdc > 0) |
| 7 | 3642 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3643 /* 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
|
3644 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3645 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3646 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3647 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3648 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3649 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3650 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
|
3651 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3652 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3653 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3654 c_extra = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3655 char_attr = hl_attr(HLF_FC); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3656 } |
| 7 | 3657 } |
| 3658 } | |
| 3659 #endif | |
| 3660 | |
| 3661 #ifdef FEAT_SIGNS | |
| 3662 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3663 { | |
| 3664 draw_state = WL_SIGN; | |
| 3665 /* Show the sign column when there are any signs in this | |
| 3666 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3667 if (signcolumn_on(wp)) |
| 7 | 3668 { |
| 2661 | 3669 int text_sign; |
| 7 | 3670 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3671 int icon_sign; |
| 7 | 3672 # endif |
| 3673 | |
| 3674 /* Draw two cells with the sign value or blank. */ | |
| 3675 c_extra = ' '; | |
| 3676 char_attr = hl_attr(HLF_SC); | |
| 3677 n_extra = 2; | |
| 3678 | |
| 5921 | 3679 if (row == startrow |
| 3680 #ifdef FEAT_DIFF | |
| 3681 + filler_lines && filler_todo <= 0 | |
| 3682 #endif | |
| 3683 ) | |
| 7 | 3684 { |
| 3685 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3686 SIGN_TEXT); | |
| 3687 # ifdef FEAT_SIGN_ICONS | |
| 3688 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3689 SIGN_ICON); | |
| 3690 if (gui.in_use && icon_sign != 0) | |
| 3691 { | |
| 3692 /* Use the image in this position. */ | |
| 3693 c_extra = SIGN_BYTE; | |
| 3694 # ifdef FEAT_NETBEANS_INTG | |
| 3695 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3696 c_extra = MULTISIGN_BYTE; | |
| 3697 # endif | |
| 3698 char_attr = icon_sign; | |
| 3699 } | |
| 3700 else | |
| 3701 # endif | |
| 3702 if (text_sign != 0) | |
| 3703 { | |
| 3704 p_extra = sign_get_text(text_sign); | |
| 3705 if (p_extra != NULL) | |
| 3706 { | |
| 3707 c_extra = NUL; | |
| 835 | 3708 n_extra = (int)STRLEN(p_extra); |
| 7 | 3709 } |
| 3710 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3711 } | |
| 3712 } | |
| 3713 } | |
| 3714 } | |
| 3715 #endif | |
| 3716 | |
| 3717 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3718 { | |
| 3719 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3720 /* 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
|
3721 * 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
|
3722 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3723 && (row == startrow |
| 3724 #ifdef FEAT_DIFF | |
| 3725 + filler_lines | |
| 3726 #endif | |
| 3727 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3728 { | |
| 3729 /* Draw the line number (empty space after wrapping). */ | |
| 3730 if (row == startrow | |
| 3731 #ifdef FEAT_DIFF | |
| 3732 + filler_lines | |
| 3733 #endif | |
| 3734 ) | |
| 3735 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3736 long num; |
| 4065 | 3737 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3738 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3739 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
|
3740 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3741 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3742 else |
| 4065 | 3743 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3744 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3745 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
|
3746 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3747 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3748 /* 'number' + 'relativenumber' */ |
| 4065 | 3749 num = lnum; |
| 3750 fmt = "%-*ld "; | |
| 3751 } | |
| 3752 } | |
| 3753 | |
| 3754 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3755 number_width(wp), num); |
| 7 | 3756 if (wp->w_skipcol > 0) |
| 3757 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3758 *p_extra = '-'; | |
| 3759 #ifdef FEAT_RIGHTLEFT | |
| 3760 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3761 rl_mirror(extra); | |
| 3762 #endif | |
| 3763 p_extra = extra; | |
| 3764 c_extra = NUL; | |
| 3765 } | |
| 3766 else | |
| 3767 c_extra = ' '; | |
| 13 | 3768 n_extra = number_width(wp) + 1; |
| 7 | 3769 char_attr = hl_attr(HLF_N); |
| 743 | 3770 #ifdef FEAT_SYN_HL |
| 3771 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3772 * the current line differently. |
| 3773 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3774 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3775 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3776 && lnum == wp->w_cursor.lnum) |
| 3427 | 3777 char_attr = hl_attr(HLF_CLN); |
| 743 | 3778 #endif |
| 7 | 3779 } |
| 3780 } | |
| 3781 | |
| 5995 | 3782 #ifdef FEAT_LINEBREAK |
| 3783 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3784 && n_extra == 0 && *p_sbr != NUL) | |
| 3785 /* draw indent after showbreak value */ | |
| 3786 draw_state = WL_BRI; | |
| 3787 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3788 /* After the showbreak, draw the breakindent */ | |
| 3789 draw_state = WL_BRI - 1; | |
| 3790 | |
| 3791 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3792 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3793 { | |
| 3794 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3795 /* 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
|
3796 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
|
3797 && (row != startrow || need_showbreak) |
| 5995 | 3798 # ifdef FEAT_DIFF |
| 3799 && filler_lines == 0 | |
| 6834 | 3800 # endif |
| 5995 | 3801 ) |
| 3802 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3803 char_attr = 0; |
| 6834 | 3804 # ifdef FEAT_DIFF |
| 5995 | 3805 if (diff_hlf != (hlf_T)0) |
| 6106 | 3806 { |
| 5995 | 3807 char_attr = hl_attr(diff_hlf); |
| 6834 | 3808 # ifdef FEAT_SYN_HL |
| 6106 | 3809 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3810 char_attr = hl_combine_attr(char_attr, | |
| 3811 hl_attr(HLF_CUL)); | |
| 6834 | 3812 # endif |
| 6106 | 3813 } |
| 6834 | 3814 # endif |
| 6028 | 3815 p_extra = NULL; |
| 5995 | 3816 c_extra = ' '; |
| 3817 n_extra = get_breakindent_win(wp, | |
| 3818 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3819 /* Correct end of highlighted area for 'breakindent', | |
| 3820 * required when 'linebreak' is also set. */ | |
| 3821 if (tocol == vcol) | |
| 3822 tocol += n_extra; | |
| 3823 } | |
| 3824 } | |
| 3825 #endif | |
| 3826 | |
| 7 | 3827 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3828 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3829 { | |
| 3830 draw_state = WL_SBR; | |
| 3831 # ifdef FEAT_DIFF | |
| 3832 if (filler_todo > 0) | |
| 3833 { | |
| 3834 /* Draw "deleted" diff line(s). */ | |
| 3835 if (char2cells(fill_diff) > 1) | |
| 3836 c_extra = '-'; | |
| 3837 else | |
| 3838 c_extra = fill_diff; | |
| 3839 # ifdef FEAT_RIGHTLEFT | |
| 3840 if (wp->w_p_rl) | |
| 3841 n_extra = col + 1; | |
| 3842 else | |
| 3843 # endif | |
| 3844 n_extra = W_WIDTH(wp) - col; | |
| 3845 char_attr = hl_attr(HLF_DED); | |
| 3846 } | |
| 3847 # endif | |
| 3848 # ifdef FEAT_LINEBREAK | |
| 3849 if (*p_sbr != NUL && need_showbreak) | |
| 3850 { | |
| 3851 /* Draw 'showbreak' at the start of each broken line. */ | |
| 3852 p_extra = p_sbr; | |
| 3853 c_extra = NUL; | |
| 3854 n_extra = (int)STRLEN(p_sbr); | |
| 3855 char_attr = hl_attr(HLF_AT); | |
| 3856 need_showbreak = FALSE; | |
| 6503 | 3857 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 3858 /* Correct end of highlighted area for 'showbreak', |
| 3859 * required when 'linebreak' is also set. */ | |
| 3860 if (tocol == vcol) | |
| 3861 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3862 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3863 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3864 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 3865 char_attr = hl_combine_attr(char_attr, |
| 3866 hl_attr(HLF_CUL)); | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3867 #endif |
| 7 | 3868 } |
| 3869 # endif | |
| 3870 } | |
| 3871 #endif | |
| 3872 | |
| 3873 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 3874 { | |
| 3875 draw_state = WL_LINE; | |
| 3876 if (saved_n_extra) | |
| 3877 { | |
| 3878 /* Continue item from end of wrapped line. */ | |
| 3879 n_extra = saved_n_extra; | |
| 3880 c_extra = saved_c_extra; | |
| 3881 p_extra = saved_p_extra; | |
| 3882 char_attr = saved_char_attr; | |
| 3883 } | |
| 3884 else | |
| 3885 char_attr = 0; | |
| 3886 } | |
| 3887 } | |
| 3888 | |
| 3889 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 3890 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 3891 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 3892 #ifdef FEAT_DIFF |
| 3893 && filler_todo <= 0 | |
| 3894 #endif | |
| 3895 ) | |
| 3896 { | |
| 3897 SCREEN_LINE(screen_row, W_WINCOL(wp), col, -(int)W_WIDTH(wp), | |
| 3898 wp->w_p_rl); | |
| 819 | 3899 /* Pretend we have finished updating the window. Except when |
| 3900 * 'cursorcolumn' is set. */ | |
| 3901 #ifdef FEAT_SYN_HL | |
| 3902 if (wp->w_p_cuc) | |
| 3903 row = wp->w_cline_row + wp->w_cline_height; | |
| 3904 else | |
| 3905 #endif | |
| 3906 row = wp->w_height; | |
| 7 | 3907 break; |
| 3908 } | |
| 3909 | |
| 3910 if (draw_state == WL_LINE && area_highlighting) | |
| 3911 { | |
| 3912 /* handle Visual or match highlighting in this line */ | |
| 3913 if (vcol == fromcol | |
| 3914 #ifdef FEAT_MBYTE | |
| 3915 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 3916 && (*mb_ptr2cells)(ptr) > 1) | |
| 3917 #endif | |
| 3918 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 3919 && vcol_prev < vcol /* not at margin */ |
| 7 | 3920 && vcol < tocol)) |
| 3921 area_attr = attr; /* start highlighting */ | |
| 3922 else if (area_attr != 0 | |
| 3923 && (vcol == tocol | |
| 3924 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 3925 area_attr = 0; /* stop highlighting */ | |
| 3926 | |
| 3927 #ifdef FEAT_SEARCH_EXTRA | |
| 3928 if (!n_extra) | |
| 3929 { | |
| 3930 /* | |
| 3931 * Check for start/end of search pattern match. | |
| 3932 * After end, check for start/end of next match. | |
| 3933 * When another match, have to check for start again. | |
| 3934 * Watch out for matching an empty string! | |
| 1326 | 3935 * Do this for 'search_hl' and the match list (ordered by |
| 3936 * priority). | |
| 7 | 3937 */ |
| 36 | 3938 v = (long)(ptr - line); |
| 1326 | 3939 cur = wp->w_match_head; |
| 3940 shl_flag = FALSE; | |
| 3941 while (cur != NULL || shl_flag == FALSE) | |
| 3942 { | |
| 3943 if (shl_flag == FALSE | |
| 3944 && ((cur != NULL | |
| 3945 && cur->priority > SEARCH_HL_PRIORITY) | |
| 3946 || cur == NULL)) | |
| 3947 { | |
| 3948 shl = &search_hl; | |
| 3949 shl_flag = TRUE; | |
| 3950 } | |
| 3951 else | |
| 3952 shl = &cur->hl; | |
| 5979 | 3953 if (cur != NULL) |
| 3954 cur->pos.cur = 0; | |
| 3955 pos_inprogress = TRUE; | |
| 3956 while (shl->rm.regprog != NULL | |
| 3957 || (cur != NULL && pos_inprogress)) | |
| 7 | 3958 { |
| 36 | 3959 if (shl->startcol != MAXCOL |
| 3960 && v >= (long)shl->startcol | |
| 3961 && v < (long)shl->endcol) | |
| 7 | 3962 { |
| 6430 | 3963 #ifdef FEAT_MBYTE |
| 3964 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 3965 | |
| 3966 if (shl->endcol < tmp_col) | |
| 3967 shl->endcol = tmp_col; | |
| 3968 #endif | |
| 7 | 3969 shl->attr_cur = shl->attr; |
| 6947 | 3970 #ifdef FEAT_CONCEAL |
| 3971 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 3972 == cur->hlg_id) | |
| 3973 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3974 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3975 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 3976 match_conc = cur->conceal_char; |
| 3977 } | |
| 3978 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3979 has_match_conc = match_conc = 0; |
| 6947 | 3980 #endif |
| 7 | 3981 } |
| 6430 | 3982 else if (v == (long)shl->endcol) |
| 7 | 3983 { |
| 3984 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3985 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
|
3986 shl == &search_hl ? NULL : cur); |
| 5979 | 3987 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 3988 ? FALSE : TRUE; |
| 7 | 3989 |
| 3990 /* Need to get the line again, a multi-line regexp | |
| 3991 * may have made it invalid. */ | |
| 3992 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3993 ptr = line + v; | |
| 3994 | |
| 3995 if (shl->lnum == lnum) | |
| 3996 { | |
| 36 | 3997 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 3998 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 3999 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4000 else |
| 36 | 4001 shl->endcol = MAXCOL; |
| 4002 | |
| 4003 if (shl->startcol == shl->endcol) | |
| 7 | 4004 { |
| 4005 /* highlight empty match, try again after | |
| 4006 * it */ | |
| 4007 #ifdef FEAT_MBYTE | |
| 4008 if (has_mbyte) | |
| 474 | 4009 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4010 + shl->endcol); |
| 7 | 4011 else |
| 4012 #endif | |
| 36 | 4013 ++shl->endcol; |
| 7 | 4014 } |
| 4015 | |
| 4016 /* Loop to check if the match starts at the | |
| 4017 * current position */ | |
| 4018 continue; | |
| 4019 } | |
| 4020 } | |
| 4021 break; | |
| 4022 } | |
| 1326 | 4023 if (shl != &search_hl && cur != NULL) |
| 4024 cur = cur->next; | |
| 4025 } | |
| 4026 | |
| 4027 /* Use attributes from match with highest priority among | |
| 4028 * 'search_hl' and the match list. */ | |
| 4029 search_attr = search_hl.attr_cur; | |
| 4030 cur = wp->w_match_head; | |
| 4031 shl_flag = FALSE; | |
| 4032 while (cur != NULL || shl_flag == FALSE) | |
| 4033 { | |
| 4034 if (shl_flag == FALSE | |
| 4035 && ((cur != NULL | |
| 4036 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4037 || cur == NULL)) | |
| 699 | 4038 { |
| 1326 | 4039 shl = &search_hl; |
| 4040 shl_flag = TRUE; | |
| 699 | 4041 } |
| 1326 | 4042 else |
| 4043 shl = &cur->hl; | |
| 4044 if (shl->attr_cur != 0) | |
| 4045 search_attr = shl->attr_cur; | |
| 4046 if (shl != &search_hl && cur != NULL) | |
| 4047 cur = cur->next; | |
| 4048 } | |
| 7 | 4049 } |
| 4050 #endif | |
| 4051 | |
| 4052 #ifdef FEAT_DIFF | |
| 674 | 4053 if (diff_hlf != (hlf_T)0) |
| 7 | 4054 { |
| 1295 | 4055 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4056 && n_extra == 0) | |
| 7 | 4057 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4058 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4059 && n_extra == 0) | |
| 7 | 4060 diff_hlf = HLF_CHD; /* changed line */ |
| 674 | 4061 line_attr = hl_attr(diff_hlf); |
| 6106 | 4062 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4063 line_attr = hl_combine_attr(line_attr, hl_attr(HLF_CUL)); | |
| 674 | 4064 } |
| 4065 #endif | |
| 4066 | |
| 4067 /* Decide which of the highlight attributes to use. */ | |
| 4068 attr_pri = TRUE; | |
| 6717 | 4069 #ifdef LINE_ATTR |
| 674 | 4070 if (area_attr != 0) |
| 6717 | 4071 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4072 else if (search_attr != 0) |
| 6717 | 4073 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4074 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4075 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4076 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4077 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4078 || vcol >= tocol)) | |
| 674 | 4079 char_attr = line_attr; |
| 6717 | 4080 #else |
| 4081 if (area_attr != 0) | |
| 4082 char_attr = area_attr; | |
| 4083 else if (search_attr != 0) | |
| 4084 char_attr = search_attr; | |
| 674 | 4085 #endif |
| 4086 else | |
| 4087 { | |
| 4088 attr_pri = FALSE; | |
| 4089 #ifdef FEAT_SYN_HL | |
| 4090 if (has_syntax) | |
| 4091 char_attr = syntax_attr; | |
| 4092 else | |
| 4093 #endif | |
| 4094 char_attr = 0; | |
| 4095 } | |
| 7 | 4096 } |
| 4097 | |
| 4098 /* | |
| 4099 * Get the next character to put on the screen. | |
| 4100 */ | |
| 4101 /* | |
| 1340 | 4102 * The "p_extra" points to the extra stuff that is inserted to |
| 4103 * represent special characters (non-printable stuff) and other | |
| 4104 * things. When all characters are the same, c_extra is used. | |
| 4105 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4106 * "p_extra[n_extra]". | |
| 7 | 4107 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4108 */ | |
| 4109 if (n_extra > 0) | |
| 4110 { | |
| 4111 if (c_extra != NUL) | |
| 4112 { | |
| 4113 c = c_extra; | |
| 4114 #ifdef FEAT_MBYTE | |
| 4115 mb_c = c; /* doesn't handle non-utf-8 multi-byte! */ | |
| 4116 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4117 { | |
| 4118 mb_utf8 = TRUE; | |
| 714 | 4119 u8cc[0] = 0; |
| 819 | 4120 c = 0xc0; |
| 7 | 4121 } |
| 4122 else | |
| 4123 mb_utf8 = FALSE; | |
| 4124 #endif | |
| 4125 } | |
| 4126 else | |
| 4127 { | |
| 4128 c = *p_extra; | |
| 4129 #ifdef FEAT_MBYTE | |
| 4130 if (has_mbyte) | |
| 4131 { | |
| 4132 mb_c = c; | |
| 4133 if (enc_utf8) | |
| 4134 { | |
| 4135 /* If the UTF-8 character is more than one byte: | |
| 4136 * Decode it into "mb_c". */ | |
| 474 | 4137 mb_l = (*mb_ptr2len)(p_extra); |
| 7 | 4138 mb_utf8 = FALSE; |
| 4139 if (mb_l > n_extra) | |
| 4140 mb_l = 1; | |
| 4141 else if (mb_l > 1) | |
| 4142 { | |
| 714 | 4143 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4144 mb_utf8 = TRUE; |
| 819 | 4145 c = 0xc0; |
| 7 | 4146 } |
| 4147 } | |
| 4148 else | |
| 4149 { | |
| 4150 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4151 mb_l = MB_BYTE2LEN(c); | |
| 4152 if (mb_l >= n_extra) | |
| 4153 mb_l = 1; | |
| 4154 else if (mb_l > 1) | |
| 4155 mb_c = (c << 8) + p_extra[1]; | |
| 4156 } | |
| 504 | 4157 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4158 mb_l = 1; | |
| 4159 | |
| 7 | 4160 /* If a double-width char doesn't fit display a '>' in the |
| 4161 * last column. */ | |
| 504 | 4162 if (( |
| 7 | 4163 # ifdef FEAT_RIGHTLEFT |
| 4164 wp->w_p_rl ? (col <= 0) : | |
| 4165 # endif | |
| 504 | 4166 (col >= W_WIDTH(wp) - 1)) |
| 7 | 4167 && (*mb_char2cells)(mb_c) == 2) |
| 4168 { | |
| 4169 c = '>'; | |
| 4170 mb_c = c; | |
| 4171 mb_l = 1; | |
| 4172 mb_utf8 = FALSE; | |
| 4173 multi_attr = hl_attr(HLF_AT); | |
| 4174 /* put the pointer back to output the double-width | |
| 4175 * character at the start of the next line. */ | |
| 4176 ++n_extra; | |
| 4177 --p_extra; | |
| 4178 } | |
| 4179 else | |
| 4180 { | |
| 4181 n_extra -= mb_l - 1; | |
| 4182 p_extra += mb_l - 1; | |
| 4183 } | |
| 4184 } | |
| 4185 #endif | |
| 4186 ++p_extra; | |
| 4187 } | |
| 4188 --n_extra; | |
| 4189 } | |
| 4190 else | |
| 4191 { | |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4192 int c0; |
|
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4193 |
| 6026 | 4194 if (p_extra_free != NULL) |
| 4195 { | |
| 4196 vim_free(p_extra_free); | |
| 4197 p_extra_free = NULL; | |
| 4198 } | |
| 7 | 4199 /* |
| 4200 * Get a character from the line itself. | |
| 4201 */ | |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4202 c0 = c = *ptr; |
| 7 | 4203 #ifdef FEAT_MBYTE |
| 4204 if (has_mbyte) | |
| 4205 { | |
| 4206 mb_c = c; | |
| 4207 if (enc_utf8) | |
| 4208 { | |
| 4209 /* If the UTF-8 character is more than one byte: Decode it | |
| 4210 * into "mb_c". */ | |
| 474 | 4211 mb_l = (*mb_ptr2len)(ptr); |
| 7 | 4212 mb_utf8 = FALSE; |
| 4213 if (mb_l > 1) | |
| 4214 { | |
| 714 | 4215 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4216 /* Overlong encoded ASCII or ASCII with composing char |
| 4217 * is displayed normally, except a NUL. */ | |
| 4218 if (mb_c < 0x80) | |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4219 c0 = c = mb_c; |
| 7 | 4220 mb_utf8 = TRUE; |
| 507 | 4221 |
| 4222 /* At start of the line we can have a composing char. | |
| 4223 * Draw it as a space with a composing char. */ | |
| 4224 if (utf_iscomposing(mb_c)) | |
| 4225 { | |
| 1326 | 4226 int i; |
| 4227 | |
| 714 | 4228 for (i = Screen_mco - 1; i > 0; --i) |
| 4229 u8cc[i] = u8cc[i - 1]; | |
| 4230 u8cc[0] = mb_c; | |
| 507 | 4231 mb_c = ' '; |
| 4232 } | |
| 7 | 4233 } |
| 4234 | |
| 4235 if ((mb_l == 1 && c >= 0x80) | |
| 4236 || (mb_l >= 1 && mb_c == 0) | |
| 4237 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4238 # ifdef UNICODE16 |
| 4239 || mb_c >= 0x10000 | |
| 4240 # endif | |
| 4241 ))) | |
| 7 | 4242 { |
| 4243 /* | |
| 4244 * Illegal UTF-8 byte: display as <xx>. | |
| 4245 * Non-BMP character : display as ? or fullwidth ?. | |
| 4246 */ | |
| 1401 | 4247 # ifdef UNICODE16 |
| 7 | 4248 if (mb_c < 0x10000) |
| 1401 | 4249 # endif |
| 7 | 4250 { |
| 4251 transchar_hex(extra, mb_c); | |
| 714 | 4252 # ifdef FEAT_RIGHTLEFT |
| 7 | 4253 if (wp->w_p_rl) /* reverse */ |
| 4254 rl_mirror(extra); | |
| 714 | 4255 # endif |
| 7 | 4256 } |
| 1401 | 4257 # ifdef UNICODE16 |
| 7 | 4258 else if (utf_char2cells(mb_c) != 2) |
| 4259 STRCPY(extra, "?"); | |
| 4260 else | |
| 4261 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4262 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4263 # endif |
| 7 | 4264 |
| 4265 p_extra = extra; | |
| 4266 c = *p_extra; | |
| 4267 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4268 mb_utf8 = (c >= 0x80); | |
| 4269 n_extra = (int)STRLEN(p_extra); | |
| 4270 c_extra = NUL; | |
| 4271 if (area_attr == 0 && search_attr == 0) | |
| 4272 { | |
| 4273 n_attr = n_extra + 1; | |
| 4274 extra_attr = hl_attr(HLF_8); | |
| 4275 saved_attr2 = char_attr; /* save current attr */ | |
| 4276 } | |
| 4277 } | |
| 4278 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4279 mb_l = 1; | |
| 4280 #ifdef FEAT_ARABIC | |
| 4281 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4282 { | |
| 4283 /* Do Arabic shaping. */ | |
| 714 | 4284 int pc, pc1, nc; |
| 4285 int pcc[MAX_MCO]; | |
| 7 | 4286 |
| 4287 /* The idea of what is the previous and next | |
| 4288 * character depends on 'rightleft'. */ | |
| 4289 if (wp->w_p_rl) | |
| 4290 { | |
| 4291 pc = prev_c; | |
| 4292 pc1 = prev_c1; | |
| 4293 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4294 prev_c1 = u8cc[0]; |
| 7 | 4295 } |
| 4296 else | |
| 4297 { | |
| 714 | 4298 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4299 nc = prev_c; |
| 714 | 4300 pc1 = pcc[0]; |
| 7 | 4301 } |
| 4302 prev_c = mb_c; | |
| 4303 | |
| 714 | 4304 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4305 } |
| 4306 else | |
| 4307 prev_c = mb_c; | |
| 4308 #endif | |
| 4309 } | |
| 4310 else /* enc_dbcs */ | |
| 4311 { | |
| 4312 mb_l = MB_BYTE2LEN(c); | |
| 4313 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4314 mb_l = 1; | |
| 4315 else if (mb_l > 1) | |
| 4316 { | |
| 4317 /* We assume a second byte below 32 is illegal. | |
| 4318 * Hopefully this is OK for all double-byte encodings! | |
| 4319 */ | |
| 4320 if (ptr[1] >= 32) | |
| 4321 mb_c = (c << 8) + ptr[1]; | |
| 4322 else | |
| 4323 { | |
| 4324 if (ptr[1] == NUL) | |
| 4325 { | |
| 4326 /* head byte at end of line */ | |
| 4327 mb_l = 1; | |
| 4328 transchar_nonprint(extra, c); | |
| 4329 } | |
| 4330 else | |
| 4331 { | |
| 4332 /* illegal tail byte */ | |
| 4333 mb_l = 2; | |
| 4334 STRCPY(extra, "XX"); | |
| 4335 } | |
| 4336 p_extra = extra; | |
| 4337 n_extra = (int)STRLEN(extra) - 1; | |
| 4338 c_extra = NUL; | |
| 4339 c = *p_extra++; | |
| 4340 if (area_attr == 0 && search_attr == 0) | |
| 4341 { | |
| 4342 n_attr = n_extra + 1; | |
| 4343 extra_attr = hl_attr(HLF_8); | |
| 4344 saved_attr2 = char_attr; /* save current attr */ | |
| 4345 } | |
| 4346 mb_c = c; | |
| 4347 } | |
| 4348 } | |
| 4349 } | |
| 4350 /* If a double-width char doesn't fit display a '>' in the | |
| 4351 * last column; the character is displayed at the start of the | |
| 4352 * next line. */ | |
| 4353 if (( | |
| 4354 # ifdef FEAT_RIGHTLEFT | |
| 4355 wp->w_p_rl ? (col <= 0) : | |
| 4356 # endif | |
| 4357 (col >= W_WIDTH(wp) - 1)) | |
| 4358 && (*mb_char2cells)(mb_c) == 2) | |
| 4359 { | |
| 4360 c = '>'; | |
| 4361 mb_c = c; | |
| 4362 mb_utf8 = FALSE; | |
| 4363 mb_l = 1; | |
| 4364 multi_attr = hl_attr(HLF_AT); | |
| 4365 /* Put pointer back so that the character will be | |
| 4366 * displayed at the start of the next line. */ | |
| 4367 --ptr; | |
| 4368 } | |
| 4369 else if (*ptr != NUL) | |
| 4370 ptr += mb_l - 1; | |
| 4371 | |
| 4372 /* 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
|
4373 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4374 * 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
|
4375 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4376 { |
| 4377 n_extra = 1; | |
| 3586 | 4378 c_extra = MB_FILLER_CHAR; |
| 7 | 4379 c = ' '; |
| 4380 if (area_attr == 0 && search_attr == 0) | |
| 4381 { | |
| 4382 n_attr = n_extra + 1; | |
| 4383 extra_attr = hl_attr(HLF_AT); | |
| 4384 saved_attr2 = char_attr; /* save current attr */ | |
| 4385 } | |
| 4386 mb_c = c; | |
| 4387 mb_utf8 = FALSE; | |
| 4388 mb_l = 1; | |
| 4389 } | |
| 4390 | |
| 4391 } | |
| 4392 #endif | |
| 4393 ++ptr; | |
| 4394 | |
| 4395 if (extra_check) | |
| 4396 { | |
| 743 | 4397 #ifdef FEAT_SPELL |
| 221 | 4398 int can_spell = TRUE; |
| 743 | 4399 #endif |
| 4400 | |
| 4401 #ifdef FEAT_SYN_HL | |
| 7 | 4402 /* Get syntax attribute, unless still at the start of the line |
| 4403 * (double-wide char that doesn't fit). */ | |
| 221 | 4404 v = (long)(ptr - line); |
| 4405 if (has_syntax && v > 0) | |
| 7 | 4406 { |
| 4407 /* Get the syntax attribute for the character. If there | |
| 4408 * is an error, disable syntax highlighting. */ | |
| 4409 save_did_emsg = did_emsg; | |
| 4410 did_emsg = FALSE; | |
| 4411 | |
| 221 | 4412 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4413 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4414 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4415 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4416 NULL, FALSE); |
| 7 | 4417 |
| 4418 if (did_emsg) | |
| 482 | 4419 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4420 wp->w_s->b_syn_error = TRUE; |
| 482 | 4421 has_syntax = FALSE; |
| 4422 } | |
| 7 | 4423 else |
| 4424 did_emsg = save_did_emsg; | |
| 4425 | |
| 4426 /* Need to get the line again, a multi-line regexp may | |
| 4427 * have made it invalid. */ | |
| 4428 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4429 ptr = line + v; | |
| 4430 | |
| 674 | 4431 if (!attr_pri) |
| 7 | 4432 char_attr = syntax_attr; |
| 301 | 4433 else |
| 303 | 4434 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
|
4435 # 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
|
4436 /* 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
|
4437 * 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
|
4438 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
|
4439 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
|
4440 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
|
4441 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
|
4442 # endif |
| 7 | 4443 } |
| 743 | 4444 #endif |
| 4445 | |
| 4446 #ifdef FEAT_SPELL | |
| 301 | 4447 /* Check spelling (unless at the end of the line). |
| 319 | 4448 * Only do this when there is no syntax highlighting, the |
| 4449 * @Spell cluster is not used or the current syntax item | |
| 4450 * contains the @Spell cluster. */ | |
| 348 | 4451 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4452 { |
| 230 | 4453 spell_attr = 0; |
| 743 | 4454 # ifdef FEAT_SYN_HL |
| 674 | 4455 if (!attr_pri) |
| 230 | 4456 char_attr = syntax_attr; |
| 743 | 4457 # endif |
| 4458 if (c != 0 && ( | |
| 4459 # ifdef FEAT_SYN_HL | |
| 4460 !has_syntax || | |
| 4461 # endif | |
| 4462 can_spell)) | |
| 221 | 4463 { |
| 348 | 4464 char_u *prev_ptr, *p; |
| 4465 int len; | |
| 534 | 4466 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4467 # ifdef FEAT_MBYTE |
| 336 | 4468 if (has_mbyte) |
| 4469 { | |
| 4470 prev_ptr = ptr - mb_l; | |
| 4471 v -= mb_l - 1; | |
| 4472 } | |
| 4473 else | |
| 221 | 4474 # endif |
| 336 | 4475 prev_ptr = ptr - 1; |
| 348 | 4476 |
| 4477 /* Use nextline[] if possible, it has the start of the | |
| 4478 * next line concatenated. */ | |
| 4479 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4480 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4481 else | |
| 4482 p = prev_ptr; | |
| 835 | 4483 cap_col -= (int)(prev_ptr - line); |
| 625 | 4484 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4485 nochange); | |
| 348 | 4486 word_end = v + len; |
| 301 | 4487 |
| 4488 /* In Insert mode only highlight a word that | |
| 4489 * doesn't touch the cursor. */ | |
| 534 | 4490 if (spell_hlf != HLF_COUNT |
| 301 | 4491 && (State & INSERT) != 0 |
| 4492 && wp->w_cursor.lnum == lnum | |
| 4493 && wp->w_cursor.col >= | |
| 4494 (colnr_T)(prev_ptr - line) | |
| 4495 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4496 { |
| 534 | 4497 spell_hlf = HLF_COUNT; |
| 301 | 4498 spell_redraw_lnum = lnum; |
| 221 | 4499 } |
| 348 | 4500 |
| 534 | 4501 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4502 && (p - nextline) + len > nextline_idx) |
| 4503 { | |
| 4504 /* Remember that the good word continues at the | |
| 4505 * start of the next line. */ | |
| 4506 checked_lnum = lnum + 1; | |
| 835 | 4507 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4508 } |
| 386 | 4509 |
| 534 | 4510 /* Turn index into actual attributes. */ |
| 4511 if (spell_hlf != HLF_COUNT) | |
| 4512 spell_attr = highlight_attr[spell_hlf]; | |
| 4513 | |
| 386 | 4514 if (cap_col > 0) |
| 4515 { | |
| 4516 if (p != prev_ptr | |
| 4517 && (p - nextline) + cap_col >= nextline_idx) | |
| 4518 { | |
| 4519 /* Remember that the word in the next line | |
| 4520 * must start with a capital. */ | |
| 4521 capcol_lnum = lnum + 1; | |
| 835 | 4522 cap_col = (int)((p - nextline) + cap_col |
| 4523 - nextline_idx); | |
| 386 | 4524 } |
| 4525 else | |
| 4526 /* Compute the actual column. */ | |
| 835 | 4527 cap_col += (int)(prev_ptr - line); |
| 386 | 4528 } |
| 221 | 4529 } |
| 4530 } | |
| 4531 if (spell_attr != 0) | |
| 348 | 4532 { |
| 674 | 4533 if (!attr_pri) |
| 348 | 4534 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4535 else | |
| 4536 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4537 } | |
| 7 | 4538 #endif |
| 4539 #ifdef FEAT_LINEBREAK | |
| 4540 /* | |
| 221 | 4541 * Found last space before word: check for line break. |
| 7 | 4542 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4543 if (wp->w_p_lbr && c0 == c |
|
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4544 && vim_isbreak(c) && !vim_isbreak(*ptr)) |
| 7 | 4545 { |
| 6681 | 4546 # ifdef FEAT_MBYTE |
| 6693 | 4547 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4548 # endif |
| 5995 | 4549 char_u *p = ptr - ( |
| 7 | 4550 # ifdef FEAT_MBYTE |
| 6693 | 4551 mb_off + |
| 7 | 4552 # endif |
| 5995 | 4553 1); |
| 6681 | 4554 |
| 5995 | 4555 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4556 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4557 NULL) - 1; |
| 6371 | 4558 if (c == TAB && n_extra + col > W_WIDTH(wp)) |
| 4559 n_extra = (int)wp->w_buffer->b_p_ts | |
| 4560 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4561 | |
| 6681 | 4562 # ifdef FEAT_MBYTE |
| 6693 | 4563 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4564 # else |
| 7 | 4565 c_extra = ' '; |
| 6681 | 4566 # endif |
| 7 | 4567 if (vim_iswhite(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4568 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4569 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4570 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4571 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4572 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4573 #endif |
| 6026 | 4574 if (!wp->w_p_list) |
| 4575 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4576 } |
| 7 | 4577 } |
| 4578 #endif | |
| 4579 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4580 /* '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
|
4581 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4582 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4583 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4584 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4585 || (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
|
4586 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4587 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4588 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4589 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4590 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4591 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
|
4592 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4593 n_attr = 1; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4594 extra_attr = hl_attr(HLF_8); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4595 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
|
4596 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4597 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4598 mb_c = c; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4599 if (enc_utf8 && (*mb_char2len)(c) > 1) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4600 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4601 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4602 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4603 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4604 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4605 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4606 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4607 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4608 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4609 |
| 7 | 4610 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4611 { | |
| 4612 c = lcs_trail; | |
| 674 | 4613 if (!attr_pri) |
| 7 | 4614 { |
| 4615 n_attr = 1; | |
| 4616 extra_attr = hl_attr(HLF_8); | |
| 4617 saved_attr2 = char_attr; /* save current attr */ | |
| 4618 } | |
| 4619 #ifdef FEAT_MBYTE | |
| 4620 mb_c = c; | |
| 4621 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4622 { | |
| 4623 mb_utf8 = TRUE; | |
| 714 | 4624 u8cc[0] = 0; |
| 819 | 4625 c = 0xc0; |
| 7 | 4626 } |
| 4627 else | |
| 4628 mb_utf8 = FALSE; | |
| 4629 #endif | |
| 4630 } | |
| 4631 } | |
| 4632 | |
| 4633 /* | |
| 4634 * Handling of non-printable characters. | |
| 4635 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4636 if (!vim_isprintc(c)) |
| 7 | 4637 { |
| 4638 /* | |
| 4639 * when getting a character from the file, we may have to | |
| 4640 * turn it into something else on the way to putting it | |
| 4641 * into "ScreenLines". | |
| 4642 */ | |
| 4643 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4644 { | |
| 6026 | 4645 int tab_len = 0; |
| 6503 | 4646 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4647 #ifdef FEAT_LINEBREAK | |
| 4648 /* only adjust the tab_len, when at the first column | |
| 4649 * after the showbreak value was drawn */ | |
| 4650 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4651 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4652 #endif | |
| 7 | 4653 /* tab amount depends on current column */ |
| 6026 | 4654 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4655 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4656 | |
| 6026 | 4657 #ifdef FEAT_LINEBREAK |
| 6100 | 4658 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4659 #endif |
| 4660 /* tab amount depends on current column */ | |
| 4661 n_extra = tab_len; | |
| 4662 #ifdef FEAT_LINEBREAK | |
| 4663 else | |
| 4664 { | |
| 4665 char_u *p; | |
| 4666 int len = n_extra; | |
| 4667 int i; | |
| 4668 int saved_nextra = n_extra; | |
| 4669 | |
| 6172 | 4670 #ifdef FEAT_CONCEAL |
| 6627 | 4671 if (vcol_off > 0) |
| 6172 | 4672 /* there are characters to conceal */ |
| 4673 tab_len += vcol_off; | |
| 6520 | 4674 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4675 */ | |
| 4676 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4677 && n_extra > tab_len) | |
| 4678 tab_len += n_extra - tab_len; | |
| 4679 #endif | |
| 4680 | |
| 6026 | 4681 /* if n_extra > 0, it gives the number of chars, to |
| 4682 * use for a tab, else we need to calculate the width | |
| 4683 * for a tab */ | |
| 4684 #ifdef FEAT_MBYTE | |
| 4685 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4686 if (n_extra > 0) | |
| 4687 len += n_extra - tab_len; | |
| 4688 #endif | |
| 4689 c = lcs_tab1; | |
| 4690 p = alloc((unsigned)(len + 1)); | |
| 4691 vim_memset(p, ' ', len); | |
| 4692 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4693 vim_free(p_extra_free); |
| 6026 | 4694 p_extra_free = p; |
| 4695 for (i = 0; i < tab_len; i++) | |
| 4696 { | |
| 4697 #ifdef FEAT_MBYTE | |
| 4698 mb_char2bytes(lcs_tab2, p); | |
| 4699 p += mb_char2len(lcs_tab2); | |
| 4700 n_extra += mb_char2len(lcs_tab2) | |
| 4701 - (saved_nextra > 0 ? 1 : 0); | |
| 4702 #else | |
| 4703 p[i] = lcs_tab2; | |
| 4704 #endif | |
| 4705 } | |
| 4706 p_extra = p_extra_free; | |
| 6172 | 4707 #ifdef FEAT_CONCEAL |
| 4708 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4709 * macro below, so need to adjust for that here */ | |
| 6627 | 4710 if (vcol_off > 0) |
| 6172 | 4711 n_extra -= vcol_off; |
| 4712 #endif | |
| 6026 | 4713 } |
| 4714 #endif | |
| 3984 | 4715 #ifdef FEAT_CONCEAL |
| 6627 | 4716 { |
| 4717 int vc_saved = vcol_off; | |
| 4718 | |
| 4719 /* Tab alignment should be identical regardless of | |
| 4720 * 'conceallevel' value. So tab compensates of all | |
| 4721 * previous concealed characters, and thus resets | |
| 4722 * vcol_off and boguscols accumulated so far in the | |
| 4723 * line. Note that the tab can be longer than | |
| 4724 * 'tabstop' when there are concealed characters. */ | |
| 4725 FIX_FOR_BOGUSCOLS; | |
| 4726 | |
| 4727 /* Make sure, the highlighting for the tab char will be | |
| 4728 * correctly set further below (effectively reverts the | |
| 4729 * FIX_FOR_BOGSUCOLS macro */ | |
| 4730 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4731 && lcs_tab1) |
| 6627 | 4732 tab_len += vc_saved; |
| 4733 } | |
| 3984 | 4734 #endif |
| 7 | 4735 #ifdef FEAT_MBYTE |
| 4736 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4737 #endif | |
| 4738 if (wp->w_p_list) | |
| 4739 { | |
| 4740 c = lcs_tab1; | |
| 6026 | 4741 #ifdef FEAT_LINEBREAK |
| 4742 if (wp->w_p_lbr) | |
| 4743 c_extra = NUL; /* using p_extra from above */ | |
| 4744 else | |
| 4745 #endif | |
| 4746 c_extra = lcs_tab2; | |
| 4747 n_attr = tab_len + 1; | |
| 7 | 4748 extra_attr = hl_attr(HLF_8); |
| 4749 saved_attr2 = char_attr; /* save current attr */ | |
| 4750 #ifdef FEAT_MBYTE | |
| 4751 mb_c = c; | |
| 4752 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4753 { | |
| 4754 mb_utf8 = TRUE; | |
| 714 | 4755 u8cc[0] = 0; |
| 819 | 4756 c = 0xc0; |
| 7 | 4757 } |
| 4758 #endif | |
| 4759 } | |
| 4760 else | |
| 4761 { | |
| 4762 c_extra = ' '; | |
| 4763 c = ' '; | |
| 4764 } | |
| 4765 } | |
| 36 | 4766 else if (c == NUL |
| 6799 | 4767 && (wp->w_p_list |
| 36 | 4768 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4769 && tocol > vcol | |
| 4770 && VIsual_mode != Ctrl_V | |
| 4771 && ( | |
| 4772 # ifdef FEAT_RIGHTLEFT | |
| 4773 wp->w_p_rl ? (col >= 0) : | |
| 4774 # endif | |
| 4775 (col < W_WIDTH(wp))) | |
| 4776 && !(noinvcur | |
| 1850 | 4777 && lnum == wp->w_cursor.lnum |
| 36 | 4778 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4779 && lcs_eol_one > 0) |
| 7 | 4780 { |
| 36 | 4781 /* Display a '$' after the line or highlight an extra |
| 4782 * character if the line break is included. */ | |
| 7 | 4783 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4784 /* For a diff line the highlighting continues after the | |
| 4785 * "$". */ | |
| 4786 if ( | |
| 4787 # ifdef FEAT_DIFF | |
| 534 | 4788 diff_hlf == (hlf_T)0 |
| 7 | 4789 # ifdef LINE_ATTR |
| 4790 && | |
| 4791 # endif | |
| 4792 # endif | |
| 4793 # ifdef LINE_ATTR | |
| 4794 line_attr == 0 | |
| 4795 # endif | |
| 4796 ) | |
| 4797 #endif | |
| 4798 { | |
| 4799 #ifdef FEAT_VIRTUALEDIT | |
| 4800 /* In virtualedit, visual selections may extend | |
| 4801 * beyond end of line. */ | |
| 4802 if (area_highlighting && virtual_active() | |
| 4803 && tocol != MAXCOL && vcol < tocol) | |
| 4804 n_extra = 0; | |
| 4805 else | |
| 4806 #endif | |
| 4807 { | |
| 4808 p_extra = at_end_str; | |
| 4809 n_extra = 1; | |
| 4810 c_extra = NUL; | |
| 4811 } | |
| 4812 } | |
| 6799 | 4813 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 4814 c = lcs_eol; |
| 4815 else | |
| 4816 c = ' '; | |
| 7 | 4817 lcs_eol_one = -1; |
| 4818 --ptr; /* put it back at the NUL */ | |
| 674 | 4819 if (!attr_pri) |
| 7 | 4820 { |
| 4821 extra_attr = hl_attr(HLF_AT); | |
| 4822 n_attr = 1; | |
| 4823 } | |
| 4824 #ifdef FEAT_MBYTE | |
| 4825 mb_c = c; | |
| 4826 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 4827 { | |
| 4828 mb_utf8 = TRUE; | |
| 714 | 4829 u8cc[0] = 0; |
| 819 | 4830 c = 0xc0; |
| 7 | 4831 } |
| 4832 else | |
| 4833 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4834 #endif | |
| 4835 } | |
| 4836 else if (c != NUL) | |
| 4837 { | |
| 4838 p_extra = transchar(c); | |
| 6064 | 4839 if (n_extra == 0) |
| 4840 n_extra = byte2cells(c) - 1; | |
| 7 | 4841 #ifdef FEAT_RIGHTLEFT |
| 4842 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 4843 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 4844 #endif | |
| 4845 c_extra = NUL; | |
| 6026 | 4846 #ifdef FEAT_LINEBREAK |
| 4847 if (wp->w_p_lbr) | |
| 4848 { | |
| 4849 char_u *p; | |
| 4850 | |
| 4851 c = *p_extra; | |
| 4852 p = alloc((unsigned)n_extra + 1); | |
| 4853 vim_memset(p, ' ', n_extra); | |
| 4854 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 4855 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4856 vim_free(p_extra_free); |
| 6026 | 4857 p_extra_free = p_extra = p; |
| 4858 } | |
| 4859 else | |
| 4860 #endif | |
| 4861 { | |
| 4862 n_extra = byte2cells(c) - 1; | |
| 4863 c = *p_extra++; | |
| 4864 } | |
| 674 | 4865 if (!attr_pri) |
| 7 | 4866 { |
| 4867 n_attr = n_extra + 1; | |
| 4868 extra_attr = hl_attr(HLF_8); | |
| 4869 saved_attr2 = char_attr; /* save current attr */ | |
| 4870 } | |
| 4871 #ifdef FEAT_MBYTE | |
| 4872 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4873 #endif | |
| 4874 } | |
| 4875 #ifdef FEAT_VIRTUALEDIT | |
| 4876 else if (VIsual_active | |
| 4877 && (VIsual_mode == Ctrl_V | |
| 4878 || VIsual_mode == 'v') | |
| 4879 && virtual_active() | |
| 4880 && tocol != MAXCOL | |
| 4881 && vcol < tocol | |
| 4882 && ( | |
| 4883 # ifdef FEAT_RIGHTLEFT | |
| 4884 wp->w_p_rl ? (col >= 0) : | |
| 4885 # endif | |
| 4886 (col < W_WIDTH(wp)))) | |
| 4887 { | |
| 4888 c = ' '; | |
| 4889 --ptr; /* put it back at the NUL */ | |
| 4890 } | |
| 4891 #endif | |
| 910 | 4892 #if defined(LINE_ATTR) |
| 7 | 4893 else if (( |
| 4894 # ifdef FEAT_DIFF | |
| 910 | 4895 diff_hlf != (hlf_T)0 || |
| 7 | 4896 # endif |
| 4897 line_attr != 0 | |
| 4898 ) && ( | |
| 4899 # ifdef FEAT_RIGHTLEFT | |
| 4900 wp->w_p_rl ? (col >= 0) : | |
| 4901 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4902 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4903 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4904 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4905 # endif |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
4906 < W_WIDTH(wp)))) |
| 7 | 4907 { |
| 4908 /* Highlight until the right side of the window */ | |
| 4909 c = ' '; | |
| 4910 --ptr; /* put it back at the NUL */ | |
| 867 | 4911 |
| 4912 /* Remember we do the char for line highlighting. */ | |
| 4913 ++did_line_attr; | |
| 4914 | |
| 4915 /* don't do search HL for the rest of the line */ | |
| 4916 if (line_attr != 0 && char_attr == search_attr && col > 0) | |
| 4917 char_attr = line_attr; | |
| 7 | 4918 # ifdef FEAT_DIFF |
| 4919 if (diff_hlf == HLF_TXD) | |
| 4920 { | |
| 4921 diff_hlf = HLF_CHD; | |
| 4922 if (attr == 0 || char_attr != attr) | |
| 6106 | 4923 { |
| 7 | 4924 char_attr = hl_attr(diff_hlf); |
| 6106 | 4925 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4926 char_attr = hl_combine_attr(char_attr, | |
| 4927 hl_attr(HLF_CUL)); | |
| 4928 } | |
| 7 | 4929 } |
| 4930 # endif | |
| 4931 } | |
| 4932 #endif | |
| 4933 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4934 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4935 #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
|
4936 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
|
4937 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 4938 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4939 && ( (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
|
4940 && !(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
|
4941 && 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
|
4942 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4943 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4944 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 4945 && (syn_get_sub_char() != NUL || match_conc |
| 4946 || 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
|
4947 && 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
|
4948 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
4949 /* 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
|
4950 * character. */ |
| 6947 | 4951 if (match_conc) |
| 4952 c = match_conc; | |
| 4953 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
|
4954 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4955 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4956 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4957 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4958 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4959 |
|
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
|
4960 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4961 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
4962 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
4963 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4964 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4965 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
|
4966 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4967 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4968 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4969 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4970 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4971 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4972 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4973 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4974 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4975 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4976 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4977 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4978 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4979 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4980 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4981 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4982 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4983 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4984 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4985 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4986 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4987 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4988 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4989 mb_c = c; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4990 if (enc_utf8 && (*mb_char2len)(c) > 1) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4991 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4992 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4993 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4994 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4995 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4996 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4997 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
|
4998 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4999 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5000 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5001 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5002 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
|
5003 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5004 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5005 #endif /* FEAT_CONCEAL */ |
| 7 | 5006 } |
| 5007 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5008 #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
|
5009 /* 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
|
5010 * 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
|
5011 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
|
5012 && 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
|
5013 && 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
|
5014 && (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
|
5015 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5016 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5017 if (wp->w_p_rl) |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5018 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
|
5019 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5020 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5021 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
|
5022 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
|
5023 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
|
5024 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5025 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5026 |
| 7 | 5027 /* Don't override visual selection highlighting. */ |
| 5028 if (n_attr > 0 | |
| 5029 && draw_state == WL_LINE | |
| 674 | 5030 && !attr_pri) |
| 7 | 5031 char_attr = extra_attr; |
| 5032 | |
| 42 | 5033 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5034 /* XIM don't send preedit_start and preedit_end, but they send |
| 5035 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5036 * im_is_preediting() here. */ | |
| 5037 if (xic != NULL | |
| 1850 | 5038 && lnum == wp->w_cursor.lnum |
| 7 | 5039 && (State & INSERT) |
| 5040 && !p_imdisable | |
| 5041 && im_is_preediting() | |
| 5042 && draw_state == WL_LINE) | |
| 5043 { | |
| 5044 colnr_T tcol; | |
| 5045 | |
| 5046 if (preedit_end_col == MAXCOL) | |
| 1850 | 5047 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5048 else |
| 5049 tcol = preedit_end_col; | |
| 5050 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5051 { | |
| 5052 if (feedback_old_attr < 0) | |
| 5053 { | |
| 5054 feedback_col = 0; | |
| 5055 feedback_old_attr = char_attr; | |
| 5056 } | |
| 5057 char_attr = im_get_feedback_attr(feedback_col); | |
| 5058 if (char_attr < 0) | |
| 5059 char_attr = feedback_old_attr; | |
| 5060 feedback_col++; | |
| 5061 } | |
| 5062 else if (feedback_old_attr >= 0) | |
| 5063 { | |
| 5064 char_attr = feedback_old_attr; | |
| 5065 feedback_old_attr = -1; | |
| 5066 feedback_col = 0; | |
| 5067 } | |
| 5068 } | |
| 5069 #endif | |
| 5070 /* | |
| 5071 * Handle the case where we are in column 0 but not on the first | |
| 5072 * character of the line and the user wants us to show us a | |
| 5073 * special character (via 'listchars' option "precedes:<char>". | |
| 5074 */ | |
| 5075 if (lcs_prec_todo != NUL | |
| 6276 | 5076 && wp->w_p_list |
| 7 | 5077 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5078 #ifdef FEAT_DIFF | |
| 5079 && filler_todo <= 0 | |
| 5080 #endif | |
| 5081 && draw_state > WL_NR | |
| 5082 && c != NUL) | |
| 5083 { | |
| 5084 c = lcs_prec; | |
| 5085 lcs_prec_todo = NUL; | |
| 5086 #ifdef FEAT_MBYTE | |
| 3586 | 5087 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5088 { | |
| 5089 /* Double-width character being overwritten by the "precedes" | |
| 5090 * character, need to fill up half the character. */ | |
| 5091 c_extra = MB_FILLER_CHAR; | |
| 5092 n_extra = 1; | |
| 5093 n_attr = 2; | |
| 5094 extra_attr = hl_attr(HLF_AT); | |
| 5095 } | |
| 7 | 5096 mb_c = c; |
| 5097 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 5098 { | |
| 5099 mb_utf8 = TRUE; | |
| 714 | 5100 u8cc[0] = 0; |
| 819 | 5101 c = 0xc0; |
| 7 | 5102 } |
| 5103 else | |
| 5104 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5105 #endif | |
| 674 | 5106 if (!attr_pri) |
| 7 | 5107 { |
| 5108 saved_attr3 = char_attr; /* save current attr */ | |
| 5109 char_attr = hl_attr(HLF_AT); /* later copied to char_attr */ | |
| 5110 n_attr3 = 1; | |
| 5111 } | |
| 5112 } | |
| 5113 | |
| 5114 /* | |
| 867 | 5115 * At end of the text line or just after the last character. |
| 7 | 5116 */ |
| 867 | 5117 if (c == NUL |
| 910 | 5118 #if defined(LINE_ATTR) |
| 867 | 5119 || did_line_attr == 1 |
| 5120 #endif | |
| 5121 ) | |
| 5122 { | |
| 5123 #ifdef FEAT_SEARCH_EXTRA | |
| 5124 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5125 |
| 5126 /* we're not really at that column when skipping some text */ | |
| 1439 | 5127 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5128 ++prevcol; |
| 867 | 5129 #endif |
| 5130 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5131 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5132 * highlight match at end of line. If it's beyond the last |
| 5133 * char on the screen, just overwrite that one (tricky!) Not | |
| 5134 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5135 #ifdef FEAT_SEARCH_EXTRA |
| 5136 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5137 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5138 prevcol_hl_flag = TRUE; |
| 5139 else | |
| 5140 { | |
| 5141 cur = wp->w_match_head; | |
| 5142 while (cur != NULL) | |
| 5143 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5144 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5145 { |
| 5146 prevcol_hl_flag = TRUE; | |
| 5147 break; | |
| 5148 } | |
| 5149 cur = cur->next; | |
| 5150 } | |
| 5151 } | |
| 5152 #endif | |
| 7 | 5153 if (lcs_eol == lcs_eol_one |
| 1850 | 5154 && ((area_attr != 0 && vcol == fromcol |
| 5155 && (VIsual_mode != Ctrl_V | |
| 5156 || lnum == VIsual.lnum | |
| 5157 || lnum == curwin->w_cursor.lnum) | |
| 5158 && c == NUL) | |
| 7 | 5159 #ifdef FEAT_SEARCH_EXTRA |
| 5160 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5161 || (prevcol_hl_flag == TRUE |
| 910 | 5162 # if defined(LINE_ATTR) |
| 867 | 5163 && did_line_attr <= 1 |
| 5164 # endif | |
| 5165 ) | |
| 7 | 5166 #endif |
| 5167 )) | |
| 5168 { | |
| 5169 int n = 0; | |
| 5170 | |
| 5171 #ifdef FEAT_RIGHTLEFT | |
| 5172 if (wp->w_p_rl) | |
| 5173 { | |
| 5174 if (col < 0) | |
| 5175 n = 1; | |
| 5176 } | |
| 5177 else | |
| 5178 #endif | |
| 5179 { | |
| 5180 if (col >= W_WIDTH(wp)) | |
| 5181 n = -1; | |
| 5182 } | |
| 5183 if (n != 0) | |
| 5184 { | |
| 5185 /* At the window boundary, highlight the last character | |
| 5186 * instead (better than nothing). */ | |
| 5187 off += n; | |
| 5188 col += n; | |
| 5189 } | |
| 5190 else | |
| 5191 { | |
| 5192 /* Add a blank character to highlight. */ | |
| 5193 ScreenLines[off] = ' '; | |
| 5194 #ifdef FEAT_MBYTE | |
| 5195 if (enc_utf8) | |
| 5196 ScreenLinesUC[off] = 0; | |
| 5197 #endif | |
| 5198 } | |
| 5199 #ifdef FEAT_SEARCH_EXTRA | |
| 5200 if (area_attr == 0) | |
| 5201 { | |
| 1326 | 5202 /* Use attributes from match with highest priority among |
| 5203 * 'search_hl' and the match list. */ | |
| 5204 char_attr = search_hl.attr; | |
| 5205 cur = wp->w_match_head; | |
| 5206 shl_flag = FALSE; | |
| 5207 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5208 { |
| 1326 | 5209 if (shl_flag == FALSE |
| 5210 && ((cur != NULL | |
| 5211 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5212 || cur == NULL)) | |
| 699 | 5213 { |
| 1326 | 5214 shl = &search_hl; |
| 5215 shl_flag = TRUE; | |
| 699 | 5216 } |
| 1326 | 5217 else |
| 5218 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5219 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
|
5220 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5221 char_attr = shl->attr; |
| 5222 if (shl != &search_hl && cur != NULL) | |
| 5223 cur = cur->next; | |
| 699 | 5224 } |
| 7 | 5225 } |
| 5226 #endif | |
| 5227 ScreenAttrs[off] = char_attr; | |
| 5228 #ifdef FEAT_RIGHTLEFT | |
| 5229 if (wp->w_p_rl) | |
| 1437 | 5230 { |
| 7 | 5231 --col; |
| 1437 | 5232 --off; |
| 5233 } | |
| 7 | 5234 else |
| 5235 #endif | |
| 1437 | 5236 { |
| 7 | 5237 ++col; |
| 1437 | 5238 ++off; |
| 5239 } | |
| 743 | 5240 ++vcol; |
| 1437 | 5241 #ifdef FEAT_SYN_HL |
| 5242 eol_hl_off = 1; | |
| 5243 #endif | |
| 743 | 5244 } |
| 867 | 5245 } |
| 5246 | |
| 5247 /* | |
| 5248 * At end of the text line. | |
| 5249 */ | |
| 5250 if (c == NUL) | |
| 5251 { | |
| 743 | 5252 #ifdef FEAT_SYN_HL |
| 1850 | 5253 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5254 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5255 { |
| 5256 /* highlight last char after line */ | |
| 5257 --col; | |
| 5258 --off; | |
| 5259 --vcol; | |
| 5260 } | |
| 5261 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5262 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5263 if (wp->w_p_wrap) |
| 5264 v = wp->w_skipcol; | |
| 5265 else | |
| 5266 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5267 |
| 820 | 5268 /* check if line ends before left margin */ |
| 5269 if (vcol < v + col - win_col_off(wp)) | |
| 5270 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
|
5271 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5272 /* 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
|
5273 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5274 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5275 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5276 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5277 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5278 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5279 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
|
5280 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5281 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5282 && (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
|
5283 && (int)wp->w_virtcol < |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5284 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
|
5285 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5286 || draw_color_col) |
| 743 | 5287 # ifdef FEAT_RIGHTLEFT |
| 5288 && !wp->w_p_rl | |
| 5289 # endif | |
| 5290 ) | |
| 5291 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5292 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5293 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5294 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5295 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5296 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5297 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5298 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5299 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
|
5300 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5301 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5302 |
| 743 | 5303 while (col < W_WIDTH(wp)) |
| 5304 { | |
| 5305 ScreenLines[off] = ' '; | |
| 5306 #ifdef FEAT_MBYTE | |
| 5307 if (enc_utf8) | |
| 5308 ScreenLinesUC[off] = 0; | |
| 5309 #endif | |
| 5310 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5311 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5312 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
|
5313 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5314 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5315 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
|
5316 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
|
5317 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
|
5318 ScreenAttrs[off++] = hl_attr(HLF_MC); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5319 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5320 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5321 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5322 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5323 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5324 |
| 743 | 5325 ++vcol; |
| 5326 } | |
| 5327 } | |
| 5328 #endif | |
| 7 | 5329 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5330 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
|
5331 (int)W_WIDTH(wp), wp->w_p_rl); |
| 7 | 5332 row++; |
| 5333 | |
| 5334 /* | |
| 5335 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5336 * updated (saves a call to plines() later). | |
| 5337 */ | |
| 5338 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5339 { | |
| 5340 curwin->w_cline_row = startrow; | |
| 5341 curwin->w_cline_height = row - startrow; | |
| 5342 #ifdef FEAT_FOLDING | |
| 5343 curwin->w_cline_folded = FALSE; | |
| 5344 #endif | |
| 5345 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5346 } | |
| 5347 | |
| 5348 break; | |
| 5349 } | |
| 5350 | |
| 5351 /* line continues beyond line end */ | |
| 5352 if (lcs_ext | |
| 5353 && !wp->w_p_wrap | |
| 5354 #ifdef FEAT_DIFF | |
| 5355 && filler_todo <= 0 | |
| 5356 #endif | |
| 5357 && ( | |
| 5358 #ifdef FEAT_RIGHTLEFT | |
| 5359 wp->w_p_rl ? col == 0 : | |
| 5360 #endif | |
| 5361 col == W_WIDTH(wp) - 1) | |
| 5362 && (*ptr != NUL | |
| 1555 | 5363 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5364 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5365 { | |
| 5366 c = lcs_ext; | |
| 5367 char_attr = hl_attr(HLF_AT); | |
| 5368 #ifdef FEAT_MBYTE | |
| 5369 mb_c = c; | |
| 5370 if (enc_utf8 && (*mb_char2len)(c) > 1) | |
| 5371 { | |
| 5372 mb_utf8 = TRUE; | |
| 714 | 5373 u8cc[0] = 0; |
| 819 | 5374 c = 0xc0; |
| 7 | 5375 } |
| 5376 else | |
| 5377 mb_utf8 = FALSE; | |
| 5378 #endif | |
| 5379 } | |
| 5380 | |
| 743 | 5381 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5382 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5383 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5384 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
|
5385 |
| 743 | 5386 /* 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
|
5387 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5388 * 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
|
5389 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5390 vcol_save_attr = -1; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5391 if (draw_state == WL_LINE && !lnum_in_visual_area) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5392 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5393 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
|
5394 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5395 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5396 vcol_save_attr = char_attr; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5397 char_attr = hl_combine_attr(char_attr, hl_attr(HLF_CUC)); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5398 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5399 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
|
5400 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5401 vcol_save_attr = char_attr; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5402 char_attr = hl_combine_attr(char_attr, hl_attr(HLF_MC)); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5403 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5404 } |
| 743 | 5405 #endif |
| 5406 | |
| 7 | 5407 /* |
| 5408 * Store character to be displayed. | |
| 5409 * Skip characters that are left of the screen for 'nowrap'. | |
| 5410 */ | |
| 5411 vcol_prev = vcol; | |
| 5412 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5413 { | |
| 5414 /* | |
| 5415 * Store the character. | |
| 5416 */ | |
| 5417 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5418 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5419 { | |
| 5420 /* A double-wide character is: put first halve in left cell. */ | |
| 5421 --off; | |
| 5422 --col; | |
| 5423 } | |
| 5424 #endif | |
| 5425 ScreenLines[off] = c; | |
| 5426 #ifdef FEAT_MBYTE | |
| 5427 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5428 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5429 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5430 ScreenLines[off] = 0x8e; |
| 7 | 5431 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5432 } |
| 7 | 5433 else if (enc_utf8) |
| 5434 { | |
| 5435 if (mb_utf8) | |
| 5436 { | |
| 1326 | 5437 int i; |
| 5438 | |
| 7 | 5439 ScreenLinesUC[off] = mb_c; |
| 819 | 5440 if ((c & 0xff) == 0) |
| 5441 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5442 for (i = 0; i < Screen_mco; ++i) |
| 5443 { | |
| 5444 ScreenLinesC[i][off] = u8cc[i]; | |
| 5445 if (u8cc[i] == 0) | |
| 5446 break; | |
| 5447 } | |
| 7 | 5448 } |
| 5449 else | |
| 5450 ScreenLinesUC[off] = 0; | |
| 5451 } | |
| 5452 if (multi_attr) | |
| 5453 { | |
| 5454 ScreenAttrs[off] = multi_attr; | |
| 5455 multi_attr = 0; | |
| 5456 } | |
| 5457 else | |
| 5458 #endif | |
| 5459 ScreenAttrs[off] = char_attr; | |
| 5460 | |
| 5461 #ifdef FEAT_MBYTE | |
| 5462 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5463 { | |
| 5464 /* Need to fill two screen columns. */ | |
| 5465 ++off; | |
| 5466 ++col; | |
| 5467 if (enc_utf8) | |
| 5468 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5469 ScreenLines[off] = 0; | |
| 5470 else | |
| 5471 /* DBCS: Put second byte in the second screen char. */ | |
| 5472 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5473 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5474 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5475 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5476 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5477 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5478 ++vcol; |
| 7 | 5479 /* When "tocol" is halfway a character, set it to the end of |
| 5480 * the character, otherwise highlighting won't stop. */ | |
| 5481 if (tocol == vcol) | |
| 5482 ++tocol; | |
| 5483 #ifdef FEAT_RIGHTLEFT | |
| 5484 if (wp->w_p_rl) | |
| 5485 { | |
| 5486 /* now it's time to backup one cell */ | |
| 5487 --off; | |
| 5488 --col; | |
| 5489 } | |
| 5490 #endif | |
| 5491 } | |
| 5492 #endif | |
| 5493 #ifdef FEAT_RIGHTLEFT | |
| 5494 if (wp->w_p_rl) | |
| 5495 { | |
| 5496 --off; | |
| 5497 --col; | |
| 5498 } | |
| 5499 else | |
| 5500 #endif | |
| 5501 { | |
| 5502 ++off; | |
| 5503 ++col; | |
| 5504 } | |
| 5505 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5506 #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
|
5507 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
|
5508 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5509 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5510 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5511 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5512 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5513 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5514 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5515 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5516 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5517 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5518 * 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
|
5519 * 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
|
5520 * 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
|
5521 * 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
|
5522 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5523 * 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
|
5524 * 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
|
5525 * 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
|
5526 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5527 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5528 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5529 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5530 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5531 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5532 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5533 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5534 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5535 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5536 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5537 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5538 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5539 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5540 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5541 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5542 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5543 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5544 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5545 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5546 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5547 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5548 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5549 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
|
5550 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5551 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5552 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5553 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5554 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5555 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5556 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5557 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5558 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5559 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5560 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5561 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5562 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5563 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5564 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5565 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5566 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5567 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5568 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5569 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5570 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5571 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5572 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5573 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5574 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5575 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5576 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5577 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5578 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5579 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5580 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5581 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5582 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5583 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5584 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5585 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5586 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5587 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5588 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5589 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5590 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5591 #endif /* FEAT_CONCEAL */ |
| 7 | 5592 else |
| 5593 --n_skip; | |
| 5594 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5595 /* 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
|
5596 * column. */ |
| 1849 | 5597 if (draw_state > WL_NR |
| 7 | 5598 #ifdef FEAT_DIFF |
| 5599 && filler_todo <= 0 | |
| 5600 #endif | |
| 5601 ) | |
| 5602 ++vcol; | |
| 5603 | |
| 743 | 5604 #ifdef FEAT_SYN_HL |
| 5605 if (vcol_save_attr >= 0) | |
| 5606 char_attr = vcol_save_attr; | |
| 5607 #endif | |
| 5608 | |
| 7 | 5609 /* restore attributes after "predeces" in 'listchars' */ |
| 5610 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5611 char_attr = saved_attr3; | |
| 5612 | |
| 5613 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5614 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5615 char_attr = saved_attr2; | |
| 5616 | |
| 5617 /* | |
| 5618 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5619 * so far. If there is no more to display it is caught above. |
| 7 | 5620 */ |
| 5621 if (( | |
| 5622 #ifdef FEAT_RIGHTLEFT | |
| 5623 wp->w_p_rl ? (col < 0) : | |
| 5624 #endif | |
| 5625 (col >= W_WIDTH(wp))) | |
| 5626 && (*ptr != NUL | |
| 5627 #ifdef FEAT_DIFF | |
| 5628 || filler_todo > 0 | |
| 5629 #endif | |
| 2724 | 5630 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5631 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5632 ) | |
| 5633 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5634 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5635 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
|
5636 (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
|
5637 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5638 #else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5639 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
|
5640 (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
|
5641 #endif |
| 7 | 5642 ++row; |
| 5643 ++screen_row; | |
| 5644 | |
| 5645 /* When not wrapping and finished diff lines, or when displayed | |
| 5646 * '$' and highlighting until last column, break here. */ | |
| 5647 if ((!wp->w_p_wrap | |
| 5648 #ifdef FEAT_DIFF | |
| 5649 && filler_todo <= 0 | |
| 5650 #endif | |
| 5651 ) || lcs_eol_one == -1) | |
| 5652 break; | |
| 5653 | |
| 5654 /* When the window is too narrow draw all "@" lines. */ | |
| 5655 if (draw_state != WL_LINE | |
| 5656 #ifdef FEAT_DIFF | |
| 5657 && filler_todo <= 0 | |
| 5658 #endif | |
| 5659 ) | |
| 5660 { | |
| 5661 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
|
5662 #ifdef FEAT_WINDOWS |
| 7 | 5663 draw_vsep_win(wp, row); |
| 5664 #endif | |
| 5665 row = endrow; | |
| 5666 } | |
| 5667 | |
| 5668 /* When line got too long for screen break here. */ | |
| 5669 if (row == endrow) | |
| 5670 { | |
| 5671 ++row; | |
| 5672 break; | |
| 5673 } | |
| 5674 | |
| 5675 if (screen_cur_row == screen_row - 1 | |
| 5676 #ifdef FEAT_DIFF | |
| 5677 && filler_todo <= 0 | |
| 5678 #endif | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5679 #ifdef FEAT_WINDOWS |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5680 && W_WIDTH(wp) == Columns |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5681 #endif |
|
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
5682 ) |
| 7 | 5683 { |
| 5684 /* Remember that the line wraps, used for modeless copy. */ | |
| 5685 LineWraps[screen_row - 1] = TRUE; | |
| 5686 | |
| 5687 /* | |
| 5688 * Special trick to make copy/paste of wrapped lines work with | |
| 5689 * xterm/screen: write an extra character beyond the end of | |
| 5690 * the line. This will work with all terminal types | |
| 5691 * (regardless of the xn,am settings). | |
| 5692 * Only do this on a fast tty. | |
| 5693 * Only do this if the cursor is on the current line | |
| 5694 * (something has been written in it). | |
| 5695 * Don't do this for the GUI. | |
| 5696 * Don't do this for double-width characters. | |
| 5697 * Don't do this for a window not at the right screen border. | |
| 5698 */ | |
| 5699 if (p_tf | |
| 5700 #ifdef FEAT_GUI | |
| 5701 && !gui.in_use | |
| 5702 #endif | |
| 5703 #ifdef FEAT_MBYTE | |
| 5704 && !(has_mbyte | |
| 1378 | 5705 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5706 LineOffset[screen_row] + screen_Columns) | |
| 5707 == 2 | |
| 7 | 5708 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5709 + (int)Columns - 2, |
| 5710 LineOffset[screen_row] + screen_Columns) | |
| 5711 == 2)) | |
| 7 | 5712 #endif |
| 5713 ) | |
| 5714 { | |
| 5715 /* First make sure we are at the end of the screen line, | |
| 5716 * then output the same character again to let the | |
| 5717 * terminal know about the wrap. If the terminal doesn't | |
| 5718 * auto-wrap, we overwrite the character. */ | |
| 5719 if (screen_cur_col != W_WIDTH(wp)) | |
| 5720 screen_char(LineOffset[screen_row - 1] | |
| 5721 + (unsigned)Columns - 1, | |
| 5722 screen_row - 1, (int)(Columns - 1)); | |
| 5723 | |
| 5724 #ifdef FEAT_MBYTE | |
| 5725 /* When there is a multi-byte character, just output a | |
| 5726 * space to keep it simple. */ | |
| 148 | 5727 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5728 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5729 out_char(' '); |
| 5730 else | |
| 5731 #endif | |
| 5732 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5733 + (Columns - 1)]); | |
| 5734 /* force a redraw of the first char on the next line */ | |
| 5735 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5736 screen_start(); /* don't know where cursor is now */ | |
| 5737 } | |
| 5738 } | |
| 5739 | |
| 5740 col = 0; | |
| 5741 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5742 #ifdef FEAT_RIGHTLEFT | |
| 5743 if (wp->w_p_rl) | |
| 5744 { | |
| 5745 col = W_WIDTH(wp) - 1; /* col is not used if breaking! */ | |
| 5746 off += col; | |
| 5747 } | |
| 5748 #endif | |
| 5749 | |
| 5750 /* reset the drawing state for the start of a wrapped line */ | |
| 5751 draw_state = WL_START; | |
| 5752 saved_n_extra = n_extra; | |
| 5753 saved_p_extra = p_extra; | |
| 5754 saved_c_extra = c_extra; | |
| 5755 saved_char_attr = char_attr; | |
| 5756 n_extra = 0; | |
| 5757 lcs_prec_todo = lcs_prec; | |
| 5758 #ifdef FEAT_LINEBREAK | |
| 5759 # ifdef FEAT_DIFF | |
| 5760 if (filler_todo <= 0) | |
| 5761 # endif | |
| 5762 need_showbreak = TRUE; | |
| 5763 #endif | |
| 5764 #ifdef FEAT_DIFF | |
| 5765 --filler_todo; | |
| 5766 /* When the filler lines are actually below the last line of the | |
| 5767 * file, don't draw the line itself, break here. */ | |
| 5768 if (filler_todo == 0 && wp->w_botfill) | |
| 5769 break; | |
| 5770 #endif | |
| 5771 } | |
| 5772 | |
| 5773 } /* for every character in the line */ | |
| 5774 | |
| 743 | 5775 #ifdef FEAT_SPELL |
| 386 | 5776 /* After an empty line check first word for capital. */ |
| 5777 if (*skipwhite(line) == NUL) | |
| 5778 { | |
| 5779 capcol_lnum = lnum + 1; | |
| 5780 cap_col = 0; | |
| 5781 } | |
| 5782 #endif | |
| 5783 | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5784 vim_free(p_extra_free); |
| 7 | 5785 return row; |
| 5786 } | |
| 5787 | |
| 714 | 5788 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5789 static int comp_char_differs(int, int); |
| 714 | 5790 |
| 5791 /* | |
| 5792 * 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
|
5793 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 5794 */ |
| 5795 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5796 comp_char_differs(int off_from, int off_to) |
| 714 | 5797 { |
| 5798 int i; | |
| 5799 | |
| 5800 for (i = 0; i < Screen_mco; ++i) | |
| 5801 { | |
| 5802 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 5803 return TRUE; | |
| 5804 if (ScreenLinesC[i][off_from] == 0) | |
| 5805 break; | |
| 5806 } | |
| 5807 return FALSE; | |
| 5808 } | |
| 5809 #endif | |
| 5810 | |
| 7 | 5811 /* |
| 5812 * Check whether the given character needs redrawing: | |
| 5813 * - the (first byte of the) character is different | |
| 5814 * - the attributes are different | |
| 5815 * - the character is multi-byte and the next byte is different | |
| 1616 | 5816 * - the character is two cells wide and the second cell differs. |
| 7 | 5817 */ |
| 5818 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5819 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 5820 { |
| 5821 if (cols > 0 | |
| 5822 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 5823 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5824 | |
| 5825 #ifdef FEAT_MBYTE | |
| 5826 || (enc_dbcs != 0 | |
| 5827 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 5828 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 5829 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 5830 : (cols > 1 && ScreenLines[off_from + 1] | |
| 5831 != ScreenLines[off_to + 1]))) | |
| 5832 || (enc_utf8 | |
| 5833 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 5834 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 5835 && comp_char_differs(off_from, off_to)) |
| 3759 | 5836 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 5837 && ScreenLines[off_from + 1] | |
| 5838 != ScreenLines[off_to + 1]))) | |
| 7 | 5839 #endif |
| 5840 )) | |
| 5841 return TRUE; | |
| 5842 return FALSE; | |
| 5843 } | |
| 5844 | |
| 5845 /* | |
| 5846 * Move one "cooked" screen line to the screen, but only the characters that | |
| 5847 * have actually changed. Handle insert/delete character. | |
| 5848 * "coloff" gives the first column on the screen for this line. | |
| 5849 * "endcol" gives the columns where valid characters are. | |
| 5850 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 5851 * needs to be cleared, negative otherwise. | |
| 5852 * "rlflag" is TRUE in a rightleft window: | |
| 5853 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 5854 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 5855 */ | |
| 5856 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5857 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5858 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5859 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5860 int endcol, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5861 int clear_width |
| 7 | 5862 #ifdef FEAT_RIGHTLEFT |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5863 , int rlflag |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5864 #endif |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5865 ) |
| 7 | 5866 { |
| 5867 unsigned off_from; | |
| 5868 unsigned off_to; | |
| 1378 | 5869 #ifdef FEAT_MBYTE |
| 5870 unsigned max_off_from; | |
| 5871 unsigned max_off_to; | |
| 5872 #endif | |
| 7 | 5873 int col = 0; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
5874 #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_WINDOWS) |
| 7 | 5875 int hl; |
| 5876 #endif | |
| 5877 int force = FALSE; /* force update rest of the line */ | |
| 5878 int redraw_this /* bool: does character need redraw? */ | |
| 5879 #ifdef FEAT_GUI | |
| 5880 = TRUE /* For GUI when while-loop empty */ | |
| 5881 #endif | |
| 5882 ; | |
| 5883 int redraw_next; /* redraw_this for next character */ | |
| 5884 #ifdef FEAT_MBYTE | |
| 5885 int clear_next = FALSE; | |
| 5886 int char_cells; /* 1: normal char */ | |
| 5887 /* 2: occupies two display cells */ | |
| 5888 # define CHAR_CELLS char_cells | |
| 5889 #else | |
| 5890 # define CHAR_CELLS 1 | |
| 5891 #endif | |
| 5892 | |
| 3413 | 5893 /* Check for illegal row and col, just in case. */ |
| 5894 if (row >= Rows) | |
| 5895 row = Rows - 1; | |
| 5896 if (endcol > Columns) | |
| 5897 endcol = Columns; | |
| 5898 | |
| 7 | 5899 # ifdef FEAT_CLIPBOARD |
| 5900 clip_may_clear_selection(row, row); | |
| 5901 # endif | |
| 5902 | |
| 5903 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5904 off_to = LineOffset[row] + coloff; | |
| 1378 | 5905 #ifdef FEAT_MBYTE |
| 5906 max_off_from = off_from + screen_Columns; | |
| 5907 max_off_to = LineOffset[row] + screen_Columns; | |
| 5908 #endif | |
| 7 | 5909 |
| 5910 #ifdef FEAT_RIGHTLEFT | |
| 5911 if (rlflag) | |
| 5912 { | |
| 5913 /* Clear rest first, because it's left of the text. */ | |
| 5914 if (clear_width > 0) | |
| 5915 { | |
| 5916 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 5917 && ScreenAttrs[off_to] == 0 | |
| 5918 # ifdef FEAT_MBYTE | |
| 5919 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 5920 # endif | |
| 5921 ) | |
| 5922 { | |
| 5923 ++off_to; | |
| 5924 ++col; | |
| 5925 } | |
| 5926 if (col <= endcol) | |
| 5927 screen_fill(row, row + 1, col + coloff, | |
| 5928 endcol + coloff + 1, ' ', ' ', 0); | |
| 5929 } | |
| 5930 col = endcol + 1; | |
| 5931 off_to = LineOffset[row] + col + coloff; | |
| 5932 off_from += col; | |
| 5933 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 5934 } | |
| 5935 #endif /* FEAT_RIGHTLEFT */ | |
| 5936 | |
| 5937 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 5938 | |
| 5939 while (col < endcol) | |
| 5940 { | |
| 5941 #ifdef FEAT_MBYTE | |
| 5942 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 5943 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 5944 else |
| 5945 char_cells = 1; | |
| 5946 #endif | |
| 5947 | |
| 5948 redraw_this = redraw_next; | |
| 5949 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 5950 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 5951 | |
| 5952 #ifdef FEAT_GUI | |
| 5953 /* If the next character was bold, then redraw the current character to | |
| 5954 * remove any pixels that might have spilt over into us. This only | |
| 5955 * happens in the GUI. | |
| 5956 */ | |
| 5957 if (redraw_next && gui.in_use) | |
| 5958 { | |
| 5959 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 5960 if (hl > HL_ALL) |
| 5961 hl = syn_attr2attr(hl); | |
| 5962 if (hl & HL_BOLD) | |
| 7 | 5963 redraw_this = TRUE; |
| 5964 } | |
| 5965 #endif | |
| 5966 | |
| 5967 if (redraw_this) | |
| 5968 { | |
| 5969 /* | |
| 5970 * Special handling when 'xs' termcap flag set (hpterm): | |
| 5971 * Attributes for characters are stored at the position where the | |
| 5972 * cursor is when writing the highlighting code. The | |
| 5973 * start-highlighting code must be written with the cursor on the | |
| 5974 * first highlighted character. The stop-highlighting code must | |
| 5975 * be written with the cursor just after the last highlighted | |
| 5976 * character. | |
| 5977 * Overwriting a character doesn't remove it's highlighting. Need | |
| 5978 * to clear the rest of the line, and force redrawing it | |
| 5979 * completely. | |
| 5980 */ | |
| 5981 if ( p_wiv | |
| 5982 && !force | |
| 5983 #ifdef FEAT_GUI | |
| 5984 && !gui.in_use | |
| 5985 #endif | |
| 5986 && ScreenAttrs[off_to] != 0 | |
| 5987 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 5988 { | |
| 5989 /* | |
| 5990 * Need to remove highlighting attributes here. | |
| 5991 */ | |
| 5992 windgoto(row, col + coloff); | |
| 5993 out_str(T_CE); /* clear rest of this screen line */ | |
| 5994 screen_start(); /* don't know where cursor is now */ | |
| 5995 force = TRUE; /* force redraw of rest of the line */ | |
| 5996 redraw_next = TRUE; /* or else next char would miss out */ | |
| 5997 | |
| 5998 /* | |
| 5999 * If the previous character was highlighted, need to stop | |
| 6000 * highlighting at this character. | |
| 6001 */ | |
| 6002 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6003 { | |
| 6004 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6005 term_windgoto(row, col + coloff); | |
| 6006 screen_stop_highlight(); | |
| 6007 } | |
| 6008 else | |
| 6009 screen_attr = 0; /* highlighting has stopped */ | |
| 6010 } | |
| 6011 #ifdef FEAT_MBYTE | |
| 6012 if (enc_dbcs != 0) | |
| 6013 { | |
| 6014 /* Check if overwriting a double-byte with a single-byte or | |
| 6015 * the other way around requires another character to be | |
| 6016 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6017 * ScreenLinesUC[] is sufficient. */ | |
| 6018 if (char_cells == 1 | |
| 6019 && col + 1 < endcol | |
| 1378 | 6020 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6021 { |
| 6022 /* Writing a single-cell character over a double-cell | |
| 6023 * character: need to redraw the next cell. */ | |
| 6024 ScreenLines[off_to + 1] = 0; | |
| 6025 redraw_next = TRUE; | |
| 6026 } | |
| 6027 else if (char_cells == 2 | |
| 6028 && col + 2 < endcol | |
| 1378 | 6029 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6030 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6031 { |
| 6032 /* Writing the second half of a double-cell character over | |
| 6033 * a double-cell character: need to redraw the second | |
| 6034 * cell. */ | |
| 6035 ScreenLines[off_to + 2] = 0; | |
| 6036 redraw_next = TRUE; | |
| 6037 } | |
| 6038 | |
| 6039 if (enc_dbcs == DBCS_JPNU) | |
| 6040 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6041 } | |
| 6042 /* When writing a single-width character over a double-width | |
| 6043 * character and at the end of the redrawn text, need to clear out | |
| 6044 * the right halve of the old character. | |
| 6045 * Also required when writing the right halve of a double-width | |
| 6046 * char over the left halve of an existing one. */ | |
| 6047 if (has_mbyte && col + char_cells == endcol | |
| 6048 && ((char_cells == 1 | |
| 1378 | 6049 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6050 || (char_cells == 2 |
| 1378 | 6051 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6052 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6053 clear_next = TRUE; |
| 6054 #endif | |
| 6055 | |
| 6056 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6057 #ifdef FEAT_MBYTE | |
| 6058 if (enc_utf8) | |
| 6059 { | |
| 6060 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6061 if (ScreenLinesUC[off_from] != 0) | |
| 6062 { | |
| 714 | 6063 int i; |
| 6064 | |
| 6065 for (i = 0; i < Screen_mco; ++i) | |
| 6066 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6067 } |
| 6068 } | |
| 6069 if (char_cells == 2) | |
| 6070 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6071 #endif | |
| 6072 | |
| 6073 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6074 /* The bold trick makes a single column of pixels appear in the |
| 6075 * next character. When a bold character is removed, the next | |
| 7 | 6076 * character should be redrawn too. This happens for our own GUI |
| 6077 * and for some xterms. */ | |
| 6078 if ( | |
| 6079 # ifdef FEAT_GUI | |
| 6080 gui.in_use | |
| 6081 # endif | |
| 6082 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6083 || | |
| 6084 # endif | |
| 6085 # ifdef UNIX | |
| 6086 term_is_xterm | |
| 6087 # endif | |
| 6088 ) | |
| 6089 { | |
| 6090 hl = ScreenAttrs[off_to]; | |
| 743 | 6091 if (hl > HL_ALL) |
| 6092 hl = syn_attr2attr(hl); | |
| 6093 if (hl & HL_BOLD) | |
| 7 | 6094 redraw_next = TRUE; |
| 6095 } | |
| 6096 #endif | |
| 6097 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6098 #ifdef FEAT_MBYTE | |
| 819 | 6099 /* For simplicity set the attributes of second half of a |
| 6100 * double-wide character equal to the first half. */ | |
| 6101 if (char_cells == 2) | |
| 6102 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6103 | |
| 7 | 6104 if (enc_dbcs != 0 && char_cells == 2) |
| 6105 screen_char_2(off_to, row, col + coloff); | |
| 6106 else | |
| 6107 #endif | |
| 6108 screen_char(off_to, row, col + coloff); | |
| 6109 } | |
| 6110 else if ( p_wiv | |
| 6111 #ifdef FEAT_GUI | |
| 6112 && !gui.in_use | |
| 6113 #endif | |
| 6114 && col + coloff > 0) | |
| 6115 { | |
| 6116 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6117 { | |
| 6118 /* | |
| 6119 * Don't output stop-highlight when moving the cursor, it will | |
| 6120 * stop the highlighting when it should continue. | |
| 6121 */ | |
| 6122 screen_attr = 0; | |
| 6123 } | |
| 6124 else if (screen_attr != 0) | |
| 6125 screen_stop_highlight(); | |
| 6126 } | |
| 6127 | |
| 6128 off_to += CHAR_CELLS; | |
| 6129 off_from += CHAR_CELLS; | |
| 6130 col += CHAR_CELLS; | |
| 6131 } | |
| 6132 | |
| 6133 #ifdef FEAT_MBYTE | |
| 6134 if (clear_next) | |
| 6135 { | |
| 6136 /* Clear the second half of a double-wide character of which the left | |
| 6137 * half was overwritten with a single-wide character. */ | |
| 6138 ScreenLines[off_to] = ' '; | |
| 6139 if (enc_utf8) | |
| 6140 ScreenLinesUC[off_to] = 0; | |
| 6141 screen_char(off_to, row, col + coloff); | |
| 6142 } | |
| 6143 #endif | |
| 6144 | |
| 6145 if (clear_width > 0 | |
| 6146 #ifdef FEAT_RIGHTLEFT | |
| 6147 && !rlflag | |
| 6148 #endif | |
| 6149 ) | |
| 6150 { | |
| 6151 #ifdef FEAT_GUI | |
| 6152 int startCol = col; | |
| 6153 #endif | |
| 6154 | |
| 6155 /* blank out the rest of the line */ | |
| 6156 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6157 && ScreenAttrs[off_to] == 0 | |
| 6158 #ifdef FEAT_MBYTE | |
| 6159 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6160 #endif | |
| 6161 ) | |
| 6162 { | |
| 6163 ++off_to; | |
| 6164 ++col; | |
| 6165 } | |
| 6166 if (col < clear_width) | |
| 6167 { | |
| 6168 #ifdef FEAT_GUI | |
| 6169 /* | |
| 6170 * In the GUI, clearing the rest of the line may leave pixels | |
| 6171 * behind if the first character cleared was bold. Some bold | |
| 6172 * fonts spill over the left. In this case we redraw the previous | |
| 6173 * character too. If we didn't skip any blanks above, then we | |
| 6174 * only redraw if the character wasn't already redrawn anyway. | |
| 6175 */ | |
| 996 | 6176 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6177 { |
| 6178 hl = ScreenAttrs[off_to]; | |
| 6179 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6180 { |
| 6181 int prev_cells = 1; | |
| 6182 # ifdef FEAT_MBYTE | |
| 6183 if (enc_utf8) | |
| 6184 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6185 * that its width is 2. */ | |
| 6186 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6187 else if (enc_dbcs != 0) | |
| 6188 { | |
| 6189 /* find previous character by counting from first | |
| 6190 * column and get its width. */ | |
| 6191 unsigned off = LineOffset[row]; | |
| 1378 | 6192 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6193 |
| 6194 while (off < off_to) | |
| 6195 { | |
| 1378 | 6196 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6197 off += prev_cells; |
| 6198 } | |
| 6199 } | |
| 6200 | |
| 6201 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6202 screen_char_2(off_to - prev_cells, row, | |
| 6203 col + coloff - prev_cells); | |
| 6204 else | |
| 6205 # endif | |
| 6206 screen_char(off_to - prev_cells, row, | |
| 6207 col + coloff - prev_cells); | |
| 6208 } | |
| 7 | 6209 } |
| 6210 #endif | |
| 6211 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6212 ' ', ' ', 0); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6213 #ifdef FEAT_WINDOWS |
| 7 | 6214 off_to += clear_width - col; |
| 6215 col = clear_width; | |
| 6216 #endif | |
| 6217 } | |
| 6218 } | |
| 6219 | |
| 6220 if (clear_width > 0) | |
| 6221 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6222 #ifdef FEAT_WINDOWS |
| 7 | 6223 /* For a window that's left of another, draw the separator char. */ |
| 6224 if (col + coloff < Columns) | |
| 6225 { | |
| 6226 int c; | |
| 6227 | |
| 6228 c = fillchar_vsep(&hl); | |
| 6477 | 6229 if (ScreenLines[off_to] != (schar_T)c |
| 7 | 6230 # ifdef FEAT_MBYTE |
| 714 | 6231 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6232 != (c >= 0x80 ? c : 0)) | |
| 7 | 6233 # endif |
| 6234 || ScreenAttrs[off_to] != hl) | |
| 6235 { | |
| 6236 ScreenLines[off_to] = c; | |
| 6237 ScreenAttrs[off_to] = hl; | |
| 6238 # ifdef FEAT_MBYTE | |
| 6239 if (enc_utf8) | |
| 6240 { | |
| 6241 if (c >= 0x80) | |
| 6242 { | |
| 6243 ScreenLinesUC[off_to] = c; | |
| 714 | 6244 ScreenLinesC[0][off_to] = 0; |
| 7 | 6245 } |
| 6246 else | |
| 6247 ScreenLinesUC[off_to] = 0; | |
| 6248 } | |
| 6249 # endif | |
| 6250 screen_char(off_to, row, col + coloff); | |
| 6251 } | |
| 6252 } | |
| 6253 else | |
| 6254 #endif | |
| 6255 LineWraps[row] = FALSE; | |
| 6256 } | |
| 6257 } | |
| 6258 | |
| 474 | 6259 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6260 /* |
| 474 | 6261 * Mirror text "str" for right-left displaying. |
| 6262 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6263 */ |
| 474 | 6264 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6265 rl_mirror(char_u *str) |
| 7 | 6266 { |
| 6267 char_u *p1, *p2; | |
| 6268 int t; | |
| 6269 | |
| 6270 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6271 { | |
| 6272 t = *p1; | |
| 6273 *p1 = *p2; | |
| 6274 *p2 = t; | |
| 6275 } | |
| 6276 } | |
| 6277 #endif | |
| 6278 | |
| 6279 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6280 /* | |
| 6281 * mark all status lines for redraw; used after first :cd | |
| 6282 */ | |
| 6283 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6284 status_redraw_all(void) |
| 7 | 6285 { |
| 6286 win_T *wp; | |
| 6287 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6288 FOR_ALL_WINDOWS(wp) |
| 7 | 6289 if (wp->w_status_height) |
| 6290 { | |
| 6291 wp->w_redr_status = TRUE; | |
| 6292 redraw_later(VALID); | |
| 6293 } | |
| 6294 } | |
| 6295 | |
| 6296 /* | |
| 6297 * mark all status lines of the current buffer for redraw | |
| 6298 */ | |
| 6299 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6300 status_redraw_curbuf(void) |
| 7 | 6301 { |
| 6302 win_T *wp; | |
| 6303 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6304 FOR_ALL_WINDOWS(wp) |
| 7 | 6305 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6306 { | |
| 6307 wp->w_redr_status = TRUE; | |
| 6308 redraw_later(VALID); | |
| 6309 } | |
| 6310 } | |
| 6311 | |
| 6312 /* | |
| 6313 * Redraw all status lines that need to be redrawn. | |
| 6314 */ | |
| 6315 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6316 redraw_statuslines(void) |
| 7 | 6317 { |
| 6318 win_T *wp; | |
| 6319 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6320 FOR_ALL_WINDOWS(wp) |
| 7 | 6321 if (wp->w_redr_status) |
| 6322 win_redr_status(wp); | |
| 673 | 6323 if (redraw_tabline) |
| 677 | 6324 draw_tabline(); |
| 7 | 6325 } |
| 6326 #endif | |
| 6327 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6328 #if (defined(FEAT_WILDMENU) && defined(FEAT_WINDOWS)) || defined(PROTO) |
| 7 | 6329 /* |
| 6330 * Redraw all status lines at the bottom of frame "frp". | |
| 6331 */ | |
| 6332 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6333 win_redraw_last_status(frame_T *frp) |
| 7 | 6334 { |
| 6335 if (frp->fr_layout == FR_LEAF) | |
| 6336 frp->fr_win->w_redr_status = TRUE; | |
| 6337 else if (frp->fr_layout == FR_ROW) | |
| 6338 { | |
| 6339 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6340 win_redraw_last_status(frp); | |
| 6341 } | |
| 6342 else /* frp->fr_layout == FR_COL */ | |
| 6343 { | |
| 6344 frp = frp->fr_child; | |
| 6345 while (frp->fr_next != NULL) | |
| 6346 frp = frp->fr_next; | |
| 6347 win_redraw_last_status(frp); | |
| 6348 } | |
| 6349 } | |
| 6350 #endif | |
| 6351 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6352 #ifdef FEAT_WINDOWS |
| 7 | 6353 /* |
| 6354 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6355 */ | |
| 6356 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6357 draw_vsep_win(win_T *wp, int row) |
| 7 | 6358 { |
| 6359 int hl; | |
| 6360 int c; | |
| 6361 | |
| 6362 if (wp->w_vsep_width) | |
| 6363 { | |
| 6364 /* draw the vertical separator right of this window */ | |
| 6365 c = fillchar_vsep(&hl); | |
| 6366 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6367 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6368 c, ' ', hl); | |
| 6369 } | |
| 6370 } | |
| 6371 #endif | |
| 6372 | |
| 6373 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6374 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
|
6375 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6376 |
| 6377 /* | |
| 1378 | 6378 * Get the length of an item as it will be shown in the status line. |
| 7 | 6379 */ |
| 6380 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6381 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6382 { |
| 6383 int len = 0; | |
| 6384 | |
| 6385 #ifdef FEAT_MENU | |
| 6386 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6387 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6388 | |
| 6389 /* Check for menu separators - replace with '|'. */ | |
| 6390 if (emenu && menu_is_separator(s)) | |
| 6391 return 1; | |
| 6392 #endif | |
| 6393 | |
| 6394 while (*s != NUL) | |
| 6395 { | |
| 1685 | 6396 s += skip_status_match_char(xp, s); |
| 42 | 6397 len += ptr2cells(s); |
| 39 | 6398 mb_ptr_adv(s); |
| 7 | 6399 } |
| 6400 | |
| 6401 return len; | |
| 6402 } | |
| 6403 | |
| 6404 /* | |
| 1685 | 6405 * Return the number of characters that should be skipped in a status match. |
| 277 | 6406 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6407 */ | |
| 6408 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6409 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6410 { |
| 1685 | 6411 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6412 #ifdef FEAT_MENU |
| 6413 || ((xp->xp_context == EXPAND_MENUS | |
| 6414 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6415 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6416 #endif | |
| 1685 | 6417 ) |
| 6418 { | |
| 6419 #ifndef BACKSLASH_IN_FILENAME | |
| 6420 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6421 return 2; | |
| 6422 #endif | |
| 6423 return 1; | |
| 6424 } | |
| 6425 return 0; | |
| 277 | 6426 } |
| 6427 | |
| 6428 /* | |
| 7 | 6429 * Show wildchar matches in the status line. |
| 6430 * Show at least the "match" item. | |
| 6431 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6432 * | |
| 6433 * If inversion is possible we use it. Else '=' characters are used. | |
| 6434 */ | |
| 6435 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6436 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6437 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6438 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6439 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6440 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6441 int showtail) |
| 7 | 6442 { |
| 6443 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6444 int row; | |
| 6445 char_u *buf; | |
| 6446 int len; | |
| 1378 | 6447 int clen; /* length in screen cells */ |
| 7 | 6448 int fillchar; |
| 6449 int attr; | |
| 6450 int i; | |
| 6451 int highlight = TRUE; | |
| 6452 char_u *selstart = NULL; | |
| 6453 int selstart_col = 0; | |
| 6454 char_u *selend = NULL; | |
| 6455 static int first_match = 0; | |
| 6456 int add_left = FALSE; | |
| 6457 char_u *s; | |
| 6458 #ifdef FEAT_MENU | |
| 6459 int emenu; | |
| 6460 #endif | |
| 6461 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6462 int l; | |
| 6463 #endif | |
| 6464 | |
| 6465 if (matches == NULL) /* interrupted completion? */ | |
| 6466 return; | |
| 6467 | |
| 39 | 6468 #ifdef FEAT_MBYTE |
| 6469 if (has_mbyte) | |
| 6470 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6471 else | |
| 6472 #endif | |
| 6473 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6474 if (buf == NULL) |
| 6475 return; | |
| 6476 | |
| 6477 if (match == -1) /* don't show match but original text */ | |
| 6478 { | |
| 6479 match = 0; | |
| 6480 highlight = FALSE; | |
| 6481 } | |
| 6482 /* count 1 for the ending ">" */ | |
| 6483 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6484 if (match == 0) | |
| 6485 first_match = 0; | |
| 6486 else if (match < first_match) | |
| 6487 { | |
| 6488 /* jumping left, as far as we can go */ | |
| 6489 first_match = match; | |
| 6490 add_left = TRUE; | |
| 6491 } | |
| 6492 else | |
| 6493 { | |
| 6494 /* check if match fits on the screen */ | |
| 6495 for (i = first_match; i < match; ++i) | |
| 6496 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6497 if (first_match > 0) | |
| 6498 clen += 2; | |
| 6499 /* jumping right, put match at the left */ | |
| 6500 if ((long)clen > Columns) | |
| 6501 { | |
| 6502 first_match = match; | |
| 6503 /* if showing the last match, we can add some on the left */ | |
| 6504 clen = 2; | |
| 6505 for (i = match; i < num_matches; ++i) | |
| 6506 { | |
| 6507 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6508 if ((long)clen >= Columns) | |
| 6509 break; | |
| 6510 } | |
| 6511 if (i == num_matches) | |
| 6512 add_left = TRUE; | |
| 6513 } | |
| 6514 } | |
| 6515 if (add_left) | |
| 6516 while (first_match > 0) | |
| 6517 { | |
| 6518 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6519 if ((long)clen >= Columns) | |
| 6520 break; | |
| 6521 --first_match; | |
| 6522 } | |
| 6523 | |
| 6524 fillchar = fillchar_status(&attr, TRUE); | |
| 6525 | |
| 6526 if (first_match == 0) | |
| 6527 { | |
| 6528 *buf = NUL; | |
| 6529 len = 0; | |
| 6530 } | |
| 6531 else | |
| 6532 { | |
| 6533 STRCPY(buf, "< "); | |
| 6534 len = 2; | |
| 6535 } | |
| 6536 clen = len; | |
| 6537 | |
| 6538 i = first_match; | |
| 6539 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6540 { | |
| 6541 if (i == match) | |
| 6542 { | |
| 6543 selstart = buf + len; | |
| 6544 selstart_col = clen; | |
| 6545 } | |
| 6546 | |
| 6547 s = L_MATCH(i); | |
| 6548 /* Check for menu separators - replace with '|' */ | |
| 6549 #ifdef FEAT_MENU | |
| 6550 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6551 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6552 if (emenu && menu_is_separator(s)) | |
| 6553 { | |
| 6554 STRCPY(buf + len, transchar('|')); | |
| 6555 l = (int)STRLEN(buf + len); | |
| 6556 len += l; | |
| 6557 clen += l; | |
| 6558 } | |
| 6559 else | |
| 6560 #endif | |
| 6561 for ( ; *s != NUL; ++s) | |
| 6562 { | |
| 1685 | 6563 s += skip_status_match_char(xp, s); |
| 7 | 6564 clen += ptr2cells(s); |
| 6565 #ifdef FEAT_MBYTE | |
| 474 | 6566 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6567 { |
| 6568 STRNCPY(buf + len, s, l); | |
| 6569 s += l - 1; | |
| 6570 len += l; | |
| 6571 } | |
| 6572 else | |
| 6573 #endif | |
| 6574 { | |
| 6575 STRCPY(buf + len, transchar_byte(*s)); | |
| 6576 len += (int)STRLEN(buf + len); | |
| 6577 } | |
| 6578 } | |
| 6579 if (i == match) | |
| 6580 selend = buf + len; | |
| 6581 | |
| 6582 *(buf + len++) = ' '; | |
| 6583 *(buf + len++) = ' '; | |
| 6584 clen += 2; | |
| 6585 if (++i == num_matches) | |
| 6586 break; | |
| 6587 } | |
| 6588 | |
| 6589 if (i != num_matches) | |
| 6590 { | |
| 6591 *(buf + len++) = '>'; | |
| 6592 ++clen; | |
| 6593 } | |
| 6594 | |
| 6595 buf[len] = NUL; | |
| 6596 | |
| 6597 row = cmdline_row - 1; | |
| 6598 if (row >= 0) | |
| 6599 { | |
| 6600 if (wild_menu_showing == 0) | |
| 6601 { | |
| 6602 if (msg_scrolled > 0) | |
| 6603 { | |
| 6604 /* Put the wildmenu just above the command line. If there is | |
| 6605 * no room, scroll the screen one line up. */ | |
| 6606 if (cmdline_row == Rows - 1) | |
| 6607 { | |
| 6608 screen_del_lines(0, 0, 1, (int)Rows, TRUE, NULL); | |
| 6609 ++msg_scrolled; | |
| 6610 } | |
| 6611 else | |
| 6612 { | |
| 6613 ++cmdline_row; | |
| 6614 ++row; | |
| 6615 } | |
| 6616 wild_menu_showing = WM_SCROLLED; | |
| 6617 } | |
| 6618 else | |
| 6619 { | |
| 6620 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6621 * Set 'winminheight' to zero to avoid that the window is | |
| 6622 * resized. */ | |
| 6623 if (lastwin->w_status_height == 0) | |
| 6624 { | |
| 6625 save_p_ls = p_ls; | |
| 6626 save_p_wmh = p_wmh; | |
| 6627 p_ls = 2; | |
| 6628 p_wmh = 0; | |
| 6629 last_status(FALSE); | |
| 6630 } | |
| 6631 wild_menu_showing = WM_SHOWN; | |
| 6632 } | |
| 6633 } | |
| 6634 | |
| 6635 screen_puts(buf, row, 0, attr); | |
| 6636 if (selstart != NULL && highlight) | |
| 6637 { | |
| 6638 *selend = NUL; | |
| 6639 screen_puts(selstart, row, selstart_col, hl_attr(HLF_WM)); | |
| 6640 } | |
| 6641 | |
| 6642 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6643 } | |
| 6644 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6645 #ifdef FEAT_WINDOWS |
| 7 | 6646 win_redraw_last_status(topframe); |
| 6647 #else | |
| 6648 lastwin->w_redr_status = TRUE; | |
| 6649 #endif | |
| 6650 vim_free(buf); | |
| 6651 } | |
| 6652 #endif | |
| 6653 | |
| 6654 #if defined(FEAT_WINDOWS) || defined(PROTO) | |
| 6655 /* | |
| 6656 * Redraw the status line of window wp. | |
| 6657 * | |
| 6658 * If inversion is possible we use it. Else '=' characters are used. | |
| 6659 */ | |
| 6660 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6661 win_redr_status(win_T *wp) |
| 7 | 6662 { |
| 6663 int row; | |
| 6664 char_u *p; | |
| 6665 int len; | |
| 6666 int fillchar; | |
| 6667 int attr; | |
| 6668 int this_ru_col; | |
| 1910 | 6669 static int busy = FALSE; |
| 6670 | |
| 6671 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6672 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6673 if (busy) | |
| 6674 return; | |
| 6675 busy = TRUE; | |
| 7 | 6676 |
| 6677 wp->w_redr_status = FALSE; | |
| 6678 if (wp->w_status_height == 0) | |
| 6679 { | |
| 6680 /* no status line, can only be last window */ | |
| 6681 redraw_cmdline = TRUE; | |
| 6682 } | |
| 540 | 6683 else if (!redrawing() |
| 6684 #ifdef FEAT_INS_EXPAND | |
| 6685 /* don't update status line when popup menu is visible and may be | |
| 6686 * drawn over it */ | |
| 6687 || pum_visible() | |
| 6688 #endif | |
| 6689 ) | |
| 7 | 6690 { |
| 6691 /* Don't redraw right now, do it later. */ | |
| 6692 wp->w_redr_status = TRUE; | |
| 6693 } | |
| 6694 #ifdef FEAT_STL_OPT | |
| 40 | 6695 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6696 { |
| 6697 /* redraw custom status line */ | |
| 1983 | 6698 redraw_custom_statusline(wp); |
| 7 | 6699 } |
| 6700 #endif | |
| 6701 else | |
| 6702 { | |
| 6703 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6704 | |
| 685 | 6705 get_trans_bufname(wp->w_buffer); |
| 7 | 6706 p = NameBuff; |
| 6707 len = (int)STRLEN(p); | |
| 6708 | |
| 6709 if (wp->w_buffer->b_help | |
| 6710 #ifdef FEAT_QUICKFIX | |
| 6711 || wp->w_p_pvw | |
| 6712 #endif | |
| 6713 || bufIsChanged(wp->w_buffer) | |
| 6714 || wp->w_buffer->b_p_ro) | |
| 6715 *(p + len++) = ' '; | |
| 6716 if (wp->w_buffer->b_help) | |
| 6717 { | |
| 809 | 6718 STRCPY(p + len, _("[Help]")); |
| 7 | 6719 len += (int)STRLEN(p + len); |
| 6720 } | |
| 6721 #ifdef FEAT_QUICKFIX | |
| 6722 if (wp->w_p_pvw) | |
| 6723 { | |
| 6724 STRCPY(p + len, _("[Preview]")); | |
| 6725 len += (int)STRLEN(p + len); | |
| 6726 } | |
| 6727 #endif | |
| 6728 if (bufIsChanged(wp->w_buffer)) | |
| 6729 { | |
| 6730 STRCPY(p + len, "[+]"); | |
| 6731 len += 3; | |
| 6732 } | |
| 6733 if (wp->w_buffer->b_p_ro) | |
| 6734 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6735 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
|
6736 len += (int)STRLEN(p + len); |
| 7 | 6737 } |
| 6738 | |
| 6739 this_ru_col = ru_col - (Columns - W_WIDTH(wp)); | |
| 6740 if (this_ru_col < (W_WIDTH(wp) + 1) / 2) | |
| 6741 this_ru_col = (W_WIDTH(wp) + 1) / 2; | |
| 6742 if (this_ru_col <= 1) | |
| 6743 { | |
| 6744 p = (char_u *)"<"; /* No room for file name! */ | |
| 6745 len = 1; | |
| 6746 } | |
| 6747 else | |
| 6748 #ifdef FEAT_MBYTE | |
| 6749 if (has_mbyte) | |
| 6750 { | |
| 6751 int clen = 0, i; | |
| 6752 | |
| 6753 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6754 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6755 |
| 7 | 6756 /* Find first character that will fit. |
| 6757 * Going from start to end is much faster for DBCS. */ | |
| 6758 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6759 i += (*mb_ptr2len)(p + i)) |
| 7 | 6760 clen -= (*mb_ptr2cells)(p + i); |
| 6761 len = clen; | |
| 6762 if (i > 0) | |
| 6763 { | |
| 6764 p = p + i - 1; | |
| 6765 *p = '<'; | |
| 6766 ++len; | |
| 6767 } | |
| 6768 | |
| 6769 } | |
| 6770 else | |
| 6771 #endif | |
| 6772 if (len > this_ru_col - 1) | |
| 6773 { | |
| 6774 p += len - (this_ru_col - 1); | |
| 6775 *p = '<'; | |
| 6776 len = this_ru_col - 1; | |
| 6777 } | |
| 6778 | |
| 6779 row = W_WINROW(wp) + wp->w_height; | |
| 6780 screen_puts(p, row, W_WINCOL(wp), attr); | |
| 6781 screen_fill(row, row + 1, len + W_WINCOL(wp), | |
| 6782 this_ru_col + W_WINCOL(wp), fillchar, fillchar, attr); | |
| 6783 | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6784 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6785 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6786 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
| 6787 - 1 + W_WINCOL(wp)), attr); | |
| 6788 | |
| 6789 #ifdef FEAT_CMDL_INFO | |
| 6790 win_redr_ruler(wp, TRUE); | |
| 6791 #endif | |
| 6792 } | |
| 6793 | |
| 6794 /* | |
| 6795 * May need to draw the character below the vertical separator. | |
| 6796 */ | |
| 6797 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6798 { | |
| 6799 if (stl_connected(wp)) | |
| 6800 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6801 else | |
| 6802 fillchar = fillchar_vsep(&attr); | |
| 6803 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 6804 attr); | |
| 6805 } | |
| 1910 | 6806 busy = FALSE; |
| 7 | 6807 } |
| 6808 | |
| 680 | 6809 #ifdef FEAT_STL_OPT |
| 6810 /* | |
| 6811 * Redraw the status line according to 'statusline' and take care of any | |
| 6812 * errors encountered. | |
| 6813 */ | |
| 6814 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6815 redraw_custom_statusline(win_T *wp) |
| 680 | 6816 { |
| 1983 | 6817 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6818 int saved_did_emsg = did_emsg; |
| 1983 | 6819 |
| 6820 /* When called recursively return. This can happen when the statusline | |
| 6821 * contains an expression that triggers a redraw. */ | |
| 6822 if (entered) | |
| 6823 return; | |
| 6824 entered = TRUE; | |
| 680 | 6825 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6826 did_emsg = FALSE; |
| 680 | 6827 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6828 if (did_emsg) |
| 1983 | 6829 { |
| 6830 /* When there is an error disable the statusline, otherwise the | |
| 6831 * display is messed up with errors and a redraw triggers the problem | |
| 6832 * again and again. */ | |
| 680 | 6833 set_string_option_direct((char_u *)"statusline", -1, |
| 6834 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 6835 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 6836 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
6837 did_emsg |= saved_did_emsg; |
| 1983 | 6838 entered = FALSE; |
| 680 | 6839 } |
| 6840 #endif | |
| 6841 | |
| 7 | 6842 /* |
| 6843 * Return TRUE if the status line of window "wp" is connected to the status | |
| 6844 * line of the window right of it. If not, then it's a vertical separator. | |
| 6845 * Only call if (wp->w_vsep_width != 0). | |
| 6846 */ | |
| 6847 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6848 stl_connected(win_T *wp) |
| 7 | 6849 { |
| 6850 frame_T *fr; | |
| 6851 | |
| 6852 fr = wp->w_frame; | |
| 6853 while (fr->fr_parent != NULL) | |
| 6854 { | |
| 6855 if (fr->fr_parent->fr_layout == FR_COL) | |
| 6856 { | |
| 6857 if (fr->fr_next != NULL) | |
| 6858 break; | |
| 6859 } | |
| 6860 else | |
| 6861 { | |
| 6862 if (fr->fr_next != NULL) | |
| 6863 return TRUE; | |
| 6864 } | |
| 6865 fr = fr->fr_parent; | |
| 6866 } | |
| 6867 return FALSE; | |
| 6868 } | |
| 6869 | |
| 6870 #endif /* FEAT_WINDOWS */ | |
| 6871 | |
| 6872 #if defined(FEAT_WINDOWS) || defined(FEAT_STL_OPT) || defined(PROTO) | |
| 6873 /* | |
| 6874 * Get the value to show for the language mappings, active 'keymap'. | |
| 6875 */ | |
| 6876 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6877 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6878 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6879 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
|
6880 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
|
6881 int len) /* length of buffer */ |
| 7 | 6882 { |
| 6883 char_u *p; | |
| 6884 | |
| 6885 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 6886 return FALSE; | |
| 6887 | |
| 6888 { | |
| 6889 #ifdef FEAT_EVAL | |
| 6890 buf_T *old_curbuf = curbuf; | |
| 6891 win_T *old_curwin = curwin; | |
| 6892 char_u *s; | |
| 6893 | |
| 6894 curbuf = wp->w_buffer; | |
| 6895 curwin = wp; | |
| 6896 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 6897 ++emsg_skip; | |
| 714 | 6898 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 6899 --emsg_skip; |
| 6900 curbuf = old_curbuf; | |
| 6901 curwin = old_curwin; | |
| 6902 if (p == NULL || *p == NUL) | |
| 6903 #endif | |
| 6904 { | |
| 6905 #ifdef FEAT_KEYMAP | |
| 6906 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 6907 p = wp->w_buffer->b_p_keymap; | |
| 6908 else | |
| 6909 #endif | |
| 6910 p = (char_u *)"lang"; | |
| 6911 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6912 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 6913 buf[0] = NUL; |
| 6914 #ifdef FEAT_EVAL | |
| 6915 vim_free(s); | |
| 6916 #endif | |
| 6917 } | |
| 6918 return buf[0] != NUL; | |
| 6919 } | |
| 6920 #endif | |
| 6921 | |
| 6922 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 6923 /* | |
| 677 | 6924 * Redraw the status line or ruler of window "wp". |
| 6925 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 6926 */ |
| 6927 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6928 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6929 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6930 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 6931 { |
| 5539 | 6932 static int entered = FALSE; |
| 7 | 6933 int attr; |
| 6934 int curattr; | |
| 6935 int row; | |
| 6936 int col = 0; | |
| 6937 int maxwidth; | |
| 6938 int width; | |
| 6939 int n; | |
| 6940 int len; | |
| 6941 int fillchar; | |
| 6942 char_u buf[MAXPATHL]; | |
| 1983 | 6943 char_u *stl; |
| 7 | 6944 char_u *p; |
| 681 | 6945 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 6946 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 6947 int use_sandbox = FALSE; |
| 2693 | 6948 win_T *ewp; |
| 6949 int p_crb_save; | |
| 7 | 6950 |
| 5539 | 6951 /* There is a tiny chance that this gets called recursively: When |
| 6952 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 6953 * Avoid trouble by not allowing recursion. */ | |
| 6954 if (entered) | |
| 6955 return; | |
| 6956 entered = TRUE; | |
| 6957 | |
| 7 | 6958 /* setup environment for the task at hand */ |
| 677 | 6959 if (wp == NULL) |
| 6960 { | |
| 6961 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 6962 stl = p_tal; |
| 677 | 6963 row = 0; |
| 707 | 6964 fillchar = ' '; |
| 677 | 6965 attr = hl_attr(HLF_TPF); |
| 6966 maxwidth = Columns; | |
| 6967 # ifdef FEAT_EVAL | |
| 681 | 6968 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 6969 # endif |
| 6970 } | |
| 40 | 6971 else |
| 677 | 6972 { |
| 6973 row = W_WINROW(wp) + wp->w_height; | |
| 6974 fillchar = fillchar_status(&attr, wp == curwin); | |
| 6975 maxwidth = W_WIDTH(wp); | |
| 6976 | |
| 6977 if (draw_ruler) | |
| 6978 { | |
| 1983 | 6979 stl = p_ruf; |
| 677 | 6980 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 6981 if (*stl == '%') |
| 6982 { | |
| 6983 if (*++stl == '-') | |
| 6984 stl++; | |
| 6985 if (atoi((char *)stl)) | |
| 6986 while (VIM_ISDIGIT(*stl)) | |
| 6987 stl++; | |
| 6988 if (*stl++ != '(') | |
| 6989 stl = p_ruf; | |
| 677 | 6990 } |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
6991 #ifdef FEAT_WINDOWS |
| 677 | 6992 col = ru_col - (Columns - W_WIDTH(wp)); |
| 6993 if (col < (W_WIDTH(wp) + 1) / 2) | |
| 6994 col = (W_WIDTH(wp) + 1) / 2; | |
| 7 | 6995 #else |
| 677 | 6996 col = ru_col; |
| 6997 if (col > (Columns + 1) / 2) | |
| 6998 col = (Columns + 1) / 2; | |
| 6999 #endif | |
| 7000 maxwidth = W_WIDTH(wp) - col; | |
| 7 | 7001 #ifdef FEAT_WINDOWS |
| 677 | 7002 if (!wp->w_status_height) |
| 7003 #endif | |
| 7004 { | |
| 7005 row = Rows - 1; | |
| 7006 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7007 fillchar = ' '; | |
| 7008 attr = 0; | |
| 7009 } | |
| 7010 | |
| 7011 # ifdef FEAT_EVAL | |
| 681 | 7012 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7013 # endif |
| 7014 } | |
| 7015 else | |
| 7016 { | |
| 7017 if (*wp->w_p_stl != NUL) | |
| 1983 | 7018 stl = wp->w_p_stl; |
| 677 | 7019 else |
| 1983 | 7020 stl = p_stl; |
| 677 | 7021 # ifdef FEAT_EVAL |
| 681 | 7022 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7023 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7024 # endif |
| 7025 } | |
| 7026 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
7027 #ifdef FEAT_WINDOWS |
| 677 | 7028 col += W_WINCOL(wp); |
| 7029 #endif | |
| 7030 } | |
| 7031 | |
| 7 | 7032 if (maxwidth <= 0) |
| 5539 | 7033 goto theend; |
| 677 | 7034 |
| 2693 | 7035 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7036 * the cursor away and back. */ | |
| 7037 ewp = wp == NULL ? curwin : wp; | |
| 7038 p_crb_save = ewp->w_p_crb; | |
| 7039 ewp->w_p_crb = FALSE; | |
| 7040 | |
| 1983 | 7041 /* Make a copy, because the statusline may include a function call that |
| 7042 * might change the option value and free the memory. */ | |
| 7043 stl = vim_strsave(stl); | |
| 2693 | 7044 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7045 stl, use_sandbox, |
| 681 | 7046 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7047 vim_free(stl); |
| 2693 | 7048 ewp->w_p_crb = p_crb_save; |
| 2661 | 7049 |
| 7050 /* Make all characters printable. */ | |
| 7051 p = transstr(buf); | |
| 7052 if (p != NULL) | |
| 7053 { | |
| 7054 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7055 vim_free(p); | |
| 7056 } | |
| 7057 | |
| 7058 /* fill up with "fillchar" */ | |
| 835 | 7059 len = (int)STRLEN(buf); |
| 1883 | 7060 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7061 { |
| 7062 #ifdef FEAT_MBYTE | |
| 7063 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7064 #else | |
| 7065 buf[len++] = fillchar; | |
| 7066 #endif | |
| 7067 ++width; | |
| 7068 } | |
| 7069 buf[len] = NUL; | |
| 7070 | |
| 681 | 7071 /* |
| 7072 * Draw each snippet with the specified highlighting. | |
| 7073 */ | |
| 7 | 7074 curattr = attr; |
| 7075 p = buf; | |
| 681 | 7076 for (n = 0; hltab[n].start != NULL; n++) |
| 7077 { | |
| 7078 len = (int)(hltab[n].start - p); | |
| 7 | 7079 screen_puts_len(p, len, row, col, curattr); |
| 7080 col += vim_strnsize(p, len); | |
| 681 | 7081 p = hltab[n].start; |
| 7082 | |
| 7083 if (hltab[n].userhl == 0) | |
| 7 | 7084 curattr = attr; |
| 681 | 7085 else if (hltab[n].userhl < 0) |
| 7086 curattr = syn_id2attr(-hltab[n].userhl); | |
| 7 | 7087 #ifdef FEAT_WINDOWS |
| 680 | 7088 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7089 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7090 #endif |
| 7091 else | |
| 681 | 7092 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7093 } |
| 7094 screen_puts(p, row, col, curattr); | |
| 681 | 7095 |
| 7096 if (wp == NULL) | |
| 7097 { | |
| 7098 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7099 col = 0; | |
| 7100 len = 0; | |
| 7101 p = buf; | |
| 7102 fillchar = 0; | |
| 7103 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7104 { | |
| 7105 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7106 while (col < len) | |
| 7107 TabPageIdxs[col++] = fillchar; | |
| 7108 p = tabtab[n].start; | |
| 7109 fillchar = tabtab[n].userhl; | |
| 7110 } | |
| 7111 while (col < Columns) | |
| 7112 TabPageIdxs[col++] = fillchar; | |
| 7113 } | |
| 5539 | 7114 |
| 7115 theend: | |
| 7116 entered = FALSE; | |
| 7 | 7117 } |
| 7118 | |
| 7119 #endif /* FEAT_STL_OPT */ | |
| 7120 | |
| 7121 /* | |
| 7122 * Output a single character directly to the screen and update ScreenLines. | |
| 7123 */ | |
| 7124 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7125 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7126 { |
| 3549 | 7127 char_u buf[MB_MAXBYTES + 1]; |
| 7128 | |
| 7 | 7129 #ifdef FEAT_MBYTE |
| 3549 | 7130 if (has_mbyte) |
| 7131 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7132 else | |
| 7133 #endif | |
| 7134 { | |
| 7135 buf[0] = c; | |
| 7136 buf[1] = NUL; | |
| 7137 } | |
| 7 | 7138 screen_puts(buf, row, col, attr); |
| 7139 } | |
| 7140 | |
| 7141 /* | |
| 7142 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7143 * Also return its attribute in *attrp; | |
| 7144 */ | |
| 7145 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7146 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7147 { |
| 7148 unsigned off; | |
| 7149 | |
| 7150 /* safety check */ | |
| 7151 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7152 { | |
| 7153 off = LineOffset[row] + col; | |
| 7154 *attrp = ScreenAttrs[off]; | |
| 7155 bytes[0] = ScreenLines[off]; | |
| 7156 bytes[1] = NUL; | |
| 7157 | |
| 7158 #ifdef FEAT_MBYTE | |
| 7159 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7160 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7161 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7162 { | |
| 7163 bytes[0] = ScreenLines[off]; | |
| 7164 bytes[1] = ScreenLines2[off]; | |
| 7165 bytes[2] = NUL; | |
| 7166 } | |
| 7167 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7168 { | |
| 7169 bytes[1] = ScreenLines[off + 1]; | |
| 7170 bytes[2] = NUL; | |
| 7171 } | |
| 7172 #endif | |
| 7173 } | |
| 7174 } | |
| 7175 | |
| 714 | 7176 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7177 static int screen_comp_differs(int, int*); |
| 714 | 7178 |
| 7179 /* | |
| 7180 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7181 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7182 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7183 */ |
| 7184 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7185 screen_comp_differs(int off, int *u8cc) |
| 714 | 7186 { |
| 7187 int i; | |
| 7188 | |
| 7189 for (i = 0; i < Screen_mco; ++i) | |
| 7190 { | |
| 7191 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7192 return TRUE; | |
| 7193 if (u8cc[i] == 0) | |
| 7194 break; | |
| 7195 } | |
| 7196 return FALSE; | |
| 7197 } | |
| 7198 #endif | |
| 7199 | |
| 7 | 7200 /* |
| 7201 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7202 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7203 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7204 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7205 */ | |
| 7206 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7207 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7208 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7209 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7210 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7211 int attr) |
| 7 | 7212 { |
| 7213 screen_puts_len(text, -1, row, col, attr); | |
| 7214 } | |
| 7215 | |
| 7216 /* | |
| 7217 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7218 * a NUL. | |
| 7219 */ | |
| 7220 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7221 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7222 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7223 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7224 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7225 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7226 int attr) |
| 7 | 7227 { |
| 7228 unsigned off; | |
| 7229 char_u *ptr = text; | |
| 5923 | 7230 int len = textlen; |
| 7 | 7231 int c; |
| 7232 #ifdef FEAT_MBYTE | |
| 1378 | 7233 unsigned max_off; |
| 7 | 7234 int mbyte_blen = 1; |
| 7235 int mbyte_cells = 1; | |
| 7236 int u8c = 0; | |
| 714 | 7237 int u8cc[MAX_MCO]; |
| 7 | 7238 int clear_next_cell = FALSE; |
| 7239 # ifdef FEAT_ARABIC | |
| 7240 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7241 int pc, nc, nc1; |
| 7242 int pcc[MAX_MCO]; | |
| 7 | 7243 # endif |
| 7244 #endif | |
| 1843 | 7245 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7246 int force_redraw_this; | |
| 7247 int force_redraw_next = FALSE; | |
| 7248 #endif | |
| 7249 int need_redraw; | |
| 7 | 7250 |
| 7251 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7252 return; | |
| 1843 | 7253 off = LineOffset[row] + col; |
| 7 | 7254 |
| 1668 | 7255 #ifdef FEAT_MBYTE |
| 7256 /* When drawing over the right halve of a double-wide char clear out the | |
| 7257 * left halve. Only needed in a terminal. */ | |
| 1685 | 7258 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7259 # ifdef FEAT_GUI |
| 7260 && !gui.in_use | |
| 7261 # endif | |
| 7262 && mb_fix_col(col, row) != col) | |
| 1843 | 7263 { |
| 7264 ScreenLines[off - 1] = ' '; | |
| 7265 ScreenAttrs[off - 1] = 0; | |
| 7266 if (enc_utf8) | |
| 7267 { | |
| 7268 ScreenLinesUC[off - 1] = 0; | |
| 7269 ScreenLinesC[0][off - 1] = 0; | |
| 7270 } | |
| 7271 /* redraw the previous cell, make it empty */ | |
| 7272 screen_char(off - 1, row, col - 1); | |
| 7273 /* force the cell at "col" to be redrawn */ | |
| 7274 force_redraw_next = TRUE; | |
| 7275 } | |
| 7276 #endif | |
| 7277 | |
| 1378 | 7278 #ifdef FEAT_MBYTE |
| 7279 max_off = LineOffset[row] + screen_Columns; | |
| 7280 #endif | |
| 1340 | 7281 while (col < screen_Columns |
| 7282 && (len < 0 || (int)(ptr - text) < len) | |
| 7283 && *ptr != NUL) | |
| 7 | 7284 { |
| 7285 c = *ptr; | |
| 7286 #ifdef FEAT_MBYTE | |
| 7287 /* check if this is the first byte of a multibyte */ | |
| 7288 if (has_mbyte) | |
| 7289 { | |
| 7290 if (enc_utf8 && len > 0) | |
| 474 | 7291 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7292 else |
| 474 | 7293 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7294 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7295 mbyte_cells = 1; | |
| 7296 else if (enc_dbcs != 0) | |
| 7297 mbyte_cells = mbyte_blen; | |
| 7298 else /* enc_utf8 */ | |
| 7299 { | |
| 7300 if (len >= 0) | |
| 714 | 7301 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7302 (int)((text + len) - ptr)); |
| 7303 else | |
| 714 | 7304 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7305 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7306 # ifdef UNICODE16 |
| 7 | 7307 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7308 if (u8c >= 0x10000) | |
| 7309 { | |
| 7310 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7311 if (attr == 0) | |
| 7312 attr = hl_attr(HLF_8); | |
| 7313 } | |
| 1401 | 7314 # endif |
| 7 | 7315 # ifdef FEAT_ARABIC |
| 7316 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7317 { | |
| 7318 /* Do Arabic shaping. */ | |
| 7319 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7320 { | |
| 7321 /* Past end of string to be displayed. */ | |
| 7322 nc = NUL; | |
| 7323 nc1 = NUL; | |
| 7324 } | |
| 7325 else | |
| 714 | 7326 { |
| 1994 | 7327 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7328 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7329 nc1 = pcc[0]; |
| 7330 } | |
| 7 | 7331 pc = prev_c; |
| 7332 prev_c = u8c; | |
| 714 | 7333 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7334 } |
| 7335 else | |
| 7336 prev_c = u8c; | |
| 7337 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7338 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7339 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7340 /* 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
|
7341 * 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
|
7342 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7343 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7344 } |
| 7 | 7345 } |
| 7346 } | |
| 7347 #endif | |
| 7348 | |
| 1843 | 7349 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7350 force_redraw_this = force_redraw_next; | |
| 7351 force_redraw_next = FALSE; | |
| 7352 #endif | |
| 7353 | |
| 7354 need_redraw = ScreenLines[off] != c | |
| 7 | 7355 #ifdef FEAT_MBYTE |
| 7356 || (mbyte_cells == 2 | |
| 7357 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7358 || (enc_dbcs == DBCS_JPNU | |
| 7359 && c == 0x8e | |
| 7360 && ScreenLines2[off] != ptr[1]) | |
| 7361 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7362 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7363 (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
|
7364 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7365 && screen_comp_differs(off, u8cc)))) |
| 7 | 7366 #endif |
| 7367 || ScreenAttrs[off] != attr | |
| 1843 | 7368 || exmode_active; |
| 7369 | |
| 7370 if (need_redraw | |
| 7371 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7372 || force_redraw_this | |
| 7373 #endif | |
| 7 | 7374 ) |
| 7375 { | |
| 7376 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7377 /* The bold trick makes a single row of pixels appear in the next | |
| 7378 * character. When a bold character is removed, the next | |
| 7379 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7380 * and for some xterms. */ |
| 7381 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7382 # ifdef FEAT_GUI |
| 7383 gui.in_use | |
| 7384 # endif | |
| 7385 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7386 || | |
| 7387 # endif | |
| 7388 # ifdef UNIX | |
| 7389 term_is_xterm | |
| 7390 # endif | |
| 1843 | 7391 )) |
| 7392 { | |
| 7393 int n = ScreenAttrs[off]; | |
| 7394 | |
| 7395 if (n > HL_ALL) | |
| 7396 n = syn_attr2attr(n); | |
| 7397 if (n & HL_BOLD) | |
| 7398 force_redraw_next = TRUE; | |
| 7 | 7399 } |
| 7400 #endif | |
| 7401 #ifdef FEAT_MBYTE | |
| 7402 /* When at the end of the text and overwriting a two-cell | |
| 7403 * character with a one-cell character, need to clear the next | |
| 7404 * cell. Also when overwriting the left halve of a two-cell char | |
| 7405 * with the right halve of a two-cell char. Do this only once | |
| 7406 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7407 if (clear_next_cell) | |
| 7408 clear_next_cell = FALSE; | |
| 7409 else if (has_mbyte | |
| 7410 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7411 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7412 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7413 || (mbyte_cells == 2 |
| 1378 | 7414 && (*mb_off2cells)(off, max_off) == 1 |
| 7415 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7416 clear_next_cell = TRUE; |
| 7417 | |
| 7418 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7419 * it confuses mb_off2cells(). */ | |
| 7420 if (enc_dbcs | |
| 1378 | 7421 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7422 || (mbyte_cells == 2 |
| 1378 | 7423 && (*mb_off2cells)(off, max_off) == 1 |
| 7424 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7425 ScreenLines[off + mbyte_blen] = 0; |
| 7426 #endif | |
| 7427 ScreenLines[off] = c; | |
| 7428 ScreenAttrs[off] = attr; | |
| 7429 #ifdef FEAT_MBYTE | |
| 7430 if (enc_utf8) | |
| 7431 { | |
| 714 | 7432 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7433 ScreenLinesUC[off] = 0; |
| 7434 else | |
| 7435 { | |
| 714 | 7436 int i; |
| 7437 | |
| 7 | 7438 ScreenLinesUC[off] = u8c; |
| 714 | 7439 for (i = 0; i < Screen_mco; ++i) |
| 7440 { | |
| 7441 ScreenLinesC[i][off] = u8cc[i]; | |
| 7442 if (u8cc[i] == 0) | |
| 7443 break; | |
| 7444 } | |
| 7 | 7445 } |
| 7446 if (mbyte_cells == 2) | |
| 7447 { | |
| 7448 ScreenLines[off + 1] = 0; | |
| 7449 ScreenAttrs[off + 1] = attr; | |
| 7450 } | |
| 7451 screen_char(off, row, col); | |
| 7452 } | |
| 7453 else if (mbyte_cells == 2) | |
| 7454 { | |
| 7455 ScreenLines[off + 1] = ptr[1]; | |
| 7456 ScreenAttrs[off + 1] = attr; | |
| 7457 screen_char_2(off, row, col); | |
| 7458 } | |
| 7459 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7460 { | |
| 7461 ScreenLines2[off] = ptr[1]; | |
| 7462 screen_char(off, row, col); | |
| 7463 } | |
| 7464 else | |
| 7465 #endif | |
| 7466 screen_char(off, row, col); | |
| 7467 } | |
| 7468 #ifdef FEAT_MBYTE | |
| 7469 if (has_mbyte) | |
| 7470 { | |
| 7471 off += mbyte_cells; | |
| 7472 col += mbyte_cells; | |
| 7473 ptr += mbyte_blen; | |
| 7474 if (clear_next_cell) | |
| 5923 | 7475 { |
| 7476 /* This only happens at the end, display one space next. */ | |
| 7 | 7477 ptr = (char_u *)" "; |
| 5923 | 7478 len = -1; |
| 7479 } | |
| 7 | 7480 } |
| 7481 else | |
| 7482 #endif | |
| 7483 { | |
| 7484 ++off; | |
| 7485 ++col; | |
| 7486 ++ptr; | |
| 7487 } | |
| 7488 } | |
| 1843 | 7489 |
| 7490 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7491 /* If we detected the next character needs to be redrawn, but the text | |
| 7492 * doesn't extend up to there, update the character here. */ | |
| 7493 if (force_redraw_next && col < screen_Columns) | |
| 7494 { | |
| 7495 # ifdef FEAT_MBYTE | |
| 7496 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7497 screen_char_2(off, row, col); | |
| 7498 else | |
| 7499 # endif | |
| 7500 screen_char(off, row, col); | |
| 7501 } | |
| 7502 #endif | |
| 7 | 7503 } |
| 7504 | |
| 7505 #ifdef FEAT_SEARCH_EXTRA | |
| 7506 /* | |
| 1326 | 7507 * Prepare for 'hlsearch' highlighting. |
| 7 | 7508 */ |
| 7509 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7510 start_search_hl(void) |
| 7 | 7511 { |
| 7512 if (p_hls && !no_hlsearch) | |
| 7513 { | |
| 7514 last_pat_prog(&search_hl.rm); | |
| 7515 search_hl.attr = hl_attr(HLF_L); | |
| 1521 | 7516 # ifdef FEAT_RELTIME |
| 7517 /* Set the time limit to 'redrawtime'. */ | |
| 7518 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7519 # endif | |
| 7 | 7520 } |
| 7521 } | |
| 7522 | |
| 7523 /* | |
| 1326 | 7524 * Clean up for 'hlsearch' highlighting. |
| 7 | 7525 */ |
| 7526 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7527 end_search_hl(void) |
| 7 | 7528 { |
| 7529 if (search_hl.rm.regprog != NULL) | |
| 7530 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7531 vim_regfree(search_hl.rm.regprog); |
| 7 | 7532 search_hl.rm.regprog = NULL; |
| 7533 } | |
| 7534 } | |
| 7535 | |
| 7536 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7537 * 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
|
7538 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7539 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7540 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
|
7541 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7542 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7543 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7544 /* 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
|
7545 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7546 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7547 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7548 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7549 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7550 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7551 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7552 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7553 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
|
7554 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
|
7555 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7556 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7557 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7558 /* 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
|
7559 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
|
7560 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7561 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7562 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7563 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
|
7564 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7565 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7566 /* 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
|
7567 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7568 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7569 /* |
| 7 | 7570 * Advance to the match in window "wp" line "lnum" or past it. |
| 7571 */ | |
| 7572 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7573 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7574 { |
| 1326 | 7575 matchitem_T *cur; /* points to the match list */ |
| 7576 match_T *shl; /* points to search_hl or a match */ | |
| 7577 int shl_flag; /* flag to indicate whether search_hl | |
| 7578 has been processed or not */ | |
| 5979 | 7579 int pos_inprogress; /* marks that position match search is |
| 7580 in progress */ | |
| 7 | 7581 int n; |
| 7582 | |
| 7583 /* | |
| 7584 * When using a multi-line pattern, start searching at the top | |
| 7585 * of the window or just after a closed fold. | |
| 1326 | 7586 * Do this both for search_hl and the match list. |
| 7 | 7587 */ |
| 1326 | 7588 cur = wp->w_match_head; |
| 7589 shl_flag = FALSE; | |
| 7590 while (cur != NULL || shl_flag == FALSE) | |
| 7591 { | |
| 7592 if (shl_flag == FALSE) | |
| 7593 { | |
| 7594 shl = &search_hl; | |
| 7595 shl_flag = TRUE; | |
| 7596 } | |
| 7597 else | |
| 7598 shl = &cur->hl; | |
| 7 | 7599 if (shl->rm.regprog != NULL |
| 7600 && shl->lnum == 0 | |
| 7601 && re_multiline(shl->rm.regprog)) | |
| 7602 { | |
| 7603 if (shl->first_lnum == 0) | |
| 7604 { | |
| 7605 # ifdef FEAT_FOLDING | |
| 7606 for (shl->first_lnum = lnum; | |
| 7607 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7608 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7609 NULL, NULL, TRUE, NULL)) | |
| 7610 break; | |
| 7611 # else | |
| 7612 shl->first_lnum = wp->w_topline; | |
| 7613 # endif | |
| 7614 } | |
| 5979 | 7615 if (cur != NULL) |
| 7616 cur->pos.cur = 0; | |
| 7617 pos_inprogress = TRUE; | |
| 7 | 7618 n = 0; |
| 5979 | 7619 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7620 || (cur != NULL && pos_inprogress))) | |
| 7621 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7622 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
|
7623 shl == &search_hl ? NULL : cur); |
| 5979 | 7624 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7625 ? FALSE : TRUE; | |
| 7 | 7626 if (shl->lnum != 0) |
| 7627 { | |
| 7628 shl->first_lnum = shl->lnum | |
| 7629 + shl->rm.endpos[0].lnum | |
| 7630 - shl->rm.startpos[0].lnum; | |
| 7631 n = shl->rm.endpos[0].col; | |
| 7632 } | |
| 7633 else | |
| 7634 { | |
| 7635 ++shl->first_lnum; | |
| 7636 n = 0; | |
| 7637 } | |
| 7638 } | |
| 7639 } | |
| 1326 | 7640 if (shl != &search_hl && cur != NULL) |
| 7641 cur = cur->next; | |
| 7 | 7642 } |
| 7643 } | |
| 7644 | |
| 7645 /* | |
| 1326 | 7646 * Search for a next 'hlsearch' or match. |
| 7 | 7647 * Uses shl->buf. |
| 7648 * Sets shl->lnum and shl->rm contents. | |
| 7649 * Note: Assumes a previous match is always before "lnum", unless | |
| 7650 * shl->lnum is zero. | |
| 7651 * Careful: Any pointers for buffer lines will become invalid. | |
| 7652 */ | |
| 7653 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7654 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7655 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7656 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
|
7657 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7658 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
|
7659 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7660 { |
| 7661 linenr_T l; | |
| 7662 colnr_T matchcol; | |
| 7663 long nmatched; | |
| 7664 | |
| 7665 if (shl->lnum != 0) | |
| 7666 { | |
| 7667 /* Check for three situations: | |
| 7668 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7669 * 2. If the previous match includes "mincol", use it. | |
| 7670 * 3. Continue after the previous match. | |
| 7671 */ | |
| 7672 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7673 if (lnum > l) | |
| 7674 shl->lnum = 0; | |
| 7675 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7676 return; | |
| 7677 } | |
| 7678 | |
| 7679 /* | |
| 7680 * Repeat searching for a match until one is found that includes "mincol" | |
| 7681 * or none is found in this line. | |
| 7682 */ | |
| 7683 called_emsg = FALSE; | |
| 7684 for (;;) | |
| 7685 { | |
| 1521 | 7686 #ifdef FEAT_RELTIME |
| 7687 /* Stop searching after passing the time limit. */ | |
| 7688 if (profile_passed_limit(&(shl->tm))) | |
| 7689 { | |
| 7690 shl->lnum = 0; /* no match found in time */ | |
| 7691 break; | |
| 7692 } | |
| 7693 #endif | |
| 7 | 7694 /* Three situations: |
| 7695 * 1. No useful previous match: search from start of line. | |
| 7696 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7697 * Break the loop if this is beyond the end of the line. | |
| 7698 * 3. Vi compatible searching: continue at end of previous match. | |
| 7699 */ | |
| 7700 if (shl->lnum == 0) | |
| 7701 matchcol = 0; | |
| 7702 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7703 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7704 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7705 { | |
| 688 | 7706 char_u *ml; |
| 685 | 7707 |
| 7708 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7709 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7710 if (*ml == NUL) |
| 7711 { | |
| 7712 ++matchcol; | |
| 7 | 7713 shl->lnum = 0; |
| 7714 break; | |
| 7715 } | |
| 685 | 7716 #ifdef FEAT_MBYTE |
| 7717 if (has_mbyte) | |
| 7718 matchcol += mb_ptr2len(ml); | |
| 7719 else | |
| 7720 #endif | |
| 7721 ++matchcol; | |
| 7 | 7722 } |
| 7723 else | |
| 7724 matchcol = shl->rm.endpos[0].col; | |
| 7725 | |
| 7726 shl->lnum = lnum; | |
| 5979 | 7727 if (shl->rm.regprog != NULL) |
| 7728 { | |
| 6394 | 7729 /* Remember whether shl->rm is using a copy of the regprog in |
| 7730 * cur->match. */ | |
| 7731 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7732 && shl == &cur->hl | |
| 7733 && cur->match.regprog == cur->hl.rm.regprog); | |
| 7734 | |
| 5979 | 7735 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7736 matchcol, | |
| 1521 | 7737 #ifdef FEAT_RELTIME |
| 5979 | 7738 &(shl->tm) |
| 1521 | 7739 #else |
| 5979 | 7740 NULL |
| 7741 #endif | |
| 7742 ); | |
| 6394 | 7743 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7744 if (regprog_is_copy) | |
| 7745 cur->match.regprog = cur->hl.rm.regprog; | |
| 7746 | |
| 5979 | 7747 if (called_emsg || got_int) |
| 7748 { | |
| 7749 /* Error while handling regexp: stop using this regexp. */ | |
| 7750 if (shl == &search_hl) | |
| 7751 { | |
| 7752 /* don't free regprog in the match list, it's a copy */ | |
| 7753 vim_regfree(shl->rm.regprog); | |
| 7754 SET_NO_HLSEARCH(TRUE); | |
| 7755 } | |
| 7756 shl->rm.regprog = NULL; | |
| 7757 shl->lnum = 0; | |
| 7758 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7759 message */ | |
| 7760 break; | |
| 7761 } | |
| 7762 } | |
| 7763 else if (cur != NULL) | |
| 7764 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7765 else |
| 7766 nmatched = 0; | |
| 7 | 7767 if (nmatched == 0) |
| 7768 { | |
| 7769 shl->lnum = 0; /* no match found */ | |
| 7770 break; | |
| 7771 } | |
| 7772 if (shl->rm.startpos[0].lnum > 0 | |
| 7773 || shl->rm.startpos[0].col >= mincol | |
| 7774 || nmatched > 1 | |
| 7775 || shl->rm.endpos[0].col > mincol) | |
| 7776 { | |
| 7777 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7778 break; /* useful match found */ | |
| 7779 } | |
| 7780 } | |
| 7781 } | |
| 7782 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7783 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7784 * 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
|
7785 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7786 */ |
| 5979 | 7787 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7788 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7789 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
|
7790 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7791 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7792 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7793 { |
| 7794 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7795 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7796 |
| 5979 | 7797 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 7798 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7799 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7800 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7801 if (pos->lnum == 0) |
| 5979 | 7802 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7803 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 7804 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7805 if (pos->lnum == lnum) |
| 5979 | 7806 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7807 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7808 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7809 /* 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
|
7810 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7811 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
|
7812 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7813 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7814 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7815 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7816 posmatch->pos[found] = tmp; |
| 5979 | 7817 } |
| 7818 } | |
| 7819 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7820 found = i; |
| 5979 | 7821 } |
| 7822 } | |
| 7823 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7824 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7825 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7826 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
|
7827 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7828 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
|
7829 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7830 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7831 shl->lnum = lnum; |
| 5979 | 7832 shl->rm.startpos[0].lnum = 0; |
| 7833 shl->rm.startpos[0].col = start; | |
| 7834 shl->rm.endpos[0].lnum = 0; | |
| 7835 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
|
7836 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7837 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7838 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7839 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7840 return 0; |
| 5979 | 7841 } |
| 5985 | 7842 #endif |
| 5979 | 7843 |
| 7 | 7844 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7845 screen_start_highlight(int attr) |
| 7 | 7846 { |
| 7847 attrentry_T *aep = NULL; | |
| 7848 | |
| 7849 screen_attr = attr; | |
| 7850 if (full_screen | |
| 7851 #ifdef WIN3264 | |
| 7852 && termcap_active | |
| 7853 #endif | |
| 7854 ) | |
| 7855 { | |
| 7856 #ifdef FEAT_GUI | |
| 7857 if (gui.in_use) | |
| 7858 { | |
| 7859 char buf[20]; | |
| 7860 | |
| 681 | 7861 /* The GUI handles this internally. */ |
| 7862 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 7863 OUT_STR(buf); |
| 7864 } | |
| 7865 else | |
| 7866 #endif | |
| 7867 { | |
| 7868 if (attr > HL_ALL) /* special HL attr. */ | |
| 7869 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7870 if (IS_CTERM) |
| 7 | 7871 aep = syn_cterm_attr2entry(attr); |
| 7872 else | |
| 7873 aep = syn_term_attr2entry(attr); | |
| 7874 if (aep == NULL) /* did ":syntax clear" */ | |
| 7875 attr = 0; | |
| 7876 else | |
| 7877 attr = aep->ae_attr; | |
| 7878 } | |
| 7879 if ((attr & HL_BOLD) && T_MD != NULL) /* bold */ | |
| 7880 out_str(T_MD); | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7881 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
|
7882 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7883 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7884 (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
|
7885 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7886 (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
|
7887 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7888 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7889 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7890 ) |
| 681 | 7891 /* If the Normal FG color has BOLD attribute and the new HL |
| 7892 * has a FG color defined, clear BOLD. */ | |
| 7893 out_str(T_ME); | |
| 7 | 7894 if ((attr & HL_STANDOUT) && T_SO != NULL) /* standout */ |
| 7895 out_str(T_SO); | |
| 205 | 7896 if ((attr & (HL_UNDERLINE | HL_UNDERCURL)) && T_US != NULL) |
| 7897 /* underline or undercurl */ | |
| 7 | 7898 out_str(T_US); |
| 7899 if ((attr & HL_ITALIC) && T_CZH != NULL) /* italic */ | |
| 7900 out_str(T_CZH); | |
| 7901 if ((attr & HL_INVERSE) && T_MR != NULL) /* inverse (reverse) */ | |
| 7902 out_str(T_MR); | |
| 7903 | |
| 7904 /* | |
| 7905 * Output the color or start string after bold etc., in case the | |
| 7906 * bold etc. override the color setting. | |
| 7907 */ | |
| 7908 if (aep != NULL) | |
| 7909 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7910 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7911 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7912 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7913 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
|
7914 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
|
7915 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
|
7916 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 7917 } |
| 7918 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7919 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7920 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7921 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7922 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7923 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
|
7924 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
|
7925 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
|
7926 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
|
7927 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7928 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7929 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7930 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
|
7931 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
|
7932 } |
| 7 | 7933 } |
| 7934 } | |
| 7935 } | |
| 7936 } | |
| 7937 } | |
| 7938 | |
| 7939 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7940 screen_stop_highlight(void) |
| 7 | 7941 { |
| 7942 int do_ME = FALSE; /* output T_ME code */ | |
| 7943 | |
| 7944 if (screen_attr != 0 | |
| 7945 #ifdef WIN3264 | |
| 7946 && termcap_active | |
| 7947 #endif | |
| 7948 ) | |
| 7949 { | |
| 7950 #ifdef FEAT_GUI | |
| 7951 if (gui.in_use) | |
| 7952 { | |
| 7953 char buf[20]; | |
| 7954 | |
| 7955 /* use internal GUI code */ | |
| 7956 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 7957 OUT_STR(buf); | |
| 7958 } | |
| 7959 else | |
| 7960 #endif | |
| 7961 { | |
| 7962 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 7963 { | |
| 7964 attrentry_T *aep; | |
| 7965 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7966 if (IS_CTERM) |
| 7 | 7967 { |
| 7968 /* | |
| 7969 * Assume that t_me restores the original colors! | |
| 7970 */ | |
| 7971 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
|
7972 if (aep != NULL && |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7973 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
7974 (p_tgc ? |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
7975 (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
|
7976 || 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
|
7977 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7978 (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
|
7979 #ifdef FEAT_TERMGUICOLORS |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7980 ) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7981 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
7982 ) |
| 7 | 7983 do_ME = TRUE; |
| 7984 } | |
| 7985 else | |
| 7986 { | |
| 7987 aep = syn_term_attr2entry(screen_attr); | |
| 7988 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 7989 { | |
| 7990 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 7991 do_ME = TRUE; | |
| 7992 else | |
| 7993 out_str(aep->ae_u.term.stop); | |
| 7994 } | |
| 7995 } | |
| 7996 if (aep == NULL) /* did ":syntax clear" */ | |
| 7997 screen_attr = 0; | |
| 7998 else | |
| 7999 screen_attr = aep->ae_attr; | |
| 8000 } | |
| 8001 | |
| 8002 /* | |
| 8003 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8004 * same sequence several times. | |
| 8005 */ | |
| 8006 if (screen_attr & HL_STANDOUT) | |
| 8007 { | |
| 8008 if (STRCMP(T_SE, T_ME) == 0) | |
| 8009 do_ME = TRUE; | |
| 8010 else | |
| 8011 out_str(T_SE); | |
| 8012 } | |
| 205 | 8013 if (screen_attr & (HL_UNDERLINE | HL_UNDERCURL)) |
| 7 | 8014 { |
| 8015 if (STRCMP(T_UE, T_ME) == 0) | |
| 8016 do_ME = TRUE; | |
| 8017 else | |
| 8018 out_str(T_UE); | |
| 8019 } | |
| 8020 if (screen_attr & HL_ITALIC) | |
| 8021 { | |
| 8022 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8023 do_ME = TRUE; | |
| 8024 else | |
| 8025 out_str(T_CZR); | |
| 8026 } | |
| 8027 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) | |
| 8028 out_str(T_ME); | |
| 8029 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8030 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8031 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8032 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8033 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
|
8034 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
|
8035 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
|
8036 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
|
8037 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8038 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8039 #endif |
|
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 (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8042 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8043 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8044 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8045 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
|
8046 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8047 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
|
8048 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8049 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8050 } |
| 7 | 8051 } |
| 8052 } | |
| 8053 } | |
| 8054 screen_attr = 0; | |
| 8055 } | |
| 8056 | |
| 8057 /* | |
| 8058 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8059 * The machine specific code may override this again. | |
| 8060 */ | |
| 8061 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8062 reset_cterm_colors(void) |
| 7 | 8063 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8064 if (IS_CTERM) |
| 7 | 8065 { |
| 8066 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8067 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8068 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
|
8069 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8070 : (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
|
8071 #else |
| 7 | 8072 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
|
8073 #endif |
| 7 | 8074 { |
| 8075 out_str(T_OP); | |
| 8076 screen_attr = -1; | |
| 8077 } | |
| 8078 if (cterm_normal_fg_bold) | |
| 8079 { | |
| 8080 out_str(T_ME); | |
| 8081 screen_attr = -1; | |
| 8082 } | |
| 8083 } | |
| 8084 } | |
| 8085 | |
| 8086 /* | |
| 8087 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8088 * using the attributes from ScreenAttrs["off"]. | |
| 8089 */ | |
| 8090 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8091 screen_char(unsigned off, int row, int col) |
| 7 | 8092 { |
| 8093 int attr; | |
| 8094 | |
| 8095 /* Check for illegal values, just in case (could happen just after | |
| 8096 * resizing). */ | |
| 8097 if (row >= screen_Rows || col >= screen_Columns) | |
| 8098 return; | |
| 8099 | |
| 6602 | 8100 /* Outputting a character in the last cell on the screen may scroll the |
| 8101 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8102 * mark the character invalid (update it when scrolled up). */ | |
| 8103 if (*T_XN == NUL | |
| 8104 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8105 #ifdef FEAT_RIGHTLEFT |
| 8106 /* account for first command-line character in rightleft mode */ | |
| 8107 && !cmdmsg_rl | |
| 8108 #endif | |
| 8109 ) | |
| 8110 { | |
| 8111 ScreenAttrs[off] = (sattr_T)-1; | |
| 8112 return; | |
| 8113 } | |
| 8114 | |
| 8115 /* | |
| 8116 * Stop highlighting first, so it's easier to move the cursor. | |
| 8117 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8118 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) |
| 7 | 8119 if (screen_char_attr != 0) |
| 8120 attr = screen_char_attr; | |
| 8121 else | |
| 8122 #endif | |
| 8123 attr = ScreenAttrs[off]; | |
| 8124 if (screen_attr != attr) | |
| 8125 screen_stop_highlight(); | |
| 8126 | |
| 8127 windgoto(row, col); | |
| 8128 | |
| 8129 if (screen_attr != attr) | |
| 8130 screen_start_highlight(attr); | |
| 8131 | |
| 8132 #ifdef FEAT_MBYTE | |
| 8133 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8134 { | |
| 8135 char_u buf[MB_MAXBYTES + 1]; | |
| 8136 | |
| 8137 /* Convert UTF-8 character to bytes and write it. */ | |
| 8138 | |
| 8139 buf[utfc_char2bytes(off, buf)] = NUL; | |
| 8140 | |
| 8141 out_str(buf); | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8142 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8143 screen_cur_col = 9999; |
|
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8144 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8145 ++screen_cur_col; |
| 8146 } | |
| 8147 else | |
| 8148 #endif | |
| 8149 { | |
| 8150 #ifdef FEAT_MBYTE | |
| 8151 out_flush_check(); | |
| 8152 #endif | |
| 8153 out_char(ScreenLines[off]); | |
| 8154 #ifdef FEAT_MBYTE | |
| 8155 /* double-byte character in single-width cell */ | |
| 8156 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8157 out_char(ScreenLines2[off]); | |
| 8158 #endif | |
| 8159 } | |
| 8160 | |
| 8161 screen_cur_col++; | |
| 8162 } | |
| 8163 | |
| 8164 #ifdef FEAT_MBYTE | |
| 8165 | |
| 8166 /* | |
| 8167 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8168 * on the screen at position 'row' and 'col'. | |
| 8169 * The attributes of the first byte is used for all. This is required to | |
| 8170 * output the two bytes of a double-byte character with nothing in between. | |
| 8171 */ | |
| 8172 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8173 screen_char_2(unsigned off, int row, int col) |
| 7 | 8174 { |
| 8175 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8176 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8177 return; | |
| 8178 | |
| 8179 /* Outputting the last character on the screen may scrollup the screen. | |
| 8180 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8181 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8182 { | |
| 8183 ScreenAttrs[off] = (sattr_T)-1; | |
| 8184 return; | |
| 8185 } | |
| 8186 | |
| 8187 /* Output the first byte normally (positions the cursor), then write the | |
| 8188 * second byte directly. */ | |
| 8189 screen_char(off, row, col); | |
| 8190 out_char(ScreenLines[off + 1]); | |
| 8191 ++screen_cur_col; | |
| 8192 } | |
| 8193 #endif | |
| 8194 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8195 #if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) || defined(PROTO) |
| 7 | 8196 /* |
| 8197 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8198 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8199 */ | |
| 8200 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8201 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8202 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8203 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8204 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8205 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8206 int invert) |
| 7 | 8207 { |
| 8208 int r, c; | |
| 8209 int off; | |
| 1378 | 8210 #ifdef FEAT_MBYTE |
| 8211 int max_off; | |
| 8212 #endif | |
| 7 | 8213 |
| 534 | 8214 /* Can't use ScreenLines unless initialized */ |
| 8215 if (ScreenLines == NULL) | |
| 8216 return; | |
| 8217 | |
| 7 | 8218 if (invert) |
| 8219 screen_char_attr = HL_INVERSE; | |
| 8220 for (r = row; r < row + height; ++r) | |
| 8221 { | |
| 8222 off = LineOffset[r]; | |
| 1378 | 8223 #ifdef FEAT_MBYTE |
| 8224 max_off = off + screen_Columns; | |
| 8225 #endif | |
| 7 | 8226 for (c = col; c < col + width; ++c) |
| 8227 { | |
| 8228 #ifdef FEAT_MBYTE | |
| 1378 | 8229 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8230 { |
| 8231 screen_char_2(off + c, r, c); | |
| 8232 ++c; | |
| 8233 } | |
| 8234 else | |
| 8235 #endif | |
| 8236 { | |
| 8237 screen_char(off + c, r, c); | |
| 8238 #ifdef FEAT_MBYTE | |
| 1378 | 8239 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8240 ++c; |
| 8241 #endif | |
| 8242 } | |
| 8243 } | |
| 8244 } | |
| 8245 screen_char_attr = 0; | |
| 8246 } | |
| 8247 #endif | |
| 8248 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8249 #ifdef FEAT_WINDOWS |
| 7 | 8250 /* |
| 8251 * Redraw the characters for a vertically split window. | |
| 8252 */ | |
| 8253 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8254 redraw_block(int row, int end, win_T *wp) |
| 7 | 8255 { |
| 8256 int col; | |
| 8257 int width; | |
| 8258 | |
| 8259 # ifdef FEAT_CLIPBOARD | |
| 8260 clip_may_clear_selection(row, end - 1); | |
| 8261 # endif | |
| 8262 | |
| 8263 if (wp == NULL) | |
| 8264 { | |
| 8265 col = 0; | |
| 8266 width = Columns; | |
| 8267 } | |
| 8268 else | |
| 8269 { | |
| 8270 col = wp->w_wincol; | |
| 8271 width = wp->w_width; | |
| 8272 } | |
| 8273 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8274 } | |
| 8275 #endif | |
| 8276 | |
| 8277 /* | |
| 8278 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8279 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8280 * Use attributes 'attr'. | |
| 8281 */ | |
| 8282 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8283 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8284 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8285 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8286 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8287 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8288 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8289 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8290 int attr) |
| 7 | 8291 { |
| 8292 int row; | |
| 8293 int col; | |
| 8294 int off; | |
| 8295 int end_off; | |
| 8296 int did_delete; | |
| 8297 int c; | |
| 8298 int norm_term; | |
| 8299 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8300 int force_next = FALSE; | |
| 8301 #endif | |
| 8302 | |
| 8303 if (end_row > screen_Rows) /* safety check */ | |
| 8304 end_row = screen_Rows; | |
| 8305 if (end_col > screen_Columns) /* safety check */ | |
| 8306 end_col = screen_Columns; | |
| 8307 if (ScreenLines == NULL | |
| 8308 || start_row >= end_row | |
| 8309 || start_col >= end_col) /* nothing to do */ | |
| 8310 return; | |
| 8311 | |
| 8312 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8313 norm_term = ( | |
| 8314 #ifdef FEAT_GUI | |
| 8315 !gui.in_use && | |
| 8316 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8317 !IS_CTERM); |
| 7 | 8318 for (row = start_row; row < end_row; ++row) |
| 8319 { | |
| 1668 | 8320 #ifdef FEAT_MBYTE |
| 8321 if (has_mbyte | |
| 8322 # ifdef FEAT_GUI | |
| 8323 && !gui.in_use | |
| 8324 # endif | |
| 8325 ) | |
| 8326 { | |
| 8327 /* When drawing over the right halve of a double-wide char clear | |
| 8328 * out the left halve. When drawing over the left halve of a | |
| 8329 * double wide-char clear out the right halve. Only needed in a | |
| 8330 * terminal. */ | |
| 1685 | 8331 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8332 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8333 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8334 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8335 } |
| 8336 #endif | |
| 7 | 8337 /* |
| 8338 * Try to use delete-line termcap code, when no attributes or in a | |
| 8339 * "normal" terminal, where a bold/italic space is just a | |
| 8340 * space. | |
| 8341 */ | |
| 8342 did_delete = FALSE; | |
| 8343 if (c2 == ' ' | |
| 8344 && end_col == Columns | |
| 8345 && can_clear(T_CE) | |
| 8346 && (attr == 0 | |
| 8347 || (norm_term | |
| 8348 && attr <= HL_ALL | |
| 8349 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8350 { | |
| 8351 /* | |
| 8352 * check if we really need to clear something | |
| 8353 */ | |
| 8354 col = start_col; | |
| 8355 if (c1 != ' ') /* don't clear first char */ | |
| 8356 ++col; | |
| 8357 | |
| 8358 off = LineOffset[row] + col; | |
| 8359 end_off = LineOffset[row] + end_col; | |
| 8360 | |
| 8361 /* skip blanks (used often, keep it fast!) */ | |
| 8362 #ifdef FEAT_MBYTE | |
| 8363 if (enc_utf8) | |
| 8364 while (off < end_off && ScreenLines[off] == ' ' | |
| 8365 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8366 ++off; | |
| 8367 else | |
| 8368 #endif | |
| 8369 while (off < end_off && ScreenLines[off] == ' ' | |
| 8370 && ScreenAttrs[off] == 0) | |
| 8371 ++off; | |
| 8372 if (off < end_off) /* something to be cleared */ | |
| 8373 { | |
| 8374 col = off - LineOffset[row]; | |
| 8375 screen_stop_highlight(); | |
| 8376 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8377 out_str(T_CE); | |
| 8378 screen_start(); /* don't know where cursor is now */ | |
| 8379 col = end_col - col; | |
| 8380 while (col--) /* clear chars in ScreenLines */ | |
| 8381 { | |
| 8382 ScreenLines[off] = ' '; | |
| 8383 #ifdef FEAT_MBYTE | |
| 8384 if (enc_utf8) | |
| 8385 ScreenLinesUC[off] = 0; | |
| 8386 #endif | |
| 8387 ScreenAttrs[off] = 0; | |
| 8388 ++off; | |
| 8389 } | |
| 8390 } | |
| 8391 did_delete = TRUE; /* the chars are cleared now */ | |
| 8392 } | |
| 8393 | |
| 8394 off = LineOffset[row] + start_col; | |
| 8395 c = c1; | |
| 8396 for (col = start_col; col < end_col; ++col) | |
| 8397 { | |
| 8398 if (ScreenLines[off] != c | |
| 8399 #ifdef FEAT_MBYTE | |
| 714 | 8400 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8401 != (c >= 0x80 ? c : 0)) | |
| 7 | 8402 #endif |
| 8403 || ScreenAttrs[off] != attr | |
| 8404 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8405 || force_next | |
| 8406 #endif | |
| 8407 ) | |
| 8408 { | |
| 8409 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8410 /* The bold trick may make a single row of pixels appear in | |
| 8411 * the next character. When a bold character is removed, the | |
| 8412 * next character should be redrawn too. This happens for our | |
| 8413 * own GUI and for some xterms. */ | |
| 8414 if ( | |
| 8415 # ifdef FEAT_GUI | |
| 8416 gui.in_use | |
| 8417 # endif | |
| 8418 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8419 || | |
| 8420 # endif | |
| 8421 # ifdef UNIX | |
| 8422 term_is_xterm | |
| 8423 # endif | |
| 8424 ) | |
| 8425 { | |
| 8426 if (ScreenLines[off] != ' ' | |
| 8427 && (ScreenAttrs[off] > HL_ALL | |
| 8428 || ScreenAttrs[off] & HL_BOLD)) | |
| 8429 force_next = TRUE; | |
| 8430 else | |
| 8431 force_next = FALSE; | |
| 8432 } | |
| 8433 #endif | |
| 8434 ScreenLines[off] = c; | |
| 8435 #ifdef FEAT_MBYTE | |
| 8436 if (enc_utf8) | |
| 8437 { | |
| 8438 if (c >= 0x80) | |
| 8439 { | |
| 8440 ScreenLinesUC[off] = c; | |
| 714 | 8441 ScreenLinesC[0][off] = 0; |
| 7 | 8442 } |
| 8443 else | |
| 8444 ScreenLinesUC[off] = 0; | |
| 8445 } | |
| 8446 #endif | |
| 8447 ScreenAttrs[off] = attr; | |
| 8448 if (!did_delete || c != ' ') | |
| 8449 screen_char(off, row, col); | |
| 8450 } | |
| 8451 ++off; | |
| 8452 if (col == start_col) | |
| 8453 { | |
| 8454 if (did_delete) | |
| 8455 break; | |
| 8456 c = c2; | |
| 8457 } | |
| 8458 } | |
| 8459 if (end_col == Columns) | |
| 8460 LineWraps[row] = FALSE; | |
| 8461 if (row == Rows - 1) /* overwritten the command line */ | |
| 8462 { | |
| 8463 redraw_cmdline = TRUE; | |
| 8464 if (c1 == ' ' && c2 == ' ') | |
| 8465 clear_cmdline = FALSE; /* command line has been cleared */ | |
| 644 | 8466 if (start_col == 0) |
| 8467 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8468 } |
| 8469 } | |
| 8470 } | |
| 8471 | |
| 8472 /* | |
| 8473 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8474 * screen or the command line. | |
| 8475 */ | |
| 8476 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8477 check_for_delay(int check_msg_scroll) |
| 7 | 8478 { |
| 8479 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8480 && !did_wait_return | |
| 8481 && emsg_silent == 0) | |
| 8482 { | |
| 8483 out_flush(); | |
| 8484 ui_delay(1000L, TRUE); | |
| 8485 emsg_on_display = FALSE; | |
| 8486 if (check_msg_scroll) | |
| 8487 msg_scroll = FALSE; | |
| 8488 } | |
| 8489 } | |
| 8490 | |
| 8491 /* | |
| 8492 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8493 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8494 * Returns TRUE if there is a valid screen to write to. |
| 8495 * Returns FALSE when starting up and screen not initialized yet. | |
| 8496 */ | |
| 8497 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8498 screen_valid(int doclear) |
| 7 | 8499 { |
| 3263 | 8500 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8501 return (ScreenLines != NULL); |
| 8502 } | |
| 8503 | |
| 8504 /* | |
| 8505 * Resize the shell to Rows and Columns. | |
| 8506 * Allocate ScreenLines[] and associated items. | |
| 8507 * | |
| 8508 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8509 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8510 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8511 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8512 * final size of the shell is needed. | |
| 8513 */ | |
| 8514 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8515 screenalloc(int doclear) |
| 7 | 8516 { |
| 8517 int new_row, old_row; | |
| 8518 #ifdef FEAT_GUI | |
| 8519 int old_Rows; | |
| 8520 #endif | |
| 8521 win_T *wp; | |
| 8522 int outofmem = FALSE; | |
| 8523 int len; | |
| 8524 schar_T *new_ScreenLines; | |
| 8525 #ifdef FEAT_MBYTE | |
| 8526 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8527 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8528 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8529 int i; |
| 7 | 8530 #endif |
| 8531 sattr_T *new_ScreenAttrs; | |
| 8532 unsigned *new_LineOffset; | |
| 8533 char_u *new_LineWraps; | |
| 671 | 8534 #ifdef FEAT_WINDOWS |
| 681 | 8535 short *new_TabPageIdxs; |
| 671 | 8536 tabpage_T *tp; |
| 8537 #endif | |
| 7 | 8538 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8539 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8540 #ifdef FEAT_AUTOCMD |
| 8541 int retry_count = 0; | |
| 8542 | |
| 8543 retry: | |
| 8544 #endif | |
| 7 | 8545 /* |
| 8546 * Allocation of the screen buffers is done only when the size changes and | |
| 8547 * when Rows and Columns have been set and we have started doing full | |
| 8548 * screen stuff. | |
| 8549 */ | |
| 8550 if ((ScreenLines != NULL | |
| 8551 && Rows == screen_Rows | |
| 8552 && Columns == screen_Columns | |
| 8553 #ifdef FEAT_MBYTE | |
| 8554 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8555 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8556 && p_mco == Screen_mco |
| 7 | 8557 #endif |
| 8558 ) | |
| 8559 || Rows == 0 | |
| 8560 || Columns == 0 | |
| 8561 || (!full_screen && ScreenLines == NULL)) | |
| 8562 return; | |
| 8563 | |
| 8564 /* | |
| 8565 * It's possible that we produce an out-of-memory message below, which | |
| 8566 * will cause this function to be called again. To break the loop, just | |
| 8567 * return here. | |
| 8568 */ | |
| 8569 if (entered) | |
| 8570 return; | |
| 8571 entered = TRUE; | |
| 8572 | |
| 911 | 8573 /* |
| 8574 * Note that the window sizes are updated before reallocating the arrays, | |
| 8575 * thus we must not redraw here! | |
| 8576 */ | |
| 8577 ++RedrawingDisabled; | |
| 8578 | |
| 7 | 8579 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8580 | |
| 8581 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8582 | |
| 8583 /* | |
| 8584 * We're changing the size of the screen. | |
| 8585 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8586 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8587 * lines (unless the screen is going to be cleared). | |
| 8588 * - Free the old arrays. | |
| 8589 * | |
| 8590 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8591 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8592 * size is wrong. | |
| 8593 */ | |
| 671 | 8594 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8595 win_free_lsize(wp); |
| 1946 | 8596 #ifdef FEAT_AUTOCMD |
| 8597 if (aucmd_win != NULL) | |
| 8598 win_free_lsize(aucmd_win); | |
| 8599 #endif | |
| 7 | 8600 |
| 8601 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8602 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8603 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8604 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8605 if (enc_utf8) |
| 8606 { | |
| 8607 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8608 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8609 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8610 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8611 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8612 } | |
| 8613 if (enc_dbcs == DBCS_JPNU) | |
| 8614 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8615 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8616 #endif | |
| 8617 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8618 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8619 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8620 Rows * sizeof(unsigned)), FALSE); | |
| 8621 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 671 | 8622 #ifdef FEAT_WINDOWS |
| 681 | 8623 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 671 | 8624 #endif |
| 7 | 8625 |
| 677 | 8626 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8627 { |
| 8628 if (win_alloc_lines(wp) == FAIL) | |
| 8629 { | |
| 8630 outofmem = TRUE; | |
| 8631 #ifdef FEAT_WINDOWS | |
| 1819 | 8632 goto give_up; |
| 8633 #endif | |
| 8634 } | |
| 8635 } | |
| 1906 | 8636 #ifdef FEAT_AUTOCMD |
| 1946 | 8637 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8638 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8639 outofmem = TRUE; |
| 8640 #endif | |
| 1819 | 8641 #ifdef FEAT_WINDOWS |
| 8642 give_up: | |
| 8643 #endif | |
| 7 | 8644 |
| 714 | 8645 #ifdef FEAT_MBYTE |
| 8646 for (i = 0; i < p_mco; ++i) | |
| 8647 if (new_ScreenLinesC[i] == NULL) | |
| 8648 break; | |
| 8649 #endif | |
| 7 | 8650 if (new_ScreenLines == NULL |
| 8651 #ifdef FEAT_MBYTE | |
| 714 | 8652 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8653 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8654 #endif | |
| 8655 || new_ScreenAttrs == NULL | |
| 8656 || new_LineOffset == NULL | |
| 8657 || new_LineWraps == NULL | |
| 671 | 8658 #ifdef FEAT_WINDOWS |
| 8659 || new_TabPageIdxs == NULL | |
| 8660 #endif | |
| 7 | 8661 || outofmem) |
| 8662 { | |
| 944 | 8663 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8664 { |
| 8665 /* guess the size */ | |
| 8666 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8667 | |
| 8668 /* Remember we did this to avoid getting outofmem messages over | |
| 8669 * and over again. */ | |
| 944 | 8670 done_outofmem_msg = TRUE; |
| 534 | 8671 } |
| 7 | 8672 vim_free(new_ScreenLines); |
| 8673 new_ScreenLines = NULL; | |
| 8674 #ifdef FEAT_MBYTE | |
| 8675 vim_free(new_ScreenLinesUC); | |
| 8676 new_ScreenLinesUC = NULL; | |
| 714 | 8677 for (i = 0; i < p_mco; ++i) |
| 8678 { | |
| 8679 vim_free(new_ScreenLinesC[i]); | |
| 8680 new_ScreenLinesC[i] = NULL; | |
| 8681 } | |
| 7 | 8682 vim_free(new_ScreenLines2); |
| 8683 new_ScreenLines2 = NULL; | |
| 8684 #endif | |
| 8685 vim_free(new_ScreenAttrs); | |
| 8686 new_ScreenAttrs = NULL; | |
| 8687 vim_free(new_LineOffset); | |
| 8688 new_LineOffset = NULL; | |
| 8689 vim_free(new_LineWraps); | |
| 8690 new_LineWraps = NULL; | |
| 671 | 8691 #ifdef FEAT_WINDOWS |
| 8692 vim_free(new_TabPageIdxs); | |
| 8693 new_TabPageIdxs = NULL; | |
| 8694 #endif | |
| 7 | 8695 } |
| 8696 else | |
| 8697 { | |
| 944 | 8698 done_outofmem_msg = FALSE; |
| 534 | 8699 |
| 7 | 8700 for (new_row = 0; new_row < Rows; ++new_row) |
| 8701 { | |
| 8702 new_LineOffset[new_row] = new_row * Columns; | |
| 8703 new_LineWraps[new_row] = FALSE; | |
| 8704 | |
| 8705 /* | |
| 8706 * If the screen is not going to be cleared, copy as much as | |
| 8707 * possible from the old screen to the new one and clear the rest | |
| 8708 * (used when resizing the window at the "--more--" prompt or when | |
| 8709 * executing an external command, for the GUI). | |
| 8710 */ | |
| 3263 | 8711 if (!doclear) |
| 7 | 8712 { |
| 8713 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8714 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8715 #ifdef FEAT_MBYTE | |
| 8716 if (enc_utf8) | |
| 8717 { | |
| 8718 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8719 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8720 for (i = 0; i < p_mco; ++i) |
| 8721 (void)vim_memset(new_ScreenLinesC[i] | |
| 8722 + new_row * Columns, | |
| 7 | 8723 0, (size_t)Columns * sizeof(u8char_T)); |
| 8724 } | |
| 8725 if (enc_dbcs == DBCS_JPNU) | |
| 8726 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8727 0, (size_t)Columns * sizeof(schar_T)); | |
| 8728 #endif | |
| 8729 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8730 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8731 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8732 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8733 { |
| 8734 if (screen_Columns < Columns) | |
| 8735 len = screen_Columns; | |
| 8736 else | |
| 8737 len = Columns; | |
| 26 | 8738 #ifdef FEAT_MBYTE |
| 571 | 8739 /* When switching to utf-8 don't copy characters, they |
| 714 | 8740 * may be invalid now. Also when p_mco changes. */ |
| 8741 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8742 && p_mco == Screen_mco) | |
| 26 | 8743 #endif |
| 8744 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8745 ScreenLines + LineOffset[old_row], | |
| 8746 (size_t)len * sizeof(schar_T)); | |
| 7 | 8747 #ifdef FEAT_MBYTE |
| 714 | 8748 if (enc_utf8 && ScreenLinesUC != NULL |
| 8749 && p_mco == Screen_mco) | |
| 7 | 8750 { |
| 8751 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8752 ScreenLinesUC + LineOffset[old_row], | |
| 8753 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8754 for (i = 0; i < p_mco; ++i) |
| 8755 mch_memmove(new_ScreenLinesC[i] | |
| 8756 + new_LineOffset[new_row], | |
| 8757 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8758 (size_t)len * sizeof(u8char_T)); |
| 8759 } | |
| 8760 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8761 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8762 ScreenLines2 + LineOffset[old_row], | |
| 8763 (size_t)len * sizeof(schar_T)); | |
| 8764 #endif | |
| 8765 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8766 ScreenAttrs + LineOffset[old_row], | |
| 8767 (size_t)len * sizeof(sattr_T)); | |
| 8768 } | |
| 8769 } | |
| 8770 } | |
| 8771 /* Use the last line of the screen for the current line. */ | |
| 8772 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8773 } | |
| 8774 | |
| 356 | 8775 free_screenlines(); |
| 8776 | |
| 7 | 8777 ScreenLines = new_ScreenLines; |
| 8778 #ifdef FEAT_MBYTE | |
| 8779 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8780 for (i = 0; i < p_mco; ++i) |
| 8781 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8782 Screen_mco = p_mco; | |
| 7 | 8783 ScreenLines2 = new_ScreenLines2; |
| 8784 #endif | |
| 8785 ScreenAttrs = new_ScreenAttrs; | |
| 8786 LineOffset = new_LineOffset; | |
| 8787 LineWraps = new_LineWraps; | |
| 671 | 8788 #ifdef FEAT_WINDOWS |
| 8789 TabPageIdxs = new_TabPageIdxs; | |
| 8790 #endif | |
| 7 | 8791 |
| 8792 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 8793 * size of ScreenLines[]. Set them before calling anything. */ | |
| 8794 #ifdef FEAT_GUI | |
| 8795 old_Rows = screen_Rows; | |
| 8796 #endif | |
| 8797 screen_Rows = Rows; | |
| 8798 screen_Columns = Columns; | |
| 8799 | |
| 8800 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 8801 if (doclear) |
| 7 | 8802 screenclear2(); |
| 8803 | |
| 8804 #ifdef FEAT_GUI | |
| 8805 else if (gui.in_use | |
| 8806 && !gui.starting | |
| 8807 && ScreenLines != NULL | |
| 8808 && old_Rows != Rows) | |
| 8809 { | |
| 8810 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 8811 /* | |
| 8812 * Adjust the position of the cursor, for when executing an external | |
| 8813 * command. | |
| 8814 */ | |
| 8815 if (msg_row >= Rows) /* Rows got smaller */ | |
| 8816 msg_row = Rows - 1; /* put cursor at last row */ | |
| 8817 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 8818 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 8819 if (msg_col >= Columns) /* Columns got smaller */ | |
| 8820 msg_col = Columns - 1; /* put cursor at last column */ | |
| 8821 } | |
| 8822 #endif | |
| 8823 | |
| 8824 entered = FALSE; | |
| 911 | 8825 --RedrawingDisabled; |
| 766 | 8826 |
| 8827 #ifdef FEAT_AUTOCMD | |
| 1824 | 8828 /* |
| 8829 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 8830 * in case applying autocommands always changes Rows or Columns. | |
| 8831 */ | |
| 8832 if (starting == 0 && ++retry_count <= 3) | |
| 8833 { | |
| 766 | 8834 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 8835 /* In rare cases, autocommands may have altered Rows or Columns, |
| 8836 * jump back to check if we need to allocate the screen again. */ | |
| 8837 goto retry; | |
| 8838 } | |
| 766 | 8839 #endif |
| 7 | 8840 } |
| 8841 | |
| 8842 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8843 free_screenlines(void) |
| 356 | 8844 { |
| 8845 #ifdef FEAT_MBYTE | |
| 714 | 8846 int i; |
| 8847 | |
| 356 | 8848 vim_free(ScreenLinesUC); |
| 714 | 8849 for (i = 0; i < Screen_mco; ++i) |
| 8850 vim_free(ScreenLinesC[i]); | |
| 356 | 8851 vim_free(ScreenLines2); |
| 8852 #endif | |
| 714 | 8853 vim_free(ScreenLines); |
| 356 | 8854 vim_free(ScreenAttrs); |
| 8855 vim_free(LineOffset); | |
| 8856 vim_free(LineWraps); | |
| 671 | 8857 #ifdef FEAT_WINDOWS |
| 8858 vim_free(TabPageIdxs); | |
| 8859 #endif | |
| 356 | 8860 } |
| 8861 | |
| 8862 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8863 screenclear(void) |
| 7 | 8864 { |
| 8865 check_for_delay(FALSE); | |
| 8866 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 8867 screenclear2(); /* clear the screen */ | |
| 8868 } | |
| 8869 | |
| 8870 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8871 screenclear2(void) |
| 7 | 8872 { |
| 8873 int i; | |
| 8874 | |
| 8875 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 8876 #ifdef FEAT_GUI | |
| 8877 || (gui.in_use && gui.starting) | |
| 8878 #endif | |
| 8879 ) | |
| 8880 return; | |
| 8881 | |
| 8882 #ifdef FEAT_GUI | |
| 8883 if (!gui.in_use) | |
| 8884 #endif | |
| 8885 screen_attr = -1; /* force setting the Normal colors */ | |
| 8886 screen_stop_highlight(); /* don't want highlighting here */ | |
| 8887 | |
| 8888 #ifdef FEAT_CLIPBOARD | |
| 8889 /* disable selection without redrawing it */ | |
| 8890 clip_scroll_selection(9999); | |
| 8891 #endif | |
| 8892 | |
| 8893 /* blank out ScreenLines */ | |
| 8894 for (i = 0; i < Rows; ++i) | |
| 8895 { | |
| 8896 lineclear(LineOffset[i], (int)Columns); | |
| 8897 LineWraps[i] = FALSE; | |
| 8898 } | |
| 8899 | |
| 8900 if (can_clear(T_CL)) | |
| 8901 { | |
| 8902 out_str(T_CL); /* clear the display */ | |
| 8903 clear_cmdline = FALSE; | |
| 644 | 8904 mode_displayed = FALSE; |
| 7 | 8905 } |
| 8906 else | |
| 8907 { | |
| 8908 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 8909 for (i = 0; i < Rows; ++i) | |
| 8910 lineinvalid(LineOffset[i], (int)Columns); | |
| 8911 clear_cmdline = TRUE; | |
| 8912 } | |
| 8913 | |
| 8914 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 8915 | |
| 8916 win_rest_invalid(firstwin); | |
| 8917 redraw_cmdline = TRUE; | |
| 670 | 8918 #ifdef FEAT_WINDOWS |
| 673 | 8919 redraw_tabline = TRUE; |
| 670 | 8920 #endif |
| 7 | 8921 if (must_redraw == CLEAR) /* no need to clear again */ |
| 8922 must_redraw = NOT_VALID; | |
| 8923 compute_cmdrow(); | |
| 8924 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 8925 msg_col = 0; | |
| 8926 screen_start(); /* don't know where cursor is now */ | |
| 8927 msg_scrolled = 0; /* can't scroll back */ | |
| 8928 msg_didany = FALSE; | |
| 8929 msg_didout = FALSE; | |
| 8930 } | |
| 8931 | |
| 8932 /* | |
| 8933 * Clear one line in ScreenLines. | |
| 8934 */ | |
| 8935 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8936 lineclear(unsigned off, int width) |
| 7 | 8937 { |
| 8938 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 8939 #ifdef FEAT_MBYTE | |
| 8940 if (enc_utf8) | |
| 8941 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 8942 (size_t)width * sizeof(u8char_T)); | |
| 8943 #endif | |
| 8944 (void)vim_memset(ScreenAttrs + off, 0, (size_t)width * sizeof(sattr_T)); | |
| 8945 } | |
| 8946 | |
| 8947 /* | |
| 8948 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 8949 * invalid value. | |
| 8950 */ | |
| 8951 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8952 lineinvalid(unsigned off, int width) |
| 7 | 8953 { |
| 8954 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 8955 } | |
| 8956 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
8957 #ifdef FEAT_WINDOWS |
| 7 | 8958 /* |
| 8959 * Copy part of a Screenline for vertically split window "wp". | |
| 8960 */ | |
| 8961 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8962 linecopy(int to, int from, win_T *wp) |
| 7 | 8963 { |
| 8964 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 8965 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 8966 | |
| 8967 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 8968 wp->w_width * sizeof(schar_T)); | |
| 8969 # ifdef FEAT_MBYTE | |
| 8970 if (enc_utf8) | |
| 8971 { | |
| 714 | 8972 int i; |
| 8973 | |
| 7 | 8974 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 8975 wp->w_width * sizeof(u8char_T)); | |
| 714 | 8976 for (i = 0; i < p_mco; ++i) |
| 8977 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 8978 wp->w_width * sizeof(u8char_T)); | |
| 7 | 8979 } |
| 8980 if (enc_dbcs == DBCS_JPNU) | |
| 8981 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 8982 wp->w_width * sizeof(schar_T)); | |
| 8983 # endif | |
| 8984 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 8985 wp->w_width * sizeof(sattr_T)); | |
| 8986 } | |
| 8987 #endif | |
| 8988 | |
| 8989 /* | |
| 8990 * Return TRUE if clearing with term string "p" would work. | |
| 8991 * It can't work when the string is empty or it won't set the right background. | |
| 8992 */ | |
| 8993 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8994 can_clear(char_u *p) |
| 7 | 8995 { |
| 8996 return (*p != NUL && (t_colors <= 1 | |
| 8997 #ifdef FEAT_GUI | |
| 8998 || gui.in_use | |
| 8999 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9000 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9001 || (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
|
9002 || (!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
|
9003 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9004 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9005 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9006 || *T_UT != NUL)); |
| 7 | 9007 } |
| 9008 | |
| 9009 /* | |
| 9010 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9011 * something directly to the screen (shell commands) or a terminal control | |
| 9012 * code. | |
| 9013 */ | |
| 9014 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9015 screen_start(void) |
| 7 | 9016 { |
| 9017 screen_cur_row = screen_cur_col = 9999; | |
| 9018 } | |
| 9019 | |
| 9020 /* | |
| 9021 * Move the cursor to position "row","col" in the screen. | |
| 9022 * This tries to find the most efficient way to move, minimizing the number of | |
| 9023 * characters sent to the terminal. | |
| 9024 */ | |
| 9025 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9026 windgoto(int row, int col) |
| 7 | 9027 { |
| 205 | 9028 sattr_T *p; |
| 7 | 9029 int i; |
| 9030 int plan; | |
| 9031 int cost; | |
| 9032 int wouldbe_col; | |
| 9033 int noinvcurs; | |
| 9034 char_u *bs; | |
| 9035 int goto_cost; | |
| 9036 int attr; | |
| 9037 | |
| 1213 | 9038 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9039 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9040 | |
| 9041 #define PLAN_LE 1 | |
| 9042 #define PLAN_CR 2 | |
| 9043 #define PLAN_NL 3 | |
| 9044 #define PLAN_WRITE 4 | |
| 9045 /* Can't use ScreenLines unless initialized */ | |
| 9046 if (ScreenLines == NULL) | |
| 9047 return; | |
| 9048 | |
| 9049 if (col != screen_cur_col || row != screen_cur_row) | |
| 9050 { | |
| 9051 /* Check for valid position. */ | |
| 9052 if (row < 0) /* window without text lines? */ | |
| 9053 row = 0; | |
| 9054 if (row >= screen_Rows) | |
| 9055 row = screen_Rows - 1; | |
| 9056 if (col >= screen_Columns) | |
| 9057 col = screen_Columns - 1; | |
| 9058 | |
| 9059 /* check if no cursor movement is allowed in highlight mode */ | |
| 9060 if (screen_attr && *T_MS == NUL) | |
| 9061 noinvcurs = HIGHL_COST; | |
| 9062 else | |
| 9063 noinvcurs = 0; | |
| 9064 goto_cost = GOTO_COST + noinvcurs; | |
| 9065 | |
| 9066 /* | |
| 9067 * Plan how to do the positioning: | |
| 9068 * 1. Use CR to move it to column 0, same row. | |
| 9069 * 2. Use T_LE to move it a few columns to the left. | |
| 9070 * 3. Use NL to move a few lines down, column 0. | |
| 9071 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9072 * | |
| 9073 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9074 * position is unknown then (some terminals wrap, some don't ) | |
| 9075 * | |
| 1213 | 9076 * First check if the highlighting attributes allow us to write |
| 7 | 9077 * characters to move the cursor to the right. |
| 9078 */ | |
| 9079 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9080 { | |
| 9081 /* | |
| 9082 * If the cursor is in the same row, bigger col, we can use CR | |
| 9083 * or T_LE. | |
| 9084 */ | |
| 9085 bs = NULL; /* init for GCC */ | |
| 9086 attr = screen_attr; | |
| 9087 if (row == screen_cur_row && col < screen_cur_col) | |
| 9088 { | |
| 9089 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9090 if (*T_LE) | |
| 9091 bs = T_LE; /* "cursor left" */ | |
| 9092 else | |
| 9093 bs = T_BC; /* "backspace character (old) */ | |
| 9094 if (*bs) | |
| 9095 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9096 else | |
| 9097 cost = 999; | |
| 9098 if (col + 1 < cost) /* using CR is less characters */ | |
| 9099 { | |
| 9100 plan = PLAN_CR; | |
| 9101 wouldbe_col = 0; | |
| 9102 cost = 1; /* CR is just one character */ | |
| 9103 } | |
| 9104 else | |
| 9105 { | |
| 9106 plan = PLAN_LE; | |
| 9107 wouldbe_col = col; | |
| 9108 } | |
| 9109 if (noinvcurs) /* will stop highlighting */ | |
| 9110 { | |
| 9111 cost += noinvcurs; | |
| 9112 attr = 0; | |
| 9113 } | |
| 9114 } | |
| 9115 | |
| 9116 /* | |
| 9117 * If the cursor is above where we want to be, we can use CR LF. | |
| 9118 */ | |
| 9119 else if (row > screen_cur_row) | |
| 9120 { | |
| 9121 plan = PLAN_NL; | |
| 9122 wouldbe_col = 0; | |
| 9123 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9124 if (noinvcurs) /* will stop highlighting */ | |
| 9125 { | |
| 9126 cost += noinvcurs; | |
| 9127 attr = 0; | |
| 9128 } | |
| 9129 } | |
| 9130 | |
| 9131 /* | |
| 9132 * If the cursor is in the same row, smaller col, just use write. | |
| 9133 */ | |
| 9134 else | |
| 9135 { | |
| 9136 plan = PLAN_WRITE; | |
| 9137 wouldbe_col = screen_cur_col; | |
| 9138 cost = 0; | |
| 9139 } | |
| 9140 | |
| 9141 /* | |
| 9142 * Check if any characters that need to be written have the | |
| 9143 * correct attributes. Also avoid UTF-8 characters. | |
| 9144 */ | |
| 9145 i = col - wouldbe_col; | |
| 9146 if (i > 0) | |
| 9147 cost += i; | |
| 9148 if (cost < goto_cost && i > 0) | |
| 9149 { | |
| 9150 /* | |
| 9151 * Check if the attributes are correct without additionally | |
| 9152 * stopping highlighting. | |
| 9153 */ | |
| 9154 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9155 while (i && *p++ == attr) | |
| 9156 --i; | |
| 9157 if (i != 0) | |
| 9158 { | |
| 9159 /* | |
| 9160 * Try if it works when highlighting is stopped here. | |
| 9161 */ | |
| 9162 if (*--p == 0) | |
| 9163 { | |
| 9164 cost += noinvcurs; | |
| 9165 while (i && *p++ == 0) | |
| 9166 --i; | |
| 9167 } | |
| 9168 if (i != 0) | |
| 9169 cost = 999; /* different attributes, don't do it */ | |
| 9170 } | |
| 9171 #ifdef FEAT_MBYTE | |
| 9172 if (enc_utf8) | |
| 9173 { | |
| 9174 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9175 for (i = wouldbe_col; i < col; ++i) | |
| 9176 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9177 { | |
| 9178 cost = 999; | |
| 9179 break; | |
| 9180 } | |
| 9181 } | |
| 9182 #endif | |
| 9183 } | |
| 9184 | |
| 9185 /* | |
| 9186 * We can do it without term_windgoto()! | |
| 9187 */ | |
| 9188 if (cost < goto_cost) | |
| 9189 { | |
| 9190 if (plan == PLAN_LE) | |
| 9191 { | |
| 9192 if (noinvcurs) | |
| 9193 screen_stop_highlight(); | |
| 9194 while (screen_cur_col > col) | |
| 9195 { | |
| 9196 out_str(bs); | |
| 9197 --screen_cur_col; | |
| 9198 } | |
| 9199 } | |
| 9200 else if (plan == PLAN_CR) | |
| 9201 { | |
| 9202 if (noinvcurs) | |
| 9203 screen_stop_highlight(); | |
| 9204 out_char('\r'); | |
| 9205 screen_cur_col = 0; | |
| 9206 } | |
| 9207 else if (plan == PLAN_NL) | |
| 9208 { | |
| 9209 if (noinvcurs) | |
| 9210 screen_stop_highlight(); | |
| 9211 while (screen_cur_row < row) | |
| 9212 { | |
| 9213 out_char('\n'); | |
| 9214 ++screen_cur_row; | |
| 9215 } | |
| 9216 screen_cur_col = 0; | |
| 9217 } | |
| 9218 | |
| 9219 i = col - screen_cur_col; | |
| 9220 if (i > 0) | |
| 9221 { | |
| 9222 /* | |
| 9223 * Use cursor-right if it's one character only. Avoids | |
| 9224 * removing a line of pixels from the last bold char, when | |
| 9225 * using the bold trick in the GUI. | |
| 9226 */ | |
| 9227 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9228 { | |
| 9229 while (i-- > 0) | |
| 9230 out_char(*T_ND); | |
| 9231 } | |
| 9232 else | |
| 9233 { | |
| 9234 int off; | |
| 9235 | |
| 9236 off = LineOffset[row] + screen_cur_col; | |
| 9237 while (i-- > 0) | |
| 9238 { | |
| 9239 if (ScreenAttrs[off] != screen_attr) | |
| 9240 screen_stop_highlight(); | |
| 9241 #ifdef FEAT_MBYTE | |
| 9242 out_flush_check(); | |
| 9243 #endif | |
| 9244 out_char(ScreenLines[off]); | |
| 9245 #ifdef FEAT_MBYTE | |
| 9246 if (enc_dbcs == DBCS_JPNU | |
| 9247 && ScreenLines[off] == 0x8e) | |
| 9248 out_char(ScreenLines2[off]); | |
| 9249 #endif | |
| 9250 ++off; | |
| 9251 } | |
| 9252 } | |
| 9253 } | |
| 9254 } | |
| 9255 } | |
| 9256 else | |
| 9257 cost = 999; | |
| 9258 | |
| 9259 if (cost >= goto_cost) | |
| 9260 { | |
| 9261 if (noinvcurs) | |
| 9262 screen_stop_highlight(); | |
| 5995 | 9263 if (row == screen_cur_row && (col > screen_cur_col) |
| 9264 && *T_CRI != NUL) | |
| 7 | 9265 term_cursor_right(col - screen_cur_col); |
| 9266 else | |
| 9267 term_windgoto(row, col); | |
| 9268 } | |
| 9269 screen_cur_row = row; | |
| 9270 screen_cur_col = col; | |
| 9271 } | |
| 9272 } | |
| 9273 | |
| 9274 /* | |
| 9275 * Set cursor to its position in the current window. | |
| 9276 */ | |
| 9277 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9278 setcursor(void) |
| 7 | 9279 { |
| 9280 if (redrawing()) | |
| 9281 { | |
| 9282 validate_cursor(); | |
| 9283 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
| 9284 W_WINCOL(curwin) + ( | |
| 9285 #ifdef FEAT_RIGHTLEFT | |
| 1545 | 9286 /* With 'rightleft' set and the cursor on a double-wide |
| 9287 * character, position it on the leftmost column. */ | |
| 7 | 9288 curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - ( |
| 9289 # ifdef FEAT_MBYTE | |
| 1545 | 9290 (has_mbyte |
| 9291 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9292 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9293 # endif |
| 9294 1)) : | |
| 9295 #endif | |
| 9296 curwin->w_wcol)); | |
| 9297 } | |
| 9298 } | |
| 9299 | |
| 9300 | |
| 9301 /* | |
| 9302 * insert 'line_count' lines at 'row' in window 'wp' | |
| 9303 * if 'invalid' is TRUE the wp->w_lines[].wl_lnum is invalidated. | |
| 9304 * if 'mayclear' is TRUE the screen will be cleared if it is faster than | |
| 9305 * scrolling. | |
| 9306 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9307 */ | |
| 9308 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9309 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9310 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9311 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9312 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9313 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9314 int mayclear) |
| 7 | 9315 { |
| 9316 int did_delete; | |
| 9317 int nextrow; | |
| 9318 int lastrow; | |
| 9319 int retval; | |
| 9320 | |
| 9321 if (invalid) | |
| 9322 wp->w_lines_valid = 0; | |
| 9323 | |
| 9324 if (wp->w_height < 5) | |
| 9325 return FAIL; | |
| 9326 | |
| 9327 if (line_count > wp->w_height - row) | |
| 9328 line_count = wp->w_height - row; | |
| 9329 | |
| 9330 retval = win_do_lines(wp, row, line_count, mayclear, FALSE); | |
| 9331 if (retval != MAYBE) | |
| 9332 return retval; | |
| 9333 | |
| 9334 /* | |
| 9335 * If there is a next window or a status line, we first try to delete the | |
| 9336 * lines at the bottom to avoid messing what is after the window. | |
| 9337 * If this fails and there are following windows, don't do anything to avoid | |
| 9338 * messing up those windows, better just redraw. | |
| 9339 */ | |
| 9340 did_delete = FALSE; | |
| 9341 #ifdef FEAT_WINDOWS | |
| 9342 if (wp->w_next != NULL || wp->w_status_height) | |
| 9343 { | |
| 9344 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9345 line_count, (int)Rows, FALSE, NULL) == OK) | |
| 9346 did_delete = TRUE; | |
| 9347 else if (wp->w_next) | |
| 9348 return FAIL; | |
| 9349 } | |
| 9350 #endif | |
| 9351 /* | |
| 9352 * if no lines deleted, blank the lines that will end up below the window | |
| 9353 */ | |
| 9354 if (!did_delete) | |
| 9355 { | |
| 9356 #ifdef FEAT_WINDOWS | |
| 9357 wp->w_redr_status = TRUE; | |
| 9358 #endif | |
| 9359 redraw_cmdline = TRUE; | |
| 9360 nextrow = W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp); | |
| 9361 lastrow = nextrow + line_count; | |
| 9362 if (lastrow > Rows) | |
| 9363 lastrow = Rows; | |
| 9364 screen_fill(nextrow - line_count, lastrow - line_count, | |
| 9365 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9366 ' ', ' ', 0); | |
| 9367 } | |
| 9368 | |
| 9369 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, NULL) | |
| 9370 == FAIL) | |
| 9371 { | |
| 9372 /* deletion will have messed up other windows */ | |
| 9373 if (did_delete) | |
| 9374 { | |
| 9375 #ifdef FEAT_WINDOWS | |
| 9376 wp->w_redr_status = TRUE; | |
| 9377 #endif | |
| 9378 win_rest_invalid(W_NEXT(wp)); | |
| 9379 } | |
| 9380 return FAIL; | |
| 9381 } | |
| 9382 | |
| 9383 return OK; | |
| 9384 } | |
| 9385 | |
| 9386 /* | |
| 9387 * delete "line_count" window lines at "row" in window "wp" | |
| 9388 * If "invalid" is TRUE curwin->w_lines[] is invalidated. | |
| 9389 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9390 * scrolling | |
| 9391 * Return OK for success, FAIL if the lines are not deleted. | |
| 9392 */ | |
| 9393 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9394 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9395 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9396 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9397 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9398 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9399 int mayclear) |
| 7 | 9400 { |
| 9401 int retval; | |
| 9402 | |
| 9403 if (invalid) | |
| 9404 wp->w_lines_valid = 0; | |
| 9405 | |
| 9406 if (line_count > wp->w_height - row) | |
| 9407 line_count = wp->w_height - row; | |
| 9408 | |
| 9409 retval = win_do_lines(wp, row, line_count, mayclear, TRUE); | |
| 9410 if (retval != MAYBE) | |
| 9411 return retval; | |
| 9412 | |
| 9413 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
| 9414 (int)Rows, FALSE, NULL) == FAIL) | |
| 9415 return FAIL; | |
| 9416 | |
| 9417 #ifdef FEAT_WINDOWS | |
| 9418 /* | |
| 9419 * If there are windows or status lines below, try to put them at the | |
| 9420 * correct place. If we can't do that, they have to be redrawn. | |
| 9421 */ | |
| 9422 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9423 { | |
| 9424 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
| 9425 line_count, (int)Rows, NULL) == FAIL) | |
| 9426 { | |
| 9427 wp->w_redr_status = TRUE; | |
| 9428 win_rest_invalid(wp->w_next); | |
| 9429 } | |
| 9430 } | |
| 9431 /* | |
| 9432 * If this is the last window and there is no status line, redraw the | |
| 9433 * command line later. | |
| 9434 */ | |
| 9435 else | |
| 9436 #endif | |
| 9437 redraw_cmdline = TRUE; | |
| 9438 return OK; | |
| 9439 } | |
| 9440 | |
| 9441 /* | |
| 9442 * Common code for win_ins_lines() and win_del_lines(). | |
| 9443 * Returns OK or FAIL when the work has been done. | |
| 9444 * Returns MAYBE when not finished yet. | |
| 9445 */ | |
| 9446 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9447 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9448 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9449 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9450 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9451 int mayclear, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9452 int del) |
| 7 | 9453 { |
| 9454 int retval; | |
| 9455 | |
| 9456 if (!redrawing() || line_count <= 0) | |
| 9457 return FAIL; | |
| 9458 | |
| 9459 /* only a few lines left: redraw is faster */ | |
| 9460 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
|
9461 #ifdef FEAT_WINDOWS |
| 7 | 9462 && wp->w_width == Columns |
| 9463 #endif | |
| 9464 ) | |
| 9465 { | |
| 9466 screenclear(); /* will set wp->w_lines_valid to 0 */ | |
| 9467 return FAIL; | |
| 9468 } | |
| 9469 | |
| 9470 /* | |
| 9471 * Delete all remaining lines | |
| 9472 */ | |
| 9473 if (row + line_count >= wp->w_height) | |
| 9474 { | |
| 9475 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 9476 W_WINCOL(wp), (int)W_ENDCOL(wp), | |
| 9477 ' ', ' ', 0); | |
| 9478 return OK; | |
| 9479 } | |
| 9480 | |
| 9481 /* | |
| 9482 * when scrolling, the message on the command line should be cleared, | |
| 9483 * otherwise it will stay there forever. | |
| 9484 */ | |
| 9485 clear_cmdline = TRUE; | |
| 9486 | |
| 9487 /* | |
| 9488 * If the terminal can set a scroll region, use that. | |
| 9489 * Always do this in a vertically split window. This will redraw from | |
| 9490 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9491 * win_line(). | |
| 9492 * 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
|
9493 * 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
|
9494 * scroll-up . |
| 7 | 9495 */ |
| 9496 if (scroll_region | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9497 #ifdef FEAT_WINDOWS |
| 7 | 9498 || W_WIDTH(wp) != Columns |
| 9499 #endif | |
| 9500 ) | |
| 9501 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9502 #ifdef FEAT_WINDOWS |
| 7 | 9503 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9504 #endif | |
| 9505 scroll_region_set(wp, row); | |
| 9506 if (del) | |
| 9507 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9508 wp->w_height - row, FALSE, wp); | |
| 9509 else | |
| 9510 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
| 9511 wp->w_height - row, wp); | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9512 #ifdef FEAT_WINDOWS |
| 7 | 9513 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9514 #endif | |
| 9515 scroll_region_reset(); | |
| 9516 return retval; | |
| 9517 } | |
| 9518 | |
| 9519 #ifdef FEAT_WINDOWS | |
| 9520 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9521 return FAIL; | |
| 9522 #endif | |
| 9523 | |
| 9524 return MAYBE; | |
| 9525 } | |
| 9526 | |
| 9527 /* | |
| 9528 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9529 */ | |
| 9530 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9531 win_rest_invalid(win_T *wp) |
| 7 | 9532 { |
| 9533 #ifdef FEAT_WINDOWS | |
| 9534 while (wp != NULL) | |
| 9535 #else | |
| 9536 if (wp != NULL) | |
| 9537 #endif | |
| 9538 { | |
| 9539 redraw_win_later(wp, NOT_VALID); | |
| 9540 #ifdef FEAT_WINDOWS | |
| 9541 wp->w_redr_status = TRUE; | |
| 9542 wp = wp->w_next; | |
| 9543 #endif | |
| 9544 } | |
| 9545 redraw_cmdline = TRUE; | |
| 9546 } | |
| 9547 | |
| 9548 /* | |
| 9549 * The rest of the routines in this file perform screen manipulations. The | |
| 9550 * given operation is performed physically on the screen. The corresponding | |
| 9551 * change is also made to the internal screen image. In this way, the editor | |
| 9552 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9553 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9554 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9555 * screen changes, and in the meantime, everything still works. | |
| 9556 */ | |
| 9557 | |
| 9558 /* | |
| 9559 * types for inserting or deleting lines | |
| 9560 */ | |
| 9561 #define USE_T_CAL 1 | |
| 9562 #define USE_T_CDL 2 | |
| 9563 #define USE_T_AL 3 | |
| 9564 #define USE_T_CE 4 | |
| 9565 #define USE_T_DL 5 | |
| 9566 #define USE_T_SR 6 | |
| 9567 #define USE_NL 7 | |
| 9568 #define USE_T_CD 8 | |
| 9569 #define USE_REDRAW 9 | |
| 9570 | |
| 9571 /* | |
| 9572 * insert lines on the screen and update ScreenLines[] | |
| 9573 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9574 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9575 * 'row' and 'end' are relative to the start of the region. | |
| 9576 * | |
| 9577 * return FAIL for failure, OK for success. | |
| 9578 */ | |
| 446 | 9579 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9580 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9581 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9582 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9583 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9584 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9585 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9586 { |
| 9587 int i; | |
| 9588 int j; | |
| 9589 unsigned temp; | |
| 9590 int cursor_row; | |
| 9591 int type; | |
| 9592 int result_empty; | |
| 9593 int can_ce = can_clear(T_CE); | |
| 9594 | |
| 9595 /* | |
| 9596 * FAIL if | |
| 9597 * - there is no valid screen | |
| 9598 * - the screen has to be redrawn completely | |
| 9599 * - the line count is less than one | |
| 9600 * - the line count is more than 'ttyscroll' | |
| 9601 */ | |
| 9602 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll) | |
| 9603 return FAIL; | |
| 9604 | |
| 9605 /* | |
| 9606 * There are seven ways to insert lines: | |
| 9607 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9608 * characters from ScreenLines[]. | |
| 9609 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9610 * the insert is just empty lines | |
| 9611 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9612 * present or line_count > 1. It looks better if we do all the inserts | |
| 9613 * at once. | |
| 9614 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9615 * insert is just empty lines and T_CE is not present or line_count > | |
| 9616 * 1. | |
| 9617 * 4. Use T_AL (insert line) if it exists. | |
| 9618 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9619 * just empty lines. | |
| 9620 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9621 * just empty lines. | |
| 9622 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9623 * the 'da' flag is not set or we have clear line capability. | |
| 9624 * 8. redraw the characters from ScreenLines[]. | |
| 9625 * | |
| 9626 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9627 * the scrollbar for the window. It does have insert line, use that if it | |
| 9628 * exists. | |
| 9629 */ | |
| 9630 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
|
9631 #ifdef FEAT_WINDOWS |
| 7 | 9632 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9633 type = USE_REDRAW; | |
| 9634 else | |
| 9635 #endif | |
| 9636 if (can_clear(T_CD) && result_empty) | |
| 9637 type = USE_T_CD; | |
| 9638 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9639 type = USE_T_CAL; | |
| 9640 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9641 type = USE_T_CDL; | |
| 9642 else if (*T_AL != NUL) | |
| 9643 type = USE_T_AL; | |
| 9644 else if (can_ce && result_empty) | |
| 9645 type = USE_T_CE; | |
| 9646 else if (*T_DL != NUL && result_empty) | |
| 9647 type = USE_T_DL; | |
| 9648 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9649 type = USE_T_SR; | |
| 9650 else | |
| 9651 return FAIL; | |
| 9652 | |
| 9653 /* | |
| 9654 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9655 * care of t_db if necessary. | |
| 9656 */ | |
| 9657 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9658 type == USE_T_CE || type == USE_T_DL) | |
| 9659 return screen_del_lines(off, row, line_count, end, FALSE, wp); | |
| 9660 | |
| 9661 /* | |
| 9662 * If text is retained below the screen, first clear or delete as many | |
| 9663 * lines at the bottom of the window as are about to be inserted so that | |
| 9664 * the deleted lines won't later surface during a screen_del_lines. | |
| 9665 */ | |
| 9666 if (*T_DB) | |
| 9667 screen_del_lines(off, end - line_count, line_count, end, FALSE, wp); | |
| 9668 | |
| 9669 #ifdef FEAT_CLIPBOARD | |
| 9670 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9671 * or not the full width of the screen. */ | |
| 9672 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9673 # ifdef FEAT_WINDOWS |
| 7 | 9674 || (wp != NULL && wp->w_width != Columns) |
| 9675 # endif | |
| 9676 ) | |
| 3674 | 9677 clip_clear_selection(&clip_star); |
| 7 | 9678 else |
| 9679 clip_scroll_selection(-line_count); | |
| 9680 #endif | |
| 9681 | |
| 9682 #ifdef FEAT_GUI | |
| 9683 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9684 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9685 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9686 #endif |
| 9687 | |
| 9688 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9689 cursor_row = row; | |
| 9690 else | |
| 9691 cursor_row = row + off; | |
| 9692 | |
| 9693 /* | |
| 9694 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9695 * Clear the inserted lines in ScreenLines[]. | |
| 9696 */ | |
| 9697 row += off; | |
| 9698 end += off; | |
| 9699 for (i = 0; i < line_count; ++i) | |
| 9700 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9701 #ifdef FEAT_WINDOWS |
| 7 | 9702 if (wp != NULL && wp->w_width != Columns) |
| 9703 { | |
| 9704 /* need to copy part of a line */ | |
| 9705 j = end - 1 - i; | |
| 9706 while ((j -= line_count) >= row) | |
| 9707 linecopy(j + line_count, j, wp); | |
| 9708 j += line_count; | |
| 9709 if (can_clear((char_u *)" ")) | |
| 9710 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9711 else | |
| 9712 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9713 LineWraps[j] = FALSE; | |
| 9714 } | |
| 9715 else | |
| 9716 #endif | |
| 9717 { | |
| 9718 j = end - 1 - i; | |
| 9719 temp = LineOffset[j]; | |
| 9720 while ((j -= line_count) >= row) | |
| 9721 { | |
| 9722 LineOffset[j + line_count] = LineOffset[j]; | |
| 9723 LineWraps[j + line_count] = LineWraps[j]; | |
| 9724 } | |
| 9725 LineOffset[j + line_count] = temp; | |
| 9726 LineWraps[j + line_count] = FALSE; | |
| 9727 if (can_clear((char_u *)" ")) | |
| 9728 lineclear(temp, (int)Columns); | |
| 9729 else | |
| 9730 lineinvalid(temp, (int)Columns); | |
| 9731 } | |
| 9732 } | |
| 9733 | |
| 9734 screen_stop_highlight(); | |
| 9735 windgoto(cursor_row, 0); | |
| 9736 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9737 #ifdef FEAT_WINDOWS |
| 7 | 9738 /* redraw the characters */ |
| 9739 if (type == USE_REDRAW) | |
| 9740 redraw_block(row, end, wp); | |
| 9741 else | |
| 9742 #endif | |
| 9743 if (type == USE_T_CAL) | |
| 9744 { | |
| 9745 term_append_lines(line_count); | |
| 9746 screen_start(); /* don't know where cursor is now */ | |
| 9747 } | |
| 9748 else | |
| 9749 { | |
| 9750 for (i = 0; i < line_count; i++) | |
| 9751 { | |
| 9752 if (type == USE_T_AL) | |
| 9753 { | |
| 9754 if (i && cursor_row != 0) | |
| 9755 windgoto(cursor_row, 0); | |
| 9756 out_str(T_AL); | |
| 9757 } | |
| 9758 else /* type == USE_T_SR */ | |
| 9759 out_str(T_SR); | |
| 9760 screen_start(); /* don't know where cursor is now */ | |
| 9761 } | |
| 9762 } | |
| 9763 | |
| 9764 /* | |
| 9765 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9766 * have been scrolled down into the region. | |
| 9767 */ | |
| 9768 if (type == USE_T_SR && *T_DA) | |
| 9769 { | |
| 9770 for (i = 0; i < line_count; ++i) | |
| 9771 { | |
| 9772 windgoto(off + i, 0); | |
| 9773 out_str(T_CE); | |
| 9774 screen_start(); /* don't know where cursor is now */ | |
| 9775 } | |
| 9776 } | |
| 9777 | |
| 9778 #ifdef FEAT_GUI | |
| 9779 gui_can_update_cursor(); | |
| 9780 if (gui.in_use) | |
| 9781 out_flush(); /* always flush after a scroll */ | |
| 9782 #endif | |
| 9783 return OK; | |
| 9784 } | |
| 9785 | |
| 9786 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9787 * 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
|
9788 * "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
|
9789 * 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
|
9790 * "row" and "end" are relative to the start of the region. |
| 7 | 9791 * |
| 9792 * Return OK for success, FAIL if the lines are not deleted. | |
| 9793 */ | |
| 9794 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9795 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9796 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9797 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9798 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9799 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9800 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
|
9801 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9802 { |
| 9803 int j; | |
| 9804 int i; | |
| 9805 unsigned temp; | |
| 9806 int cursor_row; | |
| 9807 int cursor_end; | |
| 9808 int result_empty; /* result is empty until end of region */ | |
| 9809 int can_delete; /* deleting line codes can be used */ | |
| 9810 int type; | |
| 9811 | |
| 9812 /* | |
| 9813 * FAIL if | |
| 9814 * - there is no valid screen | |
| 9815 * - the screen has to be redrawn completely | |
| 9816 * - the line count is less than one | |
| 9817 * - the line count is more than 'ttyscroll' | |
| 9818 */ | |
| 9819 if (!screen_valid(TRUE) || line_count <= 0 || | |
| 9820 (!force && line_count > p_ttyscroll)) | |
| 9821 return FAIL; | |
| 9822 | |
| 9823 /* | |
| 9824 * Check if the rest of the current region will become empty. | |
| 9825 */ | |
| 9826 result_empty = row + line_count >= end; | |
| 9827 | |
| 9828 /* | |
| 9829 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 9830 * available. | |
| 9831 */ | |
| 9832 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 9833 | |
| 9834 /* | |
| 9835 * There are six ways to delete lines: | |
| 9836 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9837 * characters from ScreenLines[]. | |
| 9838 * 1. Use T_CD if it exists and the result is empty. | |
| 9839 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 9840 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 9841 * none of the other ways work. | |
| 9842 * 4. Use T_CE (erase line) if the result is empty. | |
| 9843 * 5. Use T_DL (delete line) if it exists. | |
| 9844 * 6. redraw the characters from ScreenLines[]. | |
| 9845 */ | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9846 #ifdef FEAT_WINDOWS |
| 7 | 9847 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) |
| 9848 type = USE_REDRAW; | |
| 9849 else | |
| 9850 #endif | |
| 9851 if (can_clear(T_CD) && result_empty) | |
| 9852 type = USE_T_CD; | |
| 9853 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 9854 /* | |
| 9855 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 9856 * its internal termcap... this works okay for tests which test *T_DB != | |
| 9857 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 9858 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 9859 * the trick... | |
| 9860 * Anyway, this hack will hopefully go away with the next OS release. | |
| 9861 * (Olaf Seibert) | |
| 9862 */ | |
| 9863 else if (row == 0 && T_DB == empty_option | |
| 9864 && (line_count == 1 || *T_CDL == NUL)) | |
| 9865 #else | |
| 9866 else if (row == 0 && ( | |
| 9867 #ifndef AMIGA | |
| 9868 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 9869 * up, so use delete-line command */ | |
| 9870 line_count == 1 || | |
| 9871 #endif | |
| 9872 *T_CDL == NUL)) | |
| 9873 #endif | |
| 9874 type = USE_NL; | |
| 9875 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 9876 type = USE_T_CDL; | |
| 9877 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
|
9878 #ifdef FEAT_WINDOWS |
| 7 | 9879 && (wp == NULL || wp->w_width == Columns) |
| 9880 #endif | |
| 9881 ) | |
| 9882 type = USE_T_CE; | |
| 9883 else if (*T_DL != NUL && can_delete) | |
| 9884 type = USE_T_DL; | |
| 9885 else if (*T_CDL != NUL && can_delete) | |
| 9886 type = USE_T_CDL; | |
| 9887 else | |
| 9888 return FAIL; | |
| 9889 | |
| 9890 #ifdef FEAT_CLIPBOARD | |
| 9891 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 9892 * not the full width of the screen. */ | |
| 9893 if (off + row > 0 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9894 # ifdef FEAT_WINDOWS |
| 7 | 9895 || (wp != NULL && wp->w_width != Columns) |
| 9896 # endif | |
| 9897 ) | |
| 3674 | 9898 clip_clear_selection(&clip_star); |
| 7 | 9899 else |
| 9900 clip_scroll_selection(line_count); | |
| 9901 #endif | |
| 9902 | |
| 9903 #ifdef FEAT_GUI | |
| 9904 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9905 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9906 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
|
9907 && gui.cursor_row < end + off); |
| 7 | 9908 #endif |
| 9909 | |
| 9910 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9911 { | |
| 9912 cursor_row = row; | |
| 9913 cursor_end = end; | |
| 9914 } | |
| 9915 else | |
| 9916 { | |
| 9917 cursor_row = row + off; | |
| 9918 cursor_end = end + off; | |
| 9919 } | |
| 9920 | |
| 9921 /* | |
| 9922 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 9923 * Clear the inserted lines in ScreenLines[]. | |
| 9924 */ | |
| 9925 row += off; | |
| 9926 end += off; | |
| 9927 for (i = 0; i < line_count; ++i) | |
| 9928 { | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9929 #ifdef FEAT_WINDOWS |
| 7 | 9930 if (wp != NULL && wp->w_width != Columns) |
| 9931 { | |
| 9932 /* need to copy part of a line */ | |
| 9933 j = row + i; | |
| 9934 while ((j += line_count) <= end - 1) | |
| 9935 linecopy(j - line_count, j, wp); | |
| 9936 j -= line_count; | |
| 9937 if (can_clear((char_u *)" ")) | |
| 9938 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9939 else | |
| 9940 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9941 LineWraps[j] = FALSE; | |
| 9942 } | |
| 9943 else | |
| 9944 #endif | |
| 9945 { | |
| 9946 /* whole width, moving the line pointers is faster */ | |
| 9947 j = row + i; | |
| 9948 temp = LineOffset[j]; | |
| 9949 while ((j += line_count) <= end - 1) | |
| 9950 { | |
| 9951 LineOffset[j - line_count] = LineOffset[j]; | |
| 9952 LineWraps[j - line_count] = LineWraps[j]; | |
| 9953 } | |
| 9954 LineOffset[j - line_count] = temp; | |
| 9955 LineWraps[j - line_count] = FALSE; | |
| 9956 if (can_clear((char_u *)" ")) | |
| 9957 lineclear(temp, (int)Columns); | |
| 9958 else | |
| 9959 lineinvalid(temp, (int)Columns); | |
| 9960 } | |
| 9961 } | |
| 9962 | |
| 9963 screen_stop_highlight(); | |
| 9964 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
9965 #ifdef FEAT_WINDOWS |
| 7 | 9966 /* redraw the characters */ |
| 9967 if (type == USE_REDRAW) | |
| 9968 redraw_block(row, end, wp); | |
| 9969 else | |
| 9970 #endif | |
| 9971 if (type == USE_T_CD) /* delete the lines */ | |
| 9972 { | |
| 9973 windgoto(cursor_row, 0); | |
| 9974 out_str(T_CD); | |
| 9975 screen_start(); /* don't know where cursor is now */ | |
| 9976 } | |
| 9977 else if (type == USE_T_CDL) | |
| 9978 { | |
| 9979 windgoto(cursor_row, 0); | |
| 9980 term_delete_lines(line_count); | |
| 9981 screen_start(); /* don't know where cursor is now */ | |
| 9982 } | |
| 9983 /* | |
| 9984 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 9985 * the whole screen (scroll region) up by outputting newlines on the | |
| 9986 * last line. | |
| 9987 */ | |
| 9988 else if (type == USE_NL) | |
| 9989 { | |
| 9990 windgoto(cursor_end - 1, 0); | |
| 9991 for (i = line_count; --i >= 0; ) | |
| 9992 out_char('\n'); /* cursor will remain on same line */ | |
| 9993 } | |
| 9994 else | |
| 9995 { | |
| 9996 for (i = line_count; --i >= 0; ) | |
| 9997 { | |
| 9998 if (type == USE_T_DL) | |
| 9999 { | |
| 10000 windgoto(cursor_row, 0); | |
| 10001 out_str(T_DL); /* delete a line */ | |
| 10002 } | |
| 10003 else /* type == USE_T_CE */ | |
| 10004 { | |
| 10005 windgoto(cursor_row + i, 0); | |
| 10006 out_str(T_CE); /* erase a line */ | |
| 10007 } | |
| 10008 screen_start(); /* don't know where cursor is now */ | |
| 10009 } | |
| 10010 } | |
| 10011 | |
| 10012 /* | |
| 10013 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10014 * scrolled up at the bottom of the region. | |
| 10015 */ | |
| 10016 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10017 { | |
| 10018 for (i = line_count; i > 0; --i) | |
| 10019 { | |
| 10020 windgoto(cursor_end - i, 0); | |
| 10021 out_str(T_CE); /* erase a line */ | |
| 10022 screen_start(); /* don't know where cursor is now */ | |
| 10023 } | |
| 10024 } | |
| 10025 | |
| 10026 #ifdef FEAT_GUI | |
| 10027 gui_can_update_cursor(); | |
| 10028 if (gui.in_use) | |
| 10029 out_flush(); /* always flush after a scroll */ | |
| 10030 #endif | |
| 10031 | |
| 10032 return OK; | |
| 10033 } | |
| 10034 | |
| 10035 /* | |
| 10036 * show the current mode and ruler | |
| 10037 * | |
| 10038 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10039 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10040 * cleared only if a mode is shown. | |
| 10041 * Return the length of the message (0 if no message). | |
| 10042 */ | |
| 10043 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10044 showmode(void) |
| 7 | 10045 { |
| 10046 int need_clear; | |
| 10047 int length = 0; | |
| 10048 int do_mode; | |
| 10049 int attr; | |
| 10050 int nwr_save; | |
| 10051 #ifdef FEAT_INS_EXPAND | |
| 10052 int sub_attr; | |
| 10053 #endif | |
| 10054 | |
| 642 | 10055 do_mode = ((p_smd && msg_silent == 0) |
| 10056 && ((State & INSERT) | |
| 10057 || restart_edit | |
| 5735 | 10058 || VIsual_active)); |
| 7 | 10059 if (do_mode || Recording) |
| 10060 { | |
| 10061 /* | |
| 10062 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10063 * Call char_avail() only when we are going to show something, because | |
| 10064 * it takes a bit of time. | |
| 10065 */ | |
| 10066 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10067 { | |
| 10068 redraw_cmdline = TRUE; /* show mode later */ | |
| 10069 return 0; | |
| 10070 } | |
| 10071 | |
| 10072 nwr_save = need_wait_return; | |
| 10073 | |
| 10074 /* wait a bit before overwriting an important message */ | |
| 10075 check_for_delay(FALSE); | |
| 10076 | |
| 10077 /* if the cmdline is more than one line high, erase top lines */ | |
| 10078 need_clear = clear_cmdline; | |
| 10079 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10080 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10081 | |
| 10082 /* Position on the last line in the window, column 0 */ | |
| 10083 msg_pos_mode(); | |
| 10084 cursor_off(); | |
| 10085 attr = hl_attr(HLF_CM); /* Highlight mode */ | |
| 10086 if (do_mode) | |
| 10087 { | |
| 10088 MSG_PUTS_ATTR("--", attr); | |
| 10089 #if defined(FEAT_XIM) | |
| 2520 | 10090 if ( |
| 10091 # ifdef FEAT_GUI_GTK | |
| 10092 preedit_get_status() | |
| 1668 | 10093 # else |
| 10094 im_get_status() | |
| 2520 | 10095 # endif |
| 1668 | 10096 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10097 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10098 MSG_PUTS_ATTR(" IM", attr); |
| 10099 # else | |
| 10100 MSG_PUTS_ATTR(" XIM", attr); | |
| 10101 # endif | |
| 10102 #endif | |
| 10103 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10104 if (gui.in_use) | |
| 10105 { | |
| 10106 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10107 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10108 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10109 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10110 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
|
10111 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10112 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
|
10113 } |
| 7 | 10114 } |
| 10115 #endif | |
| 10116 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10117 /* CTRL-X in Insert mode */ |
| 10118 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10119 { |
| 10120 /* These messages can get long, avoid a wrap in a narrow | |
| 10121 * window. Prefer showing edit_submode_extra. */ | |
| 10122 length = (Rows - msg_row) * Columns - 3; | |
| 10123 if (edit_submode_extra != NULL) | |
| 10124 length -= vim_strsize(edit_submode_extra); | |
| 10125 if (length > 0) | |
| 10126 { | |
| 10127 if (edit_submode_pre != NULL) | |
| 10128 length -= vim_strsize(edit_submode_pre); | |
| 10129 if (length - vim_strsize(edit_submode) > 0) | |
| 10130 { | |
| 10131 if (edit_submode_pre != NULL) | |
| 10132 msg_puts_attr(edit_submode_pre, attr); | |
| 10133 msg_puts_attr(edit_submode, attr); | |
| 10134 } | |
| 10135 if (edit_submode_extra != NULL) | |
| 10136 { | |
| 10137 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10138 if ((int)edit_submode_highl < (int)HLF_COUNT) | |
| 10139 sub_attr = hl_attr(edit_submode_highl); | |
| 10140 else | |
| 10141 sub_attr = attr; | |
| 10142 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10143 } | |
| 10144 } | |
| 10145 length = 0; | |
| 10146 } | |
| 10147 else | |
| 10148 #endif | |
| 10149 { | |
| 10150 #ifdef FEAT_VREPLACE | |
| 10151 if (State & VREPLACE_FLAG) | |
| 10152 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10153 else | |
| 10154 #endif | |
| 10155 if (State & REPLACE_FLAG) | |
| 10156 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10157 else if (State & INSERT) | |
| 10158 { | |
| 10159 #ifdef FEAT_RIGHTLEFT | |
| 10160 if (p_ri) | |
| 10161 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10162 #endif | |
| 10163 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10164 } | |
| 10165 else if (restart_edit == 'I') | |
| 10166 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10167 else if (restart_edit == 'R') | |
| 10168 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10169 else if (restart_edit == 'V') | |
| 10170 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10171 #ifdef FEAT_RIGHTLEFT | |
| 10172 if (p_hkmap) | |
| 10173 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10174 # ifdef FEAT_FKMAP | |
| 10175 if (p_fkmap) | |
| 10176 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10177 # endif | |
| 10178 #endif | |
| 10179 #ifdef FEAT_KEYMAP | |
| 10180 if (State & LANGMAP) | |
| 10181 { | |
| 10182 # ifdef FEAT_ARABIC | |
| 10183 if (curwin->w_p_arab) | |
| 10184 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10185 else | |
| 10186 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10187 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
|
10188 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10189 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10190 } |
| 10191 #endif | |
| 10192 if ((State & INSERT) && p_paste) | |
| 10193 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10194 | |
| 10195 if (VIsual_active) | |
| 10196 { | |
| 10197 char *p; | |
| 10198 | |
| 10199 /* Don't concatenate separate words to avoid translation | |
| 10200 * problems. */ | |
| 10201 switch ((VIsual_select ? 4 : 0) | |
| 10202 + (VIsual_mode == Ctrl_V) * 2 | |
| 10203 + (VIsual_mode == 'V')) | |
| 10204 { | |
| 10205 case 0: p = N_(" VISUAL"); break; | |
| 10206 case 1: p = N_(" VISUAL LINE"); break; | |
| 10207 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10208 case 4: p = N_(" SELECT"); break; | |
| 10209 case 5: p = N_(" SELECT LINE"); break; | |
| 10210 default: p = N_(" SELECT BLOCK"); break; | |
| 10211 } | |
| 10212 MSG_PUTS_ATTR(_(p), attr); | |
| 10213 } | |
| 10214 MSG_PUTS_ATTR(" --", attr); | |
| 10215 } | |
| 644 | 10216 |
| 7 | 10217 need_clear = TRUE; |
| 10218 } | |
| 10219 if (Recording | |
| 10220 #ifdef FEAT_INS_EXPAND | |
| 10221 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10222 #endif | |
| 10223 ) | |
| 10224 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10225 recording_mode(attr); |
| 7 | 10226 need_clear = TRUE; |
| 10227 } | |
| 644 | 10228 |
| 10229 mode_displayed = TRUE; | |
| 7 | 10230 if (need_clear || clear_cmdline) |
| 10231 msg_clr_eos(); | |
| 10232 msg_didout = FALSE; /* overwrite this message */ | |
| 10233 length = msg_col; | |
| 10234 msg_col = 0; | |
| 10235 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10236 } | |
| 10237 else if (clear_cmdline && msg_silent == 0) | |
| 10238 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10239 msg_clr_cmdline(); | |
| 10240 | |
| 10241 #ifdef FEAT_CMDL_INFO | |
| 10242 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10243 if (VIsual_active) | |
| 10244 clear_showcmd(); | |
| 10245 | |
| 10246 /* If the last window has no status line, the ruler is after the mode | |
| 10247 * message and must be redrawn */ | |
| 10248 if (redrawing() | |
| 10249 # ifdef FEAT_WINDOWS | |
| 10250 && lastwin->w_status_height == 0 | |
| 10251 # endif | |
| 10252 ) | |
| 10253 win_redr_ruler(lastwin, TRUE); | |
| 10254 #endif | |
| 10255 redraw_cmdline = FALSE; | |
| 10256 clear_cmdline = FALSE; | |
| 10257 | |
| 10258 return length; | |
| 10259 } | |
| 10260 | |
| 10261 /* | |
| 10262 * Position for a mode message. | |
| 10263 */ | |
| 10264 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10265 msg_pos_mode(void) |
| 7 | 10266 { |
| 10267 msg_col = 0; | |
| 10268 msg_row = Rows - 1; | |
| 10269 } | |
| 10270 | |
| 10271 /* | |
| 10272 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10273 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10274 * Caller should check "mode_displayed". |
| 7 | 10275 */ |
| 10276 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10277 unshowmode(int force) |
| 7 | 10278 { |
| 10279 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10280 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10281 */ |
| 10282 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10283 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10284 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10285 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10286 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10287 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10288 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10289 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10290 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10291 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10292 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10293 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10294 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10295 if (Recording) |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10296 recording_mode(hl_attr(HLF_CM)); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10297 msg_clr_eos(); |
| 7 | 10298 } |
| 10299 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10300 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10301 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10302 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10303 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10304 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10305 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10306 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10307 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10308 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10309 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10310 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10311 |
| 667 | 10312 #if defined(FEAT_WINDOWS) |
| 10313 /* | |
| 10314 * Draw the tab pages line at the top of the Vim window. | |
| 10315 */ | |
| 10316 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10317 draw_tabline(void) |
| 667 | 10318 { |
| 10319 int tabcount = 0; | |
| 10320 tabpage_T *tp; | |
| 10321 int tabwidth; | |
| 10322 int col = 0; | |
| 673 | 10323 int scol = 0; |
| 667 | 10324 int attr; |
| 10325 win_T *wp; | |
| 671 | 10326 win_T *cwp; |
| 10327 int wincount; | |
| 10328 int modified; | |
| 667 | 10329 int c; |
| 10330 int len; | |
| 10331 int attr_sel = hl_attr(HLF_TPS); | |
| 10332 int attr_nosel = hl_attr(HLF_TP); | |
| 10333 int attr_fill = hl_attr(HLF_TPF); | |
| 673 | 10334 char_u *p; |
| 677 | 10335 int room; |
| 10336 int use_sep_chars = (t_colors < 8 | |
| 10337 #ifdef FEAT_GUI | |
| 10338 && !gui.in_use | |
| 10339 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10340 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10341 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10342 #endif |
| 677 | 10343 ); |
| 673 | 10344 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10345 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10346 return; |
| 673 | 10347 redraw_tabline = FALSE; |
| 667 | 10348 |
| 685 | 10349 #ifdef FEAT_GUI_TABLINE |
| 798 | 10350 /* Take care of a GUI tabline. */ |
| 685 | 10351 if (gui_use_tabline()) |
| 10352 { | |
| 10353 gui_update_tabline(); | |
| 10354 return; | |
| 10355 } | |
| 10356 #endif | |
| 10357 | |
| 10358 if (tabline_height() < 1) | |
| 667 | 10359 return; |
| 10360 | |
| 677 | 10361 #if defined(FEAT_STL_OPT) |
| 681 | 10362 |
| 10363 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10364 for (scol = 0; scol < Columns; ++scol) | |
| 10365 TabPageIdxs[scol] = 0; | |
| 10366 | |
| 677 | 10367 /* Use the 'tabline' option if it's set. */ |
| 10368 if (*p_tal != NUL) | |
| 10369 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10370 int saved_did_emsg = did_emsg; |
| 680 | 10371 |
| 10372 /* Check for an error. If there is one we would loop in redrawing the | |
| 10373 * 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
|
10374 did_emsg = FALSE; |
| 677 | 10375 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10376 if (did_emsg) |
| 680 | 10377 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10378 (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
|
10379 did_emsg |= saved_did_emsg; |
| 680 | 10380 } |
| 10381 else | |
| 10382 #endif | |
| 10383 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10384 FOR_ALL_TABPAGES(tp) |
| 680 | 10385 ++tabcount; |
| 10386 | |
| 10387 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10388 if (tabwidth < 6) | |
| 10389 tabwidth = 6; | |
| 10390 | |
| 10391 attr = attr_nosel; | |
| 10392 tabcount = 0; | |
| 681 | 10393 scol = 0; |
| 699 | 10394 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10395 tp = tp->tp_next) | |
| 680 | 10396 { |
| 10397 scol = col; | |
| 10398 | |
| 10399 if (tp->tp_topframe == topframe) | |
| 10400 attr = attr_sel; | |
| 10401 if (use_sep_chars && col > 0) | |
| 10402 screen_putchar('|', 0, col++, attr); | |
| 10403 | |
| 10404 if (tp->tp_topframe != topframe) | |
| 10405 attr = attr_nosel; | |
| 10406 | |
| 10407 screen_putchar(' ', 0, col++, attr); | |
| 10408 | |
| 10409 if (tp == curtab) | |
| 10410 { | |
| 10411 cwp = curwin; | |
| 10412 wp = firstwin; | |
| 10413 } | |
| 10414 else | |
| 10415 { | |
| 10416 cwp = tp->tp_curwin; | |
| 10417 wp = tp->tp_firstwin; | |
| 10418 } | |
| 10419 | |
| 10420 modified = FALSE; | |
| 10421 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10422 if (bufIsChanged(wp->w_buffer)) | |
| 10423 modified = TRUE; | |
| 10424 if (modified || wincount > 1) | |
| 10425 { | |
| 10426 if (wincount > 1) | |
| 10427 { | |
| 10428 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10429 len = (int)STRLEN(NameBuff); |
| 699 | 10430 if (col + len >= Columns - 3) |
| 10431 break; | |
| 680 | 10432 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10433 #if defined(FEAT_SYN_HL) |
| 6106 | 10434 hl_combine_attr(attr, hl_attr(HLF_T)) |
| 677 | 10435 #else |
| 6106 | 10436 attr |
| 680 | 10437 #endif |
| 10438 ); | |
| 10439 col += len; | |
| 10440 } | |
| 10441 if (modified) | |
| 10442 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10443 screen_putchar(' ', 0, col++, attr); | |
| 10444 } | |
| 10445 | |
| 10446 room = scol - col + tabwidth - 1; | |
| 10447 if (room > 0) | |
| 10448 { | |
| 685 | 10449 /* Get buffer name in NameBuff[] */ |
| 10450 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10451 shorten_dir(NameBuff); |
| 680 | 10452 len = vim_strsize(NameBuff); |
| 10453 p = NameBuff; | |
| 677 | 10454 #ifdef FEAT_MBYTE |
| 680 | 10455 if (has_mbyte) |
| 10456 while (len > room) | |
| 10457 { | |
| 10458 len -= ptr2cells(p); | |
| 10459 mb_ptr_adv(p); | |
| 10460 } | |
| 10461 else | |
| 10462 #endif | |
| 10463 if (len > room) | |
| 677 | 10464 { |
| 680 | 10465 p += len - room; |
| 10466 len = room; | |
| 677 | 10467 } |
| 699 | 10468 if (len > Columns - col - 1) |
| 10469 len = Columns - col - 1; | |
| 680 | 10470 |
| 835 | 10471 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10472 col += len; |
| 10473 } | |
| 10474 screen_putchar(' ', 0, col++, attr); | |
| 10475 | |
| 10476 /* Store the tab page number in TabPageIdxs[], so that | |
| 10477 * jump_to_mouse() knows where each one is. */ | |
| 10478 ++tabcount; | |
| 10479 while (scol < col) | |
| 10480 TabPageIdxs[scol++] = tabcount; | |
| 10481 } | |
| 10482 | |
| 10483 if (use_sep_chars) | |
| 10484 c = '_'; | |
| 10485 else | |
| 10486 c = ' '; | |
| 10487 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10488 |
| 10489 /* Put an "X" for closing the current tab if there are several. */ | |
| 10490 if (first_tabpage->tp_next != NULL) | |
| 10491 { | |
| 10492 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10493 TabPageIdxs[Columns - 1] = -999; | |
| 10494 } | |
| 10495 } | |
| 834 | 10496 |
| 10497 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10498 * set. */ | |
| 10499 redraw_tabline = FALSE; | |
| 667 | 10500 } |
| 685 | 10501 |
| 10502 /* | |
| 10503 * Get buffer name for "buf" into NameBuff[]. | |
| 10504 * Takes care of special buffer names and translates special characters. | |
| 10505 */ | |
| 10506 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10507 get_trans_bufname(buf_T *buf) |
| 685 | 10508 { |
| 10509 if (buf_spname(buf) != NULL) | |
| 3839 | 10510 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10511 else |
| 10512 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10513 trans_characters(NameBuff, MAXPATHL); | |
| 10514 } | |
| 667 | 10515 #endif |
| 10516 | |
| 7 | 10517 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) |
| 10518 /* | |
| 10519 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10520 */ | |
| 10521 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10522 fillchar_status(int *attr, int is_curwin) |
| 7 | 10523 { |
| 10524 int fill; | |
| 10525 if (is_curwin) | |
| 10526 { | |
| 10527 *attr = hl_attr(HLF_S); | |
| 10528 fill = fill_stl; | |
| 10529 } | |
| 10530 else | |
| 10531 { | |
| 10532 *attr = hl_attr(HLF_SNC); | |
| 10533 fill = fill_stlnc; | |
| 10534 } | |
| 10535 /* Use fill when there is highlighting, and highlighting of current | |
| 10536 * window differs, or the fillchars differ, or this is not the | |
| 10537 * current window */ | |
| 10538 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
|
10539 || !is_curwin || ONE_WINDOW) |
| 7 | 10540 || (fill_stl != fill_stlnc))) |
| 10541 return fill; | |
| 10542 if (is_curwin) | |
| 10543 return '^'; | |
| 10544 return '='; | |
| 10545 } | |
| 10546 #endif | |
| 10547 | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10548 #ifdef FEAT_WINDOWS |
| 7 | 10549 /* |
| 10550 * Get the character to use in a separator between vertically split windows. | |
| 10551 * Get its attributes in "*attr". | |
| 10552 */ | |
| 10553 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10554 fillchar_vsep(int *attr) |
| 7 | 10555 { |
| 10556 *attr = hl_attr(HLF_C); | |
| 10557 if (*attr == 0 && fill_vert == ' ') | |
| 10558 return '|'; | |
| 10559 else | |
| 10560 return fill_vert; | |
| 10561 } | |
| 10562 #endif | |
| 10563 | |
| 10564 /* | |
| 10565 * Return TRUE if redrawing should currently be done. | |
| 10566 */ | |
| 10567 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10568 redrawing(void) |
| 7 | 10569 { |
| 10570 return (!RedrawingDisabled | |
| 10571 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); | |
| 10572 } | |
| 10573 | |
| 10574 /* | |
| 10575 * Return TRUE if printing messages should currently be done. | |
| 10576 */ | |
| 10577 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10578 messaging(void) |
| 7 | 10579 { |
| 10580 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10581 } | |
| 10582 | |
| 10583 /* | |
| 10584 * Show current status info in ruler and various other places | |
| 10585 * If always is FALSE, only show ruler if position has changed. | |
| 10586 */ | |
| 10587 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10588 showruler(int always) |
| 7 | 10589 { |
| 10590 if (!always && !redrawing()) | |
| 10591 return; | |
| 574 | 10592 #ifdef FEAT_INS_EXPAND |
| 10593 if (pum_visible()) | |
| 10594 { | |
| 639 | 10595 # ifdef FEAT_WINDOWS |
| 574 | 10596 /* Don't redraw right now, do it later. */ |
| 10597 curwin->w_redr_status = TRUE; | |
| 639 | 10598 # endif |
| 574 | 10599 return; |
| 10600 } | |
| 10601 #endif | |
| 7 | 10602 #if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS) |
| 40 | 10603 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10604 { |
| 1983 | 10605 redraw_custom_statusline(curwin); |
| 680 | 10606 } |
| 7 | 10607 else |
| 10608 #endif | |
| 10609 #ifdef FEAT_CMDL_INFO | |
| 10610 win_redr_ruler(curwin, always); | |
| 10611 #endif | |
| 10612 | |
| 10613 #ifdef FEAT_TITLE | |
| 10614 if (need_maketitle | |
| 10615 # ifdef FEAT_STL_OPT | |
| 10616 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10617 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10618 # endif | |
| 10619 ) | |
| 10620 maketitle(); | |
| 10621 #endif | |
| 1588 | 10622 #ifdef FEAT_WINDOWS |
| 10623 /* Redraw the tab pages line if needed. */ | |
| 10624 if (redraw_tabline) | |
| 10625 draw_tabline(); | |
| 10626 #endif | |
| 7 | 10627 } |
| 10628 | |
| 10629 #ifdef FEAT_CMDL_INFO | |
| 10630 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10631 win_redr_ruler(win_T *wp, int always) |
| 7 | 10632 { |
| 1869 | 10633 #define RULER_BUF_LEN 70 |
| 10634 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10635 int row; |
| 10636 int fillchar; | |
| 10637 int attr; | |
| 10638 int empty_line = FALSE; | |
| 10639 colnr_T virtcol; | |
| 10640 int i; | |
| 1869 | 10641 size_t len; |
| 7 | 10642 int o; |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10643 #ifdef FEAT_WINDOWS |
| 7 | 10644 int this_ru_col; |
| 10645 int off = 0; | |
| 10646 int width = Columns; | |
| 10647 # define WITH_OFF(x) x | |
| 10648 # define WITH_WIDTH(x) x | |
| 10649 #else | |
| 10650 # define WITH_OFF(x) 0 | |
| 10651 # define WITH_WIDTH(x) Columns | |
| 10652 # define this_ru_col ru_col | |
| 10653 #endif | |
| 10654 | |
| 10655 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10656 if (!p_ru) | |
| 10657 return; | |
| 10658 | |
| 10659 /* | |
| 10660 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10661 * after deleting lines, before cursor.lnum is corrected. | |
| 10662 */ | |
| 10663 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10664 return; | |
| 10665 | |
| 10666 #ifdef FEAT_INS_EXPAND | |
| 10667 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10668 * the (long) mode message. */ | |
| 10669 # ifdef FEAT_WINDOWS | |
| 10670 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10671 # endif | |
| 10672 if (edit_submode != NULL) | |
| 10673 return; | |
| 540 | 10674 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10675 if (pum_visible()) | |
| 10676 return; | |
| 7 | 10677 #endif |
| 10678 | |
| 10679 #ifdef FEAT_STL_OPT | |
| 10680 if (*p_ruf) | |
| 10681 { | |
| 680 | 10682 int save_called_emsg = called_emsg; |
| 10683 | |
| 10684 called_emsg = FALSE; | |
| 7 | 10685 win_redr_custom(wp, TRUE); |
| 680 | 10686 if (called_emsg) |
| 10687 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10688 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10689 called_emsg |= save_called_emsg; |
| 7 | 10690 return; |
| 10691 } | |
| 10692 #endif | |
| 10693 | |
| 10694 /* | |
| 10695 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10696 */ | |
| 10697 if (!(State & INSERT) | |
| 10698 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10699 empty_line = TRUE; | |
| 10700 | |
| 10701 /* | |
| 10702 * Only draw the ruler when something changed. | |
| 10703 */ | |
| 10704 validate_virtcol_win(wp); | |
| 10705 if ( redraw_cmdline | |
| 10706 || always | |
| 10707 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10708 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10709 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10710 #ifdef FEAT_VIRTUALEDIT | |
| 10711 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10712 #endif | |
| 10713 || wp->w_topline != wp->w_ru_topline | |
| 10714 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10715 #ifdef FEAT_DIFF | |
| 10716 || wp->w_topfill != wp->w_ru_topfill | |
| 10717 #endif | |
| 10718 || empty_line != wp->w_ru_empty) | |
| 10719 { | |
| 10720 cursor_off(); | |
| 10721 #ifdef FEAT_WINDOWS | |
| 10722 if (wp->w_status_height) | |
| 10723 { | |
| 10724 row = W_WINROW(wp) + wp->w_height; | |
| 10725 fillchar = fillchar_status(&attr, wp == curwin); | |
| 10726 off = W_WINCOL(wp); | |
| 10727 width = W_WIDTH(wp); | |
| 10728 } | |
| 10729 else | |
| 10730 #endif | |
| 10731 { | |
| 10732 row = Rows - 1; | |
| 10733 fillchar = ' '; | |
| 10734 attr = 0; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10735 #ifdef FEAT_WINDOWS |
| 7 | 10736 width = Columns; |
| 10737 off = 0; | |
| 10738 #endif | |
| 10739 } | |
| 10740 | |
| 10741 /* In list mode virtcol needs to be recomputed */ | |
| 10742 virtcol = wp->w_virtcol; | |
| 10743 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10744 { | |
| 10745 wp->w_p_list = FALSE; | |
| 10746 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10747 wp->w_p_list = TRUE; | |
| 10748 } | |
| 10749 | |
| 10750 /* | |
| 10751 * Some sprintfs return the length, some return a pointer. | |
| 10752 * To avoid portability problems we use strlen() here. | |
| 10753 */ | |
| 1869 | 10754 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 10755 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 10756 ? 0L | |
| 10757 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 10758 len = STRLEN(buffer); |
| 10759 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 10760 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 10761 (int)virtcol + 1); | |
| 10762 | |
| 10763 /* | |
| 10764 * Add a "50%" if there is room for it. | |
| 10765 * On the last line, don't print in the last column (scrolls the | |
| 10766 * screen up on some terminals). | |
| 10767 */ | |
| 10768 i = (int)STRLEN(buffer); | |
| 1869 | 10769 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 10770 o = i + vim_strsize(buffer + i + 1); |
| 10771 #ifdef FEAT_WINDOWS | |
| 10772 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 10773 #endif | |
| 10774 ++o; | |
|
8643
24b43dd167eb
commit https://github.com/vim/vim/commit/44a2f923c00f1384c9ecde12fb5b4711bc20702e
Christian Brabandt <cb@256bit.org>
parents:
8627
diff
changeset
|
10775 #ifdef FEAT_WINDOWS |
| 7 | 10776 this_ru_col = ru_col - (Columns - width); |
| 10777 if (this_ru_col < 0) | |
| 10778 this_ru_col = 0; | |
| 10779 #endif | |
| 10780 /* Never use more than half the window/screen width, leave the other | |
| 10781 * half for the filename. */ | |
| 10782 if (this_ru_col < (WITH_WIDTH(width) + 1) / 2) | |
| 10783 this_ru_col = (WITH_WIDTH(width) + 1) / 2; | |
| 10784 if (this_ru_col + o < WITH_WIDTH(width)) | |
| 10785 { | |
| 6466 | 10786 /* need at least 3 chars left for get_rel_pos() + NUL */ |
| 10787 while (this_ru_col + o < WITH_WIDTH(width) && RULER_BUF_LEN > i + 4) | |
| 7 | 10788 { |
| 10789 #ifdef FEAT_MBYTE | |
| 10790 if (has_mbyte) | |
| 10791 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 10792 else | |
| 10793 #endif | |
| 10794 buffer[i++] = fillchar; | |
| 10795 ++o; | |
| 10796 } | |
| 1869 | 10797 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 10798 } |
| 10799 /* Truncate at window boundary. */ | |
| 10800 #ifdef FEAT_MBYTE | |
| 10801 if (has_mbyte) | |
| 10802 { | |
| 10803 o = 0; | |
| 474 | 10804 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 10805 { |
| 10806 o += (*mb_ptr2cells)(buffer + i); | |
| 10807 if (this_ru_col + o > WITH_WIDTH(width)) | |
| 10808 { | |
| 10809 buffer[i] = NUL; | |
| 10810 break; | |
| 10811 } | |
| 10812 } | |
| 10813 } | |
| 10814 else | |
| 10815 #endif | |
| 10816 if (this_ru_col + (int)STRLEN(buffer) > WITH_WIDTH(width)) | |
| 10817 buffer[WITH_WIDTH(width) - this_ru_col] = NUL; | |
| 10818 | |
| 10819 screen_puts(buffer, row, this_ru_col + WITH_OFF(off), attr); | |
| 10820 i = redraw_cmdline; | |
| 10821 screen_fill(row, row + 1, | |
| 10822 this_ru_col + WITH_OFF(off) + (int)STRLEN(buffer), | |
| 10823 (int)(WITH_OFF(off) + WITH_WIDTH(width)), | |
| 10824 fillchar, fillchar, attr); | |
| 10825 /* don't redraw the cmdline because of showing the ruler */ | |
| 10826 redraw_cmdline = i; | |
| 10827 wp->w_ru_cursor = wp->w_cursor; | |
| 10828 wp->w_ru_virtcol = wp->w_virtcol; | |
| 10829 wp->w_ru_empty = empty_line; | |
| 10830 wp->w_ru_topline = wp->w_topline; | |
| 10831 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 10832 #ifdef FEAT_DIFF | |
| 10833 wp->w_ru_topfill = wp->w_topfill; | |
| 10834 #endif | |
| 10835 } | |
| 10836 } | |
| 10837 #endif | |
| 13 | 10838 |
| 10839 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 10840 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
10841 * 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
|
10842 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 10843 * Otherwise it depends on 'numberwidth' and the line count. |
| 10844 */ | |
| 10845 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10846 number_width(win_T *wp) |
| 13 | 10847 { |
| 10848 int n; | |
| 10849 linenr_T lnum; | |
| 10850 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10851 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
|
10852 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10853 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10854 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10855 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
10856 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
|
10857 |
| 6679 | 10858 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 10859 return wp->w_nrwidth_width; |
| 10860 wp->w_nrwidth_line_count = lnum; | |
| 10861 | |
| 10862 n = 0; | |
| 10863 do | |
| 10864 { | |
| 856 | 10865 lnum /= 10; |
| 10866 ++n; | |
| 13 | 10867 } while (lnum > 0); |
| 10868 | |
| 10869 /* 'numberwidth' gives the minimal width plus one */ | |
| 10870 if (n < wp->w_p_nuw - 1) | |
| 10871 n = wp->w_p_nuw - 1; | |
| 10872 | |
| 10873 wp->w_nrwidth_width = n; | |
| 6679 | 10874 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 10875 return n; |
| 10876 } | |
| 10877 #endif | |
| 3986 | 10878 |
| 10879 /* | |
| 10880 * Return the current cursor column. This is the actual position on the | |
| 10881 * screen. First column is 0. | |
| 10882 */ | |
| 10883 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10884 screen_screencol(void) |
| 3986 | 10885 { |
| 10886 return screen_cur_col; | |
| 10887 } | |
| 10888 | |
| 10889 /* | |
| 10890 * Return the current cursor row. This is the actual position on the screen. | |
| 10891 * First row is 0. | |
| 10892 */ | |
| 10893 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10894 screen_screenrow(void) |
| 3986 | 10895 { |
| 10896 return screen_cur_row; | |
| 10897 } |