Mercurial > vim
annotate src/screen.c @ 13666:57da3d873f20 v8.0.1705
patch 8.0.1705: when making a vertical split the mode message isn't updated
commit https://github.com/vim/vim/commit/5bab555c2f1b3b86d57e4adeb86d908eff477fc9
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Apr 13 20:41:29 2018 +0200
patch 8.0.1705: when making a vertical split the mode message isn't updated
Problem: When making a vertical split the mode message isn't always
updated, "VISUAL" remains. (Alexei Averchenko)
Solution: Only reset clear_cmdline when filling all columns of the last
screen line. (Tom M. closes #2611)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 13 Apr 2018 20:45:07 +0200 |
| parents | cec5137d5332 |
| children | 0e9b2971d7c3 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9992
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * screen.c: code for displaying on the screen | |
| 12 * | |
| 13 * Output to the screen (console, terminal emulator or GUI window) is minimized | |
| 14 * by remembering what is already on the screen, and only updating the parts | |
| 15 * that changed. | |
| 16 * | |
| 17 * ScreenLines[off] Contains a copy of the whole screen, as it is currently | |
| 18 * displayed (excluding text written by external commands). | |
| 19 * ScreenAttrs[off] Contains the associated attributes. | |
| 20 * LineOffset[row] Contains the offset into ScreenLines*[] and ScreenAttrs[] | |
| 21 * for each line. | |
| 22 * LineWraps[row] Flag for each line whether it wraps to the next line. | |
| 23 * | |
| 24 * For double-byte characters, two consecutive bytes in ScreenLines[] can form | |
| 25 * one character which occupies two display cells. | |
| 26 * For UTF-8 a multi-byte character is converted to Unicode and stored in | |
| 27 * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
28 * character without composing chars ScreenLinesUC[] will be 0 and |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
29 * ScreenLinesC[][] is not used. When the character occupies two display |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
30 * cells the next byte in ScreenLines[] is 0. |
| 714 | 31 * ScreenLinesC[][] contain up to 'maxcombine' composing characters |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
32 * (drawn on top of the first character). There is 0 after the last one used. |
| 7 | 33 * ScreenLines2[] is only used for euc-jp to store the second byte if the |
| 34 * first byte is 0x8e (single-width character). | |
| 35 * | |
| 36 * The screen_*() functions write to the screen and handle updating | |
| 37 * ScreenLines[]. | |
| 38 * | |
| 39 * update_screen() is the function that updates all windows and status lines. | |
| 40 * It is called form the main loop when must_redraw is non-zero. It may be | |
| 1213 | 41 * called from other places when an immediate screen update is needed. |
| 7 | 42 * |
| 43 * The part of the buffer that is displayed in a window is set with: | |
| 44 * - w_topline (first buffer line in window) | |
| 5946 | 45 * - w_topfill (filler lines above the first line) |
| 7 | 46 * - w_leftcol (leftmost window cell in window), |
| 47 * - w_skipcol (skipped window cells of first line) | |
| 48 * | |
| 49 * Commands that only move the cursor around in a window, do not need to take | |
| 50 * action to update the display. The main loop will check if w_topline is | |
| 51 * valid and update it (scroll the window) when needed. | |
| 52 * | |
| 53 * Commands that scroll a window change w_topline and must call | |
| 54 * check_cursor() to move the cursor into the visible part of the window, and | |
| 55 * call redraw_later(VALID) to have the window displayed by update_screen() | |
| 56 * later. | |
| 57 * | |
| 58 * Commands that change text in the buffer must call changed_bytes() or | |
| 59 * changed_lines() to mark the area that changed and will require updating | |
| 60 * later. The main loop will call update_screen(), which will update each | |
| 61 * window that shows the changed buffer. This assumes text above the change | |
| 62 * can remain displayed as it is. Text after the change may need updating for | |
| 63 * scrolling, folding and syntax highlighting. | |
| 64 * | |
| 65 * Commands that change how a window is displayed (e.g., setting 'list') or | |
| 66 * invalidate the contents of a window in another way (e.g., change fold | |
| 67 * settings), must call redraw_later(NOT_VALID) to have the whole window | |
| 68 * redisplayed by update_screen() later. | |
| 69 * | |
| 70 * Commands that change how a buffer is displayed (e.g., setting 'tabstop') | |
| 71 * must call redraw_curbuf_later(NOT_VALID) to have all the windows for the | |
| 72 * buffer redisplayed by update_screen() later. | |
| 73 * | |
| 743 | 74 * Commands that change highlighting and possibly cause a scroll too must call |
| 75 * redraw_later(SOME_VALID) to update the whole window but still use scrolling | |
| 76 * to avoid redrawing everything. But the length of displayed lines must not | |
| 77 * change, use NOT_VALID then. | |
| 78 * | |
| 7 | 79 * Commands that move the window position must call redraw_later(NOT_VALID). |
| 80 * TODO: should minimize redrawing by scrolling when possible. | |
| 81 * | |
| 82 * Commands that change everything (e.g., resizing the screen) must call | |
| 83 * redraw_all_later(NOT_VALID) or redraw_all_later(CLEAR). | |
| 84 * | |
| 85 * Things that are handled indirectly: | |
| 86 * - When messages scroll the screen up, msg_scrolled will be set and | |
| 87 * update_screen() called to redraw. | |
| 88 */ | |
| 89 | |
| 90 #include "vim.h" | |
| 91 | |
| 3586 | 92 #define MB_FILLER_CHAR '<' /* character used when a double-width character |
| 93 * doesn't fit. */ | |
| 94 | |
| 7 | 95 /* |
| 96 * The attributes that are actually active for writing to the screen. | |
| 97 */ | |
| 98 static int screen_attr = 0; | |
| 99 | |
| 100 /* | |
| 101 * Positioning the cursor is reduced by remembering the last position. | |
| 102 * Mostly used by windgoto() and screen_char(). | |
| 103 */ | |
| 104 static int screen_cur_row, screen_cur_col; /* last known cursor position */ | |
| 105 | |
| 106 #ifdef FEAT_SEARCH_EXTRA | |
| 107 static match_T search_hl; /* used for 'hlsearch' highlight matching */ | |
| 108 #endif | |
| 109 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
110 #if defined(FEAT_MENU) || defined(FEAT_FOLDING) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
111 static int text_to_screenline(win_T *wp, char_u *text, int col); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
112 #endif |
| 7 | 113 #ifdef FEAT_FOLDING |
| 114 static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */ | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
115 static int compute_foldcolumn(win_T *wp, int col); |
| 7 | 116 #endif |
| 117 | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
118 /* Flag that is set when drawing for a callback, not from the main command |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
119 * loop. */ |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
120 static int redrawing_for_callback = 0; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
121 |
| 7 | 122 /* |
| 123 * Buffer for one screen line (characters and attributes). | |
| 124 */ | |
| 125 static schar_T *current_ScreenLine; | |
| 126 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
127 static void win_update(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
128 static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T hl); |
| 7 | 129 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
130 static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T lnum, int row); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
131 static void fill_foldcolumn(char_u *p, win_T *wp, int closed, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
132 static void copy_text_attr(int off, char_u *buf, int len, int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
133 #endif |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
134 static int win_line(win_T *, linenr_T, int, int, int nochange); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
135 static int char_needs_redraw(int off_from, int off_to, int cols); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
136 static void draw_vsep_win(win_T *wp, int row); |
| 680 | 137 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
138 static void redraw_custom_statusline(win_T *wp); |
| 680 | 139 #endif |
| 7 | 140 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 141 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
142 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
143 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 static void init_search_hl(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
145 static void prepare_search_hl(win_T *wp, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
146 static void next_search_hl(win_T *win, match_T *shl, linenr_T lnum, colnr_T mincol, matchitem_T *cur); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
147 static int next_search_hl_pos(match_T *shl, linenr_T lnum, posmatch_T *pos, colnr_T mincol); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
148 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
149 static void screen_start_highlight(int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
150 static void screen_char(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
151 #ifdef FEAT_MBYTE |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
152 static void screen_char_2(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
153 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
154 static void screenclear2(void); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
155 static void lineclear(unsigned off, int width, int attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 static void lineinvalid(unsigned off, int width); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
157 static void linecopy(int to, int from, win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
158 static void redraw_block(int row, int end, win_T *wp); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
159 static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del, int clear_attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
160 static void win_rest_invalid(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
161 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
162 static void recording_mode(int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
163 static void draw_tabline(void); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
164 static int fillchar_status(int *attr, win_T *wp); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
165 static int fillchar_vsep(int *attr); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
166 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
167 static void redraw_win_toolbar(win_T *wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
168 #endif |
| 7 | 169 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
170 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 171 #endif |
| 172 #ifdef FEAT_CMDL_INFO | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
173 static void win_redr_ruler(win_T *wp, int always); |
| 7 | 174 #endif |
| 175 | |
| 176 /* Ugly global: overrule attribute used by screen_char() */ | |
| 177 static int screen_char_attr = 0; | |
| 178 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
179 #if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
180 /* Can limit syntax highlight time to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
181 # define SYN_TIME_LIMIT 1 |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
182 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
183 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
184 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
185 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
186 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
187 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
188 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
189 |
| 7 | 190 /* |
| 191 * Redraw the current window later, with update_screen(type). | |
| 192 * Set must_redraw only if not already set to a higher value. | |
| 193 * e.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. | |
| 194 */ | |
| 195 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
196 redraw_later(int type) |
| 7 | 197 { |
| 198 redraw_win_later(curwin, type); | |
| 199 } | |
| 200 | |
| 201 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
202 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
203 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
204 int type) |
| 7 | 205 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
206 if (!exiting && wp->w_redr_type < type) |
| 7 | 207 { |
| 208 wp->w_redr_type = type; | |
| 209 if (type >= NOT_VALID) | |
| 210 wp->w_lines_valid = 0; | |
| 211 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 212 must_redraw = type; | |
| 213 } | |
| 214 } | |
| 215 | |
| 216 /* | |
| 217 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 218 * after executing a shell command that messes up the screen. | |
| 219 */ | |
| 220 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
221 redraw_later_clear(void) |
| 7 | 222 { |
| 223 redraw_all_later(CLEAR); | |
| 826 | 224 #ifdef FEAT_GUI |
| 225 if (gui.in_use) | |
| 226 /* Use a code that will reset gui.highlight_mask in | |
| 227 * gui_stop_highlight(). */ | |
| 228 screen_attr = HL_ALL + 1; | |
| 229 else | |
| 230 #endif | |
| 231 /* Use attributes that is very unlikely to appear in text. */ | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
232 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 233 } |
| 234 | |
| 235 /* | |
| 236 * Mark all windows to be redrawn later. | |
| 237 */ | |
| 238 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
239 redraw_all_later(int type) |
| 7 | 240 { |
| 241 win_T *wp; | |
| 242 | |
| 243 FOR_ALL_WINDOWS(wp) | |
| 244 { | |
| 245 redraw_win_later(wp, type); | |
| 246 } | |
| 247 } | |
| 248 | |
| 249 /* | |
| 301 | 250 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 251 */ |
| 252 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
253 redraw_curbuf_later(int type) |
| 7 | 254 { |
| 255 redraw_buf_later(curbuf, type); | |
| 256 } | |
| 257 | |
| 258 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
259 redraw_buf_later(buf_T *buf, int type) |
| 7 | 260 { |
| 261 win_T *wp; | |
| 262 | |
| 263 FOR_ALL_WINDOWS(wp) | |
| 264 { | |
| 265 if (wp->w_buffer == buf) | |
| 266 redraw_win_later(wp, type); | |
| 267 } | |
| 268 } | |
| 269 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
270 void |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
271 redraw_buf_and_status_later(buf_T *buf, int type) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
272 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
273 win_T *wp; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
274 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
275 #ifdef FEAT_WILDMENU |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
276 if (wild_menu_showing != 0) |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
277 /* Don't redraw while the command line completion is displayed, it |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
278 * would disappear. */ |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
279 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
280 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
281 FOR_ALL_WINDOWS(wp) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
282 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
283 if (wp->w_buffer == buf) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
284 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
285 redraw_win_later(wp, type); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
286 wp->w_redr_status = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
287 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
288 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
289 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
290 |
| 7 | 291 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
292 * Redraw as soon as possible. When the command line is not scrolled redraw |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
293 * right away and restore what was on the command line. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
294 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
295 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
296 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
297 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
298 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
299 int rows; |
| 6959 | 300 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
301 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
302 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
303 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
304 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
305 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
306 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
307 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 u8char_T *screenlineC[MAX_MCO]; /* copy from ScreenLinesC[][] */ |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
309 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
311 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
312 redraw_later(type); |
| 6959 | 313 if (msg_scrolled || (State != NORMAL && State != NORMAL_BUSY) || exiting) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
315 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 317 rows = screen_Rows - cmdline_row; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
318 screenline = (schar_T *)lalloc( |
| 6959 | 319 (long_u)(rows * cols * sizeof(schar_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
320 screenattr = (sattr_T *)lalloc( |
| 6959 | 321 (long_u)(rows * cols * sizeof(sattr_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
323 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
326 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
327 screenlineUC = (u8char_T *)lalloc( |
| 6959 | 328 (long_u)(rows * cols * sizeof(u8char_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
329 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
330 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
332 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 screenlineC[i] = (u8char_T *)lalloc( |
| 6959 | 334 (long_u)(rows * cols * sizeof(u8char_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 screenline2 = (schar_T *)lalloc( |
| 6959 | 342 (long_u)(rows * cols * sizeof(schar_T)), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 /* Save the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 { |
| 6959 | 353 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 355 (size_t)cols * sizeof(schar_T)); |
| 356 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 358 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
359 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
361 { |
| 6959 | 362 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
363 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 364 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 for (i = 0; i < p_mco; ++i) |
| 6959 | 366 mch_memmove(screenlineC[i] + r * cols, |
| 367 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 368 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
369 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 371 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 373 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
375 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
378 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
380 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
383 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 /* Restore the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
387 mch_memmove(current_ScreenLine, |
| 6959 | 388 screenline + r * cols, |
| 389 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 mch_memmove(ScreenAttrs + off, |
| 6959 | 391 screenattr + r * cols, |
| 392 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
393 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
395 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
396 mch_memmove(ScreenLinesUC + off, |
| 6959 | 397 screenlineUC + r * cols, |
| 398 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
400 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 401 screenlineC[i] + r * cols, |
| 402 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
405 mch_memmove(ScreenLines2 + off, |
| 6959 | 406 screenline2 + r * cols, |
| 407 (size_t)cols * sizeof(schar_T)); | |
| 408 #endif | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
409 screen_line(cmdline_row + r, 0, cols, cols, FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
410 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
411 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
414 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
415 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 #ifdef FEAT_MBYTE |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 #endif |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
428 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
429 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
430 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
431 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
432 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
434 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
435 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
436 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
437 * Invoked after an asynchronous callback is called. |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
438 * If an echo command was used the cursor needs to be put back where |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
439 * it belongs. If highlighting was changed a redraw is needed. |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
440 * If "call_update_screen" is FALSE don't call update_screen() when at the |
|
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
441 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
442 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
443 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
444 redraw_after_callback(int call_update_screen) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
445 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
446 ++redrawing_for_callback; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
447 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
448 if (State == HITRETURN || State == ASKMORE) |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
449 ; /* do nothing */ |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
450 else if (State & CMDLINE) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
451 { |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
452 /* Redrawing only works when the screen didn't scroll. Don't clear |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
453 * wildmenu entries. */ |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
454 if (msg_scrolled == 0 |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
455 #ifdef FEAT_WILDMENU |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
456 && wild_menu_showing == 0 |
|
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
457 #endif |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
458 && call_update_screen) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
459 update_screen(0); |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
460 /* Redraw in the same position, so that the user can continue |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
461 * editing the command. */ |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
462 redrawcmdline_ex(FALSE); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
463 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
464 else if (State & (NORMAL | INSERT | TERMINAL)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
465 { |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
466 /* keep the command line if possible */ |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
467 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
468 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
469 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
470 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
471 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
472 if (gui.in_use && !gui_mch_is_blink_off()) |
|
9428
0c7f47088e55
commit https://github.com/vim/vim/commit/9d5d3c9c4468ad76f16b50eabd3d9e7eab2ed44d
Christian Brabandt <cb@256bit.org>
parents:
9320
diff
changeset
|
473 /* 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
|
474 * flicker. */ |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
475 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
476 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
477 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
478 out_flush(); |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
479 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
480 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
481 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
482 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
483 /* |
| 7 | 484 * Changed something in the current window, at buffer line "lnum", that |
| 485 * requires that line and possibly other lines to be redrawn. | |
| 486 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 487 * Used to remove the "$" from a change command. | |
| 488 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 489 * may become invalid and the whole window will have to be redrawn. | |
| 490 */ | |
| 491 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
492 redrawWinline( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
493 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
494 int invalid UNUSED) /* window line height is invalid now */ |
| 7 | 495 { |
| 496 #ifdef FEAT_FOLDING | |
| 497 int i; | |
| 498 #endif | |
| 499 | |
| 500 if (curwin->w_redraw_top == 0 || curwin->w_redraw_top > lnum) | |
| 501 curwin->w_redraw_top = lnum; | |
| 502 if (curwin->w_redraw_bot == 0 || curwin->w_redraw_bot < lnum) | |
| 503 curwin->w_redraw_bot = lnum; | |
| 504 redraw_later(VALID); | |
| 505 | |
| 506 #ifdef FEAT_FOLDING | |
| 507 if (invalid) | |
| 508 { | |
| 509 /* A w_lines[] entry for this lnum has become invalid. */ | |
| 510 i = find_wl_entry(curwin, lnum); | |
| 511 if (i >= 0) | |
| 512 curwin->w_lines[i].wl_valid = FALSE; | |
| 513 } | |
| 514 #endif | |
| 515 } | |
| 516 | |
| 517 /* | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
518 * Update all windows that are editing the current buffer. |
| 7 | 519 */ |
| 520 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
521 update_curbuf(int type) |
| 7 | 522 { |
| 523 redraw_curbuf_later(type); | |
| 524 update_screen(type); | |
| 525 } | |
| 526 | |
| 527 /* | |
| 528 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 529 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
530 * Return OK when the screen was updated, FAIL if it was not done. |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
531 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
532 int |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
533 update_screen(int type_arg) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
534 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
535 int type = type_arg; |
| 7 | 536 win_T *wp; |
| 537 static int did_intro = FALSE; | |
| 538 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 539 int did_one; | |
| 540 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
541 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
542 int did_undraw = FALSE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
543 int gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
544 int gui_cursor_row; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
545 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
546 int no_update = FALSE; |
| 7 | 547 |
| 2008 | 548 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 549 if (!screen_valid(TRUE)) |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
550 return FAIL; |
| 7 | 551 |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
552 if (type == VALID_NO_UPDATE) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
553 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
554 no_update = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
555 type = 0; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
556 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
557 |
| 7 | 558 if (must_redraw) |
| 559 { | |
| 560 if (type < must_redraw) /* use maximal type */ | |
| 561 type = must_redraw; | |
| 1331 | 562 |
| 563 /* must_redraw is reset here, so that when we run into some weird | |
| 564 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 565 * scrolling), or update_topline() in win_update() will cause a | |
| 566 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 567 must_redraw = 0; |
| 568 } | |
| 569 | |
| 570 /* Need to update w_lines[]. */ | |
| 571 if (curwin->w_lines_valid == 0 && type < NOT_VALID) | |
| 572 type = NOT_VALID; | |
| 573 | |
| 2008 | 574 /* Postpone the redrawing when it's not needed and when being called |
| 575 * recursively. */ | |
| 576 if (!redrawing() || updating_screen) | |
| 7 | 577 { |
| 578 redraw_later(type); /* remember type for next time */ | |
| 579 must_redraw = type; | |
| 580 if (type > INVERTED_ALL) | |
| 581 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
582 return FAIL; |
| 7 | 583 } |
| 584 | |
| 585 updating_screen = TRUE; | |
| 586 #ifdef FEAT_SYN_HL | |
| 587 ++display_tick; /* let syntax code know we're in a next round of | |
| 588 * display updating */ | |
| 589 #endif | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
590 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
591 ++no_win_do_lines_ins; |
| 7 | 592 |
| 593 /* | |
| 594 * if the screen was scrolled up when displaying a message, scroll it down | |
| 595 */ | |
| 596 if (msg_scrolled) | |
| 597 { | |
| 598 clear_cmdline = TRUE; | |
| 599 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 600 type = CLEAR; | |
| 601 else if (type != CLEAR) | |
| 602 { | |
| 603 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
604 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, 0, NULL) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
605 == FAIL) |
| 7 | 606 type = CLEAR; |
| 607 FOR_ALL_WINDOWS(wp) | |
| 608 { | |
| 609 if (W_WINROW(wp) < msg_scrolled) | |
| 610 { | |
| 611 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 612 && wp->w_redr_type < REDRAW_TOP | |
| 613 && wp->w_lines_valid > 0 | |
| 614 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 615 { | |
| 616 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 617 wp->w_redr_type = REDRAW_TOP; | |
| 618 } | |
| 619 else | |
| 620 { | |
| 621 wp->w_redr_type = NOT_VALID; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
622 if (W_WINROW(wp) + wp->w_height + wp->w_status_height |
|
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
623 <= msg_scrolled) |
| 7 | 624 wp->w_redr_status = TRUE; |
| 625 } | |
| 626 } | |
| 627 } | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
628 if (!no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
629 redraw_cmdline = TRUE; |
| 673 | 630 redraw_tabline = TRUE; |
| 7 | 631 } |
| 632 msg_scrolled = 0; | |
| 633 need_wait_return = FALSE; | |
| 634 } | |
| 635 | |
| 636 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 637 compute_cmdrow(); | |
| 638 | |
| 639 /* Check for changed highlighting */ | |
| 640 if (need_highlight_changed) | |
| 641 highlight_changed(); | |
| 642 | |
| 643 if (type == CLEAR) /* first clear screen */ | |
| 644 { | |
| 645 screenclear(); /* will reset clear_cmdline */ | |
| 646 type = NOT_VALID; | |
|
11607
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
647 /* must_redraw may be set indirectly, avoid another redraw later */ |
|
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
648 must_redraw = 0; |
| 7 | 649 } |
| 650 | |
| 651 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 652 check_for_delay(FALSE); | |
| 653 | |
| 13 | 654 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
655 /* 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
|
656 * changes. */ |
| 13 | 657 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
658 && 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
|
659 ? number_width(curwin) : 0)) |
| 13 | 660 curwin->w_redr_type = NOT_VALID; |
| 661 #endif | |
| 662 | |
| 7 | 663 /* |
| 664 * Only start redrawing if there is really something to do. | |
| 665 */ | |
| 666 if (type == INVERTED) | |
| 667 update_curswant(); | |
| 668 if (curwin->w_redr_type < type | |
| 669 && !((type == VALID | |
| 670 && curwin->w_lines[0].wl_valid | |
| 671 #ifdef FEAT_DIFF | |
| 672 && curwin->w_topfill == curwin->w_old_topfill | |
| 673 && curwin->w_botfill == curwin->w_old_botfill | |
| 674 #endif | |
| 675 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 676 || (type == INVERTED | |
| 1043 | 677 && VIsual_active |
| 7 | 678 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 679 && curwin->w_old_visual_mode == VIsual_mode | |
| 680 && (curwin->w_valid & VALID_VIRTCOL) | |
| 681 && curwin->w_old_curswant == curwin->w_curswant) | |
| 682 )) | |
| 683 curwin->w_redr_type = type; | |
| 684 | |
| 849 | 685 /* Redraw the tab pages line if needed. */ |
| 686 if (redraw_tabline || type >= NOT_VALID) | |
| 687 draw_tabline(); | |
| 688 | |
| 7 | 689 #ifdef FEAT_SYN_HL |
| 690 /* | |
| 691 * Correct stored syntax highlighting info for changes in each displayed | |
| 692 * buffer. Each buffer must only be done once. | |
| 693 */ | |
| 694 FOR_ALL_WINDOWS(wp) | |
| 695 { | |
| 696 if (wp->w_buffer->b_mod_set) | |
| 697 { | |
| 698 win_T *wwp; | |
| 699 | |
| 700 /* Check if we already did this buffer. */ | |
| 701 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 702 if (wwp->w_buffer == wp->w_buffer) | |
| 703 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
704 if (wwp == wp && syntax_present(wp)) |
| 7 | 705 syn_stack_apply_changes(wp->w_buffer); |
| 706 } | |
| 707 } | |
| 708 #endif | |
| 709 | |
| 710 /* | |
| 711 * Go from top to bottom through the windows, redrawing the ones that need | |
| 712 * it. | |
| 713 */ | |
| 714 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 715 did_one = FALSE; | |
| 716 #endif | |
| 717 #ifdef FEAT_SEARCH_EXTRA | |
| 718 search_hl.rm.regprog = NULL; | |
| 719 #endif | |
| 720 FOR_ALL_WINDOWS(wp) | |
| 721 { | |
| 722 if (wp->w_redr_type != 0) | |
| 723 { | |
| 724 cursor_off(); | |
| 725 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 726 if (!did_one) | |
| 727 { | |
| 728 did_one = TRUE; | |
| 729 # ifdef FEAT_SEARCH_EXTRA | |
| 730 start_search_hl(); | |
| 731 # endif | |
| 732 # ifdef FEAT_CLIPBOARD | |
| 733 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 734 if (clip_star.available && clip_isautosel_star()) |
| 735 clip_update_selection(&clip_star); | |
| 736 if (clip_plus.available && clip_isautosel_plus()) | |
| 737 clip_update_selection(&clip_plus); | |
| 7 | 738 # endif |
| 739 #ifdef FEAT_GUI | |
| 740 /* Remove the cursor before starting to do anything, because | |
| 741 * scrolling may make it difficult to redraw the text under | |
| 742 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
743 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
|
744 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
745 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
746 gui_cursor_row = gui.cursor_row; |
| 7 | 747 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
748 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
749 } |
| 7 | 750 #endif |
| 751 } | |
| 752 #endif | |
| 753 win_update(wp); | |
| 754 } | |
| 755 | |
| 756 /* redraw status line after the window to minimize cursor movement */ | |
| 757 if (wp->w_redr_status) | |
| 758 { | |
| 759 cursor_off(); | |
| 760 win_redr_status(wp); | |
| 761 } | |
| 762 } | |
| 763 #if defined(FEAT_SEARCH_EXTRA) | |
| 764 end_search_hl(); | |
| 765 #endif | |
| 4107 | 766 #ifdef FEAT_INS_EXPAND |
| 767 /* May need to redraw the popup menu. */ | |
| 768 if (pum_visible()) | |
| 769 pum_redraw(); | |
| 770 #endif | |
| 7 | 771 |
| 772 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 773 * 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
|
774 FOR_ALL_WINDOWS(wp) |
| 7 | 775 wp->w_buffer->b_mod_set = FALSE; |
| 776 | |
| 777 updating_screen = FALSE; | |
| 778 #ifdef FEAT_GUI | |
| 779 gui_may_resize_shell(); | |
| 780 #endif | |
| 781 | |
| 782 /* Clear or redraw the command line. Done last, because scrolling may | |
| 783 * mess up the command line. */ | |
| 784 if (clear_cmdline || redraw_cmdline) | |
| 785 showmode(); | |
| 786 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
787 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
788 --no_win_do_lines_ins; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
789 |
| 7 | 790 /* 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
|
791 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
792 maybe_intro_message(); |
| 7 | 793 did_intro = TRUE; |
| 794 | |
| 795 #ifdef FEAT_GUI | |
| 796 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 797 * done. */ | |
| 798 if (gui.in_use) | |
| 799 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
800 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
|
801 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
802 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
803 out_flush(); /* required before updating the cursor */ |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
804 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
805 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
806 /* Put the GUI position where the cursor was, gui_update_cursor() |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
807 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
808 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
809 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
810 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
811 gui.col = mb_fix_col(gui.col, gui.row); |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
812 # endif |
| 7 | 813 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
814 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
815 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
816 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
817 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
818 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
819 out_flush(); |
| 7 | 820 gui_update_scrollbars(FALSE); |
| 821 } | |
| 822 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
823 return OK; |
| 7 | 824 } |
| 825 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
826 #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
|
827 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
828 * 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
|
829 * 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
|
830 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
831 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
832 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
833 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
834 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
835 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
836 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
837 /* 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
|
838 * 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
|
839 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
840 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
841 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
842 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
843 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
844 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
845 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
846 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
847 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
848 * 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
|
849 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
850 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
851 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
853 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
856 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
857 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 updating_screen = FALSE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 gui_may_resize_shell(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 /* 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
|
866 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
869 out_flush_cursor(FALSE, FALSE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
876 #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
|
877 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
878 * 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
|
879 * 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
|
880 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
881 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
882 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
|
883 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
884 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
|
885 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
886 if (*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
|
887 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
|
888 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
|
889 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
|
890 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
|
891 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
|
892 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
|
893 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
894 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
895 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
|
896 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
897 return FALSE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
898 return 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
|
899 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
900 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
901 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
902 * 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
|
903 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
904 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
905 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
|
906 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
907 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
|
908 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
909 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
|
910 /* 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
|
911 * 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
|
912 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
|
913 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
914 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
915 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
916 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
917 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
|
918 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
919 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
920 int j; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
921 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
922 proftime_T syntax_tm; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
923 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
924 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
925 /* 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
|
926 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
|
927 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
928 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
929 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
|
930 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
931 { |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
932 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
933 /* Set the time limit to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
934 profile_setlimit(p_rdt, &syntax_tm); |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
935 syn_set_timeout(&syntax_tm); |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
936 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
937 update_prepare(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
938 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
939 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
940 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
|
941 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
942 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
|
943 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
944 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
|
945 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
946 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
947 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
948 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
949 # endif |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
950 win_line(wp, lnum, row, row + wp->w_lines[j].wl_size, FALSE); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
951 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
952 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
953 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
954 break; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
955 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
956 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
957 } |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
958 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
959 update_finish(); |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
960 |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
961 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
962 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
963 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
964 } |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
965 need_cursor_line_redraw = FALSE; |
| 7 | 966 } |
| 967 #endif | |
| 968 | |
| 969 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 970 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
971 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 972 { |
| 973 win_T *wp; | |
| 974 int doit = FALSE; | |
| 975 | |
| 976 # ifdef FEAT_FOLDING | |
| 977 win_foldinfo.fi_level = 0; | |
| 978 # endif | |
| 979 | |
| 980 /* update/delete a specific mark */ | |
| 981 FOR_ALL_WINDOWS(wp) | |
| 982 { | |
| 983 if (buf != NULL && lnum > 0) | |
| 984 { | |
| 985 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 986 && lnum < wp->w_botline) | |
| 987 { | |
| 988 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 989 wp->w_redraw_top = lnum; | |
| 990 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 991 wp->w_redraw_bot = lnum; | |
| 992 redraw_win_later(wp, VALID); | |
| 993 } | |
| 994 } | |
| 995 else | |
| 996 redraw_win_later(wp, VALID); | |
| 997 if (wp->w_redr_type != 0) | |
| 998 doit = TRUE; | |
| 999 } | |
| 1000 | |
| 3250 | 1001 /* Return when there is nothing to do, screen updating is already |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
1002 * happening (recursive call), messages on the screen or still starting up. |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
1003 */ |
| 3250 | 1004 if (!doit || updating_screen |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
1005 || State == ASKMORE || State == HITRETURN |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
1006 || msg_scrolled |
| 3250 | 1007 #ifdef FEAT_GUI |
| 1008 || gui.starting | |
| 1009 #endif | |
| 1010 || starting) | |
| 7 | 1011 return; |
| 1012 | |
| 1013 /* update all windows that need updating */ | |
| 1014 update_prepare(); | |
| 1015 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
1016 FOR_ALL_WINDOWS(wp) |
| 7 | 1017 { |
| 1018 if (wp->w_redr_type != 0) | |
| 1019 win_update(wp); | |
| 1020 if (wp->w_redr_status) | |
| 1021 win_redr_status(wp); | |
| 1022 } | |
| 1023 | |
| 1024 update_finish(); | |
| 1025 } | |
| 1026 #endif | |
| 1027 | |
| 1028 | |
| 1029 #if defined(FEAT_GUI) || defined(PROTO) | |
| 1030 /* | |
| 1031 * Update a single window, its status line and maybe the command line msg. | |
| 1032 * Used for the GUI scrollbar. | |
| 1033 */ | |
| 1034 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1035 updateWindow(win_T *wp) |
| 7 | 1036 { |
| 2008 | 1037 /* return if already busy updating */ |
| 1038 if (updating_screen) | |
| 1039 return; | |
| 1040 | |
| 7 | 1041 update_prepare(); |
| 1042 | |
| 1043 #ifdef FEAT_CLIPBOARD | |
| 1044 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1045 if (clip_star.available && clip_isautosel_star()) |
| 1046 clip_update_selection(&clip_star); | |
| 1047 if (clip_plus.available && clip_isautosel_plus()) | |
| 1048 clip_update_selection(&clip_plus); | |
| 7 | 1049 #endif |
| 670 | 1050 |
| 7 | 1051 win_update(wp); |
| 670 | 1052 |
| 1053 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1054 if (redraw_tabline) |
| 677 | 1055 draw_tabline(); |
| 670 | 1056 |
| 7 | 1057 if (wp->w_redr_status |
| 1058 # ifdef FEAT_CMDL_INFO | |
| 1059 || p_ru | |
| 1060 # endif | |
| 1061 # ifdef FEAT_STL_OPT | |
| 40 | 1062 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1063 # endif |
| 1064 ) | |
| 1065 win_redr_status(wp); | |
| 1066 | |
| 1067 update_finish(); | |
| 1068 } | |
| 1069 #endif | |
| 1070 | |
| 1071 /* | |
| 1072 * Update a single window. | |
| 1073 * | |
| 1074 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1075 * screen or scrolling lines). | |
| 1076 * | |
| 1077 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1078 * implies the one below it. | |
| 1079 * NOT_VALID redraw the whole window | |
| 743 | 1080 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1081 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1082 * INVERTED redraw the changed part of the Visual area | |
| 1083 * INVERTED_ALL redraw the whole Visual area | |
| 1084 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1085 * 2. update lines at the top when scrolled down | |
| 1086 * 3. redraw changed text: | |
| 301 | 1087 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1088 * b_mod_top and b_mod_bot. |
| 1089 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1090 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1091 * - continue redrawing when syntax status is invalid. | |
| 1092 * 4. if scrolled up, update lines at the bottom. | |
| 1093 * This results in three areas that may need updating: | |
| 1094 * top: from first row to top_end (when scrolled down) | |
| 1095 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1096 * bot: from bot_start to last row (when scrolled up) | |
| 1097 */ | |
| 1098 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1099 win_update(win_T *wp) |
| 7 | 1100 { |
| 1101 buf_T *buf = wp->w_buffer; | |
| 1102 int type; | |
| 1103 int top_end = 0; /* Below last row of the top area that needs | |
| 1104 updating. 0 when no top area updating. */ | |
| 1105 int mid_start = 999;/* first row of the mid area that needs | |
| 1106 updating. 999 when no mid area updating. */ | |
| 1107 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1108 updating. 0 when no mid area updating. */ | |
| 1109 int bot_start = 999;/* first row of the bot area that needs | |
| 1110 updating. 999 when no bot area updating */ | |
| 1111 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1112 w_topline got smaller a bit */ | |
| 1113 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1114 matchitem_T *cur; /* points to the match list */ |
| 7 | 1115 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1116 #endif | |
| 1117 | |
| 1118 int row; /* current window row to display */ | |
| 1119 linenr_T lnum; /* current buffer lnum to display */ | |
| 1120 int idx; /* current index in w_lines[] */ | |
| 1121 int srow; /* starting row of the current line */ | |
| 1122 | |
| 1123 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1124 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1125 int i; | |
| 1126 long j; | |
| 1127 static int recursive = FALSE; /* being called recursively */ | |
| 1128 int old_botline = wp->w_botline; | |
| 1129 #ifdef FEAT_FOLDING | |
| 1130 long fold_count; | |
| 1131 #endif | |
| 1132 #ifdef FEAT_SYN_HL | |
| 1133 /* remember what happened to the previous line, to know if | |
| 1134 * check_visual_highlight() can be used */ | |
| 1135 #define DID_NONE 1 /* didn't update a line */ | |
| 1136 #define DID_LINE 2 /* updated a normal line */ | |
| 1137 #define DID_FOLD 3 /* updated a folded line */ | |
| 1138 int did_update = DID_NONE; | |
| 1139 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1140 #endif | |
| 1141 linenr_T mod_top = 0; | |
| 1142 linenr_T mod_bot = 0; | |
| 1143 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1144 int save_got_int; | |
| 1145 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1146 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1147 proftime_T syntax_tm; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1148 #endif |
| 7 | 1149 |
| 1150 type = wp->w_redr_type; | |
| 1151 | |
| 1152 if (type == NOT_VALID) | |
| 1153 { | |
| 1154 wp->w_redr_status = TRUE; | |
| 1155 wp->w_lines_valid = 0; | |
| 1156 } | |
| 1157 | |
| 1158 /* Window is zero-height: nothing to draw. */ | |
|
12998
dd734ee3e2fe
patch 8.0.1375: window size wrong after maximizing with WinBar
Christian Brabandt <cb@256bit.org>
parents:
12964
diff
changeset
|
1159 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1160 { |
| 1161 wp->w_redr_type = 0; | |
| 1162 return; | |
| 1163 } | |
| 1164 | |
| 1165 /* Window is zero-width: Only need to draw the separator. */ | |
| 1166 if (wp->w_width == 0) | |
| 1167 { | |
| 1168 /* draw the vertical separator right of this window */ | |
| 1169 draw_vsep_win(wp, 0); | |
| 1170 wp->w_redr_type = 0; | |
| 1171 return; | |
| 1172 } | |
| 1173 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1174 #ifdef FEAT_TERMINAL |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1175 /* If this window contains a terminal, redraw works completely differently. |
|
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1176 */ |
|
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1177 if (term_update_window(wp) == OK) |
|
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
1178 { |
|
13292
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1179 # ifdef FEAT_MENU |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1180 /* Draw the window toolbar, if there is one. */ |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1181 if (winbar_height(wp) > 0) |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1182 redraw_win_toolbar(wp); |
|
c42fe898b578
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1183 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1184 wp->w_redr_type = 0; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1185 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1186 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1187 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1188 |
| 7 | 1189 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1190 init_search_hl(wp); |
| 7 | 1191 #endif |
| 1192 | |
| 13 | 1193 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1194 /* 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
|
1195 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1196 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1197 if (wp->w_nrwidth != i) |
| 13 | 1198 { |
| 1199 type = NOT_VALID; | |
| 677 | 1200 wp->w_nrwidth = i; |
| 13 | 1201 } |
| 1202 else | |
| 1203 #endif | |
| 1204 | |
| 7 | 1205 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1206 { | |
| 1207 /* | |
| 1208 * When there are both inserted/deleted lines and specific lines to be | |
| 1209 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1210 * everything (only happens when redrawing is off for while). | |
| 1211 */ | |
| 1212 type = NOT_VALID; | |
| 1213 } | |
| 1214 else | |
| 1215 { | |
| 1216 /* | |
| 1217 * Set mod_top to the first line that needs displaying because of | |
| 1218 * changes. Set mod_bot to the first line after the changes. | |
| 1219 */ | |
| 1220 mod_top = wp->w_redraw_top; | |
| 1221 if (wp->w_redraw_bot != 0) | |
| 1222 mod_bot = wp->w_redraw_bot + 1; | |
| 1223 else | |
| 1224 mod_bot = 0; | |
| 1225 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1226 wp->w_redraw_bot = 0; | |
| 1227 if (buf->b_mod_set) | |
| 1228 { | |
| 1229 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1230 { | |
| 1231 mod_top = buf->b_mod_top; | |
| 1232 #ifdef FEAT_SYN_HL | |
| 1233 /* Need to redraw lines above the change that may be included | |
| 1234 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1235 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1236 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1237 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1238 if (mod_top < 1) |
| 1239 mod_top = 1; | |
| 1240 } | |
| 1241 #endif | |
| 1242 } | |
| 1243 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1244 mod_bot = buf->b_mod_bot; | |
| 1245 | |
| 1246 #ifdef FEAT_SEARCH_EXTRA | |
| 1247 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1248 * change in one line may make the Search highlighting in a | |
| 1249 * previous line invalid. Simple solution: redraw all visible | |
| 1250 * lines above the change. | |
| 1326 | 1251 * Same for a match pattern. |
| 7 | 1252 */ |
| 699 | 1253 if (search_hl.rm.regprog != NULL |
| 1254 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1255 top_to_mod = TRUE; |
| 699 | 1256 else |
| 1326 | 1257 { |
| 1258 cur = wp->w_match_head; | |
| 1259 while (cur != NULL) | |
| 1260 { | |
| 1261 if (cur->match.regprog != NULL | |
| 1262 && re_multiline(cur->match.regprog)) | |
| 699 | 1263 { |
| 1264 top_to_mod = TRUE; | |
| 1265 break; | |
| 1266 } | |
| 1326 | 1267 cur = cur->next; |
| 1268 } | |
| 1269 } | |
| 7 | 1270 #endif |
| 1271 } | |
| 1272 #ifdef FEAT_FOLDING | |
| 1273 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1274 { | |
| 1275 linenr_T lnumt, lnumb; | |
| 1276 | |
| 1277 /* | |
| 1278 * A change in a line can cause lines above it to become folded or | |
| 1279 * unfolded. Find the top most buffer line that may be affected. | |
| 1280 * If the line was previously folded and displayed, get the first | |
| 1281 * line of that fold. If the line is folded now, get the first | |
| 1282 * folded line. Use the minimum of these two. | |
| 1283 */ | |
| 1284 | |
| 1285 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1286 * the line below it. If there is no valid entry, use w_topline. | |
| 1287 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1288 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1289 lnumt = wp->w_topline; | |
| 1290 lnumb = MAXLNUM; | |
| 1291 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1292 if (wp->w_lines[i].wl_valid) | |
| 1293 { | |
| 1294 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1295 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1296 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1297 { | |
| 1298 lnumb = wp->w_lines[i].wl_lnum; | |
| 1299 /* When there is a fold column it might need updating | |
| 1300 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1301 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1302 ++lnumb; |
| 1303 } | |
| 1304 } | |
| 1305 | |
| 1306 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1307 if (mod_top > lnumt) | |
| 1308 mod_top = lnumt; | |
| 1309 | |
| 1310 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1311 --mod_bot; | |
| 1312 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1313 ++mod_bot; | |
| 1314 if (mod_bot < lnumb) | |
| 1315 mod_bot = lnumb; | |
| 1316 } | |
| 1317 #endif | |
| 1318 | |
| 1319 /* When a change starts above w_topline and the end is below | |
| 1320 * w_topline, start redrawing at w_topline. | |
| 36 | 1321 * If the end of the change is above w_topline: do like no change was |
| 1322 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1323 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1324 { | |
| 1325 if (mod_bot > wp->w_topline) | |
| 1326 mod_top = wp->w_topline; | |
| 1327 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1328 else if (syntax_present(wp)) |
| 7 | 1329 top_end = 1; |
| 1330 #endif | |
| 1331 } | |
| 36 | 1332 |
| 1333 /* When line numbers are displayed need to redraw all lines below | |
| 1334 * inserted/deleted lines. */ | |
| 1335 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1336 mod_bot = MAXLNUM; | |
| 7 | 1337 } |
| 1338 | |
| 1339 /* | |
| 1340 * When only displaying the lines at the top, set top_end. Used when | |
| 1341 * window has scrolled down for msg_scrolled. | |
| 1342 */ | |
| 1343 if (type == REDRAW_TOP) | |
| 1344 { | |
| 1345 j = 0; | |
| 1346 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1347 { | |
| 1348 j += wp->w_lines[i].wl_size; | |
| 1349 if (j >= wp->w_upd_rows) | |
| 1350 { | |
| 1351 top_end = j; | |
| 1352 break; | |
| 1353 } | |
| 1354 } | |
| 1355 if (top_end == 0) | |
| 1356 /* not found (cannot happen?): redraw everything */ | |
| 1357 type = NOT_VALID; | |
| 1358 else | |
| 1359 /* top area defined, the rest is VALID */ | |
| 1360 type = VALID; | |
| 1361 } | |
| 1362 | |
| 1378 | 1363 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1364 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1365 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1366 * called. */ | |
| 1367 if (screen_cleared) | |
| 1368 screen_cleared = MAYBE; | |
| 1369 | |
| 7 | 1370 /* |
| 1371 * If there are no changes on the screen that require a complete redraw, | |
| 1372 * handle three cases: | |
| 1373 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1374 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1375 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1376 * w_lines[] that needs updating. | |
| 1377 */ | |
| 743 | 1378 if ((type == VALID || type == SOME_VALID |
| 1379 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1380 #ifdef FEAT_DIFF |
| 1381 && !wp->w_botfill && !wp->w_old_botfill | |
| 1382 #endif | |
| 1383 ) | |
| 1384 { | |
| 1385 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1386 { | |
| 1387 /* | |
| 1388 * w_topline is the first changed line, the scrolling will be done | |
| 1389 * further down. | |
| 1390 */ | |
| 1391 } | |
| 1392 else if (wp->w_lines[0].wl_valid | |
| 1393 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1394 #ifdef FEAT_DIFF | |
| 1395 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1396 && wp->w_topfill > wp->w_old_topfill) | |
| 1397 #endif | |
| 1398 )) | |
| 1399 { | |
| 1400 /* | |
| 1401 * New topline is above old topline: May scroll down. | |
| 1402 */ | |
| 1403 #ifdef FEAT_FOLDING | |
| 1404 if (hasAnyFolding(wp)) | |
| 1405 { | |
| 1406 linenr_T ln; | |
| 1407 | |
| 1408 /* count the number of lines we are off, counting a sequence | |
| 1409 * of folded lines as one */ | |
| 1410 j = 0; | |
| 1411 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1412 { | |
| 1413 ++j; | |
| 1414 if (j >= wp->w_height - 2) | |
| 1415 break; | |
| 1416 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1417 } | |
| 1418 } | |
| 1419 else | |
| 1420 #endif | |
| 1421 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1422 if (j < wp->w_height - 2) /* not too far off */ | |
| 1423 { | |
| 1424 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1425 #ifdef FEAT_DIFF | |
| 1426 /* insert extra lines for previously invisible filler lines */ | |
| 1427 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1428 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1429 - wp->w_old_topfill; | |
| 1430 #endif | |
| 1431 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1432 { | |
| 1433 /* | |
| 1434 * Try to insert the correct number of lines. | |
| 1435 * If not the last window, delete the lines at the bottom. | |
| 1436 * win_ins_lines may fail when the terminal can't do it. | |
| 1437 */ | |
| 1438 if (i > 0) | |
| 1439 check_for_delay(FALSE); | |
| 1440 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1441 { | |
| 1442 if (wp->w_lines_valid != 0) | |
| 1443 { | |
| 1444 /* Need to update rows that are new, stop at the | |
| 1445 * first one that scrolled down. */ | |
| 1446 top_end = i; | |
| 1447 scrolled_down = TRUE; | |
| 1448 | |
| 1449 /* Move the entries that were scrolled, disable | |
| 1450 * the entries for the lines to be redrawn. */ | |
| 1451 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1452 wp->w_lines_valid = wp->w_height; | |
| 1453 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1454 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1455 while (idx >= 0) | |
| 1456 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1457 } | |
| 1458 } | |
| 1459 else | |
| 1460 mid_start = 0; /* redraw all lines */ | |
| 1461 } | |
| 1462 else | |
| 1463 mid_start = 0; /* redraw all lines */ | |
| 1464 } | |
| 1465 else | |
| 1466 mid_start = 0; /* redraw all lines */ | |
| 1467 } | |
| 1468 else | |
| 1469 { | |
| 1470 /* | |
| 1471 * New topline is at or below old topline: May scroll up. | |
| 1472 * When topline didn't change, find first entry in w_lines[] that | |
| 1473 * needs updating. | |
| 1474 */ | |
| 1475 | |
| 1476 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1477 j = -1; | |
| 1478 row = 0; | |
| 1479 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1480 { | |
| 1481 if (wp->w_lines[i].wl_valid | |
| 1482 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1483 { | |
| 1484 j = i; | |
| 1485 break; | |
| 1486 } | |
| 1487 row += wp->w_lines[i].wl_size; | |
| 1488 } | |
| 1489 if (j == -1) | |
| 1490 { | |
| 1491 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1492 * lines */ | |
| 1493 mid_start = 0; | |
| 1494 } | |
| 1495 else | |
| 1496 { | |
| 1497 /* | |
| 1498 * Try to delete the correct number of lines. | |
| 1499 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1500 */ | |
| 1501 #ifdef FEAT_DIFF | |
| 1502 /* If the topline didn't change, delete old filler lines, | |
| 1503 * otherwise delete filler lines of the new topline... */ | |
| 1504 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1505 row += wp->w_old_topfill; | |
| 1506 else | |
| 1507 row += diff_check_fill(wp, wp->w_topline); | |
| 1508 /* ... but don't delete new filler lines. */ | |
| 1509 row -= wp->w_topfill; | |
| 1510 #endif | |
| 1511 if (row > 0) | |
| 1512 { | |
| 1513 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1514 if (win_del_lines(wp, 0, row, FALSE, wp == firstwin, 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1515 == OK) |
| 7 | 1516 bot_start = wp->w_height - row; |
| 1517 else | |
| 1518 mid_start = 0; /* redraw all lines */ | |
| 1519 } | |
| 1520 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1521 { | |
| 1522 /* | |
| 1523 * Skip the lines (below the deleted lines) that are still | |
| 1524 * valid and don't need redrawing. Copy their info | |
| 1525 * upwards, to compensate for the deleted lines. Set | |
| 1526 * bot_start to the first row that needs redrawing. | |
| 1527 */ | |
| 1528 bot_start = 0; | |
| 1529 idx = 0; | |
| 1530 for (;;) | |
| 1531 { | |
| 1532 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1533 /* stop at line that didn't fit, unless it is still | |
| 1534 * valid (no lines deleted) */ | |
| 1535 if (row > 0 && bot_start + row | |
| 1536 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1537 { | |
| 1538 wp->w_lines_valid = idx + 1; | |
| 1539 break; | |
| 1540 } | |
| 1541 bot_start += wp->w_lines[idx++].wl_size; | |
| 1542 | |
| 1543 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1544 if (++j >= wp->w_lines_valid) | |
| 1545 { | |
| 1546 wp->w_lines_valid = idx; | |
| 1547 break; | |
| 1548 } | |
| 1549 } | |
| 1550 #ifdef FEAT_DIFF | |
| 1551 /* Correct the first entry for filler lines at the top | |
| 1552 * when it won't get updated below. */ | |
| 1553 if (wp->w_p_diff && bot_start > 0) | |
| 1554 wp->w_lines[0].wl_size = | |
| 1555 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1556 + wp->w_topfill; | |
| 1557 #endif | |
| 1558 } | |
| 1559 } | |
| 1560 } | |
| 1561 | |
| 1562 /* When starting redraw in the first line, redraw all lines. When | |
| 1563 * there is only one window it's probably faster to clear the screen | |
| 1564 * first. */ | |
| 1565 if (mid_start == 0) | |
| 1566 { | |
| 1567 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1568 if (ONE_WINDOW) |
| 981 | 1569 { |
| 1331 | 1570 /* Clear the screen when it was not done by win_del_lines() or |
| 1571 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1572 * then. */ | |
| 1573 if (screen_cleared != TRUE) | |
| 1574 screenclear(); | |
| 981 | 1575 /* The screen was cleared, redraw the tab pages line. */ |
| 1576 if (redraw_tabline) | |
| 1577 draw_tabline(); | |
| 1578 } | |
| 7 | 1579 } |
| 1331 | 1580 |
| 1581 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1582 * cleared (only happens for the first window) or when screenclear() | |
| 1583 * was called directly above, "must_redraw" will have been set to | |
| 1584 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1585 if (screen_cleared == TRUE) | |
| 1586 must_redraw = 0; | |
| 7 | 1587 } |
| 1588 else | |
| 1589 { | |
| 1590 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1591 mid_start = 0; | |
| 1592 mid_end = wp->w_height; | |
| 1593 } | |
| 1594 | |
| 743 | 1595 if (type == SOME_VALID) |
| 1596 { | |
| 1597 /* SOME_VALID: redraw all lines. */ | |
| 1598 mid_start = 0; | |
| 1599 mid_end = wp->w_height; | |
| 1600 type = NOT_VALID; | |
| 1601 } | |
| 1602 | |
| 7 | 1603 /* check if we are updating or removing the inverted part */ |
| 1604 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1605 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1606 { | |
| 1607 linenr_T from, to; | |
| 1608 | |
| 1609 if (VIsual_active) | |
| 1610 { | |
| 1611 if (VIsual_active | |
| 1612 && (VIsual_mode != wp->w_old_visual_mode | |
| 1613 || type == INVERTED_ALL)) | |
| 1614 { | |
| 1615 /* | |
| 1616 * If the type of Visual selection changed, redraw the whole | |
| 1617 * selection. Also when the ownership of the X selection is | |
| 1618 * gained or lost. | |
| 1619 */ | |
| 1620 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1621 { | |
| 1622 from = curwin->w_cursor.lnum; | |
| 1623 to = VIsual.lnum; | |
| 1624 } | |
| 1625 else | |
| 1626 { | |
| 1627 from = VIsual.lnum; | |
| 1628 to = curwin->w_cursor.lnum; | |
| 1629 } | |
| 1630 /* redraw more when the cursor moved as well */ | |
| 1631 if (wp->w_old_cursor_lnum < from) | |
| 1632 from = wp->w_old_cursor_lnum; | |
| 1633 if (wp->w_old_cursor_lnum > to) | |
| 1634 to = wp->w_old_cursor_lnum; | |
| 1635 if (wp->w_old_visual_lnum < from) | |
| 1636 from = wp->w_old_visual_lnum; | |
| 1637 if (wp->w_old_visual_lnum > to) | |
| 1638 to = wp->w_old_visual_lnum; | |
| 1639 } | |
| 1640 else | |
| 1641 { | |
| 1642 /* | |
| 1643 * Find the line numbers that need to be updated: The lines | |
| 1644 * between the old cursor position and the current cursor | |
| 1645 * position. Also check if the Visual position changed. | |
| 1646 */ | |
| 1647 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1648 { | |
| 1649 from = curwin->w_cursor.lnum; | |
| 1650 to = wp->w_old_cursor_lnum; | |
| 1651 } | |
| 1652 else | |
| 1653 { | |
| 1654 from = wp->w_old_cursor_lnum; | |
| 1655 to = curwin->w_cursor.lnum; | |
| 1656 if (from == 0) /* Visual mode just started */ | |
| 1657 from = to; | |
| 1658 } | |
| 1659 | |
| 422 | 1660 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1661 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1662 { |
| 1663 if (wp->w_old_visual_lnum < from | |
| 1664 && wp->w_old_visual_lnum != 0) | |
| 1665 from = wp->w_old_visual_lnum; | |
| 1666 if (wp->w_old_visual_lnum > to) | |
| 1667 to = wp->w_old_visual_lnum; | |
| 1668 if (VIsual.lnum < from) | |
| 1669 from = VIsual.lnum; | |
| 1670 if (VIsual.lnum > to) | |
| 1671 to = VIsual.lnum; | |
| 1672 } | |
| 1673 } | |
| 1674 | |
| 1675 /* | |
| 1676 * If in block mode and changed column or curwin->w_curswant: | |
| 1677 * update all lines. | |
| 1678 * First compute the actual start and end column. | |
| 1679 */ | |
| 1680 if (VIsual_mode == Ctrl_V) | |
| 1681 { | |
| 6266 | 1682 colnr_T fromc, toc; |
| 1683 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1684 int save_ve_flags = ve_flags; | |
| 1685 | |
| 1686 if (curwin->w_p_lbr) | |
| 1687 ve_flags = VE_ALL; | |
| 1688 #endif | |
| 7 | 1689 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1690 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1691 ve_flags = save_ve_flags; | |
| 1692 #endif | |
| 7 | 1693 ++toc; |
| 1694 if (curwin->w_curswant == MAXCOL) | |
| 1695 toc = MAXCOL; | |
| 1696 | |
| 1697 if (fromc != wp->w_old_cursor_fcol | |
| 1698 || toc != wp->w_old_cursor_lcol) | |
| 1699 { | |
| 1700 if (from > VIsual.lnum) | |
| 1701 from = VIsual.lnum; | |
| 1702 if (to < VIsual.lnum) | |
| 1703 to = VIsual.lnum; | |
| 1704 } | |
| 1705 wp->w_old_cursor_fcol = fromc; | |
| 1706 wp->w_old_cursor_lcol = toc; | |
| 1707 } | |
| 1708 } | |
| 1709 else | |
| 1710 { | |
| 1711 /* Use the line numbers of the old Visual area. */ | |
| 1712 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1713 { | |
| 1714 from = wp->w_old_cursor_lnum; | |
| 1715 to = wp->w_old_visual_lnum; | |
| 1716 } | |
| 1717 else | |
| 1718 { | |
| 1719 from = wp->w_old_visual_lnum; | |
| 1720 to = wp->w_old_cursor_lnum; | |
| 1721 } | |
| 1722 } | |
| 1723 | |
| 1724 /* | |
| 1725 * There is no need to update lines above the top of the window. | |
| 1726 */ | |
| 1727 if (from < wp->w_topline) | |
| 1728 from = wp->w_topline; | |
| 1729 | |
| 1730 /* | |
| 1731 * If we know the value of w_botline, use it to restrict the update to | |
| 1732 * the lines that are visible in the window. | |
| 1733 */ | |
| 1734 if (wp->w_valid & VALID_BOTLINE) | |
| 1735 { | |
| 1736 if (from >= wp->w_botline) | |
| 1737 from = wp->w_botline - 1; | |
| 1738 if (to >= wp->w_botline) | |
| 1739 to = wp->w_botline - 1; | |
| 1740 } | |
| 1741 | |
| 1742 /* | |
| 1743 * Find the minimal part to be updated. | |
| 1744 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1745 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1746 * top_end; need to redraw from top_end to the "to" line. | |
| 1747 * A middle mouse click with a Visual selection may change the text | |
| 1748 * above the Visual area and reset wl_valid, do count these for | |
| 1749 * mid_end (in srow). | |
| 1750 */ | |
| 1751 if (mid_start > 0) | |
| 1752 { | |
| 1753 lnum = wp->w_topline; | |
| 1754 idx = 0; | |
| 1755 srow = 0; | |
| 1756 if (scrolled_down) | |
| 1757 mid_start = top_end; | |
| 1758 else | |
| 1759 mid_start = 0; | |
| 1760 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1761 { | |
| 1762 if (wp->w_lines[idx].wl_valid) | |
| 1763 mid_start += wp->w_lines[idx].wl_size; | |
| 1764 else if (!scrolled_down) | |
| 1765 srow += wp->w_lines[idx].wl_size; | |
| 1766 ++idx; | |
| 1767 # ifdef FEAT_FOLDING | |
| 1768 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1769 lnum = wp->w_lines[idx].wl_lnum; | |
| 1770 else | |
| 1771 # endif | |
| 1772 ++lnum; | |
| 1773 } | |
| 1774 srow += mid_start; | |
| 1775 mid_end = wp->w_height; | |
| 1776 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1777 { | |
| 1778 if (wp->w_lines[idx].wl_valid | |
| 1779 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1780 { | |
| 1781 /* Only update until first row of this line */ | |
| 1782 mid_end = srow; | |
| 1783 break; | |
| 1784 } | |
| 1785 srow += wp->w_lines[idx].wl_size; | |
| 1786 } | |
| 1787 } | |
| 1788 } | |
| 1789 | |
| 1790 if (VIsual_active && buf == curwin->w_buffer) | |
| 1791 { | |
| 1792 wp->w_old_visual_mode = VIsual_mode; | |
| 1793 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1794 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1795 wp->w_old_visual_col = VIsual.col; |
| 7 | 1796 wp->w_old_curswant = curwin->w_curswant; |
| 1797 } | |
| 1798 else | |
| 1799 { | |
| 1800 wp->w_old_visual_mode = 0; | |
| 1801 wp->w_old_cursor_lnum = 0; | |
| 1802 wp->w_old_visual_lnum = 0; | |
| 422 | 1803 wp->w_old_visual_col = 0; |
| 7 | 1804 } |
| 1805 | |
| 1806 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1807 /* reset got_int, otherwise regexp won't work */ | |
| 1808 save_got_int = got_int; | |
| 1809 got_int = 0; | |
| 1810 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1811 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1812 /* Set the time limit to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1813 profile_setlimit(p_rdt, &syntax_tm); |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
1814 syn_set_timeout(&syntax_tm); |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1815 #endif |
| 7 | 1816 #ifdef FEAT_FOLDING |
| 1817 win_foldinfo.fi_level = 0; | |
| 1818 #endif | |
| 1819 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1820 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1821 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1822 * Draw the window toolbar, if there is one. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1823 * TODO: only when needed. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1824 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1825 if (winbar_height(wp) > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1826 redraw_win_toolbar(wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1827 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1828 |
| 7 | 1829 /* |
| 1830 * Update all the window rows. | |
| 1831 */ | |
| 1832 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1833 row = 0; | |
| 1834 srow = 0; | |
| 1835 lnum = wp->w_topline; /* first line shown in window */ | |
| 1836 for (;;) | |
| 1837 { | |
| 1838 /* stop updating when reached the end of the window (check for _past_ | |
| 1839 * the end of the window is at the end of the loop) */ | |
| 1840 if (row == wp->w_height) | |
| 1841 { | |
| 1842 didline = TRUE; | |
| 1843 break; | |
| 1844 } | |
| 1845 | |
| 1846 /* stop updating when hit the end of the file */ | |
| 1847 if (lnum > buf->b_ml.ml_line_count) | |
| 1848 { | |
| 1849 eof = TRUE; | |
| 1850 break; | |
| 1851 } | |
| 1852 | |
| 1853 /* Remember the starting row of the line that is going to be dealt | |
| 1854 * with. It is used further down when the line doesn't fit. */ | |
| 1855 srow = row; | |
| 1856 | |
| 1857 /* | |
| 1858 * Update a line when it is in an area that needs updating, when it | |
| 1859 * has changes or w_lines[idx] is invalid. | |
| 1860 * bot_start may be halfway a wrapped line after using | |
| 1861 * win_del_lines(), check if the current line includes it. | |
| 1862 * When syntax folding is being used, the saved syntax states will | |
| 1863 * already have been updated, we can't see where the syntax state is | |
| 1864 * the same again, just update until the end of the window. | |
| 1865 */ | |
| 1866 if (row < top_end | |
| 1867 || (row >= mid_start && row < mid_end) | |
| 1868 #ifdef FEAT_SEARCH_EXTRA | |
| 1869 || top_to_mod | |
| 1870 #endif | |
| 1871 || idx >= wp->w_lines_valid | |
| 1872 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1873 || (mod_top != 0 | |
| 1874 && (lnum == mod_top | |
| 1875 || (lnum >= mod_top | |
| 1876 && (lnum < mod_bot | |
| 1877 #ifdef FEAT_SYN_HL | |
| 1878 || did_update == DID_FOLD | |
| 1879 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1880 && syntax_present(wp) |
| 7 | 1881 && ( |
| 1882 # ifdef FEAT_FOLDING | |
| 1883 (foldmethodIsSyntax(wp) | |
| 1884 && hasAnyFolding(wp)) || | |
| 1885 # endif | |
| 1886 syntax_check_changed(lnum))) | |
| 1887 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1888 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1889 /* match in fixed position might need redraw |
| 1890 * if lines were inserted or deleted */ | |
| 1891 || (wp->w_match_head != NULL | |
| 1892 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1893 #endif |
| 7 | 1894 ))))) |
| 1895 { | |
| 1896 #ifdef FEAT_SEARCH_EXTRA | |
| 1897 if (lnum == mod_top) | |
| 1898 top_to_mod = FALSE; | |
| 1899 #endif | |
| 1900 | |
| 1901 /* | |
| 1902 * When at start of changed lines: May scroll following lines | |
| 1903 * up or down to minimize redrawing. | |
| 1904 * Don't do this when the change continues until the end. | |
| 3318 | 1905 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1906 */ |
| 1907 if (lnum == mod_top | |
| 1908 && mod_bot != MAXLNUM | |
| 3318 | 1909 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1910 { |
| 1911 int old_rows = 0; | |
| 1912 int new_rows = 0; | |
| 1913 int xtra_rows; | |
| 1914 linenr_T l; | |
| 1915 | |
| 1916 /* Count the old number of window rows, using w_lines[], which | |
| 1917 * should still contain the sizes for the lines as they are | |
| 1918 * currently displayed. */ | |
| 1919 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1920 { | |
| 1921 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1922 * lines are part of the changed area. */ | |
| 1923 if (wp->w_lines[i].wl_valid | |
| 1924 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1925 break; | |
| 1926 old_rows += wp->w_lines[i].wl_size; | |
| 1927 #ifdef FEAT_FOLDING | |
| 1928 if (wp->w_lines[i].wl_valid | |
| 1929 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1930 { | |
| 1931 /* Must have found the last valid entry above mod_bot. | |
| 1932 * Add following invalid entries. */ | |
| 1933 ++i; | |
| 1934 while (i < wp->w_lines_valid | |
| 1935 && !wp->w_lines[i].wl_valid) | |
| 1936 old_rows += wp->w_lines[i++].wl_size; | |
| 1937 break; | |
| 1938 } | |
| 1939 #endif | |
| 1940 } | |
| 1941 | |
| 1942 if (i >= wp->w_lines_valid) | |
| 1943 { | |
| 1944 /* We can't find a valid line below the changed lines, | |
| 1945 * need to redraw until the end of the window. | |
| 1946 * Inserting/deleting lines has no use. */ | |
| 1947 bot_start = 0; | |
| 1948 } | |
| 1949 else | |
| 1950 { | |
| 1951 /* Able to count old number of rows: Count new window | |
| 1952 * rows, and may insert/delete lines */ | |
| 1953 j = idx; | |
| 1954 for (l = lnum; l < mod_bot; ++l) | |
| 1955 { | |
| 1956 #ifdef FEAT_FOLDING | |
| 1957 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1958 ++new_rows; | |
| 1959 else | |
| 1960 #endif | |
| 1961 #ifdef FEAT_DIFF | |
| 1962 if (l == wp->w_topline) | |
| 1963 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1964 + wp->w_topfill; | |
| 1965 else | |
| 1966 #endif | |
| 1967 new_rows += plines_win(wp, l, TRUE); | |
| 1968 ++j; | |
| 1969 if (new_rows > wp->w_height - row - 2) | |
| 1970 { | |
| 1971 /* it's getting too much, must redraw the rest */ | |
| 1972 new_rows = 9999; | |
| 1973 break; | |
| 1974 } | |
| 1975 } | |
| 1976 xtra_rows = new_rows - old_rows; | |
| 1977 if (xtra_rows < 0) | |
| 1978 { | |
| 1979 /* May scroll text up. If there is not enough | |
| 1980 * remaining text or scrolling fails, must redraw the | |
| 1981 * rest. If scrolling works, must redraw the text | |
| 1982 * below the scrolled text. */ | |
| 1983 if (row - xtra_rows >= wp->w_height - 2) | |
| 1984 mod_bot = MAXLNUM; | |
| 1985 else | |
| 1986 { | |
| 1987 check_for_delay(FALSE); | |
| 1988 if (win_del_lines(wp, row, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
1989 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1990 mod_bot = MAXLNUM; |
| 1991 else | |
| 1992 bot_start = wp->w_height + xtra_rows; | |
| 1993 } | |
| 1994 } | |
| 1995 else if (xtra_rows > 0) | |
| 1996 { | |
| 1997 /* May scroll text down. If there is not enough | |
| 1998 * remaining text of scrolling fails, must redraw the | |
| 1999 * rest. */ | |
| 2000 if (row + xtra_rows >= wp->w_height - 2) | |
| 2001 mod_bot = MAXLNUM; | |
| 2002 else | |
| 2003 { | |
| 2004 check_for_delay(FALSE); | |
| 2005 if (win_ins_lines(wp, row + old_rows, | |
| 2006 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2007 mod_bot = MAXLNUM; | |
| 2008 else if (top_end > row + old_rows) | |
| 2009 /* Scrolled the part at the top that requires | |
| 2010 * updating down. */ | |
| 2011 top_end += xtra_rows; | |
| 2012 } | |
| 2013 } | |
| 2014 | |
| 2015 /* When not updating the rest, may need to move w_lines[] | |
| 2016 * entries. */ | |
| 2017 if (mod_bot != MAXLNUM && i != j) | |
| 2018 { | |
| 2019 if (j < i) | |
| 2020 { | |
| 2021 int x = row + new_rows; | |
| 2022 | |
| 2023 /* move entries in w_lines[] upwards */ | |
| 2024 for (;;) | |
| 2025 { | |
| 2026 /* stop at last valid entry in w_lines[] */ | |
| 2027 if (i >= wp->w_lines_valid) | |
| 2028 { | |
| 2029 wp->w_lines_valid = j; | |
| 2030 break; | |
| 2031 } | |
| 2032 wp->w_lines[j] = wp->w_lines[i]; | |
| 2033 /* stop at a line that won't fit */ | |
| 2034 if (x + (int)wp->w_lines[j].wl_size | |
| 2035 > wp->w_height) | |
| 2036 { | |
| 2037 wp->w_lines_valid = j + 1; | |
| 2038 break; | |
| 2039 } | |
| 2040 x += wp->w_lines[j++].wl_size; | |
| 2041 ++i; | |
| 2042 } | |
| 2043 if (bot_start > x) | |
| 2044 bot_start = x; | |
| 2045 } | |
| 2046 else /* j > i */ | |
| 2047 { | |
| 2048 /* move entries in w_lines[] downwards */ | |
| 2049 j -= i; | |
| 2050 wp->w_lines_valid += j; | |
| 2051 if (wp->w_lines_valid > wp->w_height) | |
| 2052 wp->w_lines_valid = wp->w_height; | |
| 2053 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2054 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2055 | |
| 2056 /* The w_lines[] entries for inserted lines are | |
| 2057 * now invalid, but wl_size may be used above. | |
| 2058 * Reset to zero. */ | |
| 2059 while (i >= idx) | |
| 2060 { | |
| 2061 wp->w_lines[i].wl_size = 0; | |
| 2062 wp->w_lines[i--].wl_valid = FALSE; | |
| 2063 } | |
| 2064 } | |
| 2065 } | |
| 2066 } | |
| 2067 } | |
| 2068 | |
| 2069 #ifdef FEAT_FOLDING | |
| 2070 /* | |
| 2071 * When lines are folded, display one line for all of them. | |
| 2072 * Otherwise, display normally (can be several display lines when | |
| 2073 * 'wrap' is on). | |
| 2074 */ | |
| 2075 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2076 if (fold_count != 0) | |
| 2077 { | |
| 2078 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2079 ++row; | |
| 2080 --fold_count; | |
| 2081 wp->w_lines[idx].wl_folded = TRUE; | |
| 2082 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2083 # ifdef FEAT_SYN_HL | |
| 2084 did_update = DID_FOLD; | |
| 2085 # endif | |
| 2086 } | |
| 2087 else | |
| 2088 #endif | |
| 2089 if (idx < wp->w_lines_valid | |
| 2090 && wp->w_lines[idx].wl_valid | |
| 2091 && wp->w_lines[idx].wl_lnum == lnum | |
| 2092 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2093 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2094 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2095 #ifdef FEAT_DIFF | |
| 2096 && diff_check_fill(wp, lnum) == 0 | |
| 2097 #endif | |
| 2098 ) | |
| 2099 { | |
| 2100 /* This line is not going to fit. Don't draw anything here, | |
| 2101 * will draw "@ " lines below. */ | |
| 2102 row = wp->w_height + 1; | |
| 2103 } | |
| 2104 else | |
| 2105 { | |
| 2106 #ifdef FEAT_SEARCH_EXTRA | |
| 2107 prepare_search_hl(wp, lnum); | |
| 2108 #endif | |
| 2109 #ifdef FEAT_SYN_HL | |
| 2110 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2111 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
|
2112 && syntax_present(wp)) |
| 7 | 2113 syntax_end_parsing(syntax_last_parsed + 1); |
| 2114 #endif | |
| 2115 | |
| 2116 /* | |
| 2117 * Display one line. | |
| 2118 */ | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2119 row = win_line(wp, lnum, srow, wp->w_height, mod_top == 0); |
| 7 | 2120 |
| 2121 #ifdef FEAT_FOLDING | |
| 2122 wp->w_lines[idx].wl_folded = FALSE; | |
| 2123 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2124 #endif | |
| 2125 #ifdef FEAT_SYN_HL | |
| 2126 did_update = DID_LINE; | |
| 2127 syntax_last_parsed = lnum; | |
| 2128 #endif | |
| 2129 } | |
| 2130 | |
| 2131 wp->w_lines[idx].wl_lnum = lnum; | |
| 2132 wp->w_lines[idx].wl_valid = TRUE; | |
|
12700
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2133 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2134 /* Past end of the window or end of the screen. Note that after |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2135 * resizing wp->w_height may be end up too big. That's a problem |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2136 * elsewhere, but prevent a crash here. */ |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2137 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2138 { |
| 2139 /* we may need the size of that too long line later on */ | |
| 3318 | 2140 if (dollar_vcol == -1) |
| 7 | 2141 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2142 ++idx; | |
| 2143 break; | |
| 2144 } | |
| 3318 | 2145 if (dollar_vcol == -1) |
| 7 | 2146 wp->w_lines[idx].wl_size = row - srow; |
| 2147 ++idx; | |
| 2148 #ifdef FEAT_FOLDING | |
| 2149 lnum += fold_count + 1; | |
| 2150 #else | |
| 2151 ++lnum; | |
| 2152 #endif | |
| 2153 } | |
| 2154 else | |
| 2155 { | |
| 2156 /* This line does not need updating, advance to the next one */ | |
| 2157 row += wp->w_lines[idx++].wl_size; | |
| 2158 if (row > wp->w_height) /* past end of screen */ | |
| 2159 break; | |
| 2160 #ifdef FEAT_FOLDING | |
| 2161 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2162 #else | |
| 2163 ++lnum; | |
| 2164 #endif | |
| 2165 #ifdef FEAT_SYN_HL | |
| 2166 did_update = DID_NONE; | |
| 2167 #endif | |
| 2168 } | |
| 2169 | |
| 2170 if (lnum > buf->b_ml.ml_line_count) | |
| 2171 { | |
| 2172 eof = TRUE; | |
| 2173 break; | |
| 2174 } | |
| 2175 } | |
| 2176 /* | |
| 2177 * End of loop over all window lines. | |
| 2178 */ | |
| 2179 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2180 #ifdef FEAT_VTP |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2181 /* Rewrite the character at the end of the screen line. */ |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2182 if (use_vtp()) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2183 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2184 int i; |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2185 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2186 for (i = 0; i < Rows; ++i) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2187 # ifdef FEAT_MBYTE |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2188 if (enc_utf8) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2189 if ((*mb_off2cells)(LineOffset[i] + Columns - 2, |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2190 LineOffset[i] + screen_Columns) > 1) |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2191 screen_draw_rectangle(i, Columns - 2, 1, 2, FALSE); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2192 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2193 screen_draw_rectangle(i, Columns - 1, 1, 1, FALSE); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2194 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2195 # endif |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2196 screen_char(LineOffset[i] + Columns - 1, i, Columns - 1); |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2197 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2198 #endif |
| 7 | 2199 |
| 2200 if (idx > wp->w_lines_valid) | |
| 2201 wp->w_lines_valid = idx; | |
| 2202 | |
| 2203 #ifdef FEAT_SYN_HL | |
| 2204 /* | |
| 2205 * Let the syntax stuff know we stop parsing here. | |
| 2206 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2207 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2208 syntax_end_parsing(syntax_last_parsed + 1); |
| 2209 #endif | |
| 2210 | |
| 2211 /* | |
| 2212 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2213 * line we were working on, then the line didn't fit. | |
| 2214 */ | |
| 2215 wp->w_empty_rows = 0; | |
| 2216 #ifdef FEAT_DIFF | |
| 2217 wp->w_filler_rows = 0; | |
| 2218 #endif | |
| 2219 if (!eof && !didline) | |
| 2220 { | |
| 2221 if (lnum == wp->w_topline) | |
| 2222 { | |
| 2223 /* | |
| 2224 * Single line that does not fit! | |
| 2225 * Don't overwrite it, it can be edited. | |
| 2226 */ | |
| 2227 wp->w_botline = lnum + 1; | |
| 2228 } | |
| 2229 #ifdef FEAT_DIFF | |
| 2230 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2231 { | |
| 2232 /* Window ends in filler lines. */ | |
| 2233 wp->w_botline = lnum; | |
| 2234 wp->w_filler_rows = wp->w_height - srow; | |
| 2235 } | |
| 2236 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2237 else if (dy_flags & DY_TRUNCATE) /* 'display' has "truncate" */ |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2238 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2239 int scr_row = W_WINROW(wp) + wp->w_height - 1; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2240 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2241 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2242 * Last line isn't finished: Display "@@@" in the last screen line. |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2243 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2244 screen_puts_len((char_u *)"@@", 2, scr_row, wp->w_wincol, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2245 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2246 screen_fill(scr_row, scr_row + 1, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2247 (int)wp->w_wincol + 2, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2248 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2249 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2250 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2251 } |
| 7 | 2252 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2253 { | |
| 2254 /* | |
| 2255 * Last line isn't finished: Display "@@@" at the end. | |
| 2256 */ | |
| 2257 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2258 W_WINROW(wp) + wp->w_height, | |
| 2259 (int)W_ENDCOL(wp) - 3, (int)W_ENDCOL(wp), | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2260 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2261 set_empty_rows(wp, srow); |
| 2262 wp->w_botline = lnum; | |
| 2263 } | |
| 2264 else | |
| 2265 { | |
| 2266 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2267 wp->w_botline = lnum; | |
| 2268 } | |
| 2269 } | |
| 2270 else | |
| 2271 { | |
| 2272 draw_vsep_win(wp, row); | |
| 2273 if (eof) /* we hit the end of the file */ | |
| 2274 { | |
| 2275 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2276 #ifdef FEAT_DIFF | |
| 2277 j = diff_check_fill(wp, wp->w_botline); | |
| 2278 if (j > 0 && !wp->w_botfill) | |
| 2279 { | |
| 2280 /* | |
| 2281 * Display filler lines at the end of the file | |
| 2282 */ | |
| 2283 if (char2cells(fill_diff) > 1) | |
| 2284 i = '-'; | |
| 2285 else | |
| 2286 i = fill_diff; | |
| 2287 if (row + j > wp->w_height) | |
| 2288 j = wp->w_height - row; | |
| 2289 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2290 row += j; | |
| 2291 } | |
| 2292 #endif | |
| 2293 } | |
| 3318 | 2294 else if (dollar_vcol == -1) |
| 7 | 2295 wp->w_botline = lnum; |
| 2296 | |
| 2297 /* make sure the rest of the screen is blank */ | |
| 2298 /* 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
|
2299 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2300 } |
| 2301 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2302 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2303 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2304 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2305 |
| 7 | 2306 /* Reset the type of redrawing required, the window has been updated. */ |
| 2307 wp->w_redr_type = 0; | |
| 2308 #ifdef FEAT_DIFF | |
| 2309 wp->w_old_topfill = wp->w_topfill; | |
| 2310 wp->w_old_botfill = wp->w_botfill; | |
| 2311 #endif | |
| 2312 | |
| 3318 | 2313 if (dollar_vcol == -1) |
| 7 | 2314 { |
| 2315 /* | |
| 2316 * There is a trick with w_botline. If we invalidate it on each | |
| 2317 * change that might modify it, this will cause a lot of expensive | |
| 2318 * calls to plines() in update_topline() each time. Therefore the | |
| 2319 * value of w_botline is often approximated, and this value is used to | |
| 2320 * compute the value of w_topline. If the value of w_botline was | |
| 2321 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2322 * the visible part of the text). If it's not, we need to redraw | |
| 2323 * again. Mostly this just means scrolling up a few lines, so it | |
| 2324 * doesn't look too bad. Only do this for the current window (where | |
| 2325 * changes are relevant). | |
| 2326 */ | |
| 2327 wp->w_valid |= VALID_BOTLINE; | |
| 2328 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2329 { | |
| 2330 recursive = TRUE; | |
| 2331 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2332 update_topline(); /* may invalidate w_botline again */ | |
| 2333 if (must_redraw != 0) | |
| 2334 { | |
| 2335 /* Don't update for changes in buffer again. */ | |
| 2336 i = curbuf->b_mod_set; | |
| 2337 curbuf->b_mod_set = FALSE; | |
| 2338 win_update(curwin); | |
| 2339 must_redraw = 0; | |
| 2340 curbuf->b_mod_set = i; | |
| 2341 } | |
| 2342 recursive = FALSE; | |
| 2343 } | |
| 2344 } | |
| 2345 | |
| 2346 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2347 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2348 if (!got_int) | |
| 2349 got_int = save_got_int; | |
| 2350 #endif | |
| 2351 } | |
| 2352 | |
| 2353 /* | |
| 2354 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2355 * as the filler character. | |
| 2356 */ | |
| 2357 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2358 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2359 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2360 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2361 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2362 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2363 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2364 hlf_T hl) |
| 7 | 2365 { |
| 2366 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2367 int n = 0; | |
| 2368 # define FDC_OFF n | |
| 2369 #else | |
| 2370 # define FDC_OFF 0 | |
| 2371 #endif | |
| 6553 | 2372 #ifdef FEAT_FOLDING |
| 2373 int fdc = compute_foldcolumn(wp, 0); | |
| 2374 #endif | |
| 7 | 2375 |
| 2376 #ifdef FEAT_RIGHTLEFT | |
| 2377 if (wp->w_p_rl) | |
| 2378 { | |
| 2379 /* No check for cmdline window: should never be right-left. */ | |
| 2380 # ifdef FEAT_FOLDING | |
| 6553 | 2381 n = fdc; |
| 7 | 2382 |
| 2383 if (n > 0) | |
| 2384 { | |
| 2385 /* draw the fold column at the right */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2386 if (n > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2387 n = wp->w_width; |
| 7 | 2388 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2389 W_ENDCOL(wp) - n, (int)W_ENDCOL(wp), | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2390 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2391 } |
| 2392 # endif | |
| 2393 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2394 if (signcolumn_on(wp)) |
| 7 | 2395 { |
| 2396 int nn = n + 2; | |
| 2397 | |
| 2398 /* draw the sign column left of the fold column */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2399 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2400 nn = wp->w_width; |
| 7 | 2401 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2402 W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2403 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2404 n = nn; |
| 2405 } | |
| 2406 # endif | |
| 2407 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2408 wp->w_wincol, W_ENDCOL(wp) - 1 - FDC_OFF, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2409 c2, c2, HL_ATTR(hl)); |
| 7 | 2410 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2411 W_ENDCOL(wp) - 1 - FDC_OFF, W_ENDCOL(wp) - FDC_OFF, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2412 c1, c2, HL_ATTR(hl)); |
| 7 | 2413 } |
| 2414 else | |
| 2415 #endif | |
| 2416 { | |
| 2417 #ifdef FEAT_CMDWIN | |
| 2418 if (cmdwin_type != 0 && wp == curwin) | |
| 2419 { | |
| 2420 /* draw the cmdline character in the leftmost column */ | |
| 2421 n = 1; | |
| 2422 if (n > wp->w_width) | |
| 2423 n = wp->w_width; | |
| 2424 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2425 wp->w_wincol, (int)wp->w_wincol + n, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2426 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2427 } |
| 2428 #endif | |
| 2429 #ifdef FEAT_FOLDING | |
| 6553 | 2430 if (fdc > 0) |
| 2431 { | |
| 2432 int nn = n + fdc; | |
| 7 | 2433 |
| 2434 /* draw the fold column at the left */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2435 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2436 nn = wp->w_width; |
| 7 | 2437 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2438 wp->w_wincol + n, (int)wp->w_wincol + nn, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2439 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2440 n = nn; |
| 2441 } | |
| 2442 #endif | |
| 2443 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2444 if (signcolumn_on(wp)) |
| 7 | 2445 { |
| 2446 int nn = n + 2; | |
| 2447 | |
| 2448 /* draw the sign column after the fold column */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2449 if (nn > wp->w_width) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2450 nn = wp->w_width; |
| 7 | 2451 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2452 wp->w_wincol + n, (int)wp->w_wincol + nn, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2453 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2454 n = nn; |
| 2455 } | |
| 2456 #endif | |
| 2457 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2458 wp->w_wincol + FDC_OFF, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2459 c1, c2, HL_ATTR(hl)); |
| 7 | 2460 } |
| 2461 set_empty_rows(wp, row); | |
| 2462 } | |
| 2463 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2464 #ifdef FEAT_SYN_HL |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2465 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
|
2466 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2467 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2468 * 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
|
2469 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2470 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2471 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
|
2472 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2473 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2474 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2475 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2476 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2477 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2478 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2479 #if defined(FEAT_MENU) || defined(FEAT_FOLDING) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2480 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2481 * Copy "text" to ScreenLines using "attr". |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2482 * Returns the next screen column. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2483 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2484 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2485 text_to_screenline(win_T *wp, char_u *text, int col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2486 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2487 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2488 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2489 #ifdef FEAT_MBYTE |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2490 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2491 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2492 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2493 int u8c, u8cc[MAX_MCO]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2494 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2495 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2497 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2498 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2499 int prev_c = 0; /* previous Arabic character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2500 int prev_c1 = 0; /* first composing char for prev_c */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2502 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2503 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2504 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2505 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2508 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2509 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2510 /* Store multibyte characters in ScreenLines[] et al. correctly. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2511 for (p = text; *p != NUL; ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2512 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2513 cells = (*mb_ptr2cells)(p); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2514 c_len = (*mb_ptr2len)(p); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2515 if (col + cells > wp->w_width |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 - (wp->w_p_rl ? col : 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2518 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2519 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2520 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2522 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2524 u8c = utfc_ptr2char(p, u8cc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2525 if (*p < 0x80 && u8cc[0] == 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2526 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2528 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2529 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2530 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2531 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2532 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2533 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2535 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2537 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2538 int pc, pc1, nc; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2539 int pcc[MAX_MCO]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2540 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2542 /* The idea of what is the previous and next |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2543 * character depends on 'rightleft'. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2544 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2545 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2546 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2548 nc = utf_ptr2char(p + c_len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 prev_c1 = u8cc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2550 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2553 pc = utfc_ptr2char(p + c_len, pcc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2554 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2555 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2557 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2558 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2559 u8c = arabic_shape(u8c, &firstbyte, &u8cc[0], |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2560 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2561 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2562 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2563 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2564 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2565 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2566 /* Non-BMP character: display as ? or fullwidth ?. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2567 #ifdef UNICODE16 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2568 if (u8c >= 0x10000) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2569 ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?'; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2570 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2571 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 ScreenLinesUC[idx] = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2573 for (i = 0; i < Screen_mco; ++i) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2574 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2575 ScreenLinesC[i][idx] = u8cc[i]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2576 if (u8cc[i] == 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2578 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2579 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2580 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2581 ScreenLines[idx + 1] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2582 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2583 else if (enc_dbcs == DBCS_JPNU && *p == 0x8e) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2584 /* double-byte single width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2585 ScreenLines2[idx] = p[1]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2586 else if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2587 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2588 ScreenLines[idx + 1] = p[1]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2589 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2590 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2591 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2592 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2593 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2594 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2595 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2596 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2597 int len = (int)STRLEN(text); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2598 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2599 if (len > wp->w_width - col) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2600 len = wp->w_width - col; |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2601 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2602 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2603 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2604 if (wp->w_p_rl) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2605 STRNCPY(current_ScreenLine, text, len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2606 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2607 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2608 STRNCPY(current_ScreenLine + col, text, len); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2609 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2610 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2611 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2612 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2613 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2614 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2615 |
| 7 | 2616 #ifdef FEAT_FOLDING |
| 2617 /* | |
| 6553 | 2618 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2619 * space is available for window "wp", minus "col". | |
| 2620 */ | |
| 2621 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2622 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2623 { |
| 2624 int fdc = wp->w_p_fdc; | |
| 2625 int wmw = wp == curwin && p_wmw == 0 ? 1 : p_wmw; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2626 int wwidth = wp->w_width; |
| 6553 | 2627 |
| 2628 if (fdc > wwidth - (col + wmw)) | |
| 2629 fdc = wwidth - (col + wmw); | |
| 2630 return fdc; | |
| 2631 } | |
| 2632 | |
| 2633 /* | |
| 7 | 2634 * Display one folded line. |
| 2635 */ | |
| 2636 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2637 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2638 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2639 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2640 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2641 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2642 int row) |
| 7 | 2643 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2644 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2645 pos_T *top, *bot; |
| 2646 linenr_T lnume = lnum + fold_count - 1; | |
| 2647 int len; | |
| 29 | 2648 char_u *text; |
| 7 | 2649 int fdc; |
| 2650 int col; | |
| 2651 int txtcol; | |
| 2652 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2653 int ri; |
| 7 | 2654 |
| 2655 /* Build the fold line: | |
| 2656 * 1. Add the cmdwin_type for the command-line window | |
| 2657 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2658 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2659 * 4. Compose the text |
| 2660 * 5. Add the text | |
| 2661 * 6. set highlighting for the Visual area an other text | |
| 2662 */ | |
| 2663 col = 0; | |
| 2664 | |
| 2665 /* | |
| 2666 * 1. Add the cmdwin_type for the command-line window | |
| 2667 * Ignores 'rightleft', this window is never right-left. | |
| 2668 */ | |
| 2669 #ifdef FEAT_CMDWIN | |
| 2670 if (cmdwin_type != 0 && wp == curwin) | |
| 2671 { | |
| 2672 ScreenLines[off] = cmdwin_type; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2673 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2674 #ifdef FEAT_MBYTE |
| 2675 if (enc_utf8) | |
| 2676 ScreenLinesUC[off] = 0; | |
| 2677 #endif | |
| 2678 ++col; | |
| 2679 } | |
| 2680 #endif | |
| 2681 | |
| 2682 /* | |
| 2683 * 2. Add the 'foldcolumn' | |
| 6553 | 2684 * Reduce the width when there is not enough space. |
| 7 | 2685 */ |
| 6553 | 2686 fdc = compute_foldcolumn(wp, col); |
| 7 | 2687 if (fdc > 0) |
| 2688 { | |
| 2689 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2690 #ifdef FEAT_RIGHTLEFT | |
| 2691 if (wp->w_p_rl) | |
| 2692 { | |
| 2693 int i; | |
| 2694 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2695 copy_text_attr(off + wp->w_width - fdc - col, buf, fdc, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2696 HL_ATTR(HLF_FC)); |
| 7 | 2697 /* reverse the fold column */ |
| 2698 for (i = 0; i < fdc; ++i) | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2699 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2700 } |
| 2701 else | |
| 2702 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2703 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2704 col += fdc; |
| 2705 } | |
| 2706 | |
| 2707 #ifdef FEAT_RIGHTLEFT | |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2708 # define RL_MEMSET(p, v, l) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2709 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2710 if (wp->w_p_rl) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2711 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2712 ScreenAttrs[off + (wp->w_width - (p) - (l)) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2713 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2714 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2715 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2716 } while (0) |
| 7 | 2717 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2718 # define RL_MEMSET(p, v, l) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2719 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2720 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2721 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2722 } while (0) |
| 7 | 2723 #endif |
| 2724 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2725 /* 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
|
2726 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2727 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2728 |
| 2729 #ifdef FEAT_SIGNS | |
| 2730 /* 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
|
2731 if (signcolumn_on(wp)) |
| 7 | 2732 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2733 len = wp->w_width - col; |
| 7 | 2734 if (len > 0) |
| 2735 { | |
| 2736 if (len > 2) | |
| 2737 len = 2; | |
| 2738 # ifdef FEAT_RIGHTLEFT | |
| 2739 if (wp->w_p_rl) | |
| 2740 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2741 copy_text_attr(off + wp->w_width - len - col, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2742 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2743 else |
| 2744 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2745 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2746 col += len; |
| 2747 } | |
| 2748 } | |
| 2749 #endif | |
| 2750 | |
| 2751 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2752 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2753 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2754 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2755 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2756 len = wp->w_width - col; |
| 7 | 2757 if (len > 0) |
| 2758 { | |
| 13 | 2759 int w = number_width(wp); |
| 5905 | 2760 long num; |
| 2761 char *fmt = "%*ld "; | |
| 13 | 2762 |
| 2763 if (len > w + 1) | |
| 2764 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2765 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2766 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
|
2767 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2768 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2769 else |
| 4065 | 2770 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2771 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2772 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
|
2773 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
|
2774 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2775 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2776 * line number */ |
| 4065 | 2777 num = lnum; |
| 2778 fmt = "%-*ld "; | |
| 2779 } | |
| 2780 } | |
| 2781 | |
| 2782 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2783 #ifdef FEAT_RIGHTLEFT |
| 2784 if (wp->w_p_rl) | |
| 2785 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2786 copy_text_attr(off + wp->w_width - len - col, buf, len, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2787 HL_ATTR(HLF_FL)); |
| 7 | 2788 else |
| 2789 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2790 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2791 col += len; |
| 2792 } | |
| 2793 } | |
| 2794 | |
| 2795 /* | |
| 2796 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2797 */ | |
| 29 | 2798 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2799 |
| 2800 txtcol = col; /* remember where text starts */ | |
| 2801 | |
| 2802 /* | |
| 2803 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2804 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2805 * in columns number-col - window-width. | |
| 2806 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2807 col = text_to_screenline(wp, text, col); |
| 7 | 2808 |
| 2809 /* Fill the rest of the line with the fold filler */ | |
| 2810 #ifdef FEAT_RIGHTLEFT | |
| 2811 if (wp->w_p_rl) | |
| 2812 col -= txtcol; | |
| 2813 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2814 while (col < wp->w_width |
| 7 | 2815 #ifdef FEAT_RIGHTLEFT |
| 2816 - (wp->w_p_rl ? txtcol : 0) | |
| 2817 #endif | |
| 2818 ) | |
| 2819 { | |
| 2820 #ifdef FEAT_MBYTE | |
| 2821 if (enc_utf8) | |
| 2822 { | |
| 2823 if (fill_fold >= 0x80) | |
| 2824 { | |
| 2825 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2826 ScreenLinesC[0][off + col] = 0; |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
2827 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2828 } |
| 2829 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2830 { |
| 7 | 2831 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2832 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2833 } |
|
11265
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2834 col++; |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2835 } |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2836 else |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2837 #endif |
|
b25895ab67be
patch 8.0.0518: bad fold text when a multi-byte char has a zero byte
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
2838 ScreenLines[off + col++] = fill_fold; |
| 7 | 2839 } |
| 2840 | |
| 2841 if (text != buf) | |
| 2842 vim_free(text); | |
| 2843 | |
| 2844 /* | |
| 2845 * 6. set highlighting for the Visual area an other text. | |
| 2846 * If all folded lines are in the Visual area, highlight the line. | |
| 2847 */ | |
| 2848 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2849 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2850 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2851 { |
| 2852 /* Visual is after curwin->w_cursor */ | |
| 2853 top = &curwin->w_cursor; | |
| 2854 bot = &VIsual; | |
| 2855 } | |
| 2856 else | |
| 2857 { | |
| 2858 /* Visual is before curwin->w_cursor */ | |
| 2859 top = &VIsual; | |
| 2860 bot = &curwin->w_cursor; | |
| 2861 } | |
| 2862 if (lnum >= top->lnum | |
| 2863 && lnume <= bot->lnum | |
| 2864 && (VIsual_mode != 'v' | |
| 2865 || ((lnum > top->lnum | |
| 2866 || (lnum == top->lnum | |
| 2867 && top->col == 0)) | |
| 2868 && (lnume < bot->lnum | |
| 2869 || (lnume == bot->lnum | |
| 2870 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2871 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2872 { |
| 2873 if (VIsual_mode == Ctrl_V) | |
| 2874 { | |
| 2875 /* Visual block mode: highlight the chars part of the block */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2876 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2877 { |
| 3040 | 2878 if (wp->w_old_cursor_lcol != MAXCOL |
| 2879 && wp->w_old_cursor_lcol + txtcol | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2880 < (colnr_T)wp->w_width) |
| 7 | 2881 len = wp->w_old_cursor_lcol; |
| 2882 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2883 len = wp->w_width - txtcol; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2884 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2885 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2886 } |
| 2887 } | |
| 2888 else | |
| 216 | 2889 { |
| 7 | 2890 /* Set all attributes of the text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2891 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2892 } |
| 7 | 2893 } |
| 2894 } | |
| 2895 | |
| 743 | 2896 #ifdef FEAT_SYN_HL |
| 6685 | 2897 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2898 if (wp->w_p_cc_cols) | |
| 2899 { | |
| 2900 int i = 0; | |
| 2901 int j = wp->w_p_cc_cols[i]; | |
| 2902 int old_txtcol = txtcol; | |
| 2903 | |
| 2904 while (j > -1) | |
| 2905 { | |
| 2906 txtcol += j; | |
| 2907 if (wp->w_p_wrap) | |
| 2908 txtcol -= wp->w_skipcol; | |
| 2909 else | |
| 2910 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2911 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2912 ScreenAttrs[off + txtcol] = hl_combine_attr( |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2913 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2914 txtcol = old_txtcol; |
| 2915 j = wp->w_p_cc_cols[++i]; | |
| 2916 } | |
| 2917 } | |
| 2918 | |
| 743 | 2919 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2920 if (wp->w_p_cuc) |
| 2921 { | |
| 2922 txtcol += wp->w_virtcol; | |
| 2923 if (wp->w_p_wrap) | |
| 2924 txtcol -= wp->w_skipcol; | |
| 2925 else | |
| 2926 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2927 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2928 ScreenAttrs[off + txtcol] = hl_combine_attr( |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2929 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2930 } |
| 743 | 2931 #endif |
| 7 | 2932 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2933 screen_line(row + W_WINROW(wp), wp->w_wincol, (int)wp->w_width, |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2934 (int)wp->w_width, FALSE); |
| 7 | 2935 |
| 2936 /* | |
| 2937 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2938 * updated (saves a call to plines() later). | |
| 2939 */ | |
| 2940 if (wp == curwin | |
| 2941 && lnum <= curwin->w_cursor.lnum | |
| 2942 && lnume >= curwin->w_cursor.lnum) | |
| 2943 { | |
| 2944 curwin->w_cline_row = row; | |
| 2945 curwin->w_cline_height = 1; | |
| 2946 curwin->w_cline_folded = TRUE; | |
| 2947 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2948 } | |
| 2949 } | |
| 2950 | |
| 2951 /* | |
| 2952 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2953 */ | |
| 2954 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2955 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2956 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2957 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2958 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2959 int attr) |
| 7 | 2960 { |
| 216 | 2961 int i; |
| 2962 | |
| 7 | 2963 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2964 # ifdef FEAT_MBYTE | |
| 2965 if (enc_utf8) | |
| 2966 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2967 # endif | |
| 216 | 2968 for (i = 0; i < len; ++i) |
| 2969 ScreenAttrs[off + i] = attr; | |
| 7 | 2970 } |
| 2971 | |
| 2972 /* | |
| 2973 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2974 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2975 */ |
| 2976 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2977 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2978 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2979 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2980 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2981 linenr_T lnum) /* current line number */ |
| 7 | 2982 { |
| 2983 int i = 0; | |
| 2984 int level; | |
| 2985 int first_level; | |
| 519 | 2986 int empty; |
| 6553 | 2987 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2988 |
| 2989 /* Init to all spaces. */ | |
| 6929 | 2990 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2991 |
| 2992 level = win_foldinfo.fi_level; | |
| 2993 if (level > 0) | |
| 2994 { | |
| 519 | 2995 /* If there is only one column put more info in it. */ |
| 6553 | 2996 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2997 |
| 7 | 2998 /* If the column is too narrow, we start at the lowest level that |
| 2999 * fits and use numbers to indicated the depth. */ | |
| 6553 | 3000 first_level = level - fdc - closed + 1 + empty; |
| 7 | 3001 if (first_level < 1) |
| 3002 first_level = 1; | |
| 3003 | |
| 6553 | 3004 for (i = 0; i + empty < fdc; ++i) |
| 7 | 3005 { |
| 3006 if (win_foldinfo.fi_lnum == lnum | |
| 3007 && first_level + i >= win_foldinfo.fi_low_level) | |
| 3008 p[i] = '-'; | |
| 3009 else if (first_level == 1) | |
| 3010 p[i] = '|'; | |
| 3011 else if (first_level + i <= 9) | |
| 3012 p[i] = '0' + first_level + i; | |
| 3013 else | |
| 3014 p[i] = '>'; | |
| 3015 if (first_level + i == level) | |
| 3016 break; | |
| 3017 } | |
| 3018 } | |
| 3019 if (closed) | |
| 6553 | 3020 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3021 } |
| 3022 #endif /* FEAT_FOLDING */ | |
| 3023 | |
| 3024 /* | |
| 3025 * Display line "lnum" of window 'wp' on the screen. | |
| 3026 * Start at row "startrow", stop when "endrow" is reached. | |
| 3027 * wp->w_virtcol needs to be valid. | |
| 3028 * | |
| 3029 * Return the number of last row the line occupies. | |
| 3030 */ | |
| 3031 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3032 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3033 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3034 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3035 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3036 int endrow, |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3037 int nochange UNUSED) /* not updating for changed text */ |
| 7 | 3038 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3039 int col = 0; /* visual column on screen */ |
| 7 | 3040 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3041 int c = 0; /* init for GCC */ | |
| 3042 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3043 #ifdef FEAT_LINEBREAK |
| 3044 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3045 #endif | |
| 7 | 3046 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3047 char_u *line; /* current line */ | |
| 3048 char_u *ptr; /* current position in "line" */ | |
| 3049 int row; /* row in the window, excl w_winrow */ | |
| 3050 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3051 | |
| 3052 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3053 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3054 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3055 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3056 int c_extra = NUL; /* extra chars, all the same */ |
| 3057 int extra_attr = 0; /* attributes when n_extra != 0 */ | |
| 3058 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3059 displaying lcs_eol at end-of-line */ | |
| 3060 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3061 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3062 | |
| 3063 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3064 int saved_n_extra = 0; | |
| 3065 char_u *saved_p_extra = NULL; | |
| 3066 int saved_c_extra = 0; | |
| 3067 int saved_char_attr = 0; | |
| 3068 | |
| 3069 int n_attr = 0; /* chars with special attr */ | |
| 3070 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3071 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3072 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3073 | |
| 3074 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3075 | |
| 3076 int fromcol, tocol; /* start/end of inverting */ | |
| 3077 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3078 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3079 pos_T *top, *bot; | |
| 1813 | 3080 int lnum_in_visual_area = FALSE; |
| 7 | 3081 pos_T pos; |
| 3082 long v; | |
| 3083 | |
| 3084 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3085 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3086 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3087 in this line */ | |
| 3088 int attr = 0; /* attributes for area highlighting */ | |
| 3089 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3090 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3091 #ifdef FEAT_SYN_HL | |
| 743 | 3092 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3093 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3094 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3095 int save_did_emsg; | |
| 1437 | 3096 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
|
3097 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3098 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3099 #endif |
| 3100 #ifdef FEAT_SPELL | |
| 221 | 3101 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3102 # define SPWORDLEN 150 |
| 3103 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3104 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3105 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3106 starts */ |
| 221 | 3107 int spell_attr = 0; /* attributes desired by spelling */ |
| 3108 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3109 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3110 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3111 * there are no spell errors */ |
| 386 | 3112 static int cap_col = -1; /* column to check for Cap word */ |
| 3113 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3114 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3115 #endif |
| 3116 int extra_check; /* has syntax or linebreak */ | |
| 3117 #ifdef FEAT_MBYTE | |
| 3118 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 3119 int mb_l = 1; /* multi-byte byte length */ | |
| 3120 int mb_c = 0; /* decoded multi-byte character */ | |
| 3121 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3122 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3123 #endif |
| 3124 #ifdef FEAT_DIFF | |
| 3125 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3126 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3127 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3128 int change_start = MAXCOL; /* first col of changed area */ |
| 3129 int change_end = -1; /* last col of changed area */ | |
| 3130 #endif | |
| 3131 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3132 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3133 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
|
3134 chars */ |
| 7 | 3135 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3136 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3137 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3138 # define LINE_ATTR |
| 1536 | 3139 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3140 #endif |
| 3141 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3142 matchitem_T *cur; /* points to the match list */ |
| 3143 match_T *shl; /* points to search_hl or a match */ | |
| 3144 int shl_flag; /* flag to indicate whether search_hl | |
| 3145 has been processed or not */ | |
| 5979 | 3146 int pos_inprogress; /* marks that position match search is |
| 3147 in progress */ | |
| 1326 | 3148 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3149 equals startcol of search_hl or one | |
| 3150 of the matches */ | |
| 7 | 3151 #endif |
| 3152 #ifdef FEAT_ARABIC | |
| 3153 int prev_c = 0; /* previous Arabic character */ | |
| 3154 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3155 #endif | |
| 910 | 3156 #if defined(LINE_ATTR) |
| 867 | 3157 int did_line_attr = 0; |
| 3158 #endif | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3159 #ifdef FEAT_TERMINAL |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3160 int get_term_attr = FALSE; |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
3161 int term_attr = 0; /* background for terminal window */ |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3162 #endif |
| 7 | 3163 |
| 3164 /* draw_state: items that are drawn in sequence: */ | |
| 3165 #define WL_START 0 /* nothing done yet */ | |
| 3166 #ifdef FEAT_CMDWIN | |
| 3167 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3168 #else | |
| 3169 # define WL_CMDLINE WL_START | |
| 3170 #endif | |
| 3171 #ifdef FEAT_FOLDING | |
| 3172 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3173 #else | |
| 3174 # define WL_FOLD WL_CMDLINE | |
| 3175 #endif | |
| 3176 #ifdef FEAT_SIGNS | |
| 3177 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3178 #else | |
| 3179 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3180 #endif | |
| 3181 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3182 #ifdef FEAT_LINEBREAK |
| 3183 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3184 #else | |
| 3185 # define WL_BRI WL_NR | |
| 3186 #endif | |
| 7 | 3187 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3188 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3189 #else |
| 5995 | 3190 # define WL_SBR WL_BRI |
| 7 | 3191 #endif |
| 3192 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3193 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3194 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3195 int feedback_col = 0; |
| 3196 int feedback_old_attr = -1; | |
| 3197 #endif | |
| 3198 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3199 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3200 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
|
3201 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
|
3202 int prev_syntax_id = 0; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3203 int conceal_attr = HL_ATTR(HLF_CONCEAL); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3204 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3205 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
|
3206 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3207 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
|
3208 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3209 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
|
3210 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3211 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3212 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3213 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3214 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3215 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3216 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3217 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3218 col -= boguscols; \ |
| 6520 | 3219 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3220 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3221 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3222 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3223 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3224 #endif |
| 7 | 3225 |
| 3226 if (startrow > endrow) /* past the end already! */ | |
| 3227 return startrow; | |
| 3228 | |
| 3229 row = startrow; | |
| 3230 screen_row = row + W_WINROW(wp); | |
| 3231 | |
| 3232 /* | |
| 3233 * To speed up the loop below, set extra_check when there is linebreak, | |
| 3234 * trailing white space and/or syntax processing to be done. | |
| 3235 */ | |
| 3236 #ifdef FEAT_LINEBREAK | |
| 3237 extra_check = wp->w_p_lbr; | |
| 3238 #else | |
| 3239 extra_check = 0; | |
| 3240 #endif | |
| 3241 #ifdef FEAT_SYN_HL | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3242 if (syntax_present(wp) && !wp->w_s->b_syn_error |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3243 # ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3244 && !wp->w_s->b_syn_slow |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3245 # endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3246 ) |
| 7 | 3247 { |
| 3248 /* Prepare for syntax highlighting in this line. When there is an | |
| 3249 * error, stop syntax highlighting. */ | |
| 3250 save_did_emsg = did_emsg; | |
| 3251 did_emsg = FALSE; | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3252 syntax_start(wp, lnum); |
| 7 | 3253 if (did_emsg) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3254 wp->w_s->b_syn_error = TRUE; |
| 7 | 3255 else |
| 3256 { | |
| 3257 did_emsg = save_did_emsg; | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3258 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3259 if (!wp->w_s->b_syn_slow) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3260 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3261 { |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3262 has_syntax = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3263 extra_check = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3264 } |
| 7 | 3265 } |
| 3266 } | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3267 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3268 /* Check for columns to display for 'colorcolumn'. */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3269 color_cols = wp->w_p_cc_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3270 if (color_cols != NULL) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3271 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3272 #endif |
| 3273 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3274 #ifdef FEAT_TERMINAL |
|
11866
be40c8a9240d
patch 8.0.0813: cannot use a terminal window while the job is running
Christian Brabandt <cb@256bit.org>
parents:
11864
diff
changeset
|
3275 if (term_show_buffer(wp->w_buffer)) |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3276 { |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3277 extra_check = TRUE; |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3278 get_term_attr = TRUE; |
|
12435
40961647f547
patch 8.0.1097: background color wrong if job changes background color
Christian Brabandt <cb@256bit.org>
parents:
12433
diff
changeset
|
3279 term_attr = term_get_attr(wp->w_buffer, lnum, -1); |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3280 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3281 #endif |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3282 |
| 743 | 3283 #ifdef FEAT_SPELL |
| 258 | 3284 if (wp->w_p_spell |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3285 && *wp->w_s->b_p_spl != NUL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3286 && 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
|
3287 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
| 221 | 3288 { |
| 3289 /* Prepare for spell checking. */ | |
| 3290 has_spell = TRUE; | |
| 3291 extra_check = TRUE; | |
| 348 | 3292 |
| 3293 /* Get the start of the next line, so that words that wrap to the next | |
| 3294 * line are found too: "et<line-break>al.". | |
| 3295 * Trick: skip a few chars for C/shell/Vim comments */ | |
| 3296 nextline[SPWORDLEN] = NUL; | |
| 3297 if (lnum < wp->w_buffer->b_ml.ml_line_count) | |
| 3298 { | |
| 3299 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); | |
| 3300 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); | |
| 3301 } | |
| 3302 | |
| 3303 /* When a word wrapped from the previous line the start of the current | |
| 3304 * line is valid. */ | |
| 3305 if (lnum == checked_lnum) | |
| 3306 cur_checked_col = checked_col; | |
| 3307 checked_lnum = 0; | |
| 386 | 3308 |
| 3309 /* When there was a sentence end in the previous line may require a | |
| 3310 * word starting with capital in this line. In line 1 always check | |
| 3311 * the first word. */ | |
| 3312 if (lnum != capcol_lnum) | |
| 3313 cap_col = -1; | |
| 3314 if (lnum == 1) | |
| 3315 cap_col = 0; | |
| 3316 capcol_lnum = 0; | |
| 221 | 3317 } |
| 7 | 3318 #endif |
| 3319 | |
| 3320 /* | |
| 3321 * handle visual active in this window | |
| 3322 */ | |
| 3323 fromcol = -10; | |
| 3324 tocol = MAXCOL; | |
| 3325 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3326 { | |
| 3327 /* Visual is after curwin->w_cursor */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
3328 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3329 { |
| 3330 top = &curwin->w_cursor; | |
| 3331 bot = &VIsual; | |
| 3332 } | |
| 3333 else /* Visual is before curwin->w_cursor */ | |
| 3334 { | |
| 3335 top = &VIsual; | |
| 3336 bot = &curwin->w_cursor; | |
| 3337 } | |
| 1813 | 3338 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
| 7 | 3339 if (VIsual_mode == Ctrl_V) /* block mode */ |
| 3340 { | |
| 1813 | 3341 if (lnum_in_visual_area) |
| 7 | 3342 { |
| 3343 fromcol = wp->w_old_cursor_fcol; | |
| 3344 tocol = wp->w_old_cursor_lcol; | |
| 3345 } | |
| 3346 } | |
| 3347 else /* non-block mode */ | |
| 3348 { | |
| 3349 if (lnum > top->lnum && lnum <= bot->lnum) | |
| 3350 fromcol = 0; | |
| 3351 else if (lnum == top->lnum) | |
| 3352 { | |
| 3353 if (VIsual_mode == 'V') /* linewise */ | |
| 3354 fromcol = 0; | |
| 3355 else | |
| 3356 { | |
| 3357 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); | |
| 3358 if (gchar_pos(top) == NUL) | |
| 3359 tocol = fromcol + 1; | |
| 3360 } | |
| 3361 } | |
| 3362 if (VIsual_mode != 'V' && lnum == bot->lnum) | |
| 3363 { | |
| 3364 if (*p_sel == 'e' && bot->col == 0 | |
| 3365 #ifdef FEAT_VIRTUALEDIT | |
| 3366 && bot->coladd == 0 | |
| 3367 #endif | |
| 3368 ) | |
| 3369 { | |
| 3370 fromcol = -10; | |
| 3371 tocol = MAXCOL; | |
| 3372 } | |
| 36 | 3373 else if (bot->col == MAXCOL) |
| 3374 tocol = MAXCOL; | |
| 7 | 3375 else |
| 3376 { | |
| 3377 pos = *bot; | |
| 3378 if (*p_sel == 'e') | |
| 3379 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3380 else | |
| 3381 { | |
| 3382 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); | |
| 3383 ++tocol; | |
| 3384 } | |
| 3385 } | |
| 3386 } | |
| 3387 } | |
| 3388 | |
| 3389 /* Check if the character under the cursor should not be inverted */ | |
| 3390 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
|
3391 #ifdef FEAT_GUI |
| 7 | 3392 && !gui.in_use |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3393 #endif |
| 7 | 3394 ) |
| 3395 noinvcur = TRUE; | |
| 3396 | |
| 3397 /* if inverting in this line set area_highlighting */ | |
| 3398 if (fromcol >= 0) | |
| 3399 { | |
| 3400 area_highlighting = TRUE; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3401 attr = HL_ATTR(HLF_V); |
| 7 | 3402 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 3674 | 3403 if ((clip_star.available && !clip_star.owned |
| 3404 && clip_isautosel_star()) | |
| 3405 || (clip_plus.available && !clip_plus.owned | |
| 3406 && clip_isautosel_plus())) | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3407 attr = HL_ATTR(HLF_VNC); |
| 7 | 3408 #endif |
| 3409 } | |
| 3410 } | |
| 3411 | |
| 3412 /* | |
| 674 | 3413 * handle 'incsearch' and ":s///c" highlighting |
| 7 | 3414 */ |
| 5735 | 3415 else if (highlight_match |
| 7 | 3416 && wp == curwin |
| 3417 && lnum >= curwin->w_cursor.lnum | |
| 3418 && lnum <= curwin->w_cursor.lnum + search_match_lines) | |
| 3419 { | |
| 3420 if (lnum == curwin->w_cursor.lnum) | |
| 3421 getvcol(curwin, &(curwin->w_cursor), | |
| 3422 (colnr_T *)&fromcol, NULL, NULL); | |
| 3423 else | |
| 3424 fromcol = 0; | |
| 3425 if (lnum == curwin->w_cursor.lnum + search_match_lines) | |
| 3426 { | |
| 3427 pos.lnum = lnum; | |
| 3428 pos.col = search_match_endcol; | |
| 3429 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3430 } | |
| 3431 else | |
| 3432 tocol = MAXCOL; | |
| 1850 | 3433 /* do at least one character; happens when past end of line */ |
| 3434 if (fromcol == tocol) | |
| 3435 tocol = fromcol + 1; | |
| 7 | 3436 area_highlighting = TRUE; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3437 attr = HL_ATTR(HLF_I); |
| 7 | 3438 } |
| 3439 | |
| 3440 #ifdef FEAT_DIFF | |
| 3441 filler_lines = diff_check(wp, lnum); | |
| 3442 if (filler_lines < 0) | |
| 3443 { | |
| 3444 if (filler_lines == -1) | |
| 3445 { | |
| 3446 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3447 diff_hlf = HLF_ADD; /* added line */ | |
| 3448 else if (change_start == 0) | |
| 3449 diff_hlf = HLF_TXD; /* changed text */ | |
| 3450 else | |
| 3451 diff_hlf = HLF_CHD; /* changed line */ | |
| 3452 } | |
| 3453 else | |
| 3454 diff_hlf = HLF_ADD; /* added line */ | |
| 3455 filler_lines = 0; | |
| 3456 area_highlighting = TRUE; | |
| 3457 } | |
| 3458 if (lnum == wp->w_topline) | |
| 3459 filler_lines = wp->w_topfill; | |
| 3460 filler_todo = filler_lines; | |
| 3461 #endif | |
| 3462 | |
| 3463 #ifdef LINE_ATTR | |
| 3464 # ifdef FEAT_SIGNS | |
| 3465 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3466 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3467 if (v != 0) | |
| 3468 line_attr = sign_get_attr((int)v, TRUE); | |
| 3469 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3470 # if defined(FEAT_QUICKFIX) |
| 7 | 3471 /* Highlight the current line in the quickfix window. */ |
| 644 | 3472 if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) |
|
11516
80491a71c716
patch 8.0.0641: cannot set a separate highlighting for the quickfix line
Christian Brabandt <cb@256bit.org>
parents:
11420
diff
changeset
|
3473 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3474 # endif |
| 3475 if (line_attr != 0) | |
| 3476 area_highlighting = TRUE; | |
| 3477 #endif | |
| 3478 | |
| 3479 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3480 ptr = line; | |
| 3481 | |
| 743 | 3482 #ifdef FEAT_SPELL |
| 348 | 3483 if (has_spell) |
| 3484 { | |
| 386 | 3485 /* For checking first word with a capital skip white space. */ |
| 3486 if (cap_col == 0) | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
12317
diff
changeset
|
3487 cap_col = getwhitecols(line); |
| 386 | 3488 |
| 348 | 3489 /* To be able to spell-check over line boundaries copy the end of the |
| 3490 * current line into nextline[]. Above the start of the next line was | |
| 3491 * copied to nextline[SPWORDLEN]. */ | |
| 3492 if (nextline[SPWORDLEN] == NUL) | |
| 3493 { | |
| 3494 /* No next line or it is empty. */ | |
| 3495 nextlinecol = MAXCOL; | |
| 3496 nextline_idx = 0; | |
| 3497 } | |
| 3498 else | |
| 3499 { | |
| 835 | 3500 v = (long)STRLEN(line); |
| 348 | 3501 if (v < SPWORDLEN) |
| 3502 { | |
| 3503 /* Short line, use it completely and append the start of the | |
| 3504 * next line. */ | |
| 3505 nextlinecol = 0; | |
| 3506 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3507 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3508 nextline_idx = v + 1; |
| 3509 } | |
| 3510 else | |
| 3511 { | |
| 3512 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3513 nextlinecol = v - SPWORDLEN; | |
| 3514 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3515 nextline_idx = SPWORDLEN + 1; | |
| 3516 } | |
| 3517 } | |
| 3518 } | |
| 3519 #endif | |
| 3520 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3521 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3522 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3523 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3524 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3525 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3526 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3527 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3528 trailcol = (colnr_T)STRLEN(ptr); |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
3529 while (trailcol > (colnr_T)0 && VIM_ISWHITE(ptr[trailcol - 1])) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3530 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3531 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3532 } |
| 7 | 3533 } |
| 3534 | |
| 3535 /* | |
| 3536 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3537 * first character to be displayed. | |
| 3538 */ | |
| 3539 if (wp->w_p_wrap) | |
| 3540 v = wp->w_skipcol; | |
| 3541 else | |
| 3542 v = wp->w_leftcol; | |
| 3543 if (v > 0) | |
| 3544 { | |
| 3545 #ifdef FEAT_MBYTE | |
| 3546 char_u *prev_ptr = ptr; | |
| 3547 #endif | |
| 3548 while (vcol < v && *ptr != NUL) | |
| 3549 { | |
| 5995 | 3550 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3551 vcol += c; |
| 3552 #ifdef FEAT_MBYTE | |
| 3553 prev_ptr = ptr; | |
| 39 | 3554 #endif |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3555 MB_PTR_ADV(ptr); |
| 7 | 3556 } |
| 3557 | |
| 1984 | 3558 /* When: |
| 3559 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3560 * - 'colorcolumn' is set, or |
| 1984 | 3561 * - 'virtualedit' is set, or |
| 3562 * - the visual mode is active, | |
| 3563 * the end of the line may be before the start of the displayed part. | |
| 3564 */ | |
| 3565 if (vcol < v && ( | |
| 5735 | 3566 #ifdef FEAT_SYN_HL |
| 3567 wp->w_p_cuc || draw_color_col || | |
| 3568 #endif | |
| 3569 #ifdef FEAT_VIRTUALEDIT | |
| 3570 virtual_active() || | |
| 3571 #endif | |
| 3572 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3573 { |
| 7 | 3574 vcol = v; |
| 1984 | 3575 } |
| 7 | 3576 |
| 3577 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3578 * that character but skip the first few screen characters. */ | |
| 3579 if (vcol > v) | |
| 3580 { | |
| 3581 vcol -= c; | |
| 3582 #ifdef FEAT_MBYTE | |
| 3583 ptr = prev_ptr; | |
| 3584 #else | |
| 3585 --ptr; | |
| 3586 #endif | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3587 /* If the character fits on the screen, don't need to skip it. |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3588 * Except for a TAB. */ |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3589 if (( |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3590 #ifdef FEAT_MBYTE |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3591 (*mb_ptr2cells)(ptr) >= c || |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3592 #endif |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3593 *ptr == TAB) && col == 0) |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3594 n_skip = v - vcol; |
| 7 | 3595 } |
| 3596 | |
| 3597 /* | |
| 3598 * Adjust for when the inverted text is before the screen, | |
| 3599 * and when the start of the inverted text is before the screen. | |
| 3600 */ | |
| 3601 if (tocol <= vcol) | |
| 3602 fromcol = 0; | |
| 3603 else if (fromcol >= 0 && fromcol < vcol) | |
| 3604 fromcol = vcol; | |
| 3605 | |
| 3606 #ifdef FEAT_LINEBREAK | |
| 3607 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3608 if (wp->w_p_wrap) | |
| 3609 need_showbreak = TRUE; | |
| 3610 #endif | |
| 743 | 3611 #ifdef FEAT_SPELL |
| 499 | 3612 /* When spell checking a word we need to figure out the start of the |
| 3613 * word and if it's badly spelled or not. */ | |
| 3614 if (has_spell) | |
| 3615 { | |
| 3616 int len; | |
| 1536 | 3617 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3618 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3619 |
| 3620 pos = wp->w_cursor; | |
| 3621 wp->w_cursor.lnum = lnum; | |
| 1536 | 3622 wp->w_cursor.col = linecol; |
| 534 | 3623 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3624 |
| 3625 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3626 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3627 ptr = line + linecol; | |
| 3628 | |
| 530 | 3629 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3630 { |
| 3631 /* no bad word found at line start, don't check until end of a | |
| 3632 * word */ | |
| 534 | 3633 spell_hlf = HLF_COUNT; |
| 3572 | 3634 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3635 } |
| 3636 else | |
| 534 | 3637 { |
| 499 | 3638 /* bad word found, use attributes until end of word */ |
| 3639 word_end = wp->w_cursor.col + len + 1; | |
| 3640 | |
| 534 | 3641 /* Turn index into actual attributes. */ |
| 3642 if (spell_hlf != HLF_COUNT) | |
| 3643 spell_attr = highlight_attr[spell_hlf]; | |
| 3644 } | |
| 499 | 3645 wp->w_cursor = pos; |
| 501 | 3646 |
| 743 | 3647 # ifdef FEAT_SYN_HL |
| 501 | 3648 /* Need to restart syntax highlighting for this line. */ |
| 3649 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3650 syntax_start(wp, lnum); |
| 743 | 3651 # endif |
| 499 | 3652 } |
| 3653 #endif | |
| 7 | 3654 } |
| 3655 | |
| 3656 /* | |
| 3657 * Correct highlighting for cursor that can't be disabled. | |
| 3658 * Avoids having to check this for each character. | |
| 3659 */ | |
| 3660 if (fromcol >= 0) | |
| 3661 { | |
| 3662 if (noinvcur) | |
| 3663 { | |
| 3664 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3665 { | |
| 3666 /* highlighting starts at cursor, let it start just after the | |
| 3667 * cursor */ | |
| 3668 fromcol_prev = fromcol; | |
| 3669 fromcol = -1; | |
| 3670 } | |
| 3671 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3672 /* restart highlighting after the cursor */ | |
| 3673 fromcol_prev = wp->w_virtcol; | |
| 3674 } | |
| 3675 if (fromcol >= tocol) | |
| 3676 fromcol = -1; | |
| 3677 } | |
| 3678 | |
| 3679 #ifdef FEAT_SEARCH_EXTRA | |
| 3680 /* | |
| 1326 | 3681 * Handle highlighting the last used search pattern and matches. |
| 3682 * Do this for both search_hl and the match list. | |
| 7 | 3683 */ |
| 1326 | 3684 cur = wp->w_match_head; |
| 3685 shl_flag = FALSE; | |
| 3686 while (cur != NULL || shl_flag == FALSE) | |
| 3687 { | |
| 3688 if (shl_flag == FALSE) | |
| 3689 { | |
| 3690 shl = &search_hl; | |
| 3691 shl_flag = TRUE; | |
| 3692 } | |
| 3693 else | |
| 3694 shl = &cur->hl; | |
| 36 | 3695 shl->startcol = MAXCOL; |
| 3696 shl->endcol = MAXCOL; | |
| 7 | 3697 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3698 shl->is_addpos = FALSE; |
| 5979 | 3699 v = (long)(ptr - line); |
| 3700 if (cur != NULL) | |
| 3701 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3702 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
|
3703 shl == &search_hl ? NULL : cur); |
| 5979 | 3704 |
| 3705 /* Need to get the line again, a multi-line regexp may have made it | |
| 3706 * invalid. */ | |
| 3707 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3708 ptr = line + v; | |
| 3709 | |
| 3710 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3711 { | |
| 3712 if (shl->lnum == lnum) | |
| 3713 shl->startcol = shl->rm.startpos[0].col; | |
| 3714 else | |
| 3715 shl->startcol = 0; | |
| 3716 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3717 - shl->rm.startpos[0].lnum) | |
| 3718 shl->endcol = shl->rm.endpos[0].col; | |
| 3719 else | |
| 3720 shl->endcol = MAXCOL; | |
| 3721 /* Highlight one character for an empty match. */ | |
| 3722 if (shl->startcol == shl->endcol) | |
| 3723 { | |
| 3724 #ifdef FEAT_MBYTE | |
| 3725 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3726 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3727 else |
| 5979 | 3728 #endif |
| 3729 ++shl->endcol; | |
| 3730 } | |
| 3731 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3732 { | |
| 3733 shl->attr_cur = shl->attr; | |
| 3734 search_attr = shl->attr; | |
| 3735 } | |
| 3736 area_highlighting = TRUE; | |
| 7 | 3737 } |
| 1326 | 3738 if (shl != &search_hl && cur != NULL) |
| 3739 cur = cur->next; | |
| 7 | 3740 } |
| 3741 #endif | |
| 3742 | |
| 743 | 3743 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3744 /* 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
|
3745 * 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
|
3746 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3747 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3748 && !(wp == curwin && VIsual_active)) |
| 743 | 3749 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3750 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3751 area_highlighting = TRUE; |
| 3752 } | |
| 3753 #endif | |
| 3754 | |
| 504 | 3755 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3756 col = 0; |
| 3757 #ifdef FEAT_RIGHTLEFT | |
| 3758 if (wp->w_p_rl) | |
| 3759 { | |
| 3760 /* Rightleft window: process the text in the normal direction, but put | |
| 3761 * it in current_ScreenLine[] from right to left. Start at the | |
| 3762 * rightmost column of the window. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3763 col = wp->w_width - 1; |
| 7 | 3764 off += col; |
| 3765 } | |
| 3766 #endif | |
| 3767 | |
| 3768 /* | |
| 3769 * Repeat for the whole displayed line. | |
| 3770 */ | |
| 3771 for (;;) | |
| 3772 { | |
| 6947 | 3773 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3774 has_match_conc = 0; |
| 6947 | 3775 #endif |
| 7 | 3776 /* Skip this quickly when working on the text. */ |
| 3777 if (draw_state != WL_LINE) | |
| 3778 { | |
| 3779 #ifdef FEAT_CMDWIN | |
| 3780 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3781 { | |
| 3782 draw_state = WL_CMDLINE; | |
| 3783 if (cmdwin_type != 0 && wp == curwin) | |
| 3784 { | |
| 3785 /* Draw the cmdline character. */ | |
| 3786 n_extra = 1; | |
| 1340 | 3787 c_extra = cmdwin_type; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3788 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3789 } |
| 3790 } | |
| 3791 #endif | |
| 3792 | |
| 3793 #ifdef FEAT_FOLDING | |
| 3794 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3795 { | |
| 6553 | 3796 int fdc = compute_foldcolumn(wp, 0); |
| 3797 | |
| 7 | 3798 draw_state = WL_FOLD; |
| 6553 | 3799 if (fdc > 0) |
| 7 | 3800 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3801 /* 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
|
3802 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3803 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3804 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3805 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3806 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3807 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3808 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
|
3809 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3810 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3811 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3812 c_extra = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3813 char_attr = HL_ATTR(HLF_FC); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3814 } |
| 7 | 3815 } |
| 3816 } | |
| 3817 #endif | |
| 3818 | |
| 3819 #ifdef FEAT_SIGNS | |
| 3820 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3821 { | |
| 3822 draw_state = WL_SIGN; | |
| 3823 /* Show the sign column when there are any signs in this | |
| 3824 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3825 if (signcolumn_on(wp)) |
| 7 | 3826 { |
| 2661 | 3827 int text_sign; |
| 7 | 3828 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3829 int icon_sign; |
| 7 | 3830 # endif |
| 3831 | |
| 3832 /* Draw two cells with the sign value or blank. */ | |
| 3833 c_extra = ' '; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3834 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3835 n_extra = 2; |
| 3836 | |
| 5921 | 3837 if (row == startrow |
| 3838 #ifdef FEAT_DIFF | |
| 3839 + filler_lines && filler_todo <= 0 | |
| 3840 #endif | |
| 3841 ) | |
| 7 | 3842 { |
| 3843 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3844 SIGN_TEXT); | |
| 3845 # ifdef FEAT_SIGN_ICONS | |
| 3846 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3847 SIGN_ICON); | |
| 3848 if (gui.in_use && icon_sign != 0) | |
| 3849 { | |
| 3850 /* Use the image in this position. */ | |
| 3851 c_extra = SIGN_BYTE; | |
| 3852 # ifdef FEAT_NETBEANS_INTG | |
| 3853 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3854 c_extra = MULTISIGN_BYTE; | |
| 3855 # endif | |
| 3856 char_attr = icon_sign; | |
| 3857 } | |
| 3858 else | |
| 3859 # endif | |
| 3860 if (text_sign != 0) | |
| 3861 { | |
| 3862 p_extra = sign_get_text(text_sign); | |
| 3863 if (p_extra != NULL) | |
| 3864 { | |
| 3865 c_extra = NUL; | |
| 835 | 3866 n_extra = (int)STRLEN(p_extra); |
| 7 | 3867 } |
| 3868 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3869 } | |
| 3870 } | |
| 3871 } | |
| 3872 } | |
| 3873 #endif | |
| 3874 | |
| 3875 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3876 { | |
| 3877 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3878 /* 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
|
3879 * 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
|
3880 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3881 && (row == startrow |
| 3882 #ifdef FEAT_DIFF | |
| 3883 + filler_lines | |
| 3884 #endif | |
| 3885 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3886 { | |
| 3887 /* Draw the line number (empty space after wrapping). */ | |
| 3888 if (row == startrow | |
| 3889 #ifdef FEAT_DIFF | |
| 3890 + filler_lines | |
| 3891 #endif | |
| 3892 ) | |
| 3893 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3894 long num; |
| 4065 | 3895 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3896 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3897 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
|
3898 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3899 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3900 else |
| 4065 | 3901 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3902 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3903 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
|
3904 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3905 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3906 /* 'number' + 'relativenumber' */ |
| 4065 | 3907 num = lnum; |
| 3908 fmt = "%-*ld "; | |
| 3909 } | |
| 3910 } | |
| 3911 | |
| 3912 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3913 number_width(wp), num); |
| 7 | 3914 if (wp->w_skipcol > 0) |
| 3915 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3916 *p_extra = '-'; | |
| 3917 #ifdef FEAT_RIGHTLEFT | |
| 3918 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3919 rl_mirror(extra); | |
| 3920 #endif | |
| 3921 p_extra = extra; | |
| 3922 c_extra = NUL; | |
| 3923 } | |
| 3924 else | |
| 3925 c_extra = ' '; | |
| 13 | 3926 n_extra = number_width(wp) + 1; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3927 char_attr = HL_ATTR(HLF_N); |
| 743 | 3928 #ifdef FEAT_SYN_HL |
| 3929 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3930 * the current line differently. |
| 3931 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3932 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3933 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3934 && lnum == wp->w_cursor.lnum) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3935 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3936 #endif |
| 7 | 3937 } |
| 3938 } | |
| 3939 | |
| 5995 | 3940 #ifdef FEAT_LINEBREAK |
| 3941 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3942 && n_extra == 0 && *p_sbr != NUL) | |
| 3943 /* draw indent after showbreak value */ | |
| 3944 draw_state = WL_BRI; | |
| 3945 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3946 /* After the showbreak, draw the breakindent */ | |
| 3947 draw_state = WL_BRI - 1; | |
| 3948 | |
| 3949 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3950 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3951 { | |
| 3952 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3953 /* 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
|
3954 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
|
3955 && (row != startrow || need_showbreak) |
| 5995 | 3956 # ifdef FEAT_DIFF |
| 3957 && filler_lines == 0 | |
| 6834 | 3958 # endif |
| 5995 | 3959 ) |
| 3960 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3961 char_attr = 0; |
| 6834 | 3962 # ifdef FEAT_DIFF |
| 5995 | 3963 if (diff_hlf != (hlf_T)0) |
| 6106 | 3964 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3965 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 3966 # ifdef FEAT_SYN_HL |
| 6106 | 3967 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3968 char_attr = hl_combine_attr(char_attr, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3969 HL_ATTR(HLF_CUL)); |
| 6834 | 3970 # endif |
| 6106 | 3971 } |
| 6834 | 3972 # endif |
| 6028 | 3973 p_extra = NULL; |
| 5995 | 3974 c_extra = ' '; |
| 3975 n_extra = get_breakindent_win(wp, | |
| 3976 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3977 /* Correct end of highlighted area for 'breakindent', | |
| 3978 * required when 'linebreak' is also set. */ | |
| 3979 if (tocol == vcol) | |
| 3980 tocol += n_extra; | |
| 3981 } | |
| 3982 } | |
| 3983 #endif | |
| 3984 | |
| 7 | 3985 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3986 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3987 { | |
| 3988 draw_state = WL_SBR; | |
| 3989 # ifdef FEAT_DIFF | |
| 3990 if (filler_todo > 0) | |
| 3991 { | |
| 3992 /* Draw "deleted" diff line(s). */ | |
| 3993 if (char2cells(fill_diff) > 1) | |
| 3994 c_extra = '-'; | |
| 3995 else | |
| 3996 c_extra = fill_diff; | |
| 3997 # ifdef FEAT_RIGHTLEFT | |
| 3998 if (wp->w_p_rl) | |
| 3999 n_extra = col + 1; | |
| 4000 else | |
| 4001 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4002 n_extra = wp->w_width - col; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4003 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4004 } |
| 4005 # endif | |
| 4006 # ifdef FEAT_LINEBREAK | |
| 4007 if (*p_sbr != NUL && need_showbreak) | |
| 4008 { | |
| 4009 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4010 p_extra = p_sbr; | |
| 4011 c_extra = NUL; | |
| 4012 n_extra = (int)STRLEN(p_sbr); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4013 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4014 need_showbreak = FALSE; |
| 6503 | 4015 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4016 /* Correct end of highlighted area for 'showbreak', |
| 4017 * required when 'linebreak' is also set. */ | |
| 4018 if (tocol == vcol) | |
| 4019 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4020 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4021 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4022 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4023 char_attr = hl_combine_attr(char_attr, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4024 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4025 #endif |
| 7 | 4026 } |
| 4027 # endif | |
| 4028 } | |
| 4029 #endif | |
| 4030 | |
| 4031 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4032 { | |
| 4033 draw_state = WL_LINE; | |
| 4034 if (saved_n_extra) | |
| 4035 { | |
| 4036 /* Continue item from end of wrapped line. */ | |
| 4037 n_extra = saved_n_extra; | |
| 4038 c_extra = saved_c_extra; | |
| 4039 p_extra = saved_p_extra; | |
| 4040 char_attr = saved_char_attr; | |
| 4041 } | |
| 4042 else | |
| 4043 char_attr = 0; | |
| 4044 } | |
| 4045 } | |
| 4046 | |
| 4047 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 4048 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 4049 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4050 #ifdef FEAT_DIFF |
| 4051 && filler_todo <= 0 | |
| 4052 #endif | |
| 4053 ) | |
| 4054 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4055 screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width, |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
4056 HAS_RIGHTLEFT(wp->w_p_rl)); |
| 819 | 4057 /* Pretend we have finished updating the window. Except when |
| 4058 * 'cursorcolumn' is set. */ | |
| 4059 #ifdef FEAT_SYN_HL | |
| 4060 if (wp->w_p_cuc) | |
| 4061 row = wp->w_cline_row + wp->w_cline_height; | |
| 4062 else | |
| 4063 #endif | |
| 4064 row = wp->w_height; | |
| 7 | 4065 break; |
| 4066 } | |
| 4067 | |
| 4068 if (draw_state == WL_LINE && area_highlighting) | |
| 4069 { | |
| 4070 /* handle Visual or match highlighting in this line */ | |
| 4071 if (vcol == fromcol | |
| 4072 #ifdef FEAT_MBYTE | |
| 4073 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4074 && (*mb_ptr2cells)(ptr) > 1) | |
| 4075 #endif | |
| 4076 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4077 && vcol_prev < vcol /* not at margin */ |
| 7 | 4078 && vcol < tocol)) |
| 4079 area_attr = attr; /* start highlighting */ | |
| 4080 else if (area_attr != 0 | |
| 4081 && (vcol == tocol | |
| 4082 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4083 area_attr = 0; /* stop highlighting */ | |
| 4084 | |
| 4085 #ifdef FEAT_SEARCH_EXTRA | |
| 4086 if (!n_extra) | |
| 4087 { | |
| 4088 /* | |
| 4089 * Check for start/end of search pattern match. | |
| 4090 * After end, check for start/end of next match. | |
| 4091 * When another match, have to check for start again. | |
| 4092 * Watch out for matching an empty string! | |
| 1326 | 4093 * Do this for 'search_hl' and the match list (ordered by |
| 4094 * priority). | |
| 7 | 4095 */ |
| 36 | 4096 v = (long)(ptr - line); |
| 1326 | 4097 cur = wp->w_match_head; |
| 4098 shl_flag = FALSE; | |
| 4099 while (cur != NULL || shl_flag == FALSE) | |
| 4100 { | |
| 4101 if (shl_flag == FALSE | |
| 4102 && ((cur != NULL | |
| 4103 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4104 || cur == NULL)) | |
| 4105 { | |
| 4106 shl = &search_hl; | |
| 4107 shl_flag = TRUE; | |
| 4108 } | |
| 4109 else | |
| 4110 shl = &cur->hl; | |
| 5979 | 4111 if (cur != NULL) |
| 4112 cur->pos.cur = 0; | |
| 4113 pos_inprogress = TRUE; | |
| 4114 while (shl->rm.regprog != NULL | |
| 4115 || (cur != NULL && pos_inprogress)) | |
| 7 | 4116 { |
| 36 | 4117 if (shl->startcol != MAXCOL |
| 4118 && v >= (long)shl->startcol | |
| 4119 && v < (long)shl->endcol) | |
| 7 | 4120 { |
| 6430 | 4121 #ifdef FEAT_MBYTE |
| 4122 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 4123 | |
| 4124 if (shl->endcol < tmp_col) | |
| 4125 shl->endcol = tmp_col; | |
| 4126 #endif | |
| 7 | 4127 shl->attr_cur = shl->attr; |
| 6947 | 4128 #ifdef FEAT_CONCEAL |
| 4129 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4130 == cur->hlg_id) | |
| 4131 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4132 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4133 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4134 match_conc = cur->conceal_char; |
| 4135 } | |
| 4136 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4137 has_match_conc = match_conc = 0; |
| 6947 | 4138 #endif |
| 7 | 4139 } |
| 6430 | 4140 else if (v == (long)shl->endcol) |
| 7 | 4141 { |
| 4142 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4143 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
|
4144 shl == &search_hl ? NULL : cur); |
| 5979 | 4145 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4146 ? FALSE : TRUE; |
| 7 | 4147 |
| 4148 /* Need to get the line again, a multi-line regexp | |
| 4149 * may have made it invalid. */ | |
| 4150 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4151 ptr = line + v; | |
| 4152 | |
| 4153 if (shl->lnum == lnum) | |
| 4154 { | |
| 36 | 4155 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4156 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4157 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4158 else |
| 36 | 4159 shl->endcol = MAXCOL; |
| 4160 | |
| 4161 if (shl->startcol == shl->endcol) | |
| 7 | 4162 { |
| 4163 /* highlight empty match, try again after | |
| 4164 * it */ | |
| 4165 #ifdef FEAT_MBYTE | |
| 4166 if (has_mbyte) | |
| 474 | 4167 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4168 + shl->endcol); |
| 7 | 4169 else |
| 4170 #endif | |
| 36 | 4171 ++shl->endcol; |
| 7 | 4172 } |
| 4173 | |
| 4174 /* Loop to check if the match starts at the | |
| 4175 * current position */ | |
| 4176 continue; | |
| 4177 } | |
| 4178 } | |
| 4179 break; | |
| 4180 } | |
| 1326 | 4181 if (shl != &search_hl && cur != NULL) |
| 4182 cur = cur->next; | |
| 4183 } | |
| 4184 | |
| 4185 /* Use attributes from match with highest priority among | |
| 4186 * 'search_hl' and the match list. */ | |
| 4187 search_attr = search_hl.attr_cur; | |
| 4188 cur = wp->w_match_head; | |
| 4189 shl_flag = FALSE; | |
| 4190 while (cur != NULL || shl_flag == FALSE) | |
| 4191 { | |
| 4192 if (shl_flag == FALSE | |
| 4193 && ((cur != NULL | |
| 4194 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4195 || cur == NULL)) | |
| 699 | 4196 { |
| 1326 | 4197 shl = &search_hl; |
| 4198 shl_flag = TRUE; | |
| 699 | 4199 } |
| 1326 | 4200 else |
| 4201 shl = &cur->hl; | |
| 4202 if (shl->attr_cur != 0) | |
| 4203 search_attr = shl->attr_cur; | |
| 4204 if (shl != &search_hl && cur != NULL) | |
| 4205 cur = cur->next; | |
| 4206 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4207 /* Only highlight one character after the last column. */ |
|
12582
97f0c74976c6
patch 8.0.1169: highlignting one char too many with 'list' and 'cul'
Christian Brabandt <cb@256bit.org>
parents:
12580
diff
changeset
|
4208 if (*ptr == NUL && (did_line_attr >= 1 |
|
97f0c74976c6
patch 8.0.1169: highlignting one char too many with 'list' and 'cul'
Christian Brabandt <cb@256bit.org>
parents:
12580
diff
changeset
|
4209 || (wp->w_p_list && lcs_eol_one == -1))) |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4210 search_attr = 0; |
| 7 | 4211 } |
| 4212 #endif | |
| 4213 | |
| 4214 #ifdef FEAT_DIFF | |
| 674 | 4215 if (diff_hlf != (hlf_T)0) |
| 7 | 4216 { |
| 1295 | 4217 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4218 && n_extra == 0) | |
| 7 | 4219 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4220 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4221 && n_extra == 0) | |
| 7 | 4222 diff_hlf = HLF_CHD; /* changed line */ |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4223 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4224 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4225 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4226 } |
| 4227 #endif | |
| 4228 | |
| 4229 /* Decide which of the highlight attributes to use. */ | |
| 4230 attr_pri = TRUE; | |
| 6717 | 4231 #ifdef LINE_ATTR |
| 674 | 4232 if (area_attr != 0) |
| 6717 | 4233 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4234 else if (search_attr != 0) |
| 6717 | 4235 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4236 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4237 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4238 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4239 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4240 || vcol >= tocol)) | |
| 674 | 4241 char_attr = line_attr; |
| 6717 | 4242 #else |
| 4243 if (area_attr != 0) | |
| 4244 char_attr = area_attr; | |
| 4245 else if (search_attr != 0) | |
| 4246 char_attr = search_attr; | |
| 674 | 4247 #endif |
| 4248 else | |
| 4249 { | |
| 4250 attr_pri = FALSE; | |
| 4251 #ifdef FEAT_SYN_HL | |
| 4252 if (has_syntax) | |
| 4253 char_attr = syntax_attr; | |
| 4254 else | |
| 4255 #endif | |
| 4256 char_attr = 0; | |
| 4257 } | |
| 7 | 4258 } |
| 4259 | |
| 4260 /* | |
| 4261 * Get the next character to put on the screen. | |
| 4262 */ | |
| 4263 /* | |
| 1340 | 4264 * The "p_extra" points to the extra stuff that is inserted to |
| 4265 * represent special characters (non-printable stuff) and other | |
| 4266 * things. When all characters are the same, c_extra is used. | |
| 4267 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4268 * "p_extra[n_extra]". | |
| 7 | 4269 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4270 */ | |
| 4271 if (n_extra > 0) | |
| 4272 { | |
| 4273 if (c_extra != NUL) | |
| 4274 { | |
| 4275 c = c_extra; | |
| 4276 #ifdef FEAT_MBYTE | |
| 4277 mb_c = c; /* doesn't handle non-utf-8 multi-byte! */ | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4278 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4279 { |
| 4280 mb_utf8 = TRUE; | |
| 714 | 4281 u8cc[0] = 0; |
| 819 | 4282 c = 0xc0; |
| 7 | 4283 } |
| 4284 else | |
| 4285 mb_utf8 = FALSE; | |
| 4286 #endif | |
| 4287 } | |
| 4288 else | |
| 4289 { | |
| 4290 c = *p_extra; | |
| 4291 #ifdef FEAT_MBYTE | |
| 4292 if (has_mbyte) | |
| 4293 { | |
| 4294 mb_c = c; | |
| 4295 if (enc_utf8) | |
| 4296 { | |
| 4297 /* If the UTF-8 character is more than one byte: | |
| 4298 * Decode it into "mb_c". */ | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4299 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4300 mb_utf8 = FALSE; |
| 4301 if (mb_l > n_extra) | |
| 4302 mb_l = 1; | |
| 4303 else if (mb_l > 1) | |
| 4304 { | |
| 714 | 4305 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4306 mb_utf8 = TRUE; |
| 819 | 4307 c = 0xc0; |
| 7 | 4308 } |
| 4309 } | |
| 4310 else | |
| 4311 { | |
| 4312 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4313 mb_l = MB_BYTE2LEN(c); | |
| 4314 if (mb_l >= n_extra) | |
| 4315 mb_l = 1; | |
| 4316 else if (mb_l > 1) | |
| 4317 mb_c = (c << 8) + p_extra[1]; | |
| 4318 } | |
| 504 | 4319 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4320 mb_l = 1; | |
| 4321 | |
| 7 | 4322 /* If a double-width char doesn't fit display a '>' in the |
| 4323 * last column. */ | |
| 504 | 4324 if (( |
| 7 | 4325 # ifdef FEAT_RIGHTLEFT |
| 4326 wp->w_p_rl ? (col <= 0) : | |
| 4327 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4328 (col >= wp->w_width - 1)) |
| 7 | 4329 && (*mb_char2cells)(mb_c) == 2) |
| 4330 { | |
| 4331 c = '>'; | |
| 4332 mb_c = c; | |
| 4333 mb_l = 1; | |
| 4334 mb_utf8 = FALSE; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4335 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4336 /* put the pointer back to output the double-width |
| 4337 * character at the start of the next line. */ | |
| 4338 ++n_extra; | |
| 4339 --p_extra; | |
| 4340 } | |
| 4341 else | |
| 4342 { | |
| 4343 n_extra -= mb_l - 1; | |
| 4344 p_extra += mb_l - 1; | |
| 4345 } | |
| 4346 } | |
| 4347 #endif | |
| 4348 ++p_extra; | |
| 4349 } | |
| 4350 --n_extra; | |
| 4351 } | |
| 4352 else | |
| 4353 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4354 #ifdef FEAT_LINEBREAK |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4355 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4356 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4357 |
| 6026 | 4358 if (p_extra_free != NULL) |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
4359 VIM_CLEAR(p_extra_free); |
| 7 | 4360 /* |
| 4361 * Get a character from the line itself. | |
| 4362 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4363 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4364 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4365 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4366 #endif |
| 7 | 4367 #ifdef FEAT_MBYTE |
| 4368 if (has_mbyte) | |
| 4369 { | |
| 4370 mb_c = c; | |
| 4371 if (enc_utf8) | |
| 4372 { | |
| 4373 /* If the UTF-8 character is more than one byte: Decode it | |
| 4374 * into "mb_c". */ | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4375 mb_l = utfc_ptr2len(ptr); |
| 7 | 4376 mb_utf8 = FALSE; |
| 4377 if (mb_l > 1) | |
| 4378 { | |
| 714 | 4379 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4380 /* Overlong encoded ASCII or ASCII with composing char |
| 4381 * is displayed normally, except a NUL. */ | |
| 4382 if (mb_c < 0x80) | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4383 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4384 c = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4385 # ifdef FEAT_LINEBREAK |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4386 c0 = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4387 # endif |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4388 } |
| 7 | 4389 mb_utf8 = TRUE; |
| 507 | 4390 |
| 4391 /* At start of the line we can have a composing char. | |
| 4392 * Draw it as a space with a composing char. */ | |
| 4393 if (utf_iscomposing(mb_c)) | |
| 4394 { | |
| 1326 | 4395 int i; |
| 4396 | |
| 714 | 4397 for (i = Screen_mco - 1; i > 0; --i) |
| 4398 u8cc[i] = u8cc[i - 1]; | |
| 4399 u8cc[0] = mb_c; | |
| 507 | 4400 mb_c = ' '; |
| 4401 } | |
| 7 | 4402 } |
| 4403 | |
| 4404 if ((mb_l == 1 && c >= 0x80) | |
| 4405 || (mb_l >= 1 && mb_c == 0) | |
| 4406 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4407 # ifdef UNICODE16 |
| 4408 || mb_c >= 0x10000 | |
| 4409 # endif | |
| 4410 ))) | |
| 7 | 4411 { |
| 4412 /* | |
| 4413 * Illegal UTF-8 byte: display as <xx>. | |
| 4414 * Non-BMP character : display as ? or fullwidth ?. | |
| 4415 */ | |
| 1401 | 4416 # ifdef UNICODE16 |
| 7 | 4417 if (mb_c < 0x10000) |
| 1401 | 4418 # endif |
| 7 | 4419 { |
| 4420 transchar_hex(extra, mb_c); | |
| 714 | 4421 # ifdef FEAT_RIGHTLEFT |
| 7 | 4422 if (wp->w_p_rl) /* reverse */ |
| 4423 rl_mirror(extra); | |
| 714 | 4424 # endif |
| 7 | 4425 } |
| 1401 | 4426 # ifdef UNICODE16 |
| 7 | 4427 else if (utf_char2cells(mb_c) != 2) |
| 4428 STRCPY(extra, "?"); | |
| 4429 else | |
| 4430 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4431 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4432 # endif |
| 7 | 4433 |
| 4434 p_extra = extra; | |
| 4435 c = *p_extra; | |
| 4436 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4437 mb_utf8 = (c >= 0x80); | |
| 4438 n_extra = (int)STRLEN(p_extra); | |
| 4439 c_extra = NUL; | |
| 4440 if (area_attr == 0 && search_attr == 0) | |
| 4441 { | |
| 4442 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4443 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4444 saved_attr2 = char_attr; /* save current attr */ |
| 4445 } | |
| 4446 } | |
| 4447 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4448 mb_l = 1; | |
| 4449 #ifdef FEAT_ARABIC | |
| 4450 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4451 { | |
| 4452 /* Do Arabic shaping. */ | |
| 714 | 4453 int pc, pc1, nc; |
| 4454 int pcc[MAX_MCO]; | |
| 7 | 4455 |
| 4456 /* The idea of what is the previous and next | |
| 4457 * character depends on 'rightleft'. */ | |
| 4458 if (wp->w_p_rl) | |
| 4459 { | |
| 4460 pc = prev_c; | |
| 4461 pc1 = prev_c1; | |
| 4462 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4463 prev_c1 = u8cc[0]; |
| 7 | 4464 } |
| 4465 else | |
| 4466 { | |
| 714 | 4467 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4468 nc = prev_c; |
| 714 | 4469 pc1 = pcc[0]; |
| 7 | 4470 } |
| 4471 prev_c = mb_c; | |
| 4472 | |
| 714 | 4473 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4474 } |
| 4475 else | |
| 4476 prev_c = mb_c; | |
| 4477 #endif | |
| 4478 } | |
| 4479 else /* enc_dbcs */ | |
| 4480 { | |
| 4481 mb_l = MB_BYTE2LEN(c); | |
| 4482 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4483 mb_l = 1; | |
| 4484 else if (mb_l > 1) | |
| 4485 { | |
| 4486 /* We assume a second byte below 32 is illegal. | |
| 4487 * Hopefully this is OK for all double-byte encodings! | |
| 4488 */ | |
| 4489 if (ptr[1] >= 32) | |
| 4490 mb_c = (c << 8) + ptr[1]; | |
| 4491 else | |
| 4492 { | |
| 4493 if (ptr[1] == NUL) | |
| 4494 { | |
| 4495 /* head byte at end of line */ | |
| 4496 mb_l = 1; | |
| 4497 transchar_nonprint(extra, c); | |
| 4498 } | |
| 4499 else | |
| 4500 { | |
| 4501 /* illegal tail byte */ | |
| 4502 mb_l = 2; | |
| 4503 STRCPY(extra, "XX"); | |
| 4504 } | |
| 4505 p_extra = extra; | |
| 4506 n_extra = (int)STRLEN(extra) - 1; | |
| 4507 c_extra = NUL; | |
| 4508 c = *p_extra++; | |
| 4509 if (area_attr == 0 && search_attr == 0) | |
| 4510 { | |
| 4511 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4512 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4513 saved_attr2 = char_attr; /* save current attr */ |
| 4514 } | |
| 4515 mb_c = c; | |
| 4516 } | |
| 4517 } | |
| 4518 } | |
| 4519 /* If a double-width char doesn't fit display a '>' in the | |
| 4520 * last column; the character is displayed at the start of the | |
| 4521 * next line. */ | |
| 4522 if (( | |
| 4523 # ifdef FEAT_RIGHTLEFT | |
| 4524 wp->w_p_rl ? (col <= 0) : | |
| 4525 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4526 (col >= wp->w_width - 1)) |
| 7 | 4527 && (*mb_char2cells)(mb_c) == 2) |
| 4528 { | |
| 4529 c = '>'; | |
| 4530 mb_c = c; | |
| 4531 mb_utf8 = FALSE; | |
| 4532 mb_l = 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4533 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4534 /* Put pointer back so that the character will be |
| 4535 * displayed at the start of the next line. */ | |
| 4536 --ptr; | |
| 4537 } | |
| 4538 else if (*ptr != NUL) | |
| 4539 ptr += mb_l - 1; | |
| 4540 | |
| 4541 /* 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
|
4542 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4543 * 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
|
4544 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4545 { |
| 4546 n_extra = 1; | |
| 3586 | 4547 c_extra = MB_FILLER_CHAR; |
| 7 | 4548 c = ' '; |
| 4549 if (area_attr == 0 && search_attr == 0) | |
| 4550 { | |
| 4551 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4552 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4553 saved_attr2 = char_attr; /* save current attr */ |
| 4554 } | |
| 4555 mb_c = c; | |
| 4556 mb_utf8 = FALSE; | |
| 4557 mb_l = 1; | |
| 4558 } | |
| 4559 | |
| 4560 } | |
| 4561 #endif | |
| 4562 ++ptr; | |
| 4563 | |
| 4564 if (extra_check) | |
| 4565 { | |
| 743 | 4566 #ifdef FEAT_SPELL |
| 221 | 4567 int can_spell = TRUE; |
| 743 | 4568 #endif |
| 4569 | |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4570 #ifdef FEAT_TERMINAL |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4571 if (get_term_attr) |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4572 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4573 syntax_attr = term_get_attr(wp->w_buffer, lnum, vcol); |
|
11836
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4574 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4575 if (!attr_pri) |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4576 char_attr = syntax_attr; |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4577 else |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4578 char_attr = hl_combine_attr(syntax_attr, char_attr); |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4579 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4580 #endif |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4581 |
| 743 | 4582 #ifdef FEAT_SYN_HL |
| 7 | 4583 /* Get syntax attribute, unless still at the start of the line |
| 4584 * (double-wide char that doesn't fit). */ | |
| 221 | 4585 v = (long)(ptr - line); |
| 4586 if (has_syntax && v > 0) | |
| 7 | 4587 { |
| 4588 /* Get the syntax attribute for the character. If there | |
| 4589 * is an error, disable syntax highlighting. */ | |
| 4590 save_did_emsg = did_emsg; | |
| 4591 did_emsg = FALSE; | |
| 4592 | |
| 221 | 4593 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4594 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4595 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4596 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4597 NULL, FALSE); |
| 7 | 4598 |
| 4599 if (did_emsg) | |
| 482 | 4600 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4601 wp->w_s->b_syn_error = TRUE; |
| 482 | 4602 has_syntax = FALSE; |
| 4603 } | |
| 7 | 4604 else |
| 4605 did_emsg = save_did_emsg; | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4606 #ifdef SYN_TIME_LIMIT |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4607 if (wp->w_s->b_syn_slow) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4608 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4609 #endif |
| 7 | 4610 |
| 4611 /* Need to get the line again, a multi-line regexp may | |
| 4612 * have made it invalid. */ | |
| 4613 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4614 ptr = line + v; | |
| 4615 | |
| 674 | 4616 if (!attr_pri) |
| 7 | 4617 char_attr = syntax_attr; |
| 301 | 4618 else |
| 303 | 4619 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
|
4620 # 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
|
4621 /* 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
|
4622 * 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
|
4623 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
|
4624 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
|
4625 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
|
4626 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
|
4627 # endif |
| 7 | 4628 } |
| 743 | 4629 #endif |
| 4630 | |
| 4631 #ifdef FEAT_SPELL | |
| 301 | 4632 /* Check spelling (unless at the end of the line). |
| 319 | 4633 * Only do this when there is no syntax highlighting, the |
| 4634 * @Spell cluster is not used or the current syntax item | |
| 4635 * contains the @Spell cluster. */ | |
| 348 | 4636 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4637 { |
| 230 | 4638 spell_attr = 0; |
| 743 | 4639 # ifdef FEAT_SYN_HL |
| 674 | 4640 if (!attr_pri) |
| 230 | 4641 char_attr = syntax_attr; |
| 743 | 4642 # endif |
| 4643 if (c != 0 && ( | |
| 4644 # ifdef FEAT_SYN_HL | |
| 4645 !has_syntax || | |
| 4646 # endif | |
| 4647 can_spell)) | |
| 221 | 4648 { |
| 348 | 4649 char_u *prev_ptr, *p; |
| 4650 int len; | |
| 534 | 4651 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4652 # ifdef FEAT_MBYTE |
| 336 | 4653 if (has_mbyte) |
| 4654 { | |
| 4655 prev_ptr = ptr - mb_l; | |
| 4656 v -= mb_l - 1; | |
| 4657 } | |
| 4658 else | |
| 221 | 4659 # endif |
| 336 | 4660 prev_ptr = ptr - 1; |
| 348 | 4661 |
| 4662 /* Use nextline[] if possible, it has the start of the | |
| 4663 * next line concatenated. */ | |
| 4664 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4665 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4666 else | |
| 4667 p = prev_ptr; | |
| 835 | 4668 cap_col -= (int)(prev_ptr - line); |
| 625 | 4669 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4670 nochange); | |
| 348 | 4671 word_end = v + len; |
| 301 | 4672 |
| 4673 /* In Insert mode only highlight a word that | |
| 4674 * doesn't touch the cursor. */ | |
| 534 | 4675 if (spell_hlf != HLF_COUNT |
| 301 | 4676 && (State & INSERT) != 0 |
| 4677 && wp->w_cursor.lnum == lnum | |
| 4678 && wp->w_cursor.col >= | |
| 4679 (colnr_T)(prev_ptr - line) | |
| 4680 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4681 { |
| 534 | 4682 spell_hlf = HLF_COUNT; |
| 301 | 4683 spell_redraw_lnum = lnum; |
| 221 | 4684 } |
| 348 | 4685 |
| 534 | 4686 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4687 && (p - nextline) + len > nextline_idx) |
| 4688 { | |
| 4689 /* Remember that the good word continues at the | |
| 4690 * start of the next line. */ | |
| 4691 checked_lnum = lnum + 1; | |
| 835 | 4692 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4693 } |
| 386 | 4694 |
| 534 | 4695 /* Turn index into actual attributes. */ |
| 4696 if (spell_hlf != HLF_COUNT) | |
| 4697 spell_attr = highlight_attr[spell_hlf]; | |
| 4698 | |
| 386 | 4699 if (cap_col > 0) |
| 4700 { | |
| 4701 if (p != prev_ptr | |
| 4702 && (p - nextline) + cap_col >= nextline_idx) | |
| 4703 { | |
| 4704 /* Remember that the word in the next line | |
| 4705 * must start with a capital. */ | |
| 4706 capcol_lnum = lnum + 1; | |
| 835 | 4707 cap_col = (int)((p - nextline) + cap_col |
| 4708 - nextline_idx); | |
| 386 | 4709 } |
| 4710 else | |
| 4711 /* Compute the actual column. */ | |
| 835 | 4712 cap_col += (int)(prev_ptr - line); |
| 386 | 4713 } |
| 221 | 4714 } |
| 4715 } | |
| 4716 if (spell_attr != 0) | |
| 348 | 4717 { |
| 674 | 4718 if (!attr_pri) |
| 348 | 4719 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4720 else | |
| 4721 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4722 } | |
| 7 | 4723 #endif |
| 4724 #ifdef FEAT_LINEBREAK | |
| 4725 /* | |
| 221 | 4726 * Found last space before word: check for line break. |
| 7 | 4727 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4728 if (wp->w_p_lbr && c0 == c |
|
11133
d8e830e32be9
patch 8.0.0454: compiler warnings for "always true" comparison
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4729 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4730 { |
| 6681 | 4731 # ifdef FEAT_MBYTE |
| 6693 | 4732 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4733 # endif |
| 5995 | 4734 char_u *p = ptr - ( |
| 7 | 4735 # ifdef FEAT_MBYTE |
| 6693 | 4736 mb_off + |
| 7 | 4737 # endif |
| 5995 | 4738 1); |
| 6681 | 4739 |
| 5995 | 4740 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4741 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4742 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4743 if (c == TAB && n_extra + col > wp->w_width) |
| 6371 | 4744 n_extra = (int)wp->w_buffer->b_p_ts |
| 4745 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4746 | |
| 6681 | 4747 # ifdef FEAT_MBYTE |
| 6693 | 4748 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4749 # else |
| 7 | 4750 c_extra = ' '; |
| 6681 | 4751 # endif |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4752 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4753 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4754 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4755 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4756 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4757 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4758 #endif |
| 6026 | 4759 if (!wp->w_p_list) |
| 4760 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4761 } |
| 7 | 4762 } |
| 4763 #endif | |
| 4764 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4765 /* '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
|
4766 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4767 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4768 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4769 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4770 || (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
|
4771 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4772 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4773 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4774 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4775 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4776 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
|
4777 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4778 n_attr = 1; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4779 extra_attr = HL_ATTR(HLF_8); |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4780 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
|
4781 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4782 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4783 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4784 if (enc_utf8 && utf_char2len(c) > 1) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4785 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4786 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4787 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4788 c = 0xc0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4789 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4790 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4791 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4792 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4793 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4794 |
| 7 | 4795 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4796 { | |
| 4797 c = lcs_trail; | |
| 674 | 4798 if (!attr_pri) |
| 7 | 4799 { |
| 4800 n_attr = 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4801 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4802 saved_attr2 = char_attr; /* save current attr */ |
| 4803 } | |
| 4804 #ifdef FEAT_MBYTE | |
| 4805 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4806 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4807 { |
| 4808 mb_utf8 = TRUE; | |
| 714 | 4809 u8cc[0] = 0; |
| 819 | 4810 c = 0xc0; |
| 7 | 4811 } |
| 4812 else | |
| 4813 mb_utf8 = FALSE; | |
| 4814 #endif | |
| 4815 } | |
| 4816 } | |
| 4817 | |
| 4818 /* | |
| 4819 * Handling of non-printable characters. | |
| 4820 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4821 if (!vim_isprintc(c)) |
| 7 | 4822 { |
| 4823 /* | |
| 4824 * when getting a character from the file, we may have to | |
| 4825 * turn it into something else on the way to putting it | |
| 4826 * into "ScreenLines". | |
| 4827 */ | |
| 4828 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4829 { | |
| 6026 | 4830 int tab_len = 0; |
| 6503 | 4831 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4832 #ifdef FEAT_LINEBREAK | |
| 4833 /* only adjust the tab_len, when at the first column | |
| 4834 * after the showbreak value was drawn */ | |
| 4835 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4836 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4837 #endif | |
| 7 | 4838 /* tab amount depends on current column */ |
| 6026 | 4839 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4840 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4841 | |
| 6026 | 4842 #ifdef FEAT_LINEBREAK |
| 6100 | 4843 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4844 #endif |
| 4845 /* tab amount depends on current column */ | |
| 4846 n_extra = tab_len; | |
| 4847 #ifdef FEAT_LINEBREAK | |
| 4848 else | |
| 4849 { | |
| 4850 char_u *p; | |
| 4851 int len = n_extra; | |
| 4852 int i; | |
| 4853 int saved_nextra = n_extra; | |
| 4854 | |
| 6172 | 4855 #ifdef FEAT_CONCEAL |
| 6627 | 4856 if (vcol_off > 0) |
| 6172 | 4857 /* there are characters to conceal */ |
| 4858 tab_len += vcol_off; | |
| 6520 | 4859 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4860 */ | |
| 4861 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4862 && n_extra > tab_len) | |
| 4863 tab_len += n_extra - tab_len; | |
| 4864 #endif | |
| 4865 | |
| 6026 | 4866 /* if n_extra > 0, it gives the number of chars, to |
| 4867 * use for a tab, else we need to calculate the width | |
| 4868 * for a tab */ | |
| 4869 #ifdef FEAT_MBYTE | |
| 4870 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4871 if (n_extra > 0) | |
| 4872 len += n_extra - tab_len; | |
| 4873 #endif | |
| 4874 c = lcs_tab1; | |
| 4875 p = alloc((unsigned)(len + 1)); | |
| 4876 vim_memset(p, ' ', len); | |
| 4877 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4878 vim_free(p_extra_free); |
| 6026 | 4879 p_extra_free = p; |
| 4880 for (i = 0; i < tab_len; i++) | |
| 4881 { | |
| 4882 #ifdef FEAT_MBYTE | |
| 4883 mb_char2bytes(lcs_tab2, p); | |
| 4884 p += mb_char2len(lcs_tab2); | |
| 4885 n_extra += mb_char2len(lcs_tab2) | |
| 4886 - (saved_nextra > 0 ? 1 : 0); | |
| 4887 #else | |
| 4888 p[i] = lcs_tab2; | |
| 4889 #endif | |
| 4890 } | |
| 4891 p_extra = p_extra_free; | |
| 6172 | 4892 #ifdef FEAT_CONCEAL |
| 4893 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4894 * macro below, so need to adjust for that here */ | |
| 6627 | 4895 if (vcol_off > 0) |
| 6172 | 4896 n_extra -= vcol_off; |
| 4897 #endif | |
| 6026 | 4898 } |
| 4899 #endif | |
| 3984 | 4900 #ifdef FEAT_CONCEAL |
| 6627 | 4901 { |
| 4902 int vc_saved = vcol_off; | |
| 4903 | |
| 4904 /* Tab alignment should be identical regardless of | |
| 4905 * 'conceallevel' value. So tab compensates of all | |
| 4906 * previous concealed characters, and thus resets | |
| 4907 * vcol_off and boguscols accumulated so far in the | |
| 4908 * line. Note that the tab can be longer than | |
| 4909 * 'tabstop' when there are concealed characters. */ | |
| 4910 FIX_FOR_BOGUSCOLS; | |
| 4911 | |
| 4912 /* Make sure, the highlighting for the tab char will be | |
| 4913 * correctly set further below (effectively reverts the | |
| 4914 * FIX_FOR_BOGSUCOLS macro */ | |
| 4915 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4916 && lcs_tab1) |
| 6627 | 4917 tab_len += vc_saved; |
| 4918 } | |
| 3984 | 4919 #endif |
| 7 | 4920 #ifdef FEAT_MBYTE |
| 4921 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4922 #endif | |
| 4923 if (wp->w_p_list) | |
| 4924 { | |
| 4925 c = lcs_tab1; | |
| 6026 | 4926 #ifdef FEAT_LINEBREAK |
| 4927 if (wp->w_p_lbr) | |
| 4928 c_extra = NUL; /* using p_extra from above */ | |
| 4929 else | |
| 4930 #endif | |
| 4931 c_extra = lcs_tab2; | |
| 4932 n_attr = tab_len + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4933 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4934 saved_attr2 = char_attr; /* save current attr */ |
| 4935 #ifdef FEAT_MBYTE | |
| 4936 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
4937 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4938 { |
| 4939 mb_utf8 = TRUE; | |
| 714 | 4940 u8cc[0] = 0; |
| 819 | 4941 c = 0xc0; |
| 7 | 4942 } |
| 4943 #endif | |
| 4944 } | |
| 4945 else | |
| 4946 { | |
| 4947 c_extra = ' '; | |
| 4948 c = ' '; | |
| 4949 } | |
| 4950 } | |
| 36 | 4951 else if (c == NUL |
| 6799 | 4952 && (wp->w_p_list |
| 36 | 4953 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4954 && tocol > vcol | |
| 4955 && VIsual_mode != Ctrl_V | |
| 4956 && ( | |
| 4957 # ifdef FEAT_RIGHTLEFT | |
| 4958 wp->w_p_rl ? (col >= 0) : | |
| 4959 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4960 (col < wp->w_width)) |
| 36 | 4961 && !(noinvcur |
| 1850 | 4962 && lnum == wp->w_cursor.lnum |
| 36 | 4963 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4964 && lcs_eol_one > 0) |
| 7 | 4965 { |
| 36 | 4966 /* Display a '$' after the line or highlight an extra |
| 4967 * character if the line break is included. */ | |
| 7 | 4968 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4969 /* For a diff line the highlighting continues after the | |
| 4970 * "$". */ | |
| 4971 if ( | |
| 4972 # ifdef FEAT_DIFF | |
| 534 | 4973 diff_hlf == (hlf_T)0 |
| 7 | 4974 # ifdef LINE_ATTR |
| 4975 && | |
| 4976 # endif | |
| 4977 # endif | |
| 4978 # ifdef LINE_ATTR | |
| 4979 line_attr == 0 | |
| 4980 # endif | |
| 4981 ) | |
| 4982 #endif | |
| 4983 { | |
| 4984 #ifdef FEAT_VIRTUALEDIT | |
| 4985 /* In virtualedit, visual selections may extend | |
| 4986 * beyond end of line. */ | |
| 4987 if (area_highlighting && virtual_active() | |
| 4988 && tocol != MAXCOL && vcol < tocol) | |
| 4989 n_extra = 0; | |
| 4990 else | |
| 4991 #endif | |
| 4992 { | |
| 4993 p_extra = at_end_str; | |
| 4994 n_extra = 1; | |
| 4995 c_extra = NUL; | |
| 4996 } | |
| 4997 } | |
| 6799 | 4998 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 4999 c = lcs_eol; |
| 5000 else | |
| 5001 c = ' '; | |
| 7 | 5002 lcs_eol_one = -1; |
| 5003 --ptr; /* put it back at the NUL */ | |
| 674 | 5004 if (!attr_pri) |
| 7 | 5005 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5006 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5007 n_attr = 1; |
| 5008 } | |
| 5009 #ifdef FEAT_MBYTE | |
| 5010 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5011 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5012 { |
| 5013 mb_utf8 = TRUE; | |
| 714 | 5014 u8cc[0] = 0; |
| 819 | 5015 c = 0xc0; |
| 7 | 5016 } |
| 5017 else | |
| 5018 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5019 #endif | |
| 5020 } | |
| 5021 else if (c != NUL) | |
| 5022 { | |
| 5023 p_extra = transchar(c); | |
| 6064 | 5024 if (n_extra == 0) |
| 5025 n_extra = byte2cells(c) - 1; | |
| 7 | 5026 #ifdef FEAT_RIGHTLEFT |
| 5027 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5028 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5029 #endif | |
| 5030 c_extra = NUL; | |
| 6026 | 5031 #ifdef FEAT_LINEBREAK |
| 5032 if (wp->w_p_lbr) | |
| 5033 { | |
| 5034 char_u *p; | |
| 5035 | |
| 5036 c = *p_extra; | |
| 5037 p = alloc((unsigned)n_extra + 1); | |
| 5038 vim_memset(p, ' ', n_extra); | |
| 5039 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5040 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5041 vim_free(p_extra_free); |
| 6026 | 5042 p_extra_free = p_extra = p; |
| 5043 } | |
| 5044 else | |
| 5045 #endif | |
| 5046 { | |
| 5047 n_extra = byte2cells(c) - 1; | |
| 5048 c = *p_extra++; | |
| 5049 } | |
| 674 | 5050 if (!attr_pri) |
| 7 | 5051 { |
| 5052 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5053 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5054 saved_attr2 = char_attr; /* save current attr */ |
| 5055 } | |
| 5056 #ifdef FEAT_MBYTE | |
| 5057 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5058 #endif | |
| 5059 } | |
| 5060 #ifdef FEAT_VIRTUALEDIT | |
| 5061 else if (VIsual_active | |
| 5062 && (VIsual_mode == Ctrl_V | |
| 5063 || VIsual_mode == 'v') | |
| 5064 && virtual_active() | |
| 5065 && tocol != MAXCOL | |
| 5066 && vcol < tocol | |
| 5067 && ( | |
| 5068 # ifdef FEAT_RIGHTLEFT | |
| 5069 wp->w_p_rl ? (col >= 0) : | |
| 5070 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5071 (col < wp->w_width))) |
| 7 | 5072 { |
| 5073 c = ' '; | |
| 5074 --ptr; /* put it back at the NUL */ | |
| 5075 } | |
| 5076 #endif | |
| 910 | 5077 #if defined(LINE_ATTR) |
| 7 | 5078 else if (( |
| 5079 # ifdef FEAT_DIFF | |
| 910 | 5080 diff_hlf != (hlf_T)0 || |
| 7 | 5081 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5082 # ifdef FEAT_TERMINAL |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5083 term_attr != 0 || |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5084 # endif |
| 7 | 5085 line_attr != 0 |
| 5086 ) && ( | |
| 5087 # ifdef FEAT_RIGHTLEFT | |
| 5088 wp->w_p_rl ? (col >= 0) : | |
| 5089 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5090 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5091 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5092 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5093 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5094 < wp->w_width))) |
| 7 | 5095 { |
| 5096 /* Highlight until the right side of the window */ | |
| 5097 c = ' '; | |
| 5098 --ptr; /* put it back at the NUL */ | |
| 867 | 5099 |
| 5100 /* Remember we do the char for line highlighting. */ | |
| 5101 ++did_line_attr; | |
| 5102 | |
| 5103 /* don't do search HL for the rest of the line */ | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5104 if (line_attr != 0 && char_attr == search_attr |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5105 && (did_line_attr > 1 |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5106 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5107 char_attr = line_attr; |
| 7 | 5108 # ifdef FEAT_DIFF |
| 5109 if (diff_hlf == HLF_TXD) | |
| 5110 { | |
| 5111 diff_hlf = HLF_CHD; | |
| 5112 if (attr == 0 || char_attr != attr) | |
| 6106 | 5113 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5114 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5115 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5116 char_attr = hl_combine_attr(char_attr, | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5117 HL_ATTR(HLF_CUL)); |
| 6106 | 5118 } |
| 7 | 5119 } |
| 5120 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5121 # ifdef FEAT_TERMINAL |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5122 if (term_attr != 0) |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5123 { |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5124 char_attr = term_attr; |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5125 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5126 char_attr = hl_combine_attr(char_attr, |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5127 HL_ATTR(HLF_CUL)); |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5128 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5129 # endif |
| 7 | 5130 } |
| 5131 #endif | |
| 5132 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5133 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5134 #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
|
5135 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
|
5136 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5137 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5138 && ( (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
|
5139 && !(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
|
5140 && 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
|
5141 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5142 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5143 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5144 && (syn_get_sub_char() != NUL || match_conc |
| 5145 || 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
|
5146 && 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
|
5147 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5148 /* 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
|
5149 * character. */ |
| 6947 | 5150 if (match_conc) |
| 5151 c = match_conc; | |
| 5152 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
|
5153 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5154 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5155 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5156 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5157 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5158 |
|
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
|
5159 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5160 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5161 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5162 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5163 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5164 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
|
5165 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5166 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5167 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5168 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5169 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5170 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5171 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5172 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5173 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5174 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5175 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5176 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5177 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5178 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5179 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5180 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5181 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5182 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5183 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5184 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5185 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5186 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5187 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5188 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5189 if (enc_utf8 && utf_char2len(c) > 1) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5190 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5191 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5192 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5193 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5194 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5195 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5196 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
|
5197 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5198 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5199 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5200 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5201 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
|
5202 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5203 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5204 #endif /* FEAT_CONCEAL */ |
| 7 | 5205 } |
| 5206 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5207 #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
|
5208 /* 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
|
5209 * 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
|
5210 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
|
5211 && 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
|
5212 && 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
|
5213 && (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
|
5214 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5215 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5216 if (wp->w_p_rl) |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5217 wp->w_wcol = wp->w_width - col + boguscols - 1; |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5218 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5219 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5220 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
|
5221 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
|
5222 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
|
5223 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5224 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5225 |
| 7 | 5226 /* Don't override visual selection highlighting. */ |
| 5227 if (n_attr > 0 | |
| 5228 && draw_state == WL_LINE | |
| 674 | 5229 && !attr_pri) |
| 7 | 5230 char_attr = extra_attr; |
| 5231 | |
| 42 | 5232 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5233 /* XIM don't send preedit_start and preedit_end, but they send |
| 5234 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5235 * im_is_preediting() here. */ | |
|
12293
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12244
diff
changeset
|
5236 if (p_imst == IM_ON_THE_SPOT |
|
1ff5e5dfa9b0
patch 8.0.1026: GTK on-the-spot input has problems
Christian Brabandt <cb@256bit.org>
parents:
12244
diff
changeset
|
5237 && xic != NULL |
| 1850 | 5238 && lnum == wp->w_cursor.lnum |
| 7 | 5239 && (State & INSERT) |
| 5240 && !p_imdisable | |
| 5241 && im_is_preediting() | |
| 5242 && draw_state == WL_LINE) | |
| 5243 { | |
| 5244 colnr_T tcol; | |
| 5245 | |
| 5246 if (preedit_end_col == MAXCOL) | |
| 1850 | 5247 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5248 else |
| 5249 tcol = preedit_end_col; | |
| 5250 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5251 { | |
| 5252 if (feedback_old_attr < 0) | |
| 5253 { | |
| 5254 feedback_col = 0; | |
| 5255 feedback_old_attr = char_attr; | |
| 5256 } | |
| 5257 char_attr = im_get_feedback_attr(feedback_col); | |
| 5258 if (char_attr < 0) | |
| 5259 char_attr = feedback_old_attr; | |
| 5260 feedback_col++; | |
| 5261 } | |
| 5262 else if (feedback_old_attr >= 0) | |
| 5263 { | |
| 5264 char_attr = feedback_old_attr; | |
| 5265 feedback_old_attr = -1; | |
| 5266 feedback_col = 0; | |
| 5267 } | |
| 5268 } | |
| 5269 #endif | |
| 5270 /* | |
| 5271 * Handle the case where we are in column 0 but not on the first | |
| 5272 * character of the line and the user wants us to show us a | |
| 5273 * special character (via 'listchars' option "precedes:<char>". | |
| 5274 */ | |
| 5275 if (lcs_prec_todo != NUL | |
| 6276 | 5276 && wp->w_p_list |
| 7 | 5277 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5278 #ifdef FEAT_DIFF | |
| 5279 && filler_todo <= 0 | |
| 5280 #endif | |
| 5281 && draw_state > WL_NR | |
| 5282 && c != NUL) | |
| 5283 { | |
| 5284 c = lcs_prec; | |
| 5285 lcs_prec_todo = NUL; | |
| 5286 #ifdef FEAT_MBYTE | |
| 3586 | 5287 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5288 { | |
| 5289 /* Double-width character being overwritten by the "precedes" | |
| 5290 * character, need to fill up half the character. */ | |
| 5291 c_extra = MB_FILLER_CHAR; | |
| 5292 n_extra = 1; | |
| 5293 n_attr = 2; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5294 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5295 } |
| 7 | 5296 mb_c = c; |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5297 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5298 { |
| 5299 mb_utf8 = TRUE; | |
| 714 | 5300 u8cc[0] = 0; |
| 819 | 5301 c = 0xc0; |
| 7 | 5302 } |
| 5303 else | |
| 5304 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5305 #endif | |
| 674 | 5306 if (!attr_pri) |
| 7 | 5307 { |
| 5308 saved_attr3 = char_attr; /* save current attr */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5309 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5310 n_attr3 = 1; |
| 5311 } | |
| 5312 } | |
| 5313 | |
| 5314 /* | |
| 867 | 5315 * At end of the text line or just after the last character. |
| 7 | 5316 */ |
| 867 | 5317 if (c == NUL |
| 910 | 5318 #if defined(LINE_ATTR) |
| 867 | 5319 || did_line_attr == 1 |
| 5320 #endif | |
| 5321 ) | |
| 5322 { | |
| 5323 #ifdef FEAT_SEARCH_EXTRA | |
| 5324 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5325 |
| 5326 /* we're not really at that column when skipping some text */ | |
| 1439 | 5327 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5328 ++prevcol; |
| 867 | 5329 #endif |
| 5330 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5331 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5332 * highlight match at end of line. If it's beyond the last |
| 5333 * char on the screen, just overwrite that one (tricky!) Not | |
| 5334 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5335 #ifdef FEAT_SEARCH_EXTRA |
| 5336 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5337 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5338 prevcol_hl_flag = TRUE; |
| 5339 else | |
| 5340 { | |
| 5341 cur = wp->w_match_head; | |
| 5342 while (cur != NULL) | |
| 5343 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5344 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5345 { |
| 5346 prevcol_hl_flag = TRUE; | |
| 5347 break; | |
| 5348 } | |
| 5349 cur = cur->next; | |
| 5350 } | |
| 5351 } | |
| 5352 #endif | |
| 7 | 5353 if (lcs_eol == lcs_eol_one |
| 1850 | 5354 && ((area_attr != 0 && vcol == fromcol |
| 5355 && (VIsual_mode != Ctrl_V | |
| 5356 || lnum == VIsual.lnum | |
| 5357 || lnum == curwin->w_cursor.lnum) | |
| 5358 && c == NUL) | |
| 7 | 5359 #ifdef FEAT_SEARCH_EXTRA |
| 5360 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5361 || (prevcol_hl_flag == TRUE |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5362 # ifdef FEAT_SYN_HL |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5363 && !(wp->w_p_cul && lnum == wp->w_cursor.lnum |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5364 && !(wp == curwin && VIsual_active)) |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5365 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5366 # ifdef FEAT_DIFF |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5367 && diff_hlf == (hlf_T)0 |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5368 # endif |
| 910 | 5369 # if defined(LINE_ATTR) |
| 867 | 5370 && did_line_attr <= 1 |
| 5371 # endif | |
| 5372 ) | |
| 7 | 5373 #endif |
| 5374 )) | |
| 5375 { | |
| 5376 int n = 0; | |
| 5377 | |
| 5378 #ifdef FEAT_RIGHTLEFT | |
| 5379 if (wp->w_p_rl) | |
| 5380 { | |
| 5381 if (col < 0) | |
| 5382 n = 1; | |
| 5383 } | |
| 5384 else | |
| 5385 #endif | |
| 5386 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5387 if (col >= wp->w_width) |
| 7 | 5388 n = -1; |
| 5389 } | |
| 5390 if (n != 0) | |
| 5391 { | |
| 5392 /* At the window boundary, highlight the last character | |
| 5393 * instead (better than nothing). */ | |
| 5394 off += n; | |
| 5395 col += n; | |
| 5396 } | |
| 5397 else | |
| 5398 { | |
| 5399 /* Add a blank character to highlight. */ | |
| 5400 ScreenLines[off] = ' '; | |
| 5401 #ifdef FEAT_MBYTE | |
| 5402 if (enc_utf8) | |
| 5403 ScreenLinesUC[off] = 0; | |
| 5404 #endif | |
| 5405 } | |
| 5406 #ifdef FEAT_SEARCH_EXTRA | |
| 5407 if (area_attr == 0) | |
| 5408 { | |
| 1326 | 5409 /* Use attributes from match with highest priority among |
| 5410 * 'search_hl' and the match list. */ | |
| 5411 char_attr = search_hl.attr; | |
| 5412 cur = wp->w_match_head; | |
| 5413 shl_flag = FALSE; | |
| 5414 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5415 { |
| 1326 | 5416 if (shl_flag == FALSE |
| 5417 && ((cur != NULL | |
| 5418 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5419 || cur == NULL)) | |
| 699 | 5420 { |
| 1326 | 5421 shl = &search_hl; |
| 5422 shl_flag = TRUE; | |
| 699 | 5423 } |
| 1326 | 5424 else |
| 5425 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5426 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
|
5427 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5428 char_attr = shl->attr; |
| 5429 if (shl != &search_hl && cur != NULL) | |
| 5430 cur = cur->next; | |
| 699 | 5431 } |
| 7 | 5432 } |
| 5433 #endif | |
| 5434 ScreenAttrs[off] = char_attr; | |
| 5435 #ifdef FEAT_RIGHTLEFT | |
| 5436 if (wp->w_p_rl) | |
| 1437 | 5437 { |
| 7 | 5438 --col; |
| 1437 | 5439 --off; |
| 5440 } | |
| 7 | 5441 else |
| 5442 #endif | |
| 1437 | 5443 { |
| 7 | 5444 ++col; |
| 1437 | 5445 ++off; |
| 5446 } | |
| 743 | 5447 ++vcol; |
| 1437 | 5448 #ifdef FEAT_SYN_HL |
| 5449 eol_hl_off = 1; | |
| 5450 #endif | |
| 743 | 5451 } |
| 867 | 5452 } |
| 5453 | |
| 5454 /* | |
| 5455 * At end of the text line. | |
| 5456 */ | |
| 5457 if (c == NUL) | |
| 5458 { | |
| 743 | 5459 #ifdef FEAT_SYN_HL |
| 1850 | 5460 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5461 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5462 { |
| 5463 /* highlight last char after line */ | |
| 5464 --col; | |
| 5465 --off; | |
| 5466 --vcol; | |
| 5467 } | |
| 5468 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5469 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5470 if (wp->w_p_wrap) |
| 5471 v = wp->w_skipcol; | |
| 5472 else | |
| 5473 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5474 |
| 820 | 5475 /* check if line ends before left margin */ |
| 5476 if (vcol < v + col - win_col_off(wp)) | |
| 5477 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
|
5478 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5479 /* 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
|
5480 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5481 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5482 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5483 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5484 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5485 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5486 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
|
5487 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5488 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5489 && (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
|
5490 && (int)wp->w_virtcol < |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5491 wp->w_width * (row - startrow + 1) + v |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5492 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5493 || draw_color_col) |
| 743 | 5494 # ifdef FEAT_RIGHTLEFT |
| 5495 && !wp->w_p_rl | |
| 5496 # endif | |
| 5497 ) | |
| 5498 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5499 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5500 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5501 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5502 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5503 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5504 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5505 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5506 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
|
5507 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5508 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5509 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5510 while (col < wp->w_width) |
| 743 | 5511 { |
| 5512 ScreenLines[off] = ' '; | |
| 5513 #ifdef FEAT_MBYTE | |
| 5514 if (enc_utf8) | |
| 5515 ScreenLinesUC[off] = 0; | |
| 5516 #endif | |
| 5517 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5518 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5519 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
|
5520 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5521 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5522 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5523 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
|
5524 else if (draw_color_col && VCOL_HLC == *color_cols) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5525 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5526 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5527 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5528 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5529 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5530 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5531 |
| 743 | 5532 ++vcol; |
| 5533 } | |
| 5534 } | |
| 5535 #endif | |
| 7 | 5536 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5537 screen_line(screen_row, wp->w_wincol, col, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5538 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
| 7 | 5539 row++; |
| 5540 | |
| 5541 /* | |
| 5542 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5543 * updated (saves a call to plines() later). | |
| 5544 */ | |
| 5545 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5546 { | |
| 5547 curwin->w_cline_row = startrow; | |
| 5548 curwin->w_cline_height = row - startrow; | |
| 5549 #ifdef FEAT_FOLDING | |
| 5550 curwin->w_cline_folded = FALSE; | |
| 5551 #endif | |
| 5552 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5553 } | |
| 5554 | |
| 5555 break; | |
| 5556 } | |
| 5557 | |
| 5558 /* line continues beyond line end */ | |
| 5559 if (lcs_ext | |
| 5560 && !wp->w_p_wrap | |
| 5561 #ifdef FEAT_DIFF | |
| 5562 && filler_todo <= 0 | |
| 5563 #endif | |
| 5564 && ( | |
| 5565 #ifdef FEAT_RIGHTLEFT | |
| 5566 wp->w_p_rl ? col == 0 : | |
| 5567 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5568 col == wp->w_width - 1) |
| 7 | 5569 && (*ptr != NUL |
| 1555 | 5570 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5571 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5572 { | |
| 5573 c = lcs_ext; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5574 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5575 #ifdef FEAT_MBYTE |
| 5576 mb_c = c; | |
|
11269
121d29004998
patch 8.0.0520: using a function pointer while the function is known
Christian Brabandt <cb@256bit.org>
parents:
11265
diff
changeset
|
5577 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5578 { |
| 5579 mb_utf8 = TRUE; | |
| 714 | 5580 u8cc[0] = 0; |
| 819 | 5581 c = 0xc0; |
| 7 | 5582 } |
| 5583 else | |
| 5584 mb_utf8 = FALSE; | |
| 5585 #endif | |
| 5586 } | |
| 5587 | |
| 743 | 5588 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5589 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5590 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5591 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
|
5592 |
| 743 | 5593 /* 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
|
5594 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5595 * 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
|
5596 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5597 vcol_save_attr = -1; |
|
11585
18373179040e
patch 8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch'
Christian Brabandt <cb@256bit.org>
parents:
11529
diff
changeset
|
5598 if (draw_state == WL_LINE && !lnum_in_visual_area |
|
18373179040e
patch 8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch'
Christian Brabandt <cb@256bit.org>
parents:
11529
diff
changeset
|
5599 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5600 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5601 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
|
5602 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5603 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5604 vcol_save_attr = char_attr; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5605 char_attr = hl_combine_attr(char_attr, HL_ATTR(HLF_CUC)); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5606 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5607 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
|
5608 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5609 vcol_save_attr = char_attr; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5610 char_attr = hl_combine_attr(char_attr, HL_ATTR(HLF_MC)); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5611 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5612 } |
| 743 | 5613 #endif |
| 5614 | |
| 7 | 5615 /* |
| 5616 * Store character to be displayed. | |
| 5617 * Skip characters that are left of the screen for 'nowrap'. | |
| 5618 */ | |
| 5619 vcol_prev = vcol; | |
| 5620 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5621 { | |
| 5622 /* | |
| 5623 * Store the character. | |
| 5624 */ | |
| 5625 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5626 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5627 { | |
| 5628 /* A double-wide character is: put first halve in left cell. */ | |
| 5629 --off; | |
| 5630 --col; | |
| 5631 } | |
| 5632 #endif | |
| 5633 ScreenLines[off] = c; | |
| 5634 #ifdef FEAT_MBYTE | |
| 5635 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5636 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5637 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5638 ScreenLines[off] = 0x8e; |
| 7 | 5639 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5640 } |
| 7 | 5641 else if (enc_utf8) |
| 5642 { | |
| 5643 if (mb_utf8) | |
| 5644 { | |
| 1326 | 5645 int i; |
| 5646 | |
| 7 | 5647 ScreenLinesUC[off] = mb_c; |
| 819 | 5648 if ((c & 0xff) == 0) |
| 5649 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5650 for (i = 0; i < Screen_mco; ++i) |
| 5651 { | |
| 5652 ScreenLinesC[i][off] = u8cc[i]; | |
| 5653 if (u8cc[i] == 0) | |
| 5654 break; | |
| 5655 } | |
| 7 | 5656 } |
| 5657 else | |
| 5658 ScreenLinesUC[off] = 0; | |
| 5659 } | |
| 5660 if (multi_attr) | |
| 5661 { | |
| 5662 ScreenAttrs[off] = multi_attr; | |
| 5663 multi_attr = 0; | |
| 5664 } | |
| 5665 else | |
| 5666 #endif | |
| 5667 ScreenAttrs[off] = char_attr; | |
| 5668 | |
| 5669 #ifdef FEAT_MBYTE | |
| 5670 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5671 { | |
| 5672 /* Need to fill two screen columns. */ | |
| 5673 ++off; | |
| 5674 ++col; | |
| 5675 if (enc_utf8) | |
| 5676 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5677 ScreenLines[off] = 0; | |
| 5678 else | |
| 5679 /* DBCS: Put second byte in the second screen char. */ | |
| 5680 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5681 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5682 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5683 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5684 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5685 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5686 ++vcol; |
| 7 | 5687 /* When "tocol" is halfway a character, set it to the end of |
| 5688 * the character, otherwise highlighting won't stop. */ | |
| 5689 if (tocol == vcol) | |
| 5690 ++tocol; | |
| 5691 #ifdef FEAT_RIGHTLEFT | |
| 5692 if (wp->w_p_rl) | |
| 5693 { | |
| 5694 /* now it's time to backup one cell */ | |
| 5695 --off; | |
| 5696 --col; | |
| 5697 } | |
| 5698 #endif | |
| 5699 } | |
| 5700 #endif | |
| 5701 #ifdef FEAT_RIGHTLEFT | |
| 5702 if (wp->w_p_rl) | |
| 5703 { | |
| 5704 --off; | |
| 5705 --col; | |
| 5706 } | |
| 5707 else | |
| 5708 #endif | |
| 5709 { | |
| 5710 ++off; | |
| 5711 ++col; | |
| 5712 } | |
| 5713 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5714 #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
|
5715 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
|
5716 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5717 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5718 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5719 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5720 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5721 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5722 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5723 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5724 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5725 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5726 * 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
|
5727 * 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
|
5728 * 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
|
5729 * 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
|
5730 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5731 * 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
|
5732 * 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
|
5733 * 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
|
5734 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5735 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5736 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5737 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5738 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5739 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5740 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5741 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5742 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5743 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5744 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5745 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5746 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5747 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5748 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5749 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5750 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5751 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5752 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5753 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5754 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5755 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5756 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5757 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
|
5758 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5759 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5760 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5761 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5762 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5763 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5764 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5765 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5766 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5767 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5768 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5769 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5770 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5771 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5772 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5773 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5774 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5775 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5776 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5777 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5778 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5779 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5780 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5781 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5782 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5783 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5784 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5785 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5786 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5787 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5788 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5789 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5790 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5791 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5792 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5793 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5794 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5795 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5796 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5797 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5798 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5799 #endif /* FEAT_CONCEAL */ |
| 7 | 5800 else |
| 5801 --n_skip; | |
| 5802 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5803 /* 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
|
5804 * column. */ |
| 1849 | 5805 if (draw_state > WL_NR |
| 7 | 5806 #ifdef FEAT_DIFF |
| 5807 && filler_todo <= 0 | |
| 5808 #endif | |
| 5809 ) | |
| 5810 ++vcol; | |
| 5811 | |
| 743 | 5812 #ifdef FEAT_SYN_HL |
| 5813 if (vcol_save_attr >= 0) | |
| 5814 char_attr = vcol_save_attr; | |
| 5815 #endif | |
| 5816 | |
| 7 | 5817 /* restore attributes after "predeces" in 'listchars' */ |
| 5818 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5819 char_attr = saved_attr3; | |
| 5820 | |
| 5821 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5822 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5823 char_attr = saved_attr2; | |
| 5824 | |
| 5825 /* | |
| 5826 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5827 * so far. If there is no more to display it is caught above. |
| 7 | 5828 */ |
| 5829 if (( | |
| 5830 #ifdef FEAT_RIGHTLEFT | |
| 5831 wp->w_p_rl ? (col < 0) : | |
| 5832 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5833 (col >= wp->w_width)) |
| 7 | 5834 && (*ptr != NUL |
| 5835 #ifdef FEAT_DIFF | |
| 5836 || filler_todo > 0 | |
| 5837 #endif | |
| 2724 | 5838 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5839 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5840 ) | |
| 5841 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5842 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5843 screen_line(screen_row, wp->w_wincol, col - boguscols, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5844 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5845 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5846 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5847 screen_line(screen_row, wp->w_wincol, col, |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5848 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5849 #endif |
| 7 | 5850 ++row; |
| 5851 ++screen_row; | |
| 5852 | |
| 5853 /* When not wrapping and finished diff lines, or when displayed | |
| 5854 * '$' and highlighting until last column, break here. */ | |
| 5855 if ((!wp->w_p_wrap | |
| 5856 #ifdef FEAT_DIFF | |
| 5857 && filler_todo <= 0 | |
| 5858 #endif | |
| 5859 ) || lcs_eol_one == -1) | |
| 5860 break; | |
| 5861 | |
| 5862 /* When the window is too narrow draw all "@" lines. */ | |
| 5863 if (draw_state != WL_LINE | |
| 5864 #ifdef FEAT_DIFF | |
| 5865 && filler_todo <= 0 | |
| 5866 #endif | |
| 5867 ) | |
| 5868 { | |
| 5869 win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); | |
| 5870 draw_vsep_win(wp, row); | |
| 5871 row = endrow; | |
| 5872 } | |
| 5873 | |
| 5874 /* When line got too long for screen break here. */ | |
| 5875 if (row == endrow) | |
| 5876 { | |
| 5877 ++row; | |
| 5878 break; | |
| 5879 } | |
| 5880 | |
| 5881 if (screen_cur_row == screen_row - 1 | |
| 5882 #ifdef FEAT_DIFF | |
| 5883 && filler_todo <= 0 | |
| 5884 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5885 && wp->w_width == Columns) |
| 7 | 5886 { |
| 5887 /* Remember that the line wraps, used for modeless copy. */ | |
| 5888 LineWraps[screen_row - 1] = TRUE; | |
| 5889 | |
| 5890 /* | |
| 5891 * Special trick to make copy/paste of wrapped lines work with | |
| 5892 * xterm/screen: write an extra character beyond the end of | |
| 5893 * the line. This will work with all terminal types | |
| 5894 * (regardless of the xn,am settings). | |
| 5895 * Only do this on a fast tty. | |
| 5896 * Only do this if the cursor is on the current line | |
| 5897 * (something has been written in it). | |
| 5898 * Don't do this for the GUI. | |
| 5899 * Don't do this for double-width characters. | |
| 5900 * Don't do this for a window not at the right screen border. | |
| 5901 */ | |
| 5902 if (p_tf | |
| 5903 #ifdef FEAT_GUI | |
| 5904 && !gui.in_use | |
| 5905 #endif | |
| 5906 #ifdef FEAT_MBYTE | |
| 5907 && !(has_mbyte | |
| 1378 | 5908 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5909 LineOffset[screen_row] + screen_Columns) | |
| 5910 == 2 | |
| 7 | 5911 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5912 + (int)Columns - 2, |
| 5913 LineOffset[screen_row] + screen_Columns) | |
| 5914 == 2)) | |
| 7 | 5915 #endif |
| 5916 ) | |
| 5917 { | |
| 5918 /* First make sure we are at the end of the screen line, | |
| 5919 * then output the same character again to let the | |
| 5920 * terminal know about the wrap. If the terminal doesn't | |
| 5921 * auto-wrap, we overwrite the character. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5922 if (screen_cur_col != wp->w_width) |
| 7 | 5923 screen_char(LineOffset[screen_row - 1] |
| 5924 + (unsigned)Columns - 1, | |
| 5925 screen_row - 1, (int)(Columns - 1)); | |
| 5926 | |
| 5927 #ifdef FEAT_MBYTE | |
| 5928 /* When there is a multi-byte character, just output a | |
| 5929 * space to keep it simple. */ | |
| 148 | 5930 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5931 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5932 out_char(' '); |
| 5933 else | |
| 5934 #endif | |
| 5935 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5936 + (Columns - 1)]); | |
| 5937 /* force a redraw of the first char on the next line */ | |
| 5938 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5939 screen_start(); /* don't know where cursor is now */ | |
| 5940 } | |
| 5941 } | |
| 5942 | |
| 5943 col = 0; | |
| 5944 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5945 #ifdef FEAT_RIGHTLEFT | |
| 5946 if (wp->w_p_rl) | |
| 5947 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5948 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 5949 off += col; |
| 5950 } | |
| 5951 #endif | |
| 5952 | |
| 5953 /* reset the drawing state for the start of a wrapped line */ | |
| 5954 draw_state = WL_START; | |
| 5955 saved_n_extra = n_extra; | |
| 5956 saved_p_extra = p_extra; | |
| 5957 saved_c_extra = c_extra; | |
| 5958 saved_char_attr = char_attr; | |
| 5959 n_extra = 0; | |
| 5960 lcs_prec_todo = lcs_prec; | |
| 5961 #ifdef FEAT_LINEBREAK | |
| 5962 # ifdef FEAT_DIFF | |
| 5963 if (filler_todo <= 0) | |
| 5964 # endif | |
| 5965 need_showbreak = TRUE; | |
| 5966 #endif | |
| 5967 #ifdef FEAT_DIFF | |
| 5968 --filler_todo; | |
| 5969 /* When the filler lines are actually below the last line of the | |
| 5970 * file, don't draw the line itself, break here. */ | |
| 5971 if (filler_todo == 0 && wp->w_botfill) | |
| 5972 break; | |
| 5973 #endif | |
| 5974 } | |
| 5975 | |
| 5976 } /* for every character in the line */ | |
| 5977 | |
| 743 | 5978 #ifdef FEAT_SPELL |
| 386 | 5979 /* After an empty line check first word for capital. */ |
| 5980 if (*skipwhite(line) == NUL) | |
| 5981 { | |
| 5982 capcol_lnum = lnum + 1; | |
| 5983 cap_col = 0; | |
| 5984 } | |
| 5985 #endif | |
| 5986 | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5987 vim_free(p_extra_free); |
| 7 | 5988 return row; |
| 5989 } | |
| 5990 | |
| 714 | 5991 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5992 static int comp_char_differs(int, int); |
| 714 | 5993 |
| 5994 /* | |
| 5995 * 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
|
5996 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 5997 */ |
| 5998 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5999 comp_char_differs(int off_from, int off_to) |
| 714 | 6000 { |
| 6001 int i; | |
| 6002 | |
| 6003 for (i = 0; i < Screen_mco; ++i) | |
| 6004 { | |
| 6005 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6006 return TRUE; | |
| 6007 if (ScreenLinesC[i][off_from] == 0) | |
| 6008 break; | |
| 6009 } | |
| 6010 return FALSE; | |
| 6011 } | |
| 6012 #endif | |
| 6013 | |
| 7 | 6014 /* |
| 6015 * Check whether the given character needs redrawing: | |
| 6016 * - the (first byte of the) character is different | |
| 6017 * - the attributes are different | |
| 6018 * - the character is multi-byte and the next byte is different | |
| 1616 | 6019 * - the character is two cells wide and the second cell differs. |
| 7 | 6020 */ |
| 6021 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6022 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6023 { |
| 6024 if (cols > 0 | |
| 6025 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6026 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6027 | |
| 6028 #ifdef FEAT_MBYTE | |
| 6029 || (enc_dbcs != 0 | |
| 6030 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6031 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6032 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6033 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6034 != ScreenLines[off_to + 1]))) | |
| 6035 || (enc_utf8 | |
| 6036 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6037 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6038 && comp_char_differs(off_from, off_to)) |
| 3759 | 6039 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6040 && ScreenLines[off_from + 1] | |
| 6041 != ScreenLines[off_to + 1]))) | |
| 7 | 6042 #endif |
| 6043 )) | |
| 6044 return TRUE; | |
| 6045 return FALSE; | |
| 6046 } | |
| 6047 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6048 #if defined(FEAT_TERMINAL) || defined(PROTO) |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6049 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6050 * Return the index in ScreenLines[] for the current screen line. |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6051 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6052 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6053 screen_get_current_line_off() |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6054 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6055 return (int)(current_ScreenLine - ScreenLines); |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6056 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6057 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6058 |
| 7 | 6059 /* |
| 6060 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6061 * have actually changed. Handle insert/delete character. | |
| 6062 * "coloff" gives the first column on the screen for this line. | |
| 6063 * "endcol" gives the columns where valid characters are. | |
| 6064 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6065 * needs to be cleared, negative otherwise. | |
| 6066 * "rlflag" is TRUE in a rightleft window: | |
| 6067 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 6068 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6069 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6070 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6071 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6072 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6073 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6074 int endcol, |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6075 int clear_width, |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6076 int rlflag UNUSED) |
| 7 | 6077 { |
| 6078 unsigned off_from; | |
| 6079 unsigned off_to; | |
| 1378 | 6080 #ifdef FEAT_MBYTE |
| 6081 unsigned max_off_from; | |
| 6082 unsigned max_off_to; | |
| 6083 #endif | |
| 7 | 6084 int col = 0; |
| 6085 int hl; | |
| 6086 int force = FALSE; /* force update rest of the line */ | |
| 6087 int redraw_this /* bool: does character need redraw? */ | |
| 6088 #ifdef FEAT_GUI | |
| 6089 = TRUE /* For GUI when while-loop empty */ | |
| 6090 #endif | |
| 6091 ; | |
| 6092 int redraw_next; /* redraw_this for next character */ | |
| 6093 #ifdef FEAT_MBYTE | |
| 6094 int clear_next = FALSE; | |
| 6095 int char_cells; /* 1: normal char */ | |
| 6096 /* 2: occupies two display cells */ | |
| 6097 # define CHAR_CELLS char_cells | |
| 6098 #else | |
| 6099 # define CHAR_CELLS 1 | |
| 6100 #endif | |
| 6101 | |
| 3413 | 6102 /* Check for illegal row and col, just in case. */ |
| 6103 if (row >= Rows) | |
| 6104 row = Rows - 1; | |
| 6105 if (endcol > Columns) | |
| 6106 endcol = Columns; | |
| 6107 | |
| 7 | 6108 # ifdef FEAT_CLIPBOARD |
| 6109 clip_may_clear_selection(row, row); | |
| 6110 # endif | |
| 6111 | |
| 6112 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6113 off_to = LineOffset[row] + coloff; | |
| 1378 | 6114 #ifdef FEAT_MBYTE |
| 6115 max_off_from = off_from + screen_Columns; | |
| 6116 max_off_to = LineOffset[row] + screen_Columns; | |
| 6117 #endif | |
| 7 | 6118 |
| 6119 #ifdef FEAT_RIGHTLEFT | |
| 6120 if (rlflag) | |
| 6121 { | |
| 6122 /* Clear rest first, because it's left of the text. */ | |
| 6123 if (clear_width > 0) | |
| 6124 { | |
| 6125 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6126 && ScreenAttrs[off_to] == 0 | |
| 6127 # ifdef FEAT_MBYTE | |
| 6128 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6129 # endif | |
| 6130 ) | |
| 6131 { | |
| 6132 ++off_to; | |
| 6133 ++col; | |
| 6134 } | |
| 6135 if (col <= endcol) | |
| 6136 screen_fill(row, row + 1, col + coloff, | |
| 6137 endcol + coloff + 1, ' ', ' ', 0); | |
| 6138 } | |
| 6139 col = endcol + 1; | |
| 6140 off_to = LineOffset[row] + col + coloff; | |
| 6141 off_from += col; | |
| 6142 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6143 } | |
| 6144 #endif /* FEAT_RIGHTLEFT */ | |
| 6145 | |
| 6146 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6147 | |
| 6148 while (col < endcol) | |
| 6149 { | |
| 6150 #ifdef FEAT_MBYTE | |
| 6151 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6152 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6153 else |
| 6154 char_cells = 1; | |
| 6155 #endif | |
| 6156 | |
| 6157 redraw_this = redraw_next; | |
| 6158 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6159 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6160 | |
| 6161 #ifdef FEAT_GUI | |
| 6162 /* If the next character was bold, then redraw the current character to | |
| 6163 * remove any pixels that might have spilt over into us. This only | |
| 6164 * happens in the GUI. | |
| 6165 */ | |
| 6166 if (redraw_next && gui.in_use) | |
| 6167 { | |
| 6168 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6169 if (hl > HL_ALL) |
| 6170 hl = syn_attr2attr(hl); | |
| 6171 if (hl & HL_BOLD) | |
| 7 | 6172 redraw_this = TRUE; |
| 6173 } | |
| 6174 #endif | |
| 6175 | |
| 6176 if (redraw_this) | |
| 6177 { | |
| 6178 /* | |
| 6179 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6180 * Attributes for characters are stored at the position where the | |
| 6181 * cursor is when writing the highlighting code. The | |
| 6182 * start-highlighting code must be written with the cursor on the | |
| 6183 * first highlighted character. The stop-highlighting code must | |
| 6184 * be written with the cursor just after the last highlighted | |
| 6185 * character. | |
| 6186 * Overwriting a character doesn't remove it's highlighting. Need | |
| 6187 * to clear the rest of the line, and force redrawing it | |
| 6188 * completely. | |
| 6189 */ | |
| 6190 if ( p_wiv | |
| 6191 && !force | |
| 6192 #ifdef FEAT_GUI | |
| 6193 && !gui.in_use | |
| 6194 #endif | |
| 6195 && ScreenAttrs[off_to] != 0 | |
| 6196 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6197 { | |
| 6198 /* | |
| 6199 * Need to remove highlighting attributes here. | |
| 6200 */ | |
| 6201 windgoto(row, col + coloff); | |
| 6202 out_str(T_CE); /* clear rest of this screen line */ | |
| 6203 screen_start(); /* don't know where cursor is now */ | |
| 6204 force = TRUE; /* force redraw of rest of the line */ | |
| 6205 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6206 | |
| 6207 /* | |
| 6208 * If the previous character was highlighted, need to stop | |
| 6209 * highlighting at this character. | |
| 6210 */ | |
| 6211 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6212 { | |
| 6213 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6214 term_windgoto(row, col + coloff); | |
| 6215 screen_stop_highlight(); | |
| 6216 } | |
| 6217 else | |
| 6218 screen_attr = 0; /* highlighting has stopped */ | |
| 6219 } | |
| 6220 #ifdef FEAT_MBYTE | |
| 6221 if (enc_dbcs != 0) | |
| 6222 { | |
| 6223 /* Check if overwriting a double-byte with a single-byte or | |
| 6224 * the other way around requires another character to be | |
| 6225 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6226 * ScreenLinesUC[] is sufficient. */ | |
| 6227 if (char_cells == 1 | |
| 6228 && col + 1 < endcol | |
| 1378 | 6229 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6230 { |
| 6231 /* Writing a single-cell character over a double-cell | |
| 6232 * character: need to redraw the next cell. */ | |
| 6233 ScreenLines[off_to + 1] = 0; | |
| 6234 redraw_next = TRUE; | |
| 6235 } | |
| 6236 else if (char_cells == 2 | |
| 6237 && col + 2 < endcol | |
| 1378 | 6238 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6239 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6240 { |
| 6241 /* Writing the second half of a double-cell character over | |
| 6242 * a double-cell character: need to redraw the second | |
| 6243 * cell. */ | |
| 6244 ScreenLines[off_to + 2] = 0; | |
| 6245 redraw_next = TRUE; | |
| 6246 } | |
| 6247 | |
| 6248 if (enc_dbcs == DBCS_JPNU) | |
| 6249 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6250 } | |
| 6251 /* When writing a single-width character over a double-width | |
| 6252 * character and at the end of the redrawn text, need to clear out | |
| 6253 * the right halve of the old character. | |
| 6254 * Also required when writing the right halve of a double-width | |
| 6255 * char over the left halve of an existing one. */ | |
| 6256 if (has_mbyte && col + char_cells == endcol | |
| 6257 && ((char_cells == 1 | |
| 1378 | 6258 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6259 || (char_cells == 2 |
| 1378 | 6260 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6261 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6262 clear_next = TRUE; |
| 6263 #endif | |
| 6264 | |
| 6265 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6266 #ifdef FEAT_MBYTE | |
| 6267 if (enc_utf8) | |
| 6268 { | |
| 6269 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6270 if (ScreenLinesUC[off_from] != 0) | |
| 6271 { | |
| 714 | 6272 int i; |
| 6273 | |
| 6274 for (i = 0; i < Screen_mco; ++i) | |
| 6275 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6276 } |
| 6277 } | |
| 6278 if (char_cells == 2) | |
| 6279 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6280 #endif | |
| 6281 | |
| 6282 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6283 /* The bold trick makes a single column of pixels appear in the |
| 6284 * next character. When a bold character is removed, the next | |
| 7 | 6285 * character should be redrawn too. This happens for our own GUI |
| 6286 * and for some xterms. */ | |
| 6287 if ( | |
| 6288 # ifdef FEAT_GUI | |
| 6289 gui.in_use | |
| 6290 # endif | |
| 6291 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6292 || | |
| 6293 # endif | |
| 6294 # ifdef UNIX | |
| 6295 term_is_xterm | |
| 6296 # endif | |
| 6297 ) | |
| 6298 { | |
| 6299 hl = ScreenAttrs[off_to]; | |
| 743 | 6300 if (hl > HL_ALL) |
| 6301 hl = syn_attr2attr(hl); | |
| 6302 if (hl & HL_BOLD) | |
| 7 | 6303 redraw_next = TRUE; |
| 6304 } | |
| 6305 #endif | |
| 6306 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6307 #ifdef FEAT_MBYTE | |
| 819 | 6308 /* For simplicity set the attributes of second half of a |
| 6309 * double-wide character equal to the first half. */ | |
| 6310 if (char_cells == 2) | |
| 6311 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6312 | |
| 7 | 6313 if (enc_dbcs != 0 && char_cells == 2) |
| 6314 screen_char_2(off_to, row, col + coloff); | |
| 6315 else | |
| 6316 #endif | |
| 6317 screen_char(off_to, row, col + coloff); | |
| 6318 } | |
| 6319 else if ( p_wiv | |
| 6320 #ifdef FEAT_GUI | |
| 6321 && !gui.in_use | |
| 6322 #endif | |
| 6323 && col + coloff > 0) | |
| 6324 { | |
| 6325 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6326 { | |
| 6327 /* | |
| 6328 * Don't output stop-highlight when moving the cursor, it will | |
| 6329 * stop the highlighting when it should continue. | |
| 6330 */ | |
| 6331 screen_attr = 0; | |
| 6332 } | |
| 6333 else if (screen_attr != 0) | |
| 6334 screen_stop_highlight(); | |
| 6335 } | |
| 6336 | |
| 6337 off_to += CHAR_CELLS; | |
| 6338 off_from += CHAR_CELLS; | |
| 6339 col += CHAR_CELLS; | |
| 6340 } | |
| 6341 | |
| 6342 #ifdef FEAT_MBYTE | |
| 6343 if (clear_next) | |
| 6344 { | |
| 6345 /* Clear the second half of a double-wide character of which the left | |
| 6346 * half was overwritten with a single-wide character. */ | |
| 6347 ScreenLines[off_to] = ' '; | |
| 6348 if (enc_utf8) | |
| 6349 ScreenLinesUC[off_to] = 0; | |
| 6350 screen_char(off_to, row, col + coloff); | |
| 6351 } | |
| 6352 #endif | |
| 6353 | |
| 6354 if (clear_width > 0 | |
| 6355 #ifdef FEAT_RIGHTLEFT | |
| 6356 && !rlflag | |
| 6357 #endif | |
| 6358 ) | |
| 6359 { | |
| 6360 #ifdef FEAT_GUI | |
| 6361 int startCol = col; | |
| 6362 #endif | |
| 6363 | |
| 6364 /* blank out the rest of the line */ | |
| 6365 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6366 && ScreenAttrs[off_to] == 0 | |
| 6367 #ifdef FEAT_MBYTE | |
| 6368 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6369 #endif | |
| 6370 ) | |
| 6371 { | |
| 6372 ++off_to; | |
| 6373 ++col; | |
| 6374 } | |
| 6375 if (col < clear_width) | |
| 6376 { | |
| 6377 #ifdef FEAT_GUI | |
| 6378 /* | |
| 6379 * In the GUI, clearing the rest of the line may leave pixels | |
| 6380 * behind if the first character cleared was bold. Some bold | |
| 6381 * fonts spill over the left. In this case we redraw the previous | |
| 6382 * character too. If we didn't skip any blanks above, then we | |
| 6383 * only redraw if the character wasn't already redrawn anyway. | |
| 6384 */ | |
| 996 | 6385 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6386 { |
| 6387 hl = ScreenAttrs[off_to]; | |
| 6388 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6389 { |
| 6390 int prev_cells = 1; | |
| 6391 # ifdef FEAT_MBYTE | |
| 6392 if (enc_utf8) | |
| 6393 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6394 * that its width is 2. */ | |
| 6395 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6396 else if (enc_dbcs != 0) | |
| 6397 { | |
| 6398 /* find previous character by counting from first | |
| 6399 * column and get its width. */ | |
| 6400 unsigned off = LineOffset[row]; | |
| 1378 | 6401 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6402 |
| 6403 while (off < off_to) | |
| 6404 { | |
| 1378 | 6405 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6406 off += prev_cells; |
| 6407 } | |
| 6408 } | |
| 6409 | |
| 6410 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6411 screen_char_2(off_to - prev_cells, row, | |
| 6412 col + coloff - prev_cells); | |
| 6413 else | |
| 6414 # endif | |
| 6415 screen_char(off_to - prev_cells, row, | |
| 6416 col + coloff - prev_cells); | |
| 6417 } | |
| 7 | 6418 } |
| 6419 #endif | |
| 6420 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6421 ' ', ' ', 0); | |
| 6422 off_to += clear_width - col; | |
| 6423 col = clear_width; | |
| 6424 } | |
| 6425 } | |
| 6426 | |
| 6427 if (clear_width > 0) | |
| 6428 { | |
| 6429 /* For a window that's left of another, draw the separator char. */ | |
| 6430 if (col + coloff < Columns) | |
| 6431 { | |
| 6432 int c; | |
| 6433 | |
| 6434 c = fillchar_vsep(&hl); | |
| 6477 | 6435 if (ScreenLines[off_to] != (schar_T)c |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6436 #ifdef FEAT_MBYTE |
| 714 | 6437 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6438 != (c >= 0x80 ? c : 0)) | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6439 #endif |
| 7 | 6440 || ScreenAttrs[off_to] != hl) |
| 6441 { | |
| 6442 ScreenLines[off_to] = c; | |
| 6443 ScreenAttrs[off_to] = hl; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6444 #ifdef FEAT_MBYTE |
| 7 | 6445 if (enc_utf8) |
| 6446 { | |
| 6447 if (c >= 0x80) | |
| 6448 { | |
| 6449 ScreenLinesUC[off_to] = c; | |
| 714 | 6450 ScreenLinesC[0][off_to] = 0; |
| 7 | 6451 } |
| 6452 else | |
| 6453 ScreenLinesUC[off_to] = 0; | |
| 6454 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6455 #endif |
| 7 | 6456 screen_char(off_to, row, col + coloff); |
| 6457 } | |
| 6458 } | |
| 6459 else | |
| 6460 LineWraps[row] = FALSE; | |
| 6461 } | |
| 6462 } | |
| 6463 | |
| 474 | 6464 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6465 /* |
| 474 | 6466 * Mirror text "str" for right-left displaying. |
| 6467 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6468 */ |
| 474 | 6469 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6470 rl_mirror(char_u *str) |
| 7 | 6471 { |
| 6472 char_u *p1, *p2; | |
| 6473 int t; | |
| 6474 | |
| 6475 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6476 { | |
| 6477 t = *p1; | |
| 6478 *p1 = *p2; | |
| 6479 *p2 = t; | |
| 6480 } | |
| 6481 } | |
| 6482 #endif | |
| 6483 | |
| 6484 /* | |
| 6485 * mark all status lines for redraw; used after first :cd | |
| 6486 */ | |
| 6487 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6488 status_redraw_all(void) |
| 7 | 6489 { |
| 6490 win_T *wp; | |
| 6491 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6492 FOR_ALL_WINDOWS(wp) |
| 7 | 6493 if (wp->w_status_height) |
| 6494 { | |
| 6495 wp->w_redr_status = TRUE; | |
| 6496 redraw_later(VALID); | |
| 6497 } | |
| 6498 } | |
| 6499 | |
| 6500 /* | |
| 6501 * mark all status lines of the current buffer for redraw | |
| 6502 */ | |
| 6503 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6504 status_redraw_curbuf(void) |
| 7 | 6505 { |
| 6506 win_T *wp; | |
| 6507 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6508 FOR_ALL_WINDOWS(wp) |
| 7 | 6509 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6510 { | |
| 6511 wp->w_redr_status = TRUE; | |
| 6512 redraw_later(VALID); | |
| 6513 } | |
| 6514 } | |
| 6515 | |
| 6516 /* | |
| 6517 * Redraw all status lines that need to be redrawn. | |
| 6518 */ | |
| 6519 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6520 redraw_statuslines(void) |
| 7 | 6521 { |
| 6522 win_T *wp; | |
| 6523 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6524 FOR_ALL_WINDOWS(wp) |
| 7 | 6525 if (wp->w_redr_status) |
| 6526 win_redr_status(wp); | |
| 673 | 6527 if (redraw_tabline) |
| 677 | 6528 draw_tabline(); |
| 7 | 6529 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6530 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6531 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6532 /* |
| 6533 * Redraw all status lines at the bottom of frame "frp". | |
| 6534 */ | |
| 6535 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6536 win_redraw_last_status(frame_T *frp) |
| 7 | 6537 { |
| 6538 if (frp->fr_layout == FR_LEAF) | |
| 6539 frp->fr_win->w_redr_status = TRUE; | |
| 6540 else if (frp->fr_layout == FR_ROW) | |
| 6541 { | |
| 6542 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6543 win_redraw_last_status(frp); | |
| 6544 } | |
| 6545 else /* frp->fr_layout == FR_COL */ | |
| 6546 { | |
| 6547 frp = frp->fr_child; | |
| 6548 while (frp->fr_next != NULL) | |
| 6549 frp = frp->fr_next; | |
| 6550 win_redraw_last_status(frp); | |
| 6551 } | |
| 6552 } | |
| 6553 #endif | |
| 6554 | |
| 6555 /* | |
| 6556 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6557 */ | |
| 6558 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6559 draw_vsep_win(win_T *wp, int row) |
| 7 | 6560 { |
| 6561 int hl; | |
| 6562 int c; | |
| 6563 | |
| 6564 if (wp->w_vsep_width) | |
| 6565 { | |
| 6566 /* draw the vertical separator right of this window */ | |
| 6567 c = fillchar_vsep(&hl); | |
| 6568 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6569 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6570 c, ' ', hl); | |
| 6571 } | |
| 6572 } | |
| 6573 | |
| 6574 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6575 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
|
6576 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6577 |
| 6578 /* | |
| 1378 | 6579 * Get the length of an item as it will be shown in the status line. |
| 7 | 6580 */ |
| 6581 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6582 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6583 { |
| 6584 int len = 0; | |
| 6585 | |
| 6586 #ifdef FEAT_MENU | |
| 6587 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6588 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6589 | |
| 6590 /* Check for menu separators - replace with '|'. */ | |
| 6591 if (emenu && menu_is_separator(s)) | |
| 6592 return 1; | |
| 6593 #endif | |
| 6594 | |
| 6595 while (*s != NUL) | |
| 6596 { | |
| 1685 | 6597 s += skip_status_match_char(xp, s); |
| 42 | 6598 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6599 MB_PTR_ADV(s); |
| 7 | 6600 } |
| 6601 | |
| 6602 return len; | |
| 6603 } | |
| 6604 | |
| 6605 /* | |
| 1685 | 6606 * Return the number of characters that should be skipped in a status match. |
| 277 | 6607 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6608 */ | |
| 6609 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6610 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6611 { |
| 1685 | 6612 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6613 #ifdef FEAT_MENU |
| 6614 || ((xp->xp_context == EXPAND_MENUS | |
| 6615 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6616 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6617 #endif | |
| 1685 | 6618 ) |
| 6619 { | |
| 6620 #ifndef BACKSLASH_IN_FILENAME | |
| 6621 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6622 return 2; | |
| 6623 #endif | |
| 6624 return 1; | |
| 6625 } | |
| 6626 return 0; | |
| 277 | 6627 } |
| 6628 | |
| 6629 /* | |
| 7 | 6630 * Show wildchar matches in the status line. |
| 6631 * Show at least the "match" item. | |
| 6632 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6633 * | |
| 6634 * If inversion is possible we use it. Else '=' characters are used. | |
| 6635 */ | |
| 6636 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6637 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6638 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6639 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6640 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6641 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6642 int showtail) |
| 7 | 6643 { |
| 6644 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6645 int row; | |
| 6646 char_u *buf; | |
| 6647 int len; | |
| 1378 | 6648 int clen; /* length in screen cells */ |
| 7 | 6649 int fillchar; |
| 6650 int attr; | |
| 6651 int i; | |
| 6652 int highlight = TRUE; | |
| 6653 char_u *selstart = NULL; | |
| 6654 int selstart_col = 0; | |
| 6655 char_u *selend = NULL; | |
| 6656 static int first_match = 0; | |
| 6657 int add_left = FALSE; | |
| 6658 char_u *s; | |
| 6659 #ifdef FEAT_MENU | |
| 6660 int emenu; | |
| 6661 #endif | |
| 6662 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6663 int l; | |
| 6664 #endif | |
| 6665 | |
| 6666 if (matches == NULL) /* interrupted completion? */ | |
| 6667 return; | |
| 6668 | |
| 39 | 6669 #ifdef FEAT_MBYTE |
| 6670 if (has_mbyte) | |
| 6671 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6672 else | |
| 6673 #endif | |
| 6674 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6675 if (buf == NULL) |
| 6676 return; | |
| 6677 | |
| 6678 if (match == -1) /* don't show match but original text */ | |
| 6679 { | |
| 6680 match = 0; | |
| 6681 highlight = FALSE; | |
| 6682 } | |
| 6683 /* count 1 for the ending ">" */ | |
| 6684 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6685 if (match == 0) | |
| 6686 first_match = 0; | |
| 6687 else if (match < first_match) | |
| 6688 { | |
| 6689 /* jumping left, as far as we can go */ | |
| 6690 first_match = match; | |
| 6691 add_left = TRUE; | |
| 6692 } | |
| 6693 else | |
| 6694 { | |
| 6695 /* check if match fits on the screen */ | |
| 6696 for (i = first_match; i < match; ++i) | |
| 6697 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6698 if (first_match > 0) | |
| 6699 clen += 2; | |
| 6700 /* jumping right, put match at the left */ | |
| 6701 if ((long)clen > Columns) | |
| 6702 { | |
| 6703 first_match = match; | |
| 6704 /* if showing the last match, we can add some on the left */ | |
| 6705 clen = 2; | |
| 6706 for (i = match; i < num_matches; ++i) | |
| 6707 { | |
| 6708 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6709 if ((long)clen >= Columns) | |
| 6710 break; | |
| 6711 } | |
| 6712 if (i == num_matches) | |
| 6713 add_left = TRUE; | |
| 6714 } | |
| 6715 } | |
| 6716 if (add_left) | |
| 6717 while (first_match > 0) | |
| 6718 { | |
| 6719 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6720 if ((long)clen >= Columns) | |
| 6721 break; | |
| 6722 --first_match; | |
| 6723 } | |
| 6724 | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6725 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6726 |
| 6727 if (first_match == 0) | |
| 6728 { | |
| 6729 *buf = NUL; | |
| 6730 len = 0; | |
| 6731 } | |
| 6732 else | |
| 6733 { | |
| 6734 STRCPY(buf, "< "); | |
| 6735 len = 2; | |
| 6736 } | |
| 6737 clen = len; | |
| 6738 | |
| 6739 i = first_match; | |
| 6740 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6741 { | |
| 6742 if (i == match) | |
| 6743 { | |
| 6744 selstart = buf + len; | |
| 6745 selstart_col = clen; | |
| 6746 } | |
| 6747 | |
| 6748 s = L_MATCH(i); | |
| 6749 /* Check for menu separators - replace with '|' */ | |
| 6750 #ifdef FEAT_MENU | |
| 6751 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6752 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6753 if (emenu && menu_is_separator(s)) | |
| 6754 { | |
| 6755 STRCPY(buf + len, transchar('|')); | |
| 6756 l = (int)STRLEN(buf + len); | |
| 6757 len += l; | |
| 6758 clen += l; | |
| 6759 } | |
| 6760 else | |
| 6761 #endif | |
| 6762 for ( ; *s != NUL; ++s) | |
| 6763 { | |
| 1685 | 6764 s += skip_status_match_char(xp, s); |
| 7 | 6765 clen += ptr2cells(s); |
| 6766 #ifdef FEAT_MBYTE | |
| 474 | 6767 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6768 { |
| 6769 STRNCPY(buf + len, s, l); | |
| 6770 s += l - 1; | |
| 6771 len += l; | |
| 6772 } | |
| 6773 else | |
| 6774 #endif | |
| 6775 { | |
| 6776 STRCPY(buf + len, transchar_byte(*s)); | |
| 6777 len += (int)STRLEN(buf + len); | |
| 6778 } | |
| 6779 } | |
| 6780 if (i == match) | |
| 6781 selend = buf + len; | |
| 6782 | |
| 6783 *(buf + len++) = ' '; | |
| 6784 *(buf + len++) = ' '; | |
| 6785 clen += 2; | |
| 6786 if (++i == num_matches) | |
| 6787 break; | |
| 6788 } | |
| 6789 | |
| 6790 if (i != num_matches) | |
| 6791 { | |
| 6792 *(buf + len++) = '>'; | |
| 6793 ++clen; | |
| 6794 } | |
| 6795 | |
| 6796 buf[len] = NUL; | |
| 6797 | |
| 6798 row = cmdline_row - 1; | |
| 6799 if (row >= 0) | |
| 6800 { | |
| 6801 if (wild_menu_showing == 0) | |
| 6802 { | |
| 6803 if (msg_scrolled > 0) | |
| 6804 { | |
| 6805 /* Put the wildmenu just above the command line. If there is | |
| 6806 * no room, scroll the screen one line up. */ | |
| 6807 if (cmdline_row == Rows - 1) | |
| 6808 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6809 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6810 ++msg_scrolled; |
| 6811 } | |
| 6812 else | |
| 6813 { | |
| 6814 ++cmdline_row; | |
| 6815 ++row; | |
| 6816 } | |
| 6817 wild_menu_showing = WM_SCROLLED; | |
| 6818 } | |
| 6819 else | |
| 6820 { | |
| 6821 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6822 * Set 'winminheight' to zero to avoid that the window is | |
| 6823 * resized. */ | |
| 6824 if (lastwin->w_status_height == 0) | |
| 6825 { | |
| 6826 save_p_ls = p_ls; | |
| 6827 save_p_wmh = p_wmh; | |
| 6828 p_ls = 2; | |
| 6829 p_wmh = 0; | |
| 6830 last_status(FALSE); | |
| 6831 } | |
| 6832 wild_menu_showing = WM_SHOWN; | |
| 6833 } | |
| 6834 } | |
| 6835 | |
| 6836 screen_puts(buf, row, 0, attr); | |
| 6837 if (selstart != NULL && highlight) | |
| 6838 { | |
| 6839 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6840 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6841 } |
| 6842 | |
| 6843 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6844 } | |
| 6845 | |
| 6846 win_redraw_last_status(topframe); | |
| 6847 vim_free(buf); | |
| 6848 } | |
| 6849 #endif | |
| 6850 | |
| 6851 /* | |
| 6852 * Redraw the status line of window wp. | |
| 6853 * | |
| 6854 * If inversion is possible we use it. Else '=' characters are used. | |
| 6855 */ | |
| 6856 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6857 win_redr_status(win_T *wp) |
| 7 | 6858 { |
| 6859 int row; | |
| 6860 char_u *p; | |
| 6861 int len; | |
| 6862 int fillchar; | |
| 6863 int attr; | |
| 6864 int this_ru_col; | |
| 1910 | 6865 static int busy = FALSE; |
| 6866 | |
| 6867 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6868 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6869 if (busy) | |
| 6870 return; | |
| 6871 busy = TRUE; | |
| 7 | 6872 |
| 6873 wp->w_redr_status = FALSE; | |
| 6874 if (wp->w_status_height == 0) | |
| 6875 { | |
| 6876 /* no status line, can only be last window */ | |
| 6877 redraw_cmdline = TRUE; | |
| 6878 } | |
| 540 | 6879 else if (!redrawing() |
| 6880 #ifdef FEAT_INS_EXPAND | |
| 6881 /* don't update status line when popup menu is visible and may be | |
| 6882 * drawn over it */ | |
| 6883 || pum_visible() | |
| 6884 #endif | |
| 6885 ) | |
| 7 | 6886 { |
| 6887 /* Don't redraw right now, do it later. */ | |
| 6888 wp->w_redr_status = TRUE; | |
| 6889 } | |
| 6890 #ifdef FEAT_STL_OPT | |
| 40 | 6891 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6892 { |
| 6893 /* redraw custom status line */ | |
| 1983 | 6894 redraw_custom_statusline(wp); |
| 7 | 6895 } |
| 6896 #endif | |
| 6897 else | |
| 6898 { | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
6899 fillchar = fillchar_status(&attr, wp); |
| 7 | 6900 |
| 685 | 6901 get_trans_bufname(wp->w_buffer); |
| 7 | 6902 p = NameBuff; |
| 6903 len = (int)STRLEN(p); | |
| 6904 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6905 if (bt_help(wp->w_buffer) |
| 7 | 6906 #ifdef FEAT_QUICKFIX |
| 6907 || wp->w_p_pvw | |
| 6908 #endif | |
| 6909 || bufIsChanged(wp->w_buffer) | |
| 6910 || wp->w_buffer->b_p_ro) | |
| 6911 *(p + len++) = ' '; | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6912 if (bt_help(wp->w_buffer)) |
| 7 | 6913 { |
| 809 | 6914 STRCPY(p + len, _("[Help]")); |
| 7 | 6915 len += (int)STRLEN(p + len); |
| 6916 } | |
| 6917 #ifdef FEAT_QUICKFIX | |
| 6918 if (wp->w_p_pvw) | |
| 6919 { | |
| 6920 STRCPY(p + len, _("[Preview]")); | |
| 6921 len += (int)STRLEN(p + len); | |
| 6922 } | |
| 6923 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6924 if (bufIsChanged(wp->w_buffer) |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6925 #ifdef FEAT_TERMINAL |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6926 && !bt_terminal(wp->w_buffer) |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6927 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6928 ) |
| 7 | 6929 { |
| 6930 STRCPY(p + len, "[+]"); | |
| 6931 len += 3; | |
| 6932 } | |
| 6933 if (wp->w_buffer->b_p_ro) | |
| 6934 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6935 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
|
6936 len += (int)STRLEN(p + len); |
| 7 | 6937 } |
| 6938 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6939 this_ru_col = ru_col - (Columns - wp->w_width); |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6940 if (this_ru_col < (wp->w_width + 1) / 2) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6941 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 6942 if (this_ru_col <= 1) |
| 6943 { | |
| 6944 p = (char_u *)"<"; /* No room for file name! */ | |
| 6945 len = 1; | |
| 6946 } | |
| 6947 else | |
| 6948 #ifdef FEAT_MBYTE | |
| 6949 if (has_mbyte) | |
| 6950 { | |
| 6951 int clen = 0, i; | |
| 6952 | |
| 6953 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6954 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6955 |
| 7 | 6956 /* Find first character that will fit. |
| 6957 * Going from start to end is much faster for DBCS. */ | |
| 6958 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6959 i += (*mb_ptr2len)(p + i)) |
| 7 | 6960 clen -= (*mb_ptr2cells)(p + i); |
| 6961 len = clen; | |
| 6962 if (i > 0) | |
| 6963 { | |
| 6964 p = p + i - 1; | |
| 6965 *p = '<'; | |
| 6966 ++len; | |
| 6967 } | |
| 6968 | |
| 6969 } | |
| 6970 else | |
| 6971 #endif | |
| 6972 if (len > this_ru_col - 1) | |
| 6973 { | |
| 6974 p += len - (this_ru_col - 1); | |
| 6975 *p = '<'; | |
| 6976 len = this_ru_col - 1; | |
| 6977 } | |
| 6978 | |
| 6979 row = W_WINROW(wp) + wp->w_height; | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6980 screen_puts(p, row, wp->w_wincol, attr); |
|
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6981 screen_fill(row, row + 1, len + wp->w_wincol, |
|
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6982 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 6983 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6984 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6985 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6986 screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff) | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6987 - 1 + wp->w_wincol), attr); |
| 7 | 6988 |
| 6989 #ifdef FEAT_CMDL_INFO | |
| 6990 win_redr_ruler(wp, TRUE); | |
| 6991 #endif | |
| 6992 } | |
| 6993 | |
| 6994 /* | |
| 6995 * May need to draw the character below the vertical separator. | |
| 6996 */ | |
| 6997 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 6998 { | |
| 6999 if (stl_connected(wp)) | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
7000 fillchar = fillchar_status(&attr, wp); |
| 7 | 7001 else |
| 7002 fillchar = fillchar_vsep(&attr); | |
| 7003 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7004 attr); | |
| 7005 } | |
| 1910 | 7006 busy = FALSE; |
| 7 | 7007 } |
| 7008 | |
| 680 | 7009 #ifdef FEAT_STL_OPT |
| 7010 /* | |
| 7011 * Redraw the status line according to 'statusline' and take care of any | |
| 7012 * errors encountered. | |
| 7013 */ | |
| 7014 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7015 redraw_custom_statusline(win_T *wp) |
| 680 | 7016 { |
| 1983 | 7017 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7018 int saved_did_emsg = did_emsg; |
| 1983 | 7019 |
| 7020 /* When called recursively return. This can happen when the statusline | |
| 7021 * contains an expression that triggers a redraw. */ | |
| 7022 if (entered) | |
| 7023 return; | |
| 7024 entered = TRUE; | |
| 680 | 7025 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7026 did_emsg = FALSE; |
| 680 | 7027 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7028 if (did_emsg) |
| 1983 | 7029 { |
| 7030 /* When there is an error disable the statusline, otherwise the | |
| 7031 * display is messed up with errors and a redraw triggers the problem | |
| 7032 * again and again. */ | |
| 680 | 7033 set_string_option_direct((char_u *)"statusline", -1, |
| 7034 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7035 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7036 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7037 did_emsg |= saved_did_emsg; |
| 1983 | 7038 entered = FALSE; |
| 680 | 7039 } |
| 7040 #endif | |
| 7041 | |
| 7 | 7042 /* |
| 7043 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7044 * line of the window right of it. If not, then it's a vertical separator. | |
| 7045 * Only call if (wp->w_vsep_width != 0). | |
| 7046 */ | |
| 7047 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7048 stl_connected(win_T *wp) |
| 7 | 7049 { |
| 7050 frame_T *fr; | |
| 7051 | |
| 7052 fr = wp->w_frame; | |
| 7053 while (fr->fr_parent != NULL) | |
| 7054 { | |
| 7055 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7056 { | |
| 7057 if (fr->fr_next != NULL) | |
| 7058 break; | |
| 7059 } | |
| 7060 else | |
| 7061 { | |
| 7062 if (fr->fr_next != NULL) | |
| 7063 return TRUE; | |
| 7064 } | |
| 7065 fr = fr->fr_parent; | |
| 7066 } | |
| 7067 return FALSE; | |
| 7068 } | |
| 7069 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7070 |
| 7 | 7071 /* |
| 7072 * Get the value to show for the language mappings, active 'keymap'. | |
| 7073 */ | |
| 7074 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7075 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7076 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7077 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
|
7078 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
|
7079 int len) /* length of buffer */ |
| 7 | 7080 { |
| 7081 char_u *p; | |
| 7082 | |
| 7083 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7084 return FALSE; | |
| 7085 | |
| 7086 { | |
| 7087 #ifdef FEAT_EVAL | |
| 7088 buf_T *old_curbuf = curbuf; | |
| 7089 win_T *old_curwin = curwin; | |
| 7090 char_u *s; | |
| 7091 | |
| 7092 curbuf = wp->w_buffer; | |
| 7093 curwin = wp; | |
| 7094 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7095 ++emsg_skip; | |
| 714 | 7096 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7097 --emsg_skip; |
| 7098 curbuf = old_curbuf; | |
| 7099 curwin = old_curwin; | |
| 7100 if (p == NULL || *p == NUL) | |
| 7101 #endif | |
| 7102 { | |
| 7103 #ifdef FEAT_KEYMAP | |
| 7104 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7105 p = wp->w_buffer->b_p_keymap; | |
| 7106 else | |
| 7107 #endif | |
| 7108 p = (char_u *)"lang"; | |
| 7109 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7110 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7111 buf[0] = NUL; |
| 7112 #ifdef FEAT_EVAL | |
| 7113 vim_free(s); | |
| 7114 #endif | |
| 7115 } | |
| 7116 return buf[0] != NUL; | |
| 7117 } | |
| 7118 | |
| 7119 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7120 /* | |
| 677 | 7121 * Redraw the status line or ruler of window "wp". |
| 7122 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7123 */ |
| 7124 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7125 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7126 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7127 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7128 { |
| 5539 | 7129 static int entered = FALSE; |
| 7 | 7130 int attr; |
| 7131 int curattr; | |
| 7132 int row; | |
| 7133 int col = 0; | |
| 7134 int maxwidth; | |
| 7135 int width; | |
| 7136 int n; | |
| 7137 int len; | |
| 7138 int fillchar; | |
| 7139 char_u buf[MAXPATHL]; | |
| 1983 | 7140 char_u *stl; |
| 7 | 7141 char_u *p; |
| 681 | 7142 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7143 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7144 int use_sandbox = FALSE; |
| 2693 | 7145 win_T *ewp; |
| 7146 int p_crb_save; | |
| 7 | 7147 |
| 5539 | 7148 /* There is a tiny chance that this gets called recursively: When |
| 7149 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7150 * Avoid trouble by not allowing recursion. */ | |
| 7151 if (entered) | |
| 7152 return; | |
| 7153 entered = TRUE; | |
| 7154 | |
| 7 | 7155 /* setup environment for the task at hand */ |
| 677 | 7156 if (wp == NULL) |
| 7157 { | |
| 7158 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7159 stl = p_tal; |
| 677 | 7160 row = 0; |
| 707 | 7161 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7162 attr = HL_ATTR(HLF_TPF); |
| 677 | 7163 maxwidth = Columns; |
| 7164 # ifdef FEAT_EVAL | |
| 681 | 7165 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7166 # endif |
| 7167 } | |
| 40 | 7168 else |
| 677 | 7169 { |
| 7170 row = W_WINROW(wp) + wp->w_height; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
7171 fillchar = fillchar_status(&attr, wp); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7172 maxwidth = wp->w_width; |
| 677 | 7173 |
| 7174 if (draw_ruler) | |
| 7175 { | |
| 1983 | 7176 stl = p_ruf; |
| 677 | 7177 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7178 if (*stl == '%') |
| 7179 { | |
| 7180 if (*++stl == '-') | |
| 7181 stl++; | |
| 7182 if (atoi((char *)stl)) | |
| 7183 while (VIM_ISDIGIT(*stl)) | |
| 7184 stl++; | |
| 7185 if (*stl++ != '(') | |
| 7186 stl = p_ruf; | |
| 677 | 7187 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7188 col = ru_col - (Columns - wp->w_width); |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7189 if (col < (wp->w_width + 1) / 2) |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7190 col = (wp->w_width + 1) / 2; |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7191 maxwidth = wp->w_width - col; |
| 677 | 7192 if (!wp->w_status_height) |
| 7193 { | |
| 7194 row = Rows - 1; | |
| 7195 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7196 fillchar = ' '; | |
| 7197 attr = 0; | |
| 7198 } | |
| 7199 | |
| 7200 # ifdef FEAT_EVAL | |
| 681 | 7201 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7202 # endif |
| 7203 } | |
| 7204 else | |
| 7205 { | |
| 7206 if (*wp->w_p_stl != NUL) | |
| 1983 | 7207 stl = wp->w_p_stl; |
| 677 | 7208 else |
| 1983 | 7209 stl = p_stl; |
| 677 | 7210 # ifdef FEAT_EVAL |
| 681 | 7211 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7212 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7213 # endif |
| 7214 } | |
| 7215 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7216 col += wp->w_wincol; |
| 677 | 7217 } |
| 7218 | |
| 7 | 7219 if (maxwidth <= 0) |
| 5539 | 7220 goto theend; |
| 677 | 7221 |
| 2693 | 7222 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7223 * the cursor away and back. */ | |
| 7224 ewp = wp == NULL ? curwin : wp; | |
| 7225 p_crb_save = ewp->w_p_crb; | |
| 7226 ewp->w_p_crb = FALSE; | |
| 7227 | |
| 1983 | 7228 /* Make a copy, because the statusline may include a function call that |
| 7229 * might change the option value and free the memory. */ | |
| 7230 stl = vim_strsave(stl); | |
| 2693 | 7231 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7232 stl, use_sandbox, |
| 681 | 7233 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7234 vim_free(stl); |
| 2693 | 7235 ewp->w_p_crb = p_crb_save; |
| 2661 | 7236 |
| 7237 /* Make all characters printable. */ | |
| 7238 p = transstr(buf); | |
| 7239 if (p != NULL) | |
| 7240 { | |
| 7241 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7242 vim_free(p); | |
| 7243 } | |
| 7244 | |
| 7245 /* fill up with "fillchar" */ | |
| 835 | 7246 len = (int)STRLEN(buf); |
| 1883 | 7247 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7248 { |
| 7249 #ifdef FEAT_MBYTE | |
| 7250 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7251 #else | |
| 7252 buf[len++] = fillchar; | |
| 7253 #endif | |
| 7254 ++width; | |
| 7255 } | |
| 7256 buf[len] = NUL; | |
| 7257 | |
| 681 | 7258 /* |
| 7259 * Draw each snippet with the specified highlighting. | |
| 7260 */ | |
| 7 | 7261 curattr = attr; |
| 7262 p = buf; | |
| 681 | 7263 for (n = 0; hltab[n].start != NULL; n++) |
| 7264 { | |
| 7265 len = (int)(hltab[n].start - p); | |
| 7 | 7266 screen_puts_len(p, len, row, col, curattr); |
| 7267 col += vim_strnsize(p, len); | |
| 681 | 7268 p = hltab[n].start; |
| 7269 | |
| 7270 if (hltab[n].userhl == 0) | |
| 7 | 7271 curattr = attr; |
| 681 | 7272 else if (hltab[n].userhl < 0) |
| 7273 curattr = syn_id2attr(-hltab[n].userhl); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7274 #ifdef FEAT_TERMINAL |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7275 else if (wp != NULL && wp != curwin && bt_terminal(wp->w_buffer) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7276 && wp->w_status_height != 0) |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
7277 curattr = highlight_stltermnc[hltab[n].userhl - 1]; |
|
12114
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7278 else if (wp != NULL && bt_terminal(wp->w_buffer) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7279 && wp->w_status_height != 0) |
|
f306e6decaf9
patch 8.0.0937: user highlight groups not adjusted for terminal
Christian Brabandt <cb@256bit.org>
parents:
11981
diff
changeset
|
7280 curattr = highlight_stlterm[hltab[n].userhl - 1]; |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7281 #endif |
| 680 | 7282 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7283 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7284 else |
| 681 | 7285 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7286 } |
| 7287 screen_puts(p, row, col, curattr); | |
| 681 | 7288 |
| 7289 if (wp == NULL) | |
| 7290 { | |
| 7291 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7292 col = 0; | |
| 7293 len = 0; | |
| 7294 p = buf; | |
| 7295 fillchar = 0; | |
| 7296 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7297 { | |
| 7298 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7299 while (col < len) | |
| 7300 TabPageIdxs[col++] = fillchar; | |
| 7301 p = tabtab[n].start; | |
| 7302 fillchar = tabtab[n].userhl; | |
| 7303 } | |
| 7304 while (col < Columns) | |
| 7305 TabPageIdxs[col++] = fillchar; | |
| 7306 } | |
| 5539 | 7307 |
| 7308 theend: | |
| 7309 entered = FALSE; | |
| 7 | 7310 } |
| 7311 | |
| 7312 #endif /* FEAT_STL_OPT */ | |
| 7313 | |
| 7314 /* | |
| 7315 * Output a single character directly to the screen and update ScreenLines. | |
| 7316 */ | |
| 7317 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7318 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7319 { |
| 3549 | 7320 char_u buf[MB_MAXBYTES + 1]; |
| 7321 | |
| 7 | 7322 #ifdef FEAT_MBYTE |
| 3549 | 7323 if (has_mbyte) |
| 7324 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7325 else | |
| 7326 #endif | |
| 7327 { | |
| 7328 buf[0] = c; | |
| 7329 buf[1] = NUL; | |
| 7330 } | |
| 7 | 7331 screen_puts(buf, row, col, attr); |
| 7332 } | |
| 7333 | |
| 7334 /* | |
| 7335 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7336 * Also return its attribute in *attrp; | |
| 7337 */ | |
| 7338 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7339 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7340 { |
| 7341 unsigned off; | |
| 7342 | |
| 7343 /* safety check */ | |
| 7344 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7345 { | |
| 7346 off = LineOffset[row] + col; | |
| 7347 *attrp = ScreenAttrs[off]; | |
| 7348 bytes[0] = ScreenLines[off]; | |
| 7349 bytes[1] = NUL; | |
| 7350 | |
| 7351 #ifdef FEAT_MBYTE | |
| 7352 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7353 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7354 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7355 { | |
| 7356 bytes[0] = ScreenLines[off]; | |
| 7357 bytes[1] = ScreenLines2[off]; | |
| 7358 bytes[2] = NUL; | |
| 7359 } | |
| 7360 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7361 { | |
| 7362 bytes[1] = ScreenLines[off + 1]; | |
| 7363 bytes[2] = NUL; | |
| 7364 } | |
| 7365 #endif | |
| 7366 } | |
| 7367 } | |
| 7368 | |
| 714 | 7369 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7370 static int screen_comp_differs(int, int*); |
| 714 | 7371 |
| 7372 /* | |
| 7373 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7374 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7375 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7376 */ |
| 7377 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7378 screen_comp_differs(int off, int *u8cc) |
| 714 | 7379 { |
| 7380 int i; | |
| 7381 | |
| 7382 for (i = 0; i < Screen_mco; ++i) | |
| 7383 { | |
| 7384 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7385 return TRUE; | |
| 7386 if (u8cc[i] == 0) | |
| 7387 break; | |
| 7388 } | |
| 7389 return FALSE; | |
| 7390 } | |
| 7391 #endif | |
| 7392 | |
| 7 | 7393 /* |
| 7394 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7395 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7396 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7397 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7398 */ | |
| 7399 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7400 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7401 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7402 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7403 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7404 int attr) |
| 7 | 7405 { |
| 7406 screen_puts_len(text, -1, row, col, attr); | |
| 7407 } | |
| 7408 | |
| 7409 /* | |
| 7410 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7411 * a NUL. | |
| 7412 */ | |
| 7413 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7414 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7415 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7416 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7417 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7418 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7419 int attr) |
| 7 | 7420 { |
| 7421 unsigned off; | |
| 7422 char_u *ptr = text; | |
| 5923 | 7423 int len = textlen; |
| 7 | 7424 int c; |
| 7425 #ifdef FEAT_MBYTE | |
| 1378 | 7426 unsigned max_off; |
| 7 | 7427 int mbyte_blen = 1; |
| 7428 int mbyte_cells = 1; | |
| 7429 int u8c = 0; | |
| 714 | 7430 int u8cc[MAX_MCO]; |
| 7 | 7431 int clear_next_cell = FALSE; |
| 7432 # ifdef FEAT_ARABIC | |
| 7433 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7434 int pc, nc, nc1; |
| 7435 int pcc[MAX_MCO]; | |
| 7 | 7436 # endif |
| 7437 #endif | |
| 1843 | 7438 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7439 int force_redraw_this; | |
| 7440 int force_redraw_next = FALSE; | |
| 7441 #endif | |
| 7442 int need_redraw; | |
| 7 | 7443 |
| 7444 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7445 return; | |
| 1843 | 7446 off = LineOffset[row] + col; |
| 7 | 7447 |
| 1668 | 7448 #ifdef FEAT_MBYTE |
| 7449 /* When drawing over the right halve of a double-wide char clear out the | |
| 7450 * left halve. Only needed in a terminal. */ | |
| 1685 | 7451 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7452 # ifdef FEAT_GUI |
| 7453 && !gui.in_use | |
| 7454 # endif | |
| 7455 && mb_fix_col(col, row) != col) | |
| 1843 | 7456 { |
| 7457 ScreenLines[off - 1] = ' '; | |
| 7458 ScreenAttrs[off - 1] = 0; | |
| 7459 if (enc_utf8) | |
| 7460 { | |
| 7461 ScreenLinesUC[off - 1] = 0; | |
| 7462 ScreenLinesC[0][off - 1] = 0; | |
| 7463 } | |
| 7464 /* redraw the previous cell, make it empty */ | |
| 7465 screen_char(off - 1, row, col - 1); | |
| 7466 /* force the cell at "col" to be redrawn */ | |
| 7467 force_redraw_next = TRUE; | |
| 7468 } | |
| 7469 #endif | |
| 7470 | |
| 1378 | 7471 #ifdef FEAT_MBYTE |
| 7472 max_off = LineOffset[row] + screen_Columns; | |
| 7473 #endif | |
| 1340 | 7474 while (col < screen_Columns |
| 7475 && (len < 0 || (int)(ptr - text) < len) | |
| 7476 && *ptr != NUL) | |
| 7 | 7477 { |
| 7478 c = *ptr; | |
| 7479 #ifdef FEAT_MBYTE | |
| 7480 /* check if this is the first byte of a multibyte */ | |
| 7481 if (has_mbyte) | |
| 7482 { | |
| 7483 if (enc_utf8 && len > 0) | |
| 474 | 7484 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7485 else |
| 474 | 7486 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7487 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7488 mbyte_cells = 1; | |
| 7489 else if (enc_dbcs != 0) | |
| 7490 mbyte_cells = mbyte_blen; | |
| 7491 else /* enc_utf8 */ | |
| 7492 { | |
| 7493 if (len >= 0) | |
| 714 | 7494 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7495 (int)((text + len) - ptr)); |
| 7496 else | |
| 714 | 7497 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7498 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7499 # ifdef UNICODE16 |
| 7 | 7500 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7501 if (u8c >= 0x10000) | |
| 7502 { | |
| 7503 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7504 if (attr == 0) | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7505 attr = HL_ATTR(HLF_8); |
| 7 | 7506 } |
| 1401 | 7507 # endif |
| 7 | 7508 # ifdef FEAT_ARABIC |
| 7509 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7510 { | |
| 7511 /* Do Arabic shaping. */ | |
| 7512 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7513 { | |
| 7514 /* Past end of string to be displayed. */ | |
| 7515 nc = NUL; | |
| 7516 nc1 = NUL; | |
| 7517 } | |
| 7518 else | |
| 714 | 7519 { |
| 1994 | 7520 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7521 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7522 nc1 = pcc[0]; |
| 7523 } | |
| 7 | 7524 pc = prev_c; |
| 7525 prev_c = u8c; | |
| 714 | 7526 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7527 } |
| 7528 else | |
| 7529 prev_c = u8c; | |
| 7530 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7531 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7532 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7533 /* 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
|
7534 * 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
|
7535 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7536 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7537 } |
| 7 | 7538 } |
| 7539 } | |
| 7540 #endif | |
| 7541 | |
| 1843 | 7542 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7543 force_redraw_this = force_redraw_next; | |
| 7544 force_redraw_next = FALSE; | |
| 7545 #endif | |
| 7546 | |
| 7547 need_redraw = ScreenLines[off] != c | |
| 7 | 7548 #ifdef FEAT_MBYTE |
| 7549 || (mbyte_cells == 2 | |
| 7550 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7551 || (enc_dbcs == DBCS_JPNU | |
| 7552 && c == 0x8e | |
| 7553 && ScreenLines2[off] != ptr[1]) | |
| 7554 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7555 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7556 (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
|
7557 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7558 && screen_comp_differs(off, u8cc)))) |
| 7 | 7559 #endif |
| 7560 || ScreenAttrs[off] != attr | |
| 1843 | 7561 || exmode_active; |
| 7562 | |
| 7563 if (need_redraw | |
| 7564 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7565 || force_redraw_this | |
| 7566 #endif | |
| 7 | 7567 ) |
| 7568 { | |
| 7569 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7570 /* The bold trick makes a single row of pixels appear in the next | |
| 7571 * character. When a bold character is removed, the next | |
| 7572 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7573 * and for some xterms. */ |
| 7574 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7575 # ifdef FEAT_GUI |
| 7576 gui.in_use | |
| 7577 # endif | |
| 7578 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7579 || | |
| 7580 # endif | |
| 7581 # ifdef UNIX | |
| 7582 term_is_xterm | |
| 7583 # endif | |
| 1843 | 7584 )) |
| 7585 { | |
| 7586 int n = ScreenAttrs[off]; | |
| 7587 | |
| 7588 if (n > HL_ALL) | |
| 7589 n = syn_attr2attr(n); | |
| 7590 if (n & HL_BOLD) | |
| 7591 force_redraw_next = TRUE; | |
| 7 | 7592 } |
| 7593 #endif | |
| 7594 #ifdef FEAT_MBYTE | |
| 7595 /* When at the end of the text and overwriting a two-cell | |
| 7596 * character with a one-cell character, need to clear the next | |
| 7597 * cell. Also when overwriting the left halve of a two-cell char | |
| 7598 * with the right halve of a two-cell char. Do this only once | |
| 7599 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7600 if (clear_next_cell) | |
| 7601 clear_next_cell = FALSE; | |
| 7602 else if (has_mbyte | |
| 7603 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7604 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7605 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7606 || (mbyte_cells == 2 |
| 1378 | 7607 && (*mb_off2cells)(off, max_off) == 1 |
| 7608 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7609 clear_next_cell = TRUE; |
| 7610 | |
| 7611 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7612 * it confuses mb_off2cells(). */ | |
| 7613 if (enc_dbcs | |
| 1378 | 7614 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7615 || (mbyte_cells == 2 |
| 1378 | 7616 && (*mb_off2cells)(off, max_off) == 1 |
| 7617 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7618 ScreenLines[off + mbyte_blen] = 0; |
| 7619 #endif | |
| 7620 ScreenLines[off] = c; | |
| 7621 ScreenAttrs[off] = attr; | |
| 7622 #ifdef FEAT_MBYTE | |
| 7623 if (enc_utf8) | |
| 7624 { | |
| 714 | 7625 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7626 ScreenLinesUC[off] = 0; |
| 7627 else | |
| 7628 { | |
| 714 | 7629 int i; |
| 7630 | |
| 7 | 7631 ScreenLinesUC[off] = u8c; |
| 714 | 7632 for (i = 0; i < Screen_mco; ++i) |
| 7633 { | |
| 7634 ScreenLinesC[i][off] = u8cc[i]; | |
| 7635 if (u8cc[i] == 0) | |
| 7636 break; | |
| 7637 } | |
| 7 | 7638 } |
| 7639 if (mbyte_cells == 2) | |
| 7640 { | |
| 7641 ScreenLines[off + 1] = 0; | |
| 7642 ScreenAttrs[off + 1] = attr; | |
| 7643 } | |
| 7644 screen_char(off, row, col); | |
| 7645 } | |
| 7646 else if (mbyte_cells == 2) | |
| 7647 { | |
| 7648 ScreenLines[off + 1] = ptr[1]; | |
| 7649 ScreenAttrs[off + 1] = attr; | |
| 7650 screen_char_2(off, row, col); | |
| 7651 } | |
| 7652 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7653 { | |
| 7654 ScreenLines2[off] = ptr[1]; | |
| 7655 screen_char(off, row, col); | |
| 7656 } | |
| 7657 else | |
| 7658 #endif | |
| 7659 screen_char(off, row, col); | |
| 7660 } | |
| 7661 #ifdef FEAT_MBYTE | |
| 7662 if (has_mbyte) | |
| 7663 { | |
| 7664 off += mbyte_cells; | |
| 7665 col += mbyte_cells; | |
| 7666 ptr += mbyte_blen; | |
| 7667 if (clear_next_cell) | |
| 5923 | 7668 { |
| 7669 /* This only happens at the end, display one space next. */ | |
| 7 | 7670 ptr = (char_u *)" "; |
| 5923 | 7671 len = -1; |
| 7672 } | |
| 7 | 7673 } |
| 7674 else | |
| 7675 #endif | |
| 7676 { | |
| 7677 ++off; | |
| 7678 ++col; | |
| 7679 ++ptr; | |
| 7680 } | |
| 7681 } | |
| 1843 | 7682 |
| 7683 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7684 /* If we detected the next character needs to be redrawn, but the text | |
| 7685 * doesn't extend up to there, update the character here. */ | |
| 7686 if (force_redraw_next && col < screen_Columns) | |
| 7687 { | |
| 7688 # ifdef FEAT_MBYTE | |
| 7689 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7690 screen_char_2(off, row, col); | |
| 7691 else | |
| 7692 # endif | |
| 7693 screen_char(off, row, col); | |
| 7694 } | |
| 7695 #endif | |
| 7 | 7696 } |
| 7697 | |
| 7698 #ifdef FEAT_SEARCH_EXTRA | |
| 7699 /* | |
| 1326 | 7700 * Prepare for 'hlsearch' highlighting. |
| 7 | 7701 */ |
| 7702 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7703 start_search_hl(void) |
| 7 | 7704 { |
| 7705 if (p_hls && !no_hlsearch) | |
| 7706 { | |
| 7707 last_pat_prog(&search_hl.rm); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7708 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7709 # ifdef FEAT_RELTIME |
| 7710 /* Set the time limit to 'redrawtime'. */ | |
| 7711 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7712 # endif | |
| 7 | 7713 } |
| 7714 } | |
| 7715 | |
| 7716 /* | |
| 1326 | 7717 * Clean up for 'hlsearch' highlighting. |
| 7 | 7718 */ |
| 7719 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7720 end_search_hl(void) |
| 7 | 7721 { |
| 7722 if (search_hl.rm.regprog != NULL) | |
| 7723 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7724 vim_regfree(search_hl.rm.regprog); |
| 7 | 7725 search_hl.rm.regprog = NULL; |
| 7726 } | |
| 7727 } | |
| 7728 | |
| 7729 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7730 * 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
|
7731 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7732 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7733 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
|
7734 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7735 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7736 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7737 /* 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
|
7738 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7739 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7740 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7741 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7742 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7743 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7744 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7745 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7746 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
|
7747 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
|
7748 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7749 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7750 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7751 /* 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
|
7752 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
|
7753 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7754 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7755 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7756 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
|
7757 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7758 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7759 /* 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
|
7760 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7761 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7762 /* |
| 7 | 7763 * Advance to the match in window "wp" line "lnum" or past it. |
| 7764 */ | |
| 7765 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7766 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7767 { |
| 1326 | 7768 matchitem_T *cur; /* points to the match list */ |
| 7769 match_T *shl; /* points to search_hl or a match */ | |
| 7770 int shl_flag; /* flag to indicate whether search_hl | |
| 7771 has been processed or not */ | |
| 5979 | 7772 int pos_inprogress; /* marks that position match search is |
| 7773 in progress */ | |
| 7 | 7774 int n; |
| 7775 | |
| 7776 /* | |
| 7777 * When using a multi-line pattern, start searching at the top | |
| 7778 * of the window or just after a closed fold. | |
| 1326 | 7779 * Do this both for search_hl and the match list. |
| 7 | 7780 */ |
| 1326 | 7781 cur = wp->w_match_head; |
| 7782 shl_flag = FALSE; | |
| 7783 while (cur != NULL || shl_flag == FALSE) | |
| 7784 { | |
| 7785 if (shl_flag == FALSE) | |
| 7786 { | |
| 7787 shl = &search_hl; | |
| 7788 shl_flag = TRUE; | |
| 7789 } | |
| 7790 else | |
| 7791 shl = &cur->hl; | |
| 7 | 7792 if (shl->rm.regprog != NULL |
| 7793 && shl->lnum == 0 | |
| 7794 && re_multiline(shl->rm.regprog)) | |
| 7795 { | |
| 7796 if (shl->first_lnum == 0) | |
| 7797 { | |
| 7798 # ifdef FEAT_FOLDING | |
| 7799 for (shl->first_lnum = lnum; | |
| 7800 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7801 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7802 NULL, NULL, TRUE, NULL)) | |
| 7803 break; | |
| 7804 # else | |
| 7805 shl->first_lnum = wp->w_topline; | |
| 7806 # endif | |
| 7807 } | |
| 5979 | 7808 if (cur != NULL) |
| 7809 cur->pos.cur = 0; | |
| 7810 pos_inprogress = TRUE; | |
| 7 | 7811 n = 0; |
| 5979 | 7812 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7813 || (cur != NULL && pos_inprogress))) | |
| 7814 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7815 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
|
7816 shl == &search_hl ? NULL : cur); |
| 5979 | 7817 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7818 ? FALSE : TRUE; | |
| 7 | 7819 if (shl->lnum != 0) |
| 7820 { | |
| 7821 shl->first_lnum = shl->lnum | |
| 7822 + shl->rm.endpos[0].lnum | |
| 7823 - shl->rm.startpos[0].lnum; | |
| 7824 n = shl->rm.endpos[0].col; | |
| 7825 } | |
| 7826 else | |
| 7827 { | |
| 7828 ++shl->first_lnum; | |
| 7829 n = 0; | |
| 7830 } | |
| 7831 } | |
| 7832 } | |
| 1326 | 7833 if (shl != &search_hl && cur != NULL) |
| 7834 cur = cur->next; | |
| 7 | 7835 } |
| 7836 } | |
| 7837 | |
| 7838 /* | |
| 1326 | 7839 * Search for a next 'hlsearch' or match. |
| 7 | 7840 * Uses shl->buf. |
| 7841 * Sets shl->lnum and shl->rm contents. | |
| 7842 * Note: Assumes a previous match is always before "lnum", unless | |
| 7843 * shl->lnum is zero. | |
| 7844 * Careful: Any pointers for buffer lines will become invalid. | |
| 7845 */ | |
| 7846 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7847 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7848 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7849 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
|
7850 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7851 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
|
7852 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7853 { |
| 7854 linenr_T l; | |
| 7855 colnr_T matchcol; | |
| 7856 long nmatched; | |
| 7857 | |
| 7858 if (shl->lnum != 0) | |
| 7859 { | |
| 7860 /* Check for three situations: | |
| 7861 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7862 * 2. If the previous match includes "mincol", use it. | |
| 7863 * 3. Continue after the previous match. | |
| 7864 */ | |
| 7865 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7866 if (lnum > l) | |
| 7867 shl->lnum = 0; | |
| 7868 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7869 return; | |
| 7870 } | |
| 7871 | |
| 7872 /* | |
| 7873 * Repeat searching for a match until one is found that includes "mincol" | |
| 7874 * or none is found in this line. | |
| 7875 */ | |
| 7876 called_emsg = FALSE; | |
| 7877 for (;;) | |
| 7878 { | |
| 1521 | 7879 #ifdef FEAT_RELTIME |
| 7880 /* Stop searching after passing the time limit. */ | |
| 7881 if (profile_passed_limit(&(shl->tm))) | |
| 7882 { | |
| 7883 shl->lnum = 0; /* no match found in time */ | |
| 7884 break; | |
| 7885 } | |
| 7886 #endif | |
| 7 | 7887 /* Three situations: |
| 7888 * 1. No useful previous match: search from start of line. | |
| 7889 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7890 * Break the loop if this is beyond the end of the line. | |
| 7891 * 3. Vi compatible searching: continue at end of previous match. | |
| 7892 */ | |
| 7893 if (shl->lnum == 0) | |
| 7894 matchcol = 0; | |
| 7895 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7896 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7897 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7898 { | |
| 688 | 7899 char_u *ml; |
| 685 | 7900 |
| 7901 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7902 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7903 if (*ml == NUL) |
| 7904 { | |
| 7905 ++matchcol; | |
| 7 | 7906 shl->lnum = 0; |
| 7907 break; | |
| 7908 } | |
| 685 | 7909 #ifdef FEAT_MBYTE |
| 7910 if (has_mbyte) | |
| 7911 matchcol += mb_ptr2len(ml); | |
| 7912 else | |
| 7913 #endif | |
| 7914 ++matchcol; | |
| 7 | 7915 } |
| 7916 else | |
| 7917 matchcol = shl->rm.endpos[0].col; | |
| 7918 | |
| 7919 shl->lnum = lnum; | |
| 5979 | 7920 if (shl->rm.regprog != NULL) |
| 7921 { | |
| 6394 | 7922 /* Remember whether shl->rm is using a copy of the regprog in |
| 7923 * cur->match. */ | |
| 7924 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7925 && shl == &cur->hl | |
| 7926 && cur->match.regprog == cur->hl.rm.regprog); | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7927 int timed_out = FALSE; |
| 6394 | 7928 |
| 5979 | 7929 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7930 matchcol, | |
| 1521 | 7931 #ifdef FEAT_RELTIME |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7932 &(shl->tm), &timed_out |
| 1521 | 7933 #else |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7934 NULL, NULL |
| 5979 | 7935 #endif |
| 7936 ); | |
| 6394 | 7937 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7938 if (regprog_is_copy) | |
| 7939 cur->match.regprog = cur->hl.rm.regprog; | |
| 7940 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7941 if (called_emsg || got_int || timed_out) |
| 5979 | 7942 { |
| 7943 /* Error while handling regexp: stop using this regexp. */ | |
| 7944 if (shl == &search_hl) | |
| 7945 { | |
| 7946 /* don't free regprog in the match list, it's a copy */ | |
| 7947 vim_regfree(shl->rm.regprog); | |
| 7948 SET_NO_HLSEARCH(TRUE); | |
| 7949 } | |
| 7950 shl->rm.regprog = NULL; | |
| 7951 shl->lnum = 0; | |
| 7952 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7953 message */ | |
| 7954 break; | |
| 7955 } | |
| 7956 } | |
| 7957 else if (cur != NULL) | |
| 7958 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7959 else |
| 7960 nmatched = 0; | |
| 7 | 7961 if (nmatched == 0) |
| 7962 { | |
| 7963 shl->lnum = 0; /* no match found */ | |
| 7964 break; | |
| 7965 } | |
| 7966 if (shl->rm.startpos[0].lnum > 0 | |
| 7967 || shl->rm.startpos[0].col >= mincol | |
| 7968 || nmatched > 1 | |
| 7969 || shl->rm.endpos[0].col > mincol) | |
| 7970 { | |
| 7971 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7972 break; /* useful match found */ | |
| 7973 } | |
| 7974 } | |
| 7975 } | |
| 7976 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7977 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7978 * 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
|
7979 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7980 */ |
| 5979 | 7981 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7982 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7983 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
|
7984 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7985 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7986 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7987 { |
| 7988 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7989 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7990 |
| 5979 | 7991 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 7992 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7993 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7994 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7995 if (pos->lnum == 0) |
| 5979 | 7996 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7997 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 7998 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7999 if (pos->lnum == lnum) |
| 5979 | 8000 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8001 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8002 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8003 /* 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
|
8004 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8005 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
|
8006 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8007 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8008 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8009 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8010 posmatch->pos[found] = tmp; |
| 5979 | 8011 } |
| 8012 } | |
| 8013 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8014 found = i; |
| 5979 | 8015 } |
| 8016 } | |
| 8017 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8018 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8019 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8020 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
|
8021 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8022 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
|
8023 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8024 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8025 shl->lnum = lnum; |
| 5979 | 8026 shl->rm.startpos[0].lnum = 0; |
| 8027 shl->rm.startpos[0].col = start; | |
| 8028 shl->rm.endpos[0].lnum = 0; | |
| 8029 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
|
8030 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8031 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8032 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8033 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8034 return 0; |
| 5979 | 8035 } |
| 5985 | 8036 #endif |
| 5979 | 8037 |
| 7 | 8038 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8039 screen_start_highlight(int attr) |
| 7 | 8040 { |
| 8041 attrentry_T *aep = NULL; | |
| 8042 | |
| 8043 screen_attr = attr; | |
| 8044 if (full_screen | |
| 8045 #ifdef WIN3264 | |
| 8046 && termcap_active | |
| 8047 #endif | |
| 8048 ) | |
| 8049 { | |
| 8050 #ifdef FEAT_GUI | |
| 8051 if (gui.in_use) | |
| 8052 { | |
| 8053 char buf[20]; | |
| 8054 | |
| 681 | 8055 /* The GUI handles this internally. */ |
| 8056 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8057 OUT_STR(buf); |
| 8058 } | |
| 8059 else | |
| 8060 #endif | |
| 8061 { | |
| 8062 if (attr > HL_ALL) /* special HL attr. */ | |
| 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 aep = syn_cterm_attr2entry(attr); |
| 8066 else | |
| 8067 aep = syn_term_attr2entry(attr); | |
| 8068 if (aep == NULL) /* did ":syntax clear" */ | |
| 8069 attr = 0; | |
| 8070 else | |
| 8071 attr = aep->ae_attr; | |
| 8072 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8073 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8074 out_str(T_MD); |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8075 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
|
8076 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8077 p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8078 ? aep->ae_u.cterm.fg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8079 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8080 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8081 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8082 /* If the Normal FG color has BOLD attribute and the new HL |
| 8083 * has a FG color defined, clear BOLD. */ | |
| 8084 out_str(T_ME); | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8085 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8086 out_str(T_SO); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8087 if ((attr & HL_UNDERCURL) && *T_UCS != NUL) /* undercurl */ |
|
12964
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8088 out_str(T_UCS); |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8089 if (((attr & HL_UNDERLINE) /* underline or undercurl */ |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8090 || ((attr & HL_UNDERCURL) && *T_UCS == NUL)) |
|
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8091 && *T_US != NUL) |
| 7 | 8092 out_str(T_US); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8093 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8094 out_str(T_CZH); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8095 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8096 out_str(T_MR); |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8097 if ((attr & HL_STRIKETHROUGH) && *T_STS != NUL) /* strike */ |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8098 out_str(T_STS); |
| 7 | 8099 |
| 8100 /* | |
| 8101 * Output the color or start string after bold etc., in case the | |
| 8102 * bold etc. override the color setting. | |
| 8103 */ | |
| 8104 if (aep != NULL) | |
| 8105 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8106 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8107 /* When 'termguicolors' is set but fg or bg is unset, |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8108 * fall back to the cterm colors. This helps for SpellBad, |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8109 * where the GUI uses a red undercurl. */ |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8110 if (p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8111 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8112 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
|
8113 term_fg_rgb_color(aep->ae_u.cterm.fg_rgb); |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8114 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8115 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8116 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8117 if (t_colors > 1) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8118 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8119 if (aep->ae_u.cterm.fg_color) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8120 term_fg_color(aep->ae_u.cterm.fg_color - 1); |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8121 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8122 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8123 if (p_tgc && aep->ae_u.cterm.bg_rgb != CTERMCOLOR) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8124 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8125 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
|
8126 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8127 } |
| 8128 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8129 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8130 if (t_colors > 1) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8131 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8132 if (aep->ae_u.cterm.bg_color) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8133 term_bg_color(aep->ae_u.cterm.bg_color - 1); |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8134 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8135 |
|
13452
9b09f6e470e0
patch 8.0.1600: crash when setting t_Co to zero when 'termguicolors' is set
Christian Brabandt <cb@256bit.org>
parents:
13400
diff
changeset
|
8136 if (!IS_CTERM) |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8137 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8138 if (aep->ae_u.term.start != NULL) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8139 out_str(aep->ae_u.term.start); |
| 7 | 8140 } |
| 8141 } | |
| 8142 } | |
| 8143 } | |
| 8144 } | |
| 8145 | |
| 8146 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8147 screen_stop_highlight(void) |
| 7 | 8148 { |
| 8149 int do_ME = FALSE; /* output T_ME code */ | |
| 8150 | |
| 8151 if (screen_attr != 0 | |
| 8152 #ifdef WIN3264 | |
| 8153 && termcap_active | |
| 8154 #endif | |
| 8155 ) | |
| 8156 { | |
| 8157 #ifdef FEAT_GUI | |
| 8158 if (gui.in_use) | |
| 8159 { | |
| 8160 char buf[20]; | |
| 8161 | |
| 8162 /* use internal GUI code */ | |
| 8163 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8164 OUT_STR(buf); | |
| 8165 } | |
| 8166 else | |
| 8167 #endif | |
| 8168 { | |
| 8169 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8170 { | |
| 8171 attrentry_T *aep; | |
| 8172 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8173 if (IS_CTERM) |
| 7 | 8174 { |
| 8175 /* | |
| 8176 * Assume that t_me restores the original colors! | |
| 8177 */ | |
| 8178 aep = syn_cterm_attr2entry(screen_attr); | |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8179 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8180 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8181 p_tgc && aep->ae_u.cterm.fg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8182 ? aep->ae_u.cterm.fg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8183 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8184 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8185 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
|
8186 #ifdef FEAT_TERMGUICOLORS |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8187 p_tgc && aep->ae_u.cterm.bg_rgb != CTERMCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8188 ? aep->ae_u.cterm.bg_rgb != INVALCOLOR |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8189 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8190 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8191 aep->ae_u.cterm.bg_color))) |
| 7 | 8192 do_ME = TRUE; |
| 8193 } | |
| 8194 else | |
| 8195 { | |
| 8196 aep = syn_term_attr2entry(screen_attr); | |
| 8197 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8198 { | |
| 8199 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8200 do_ME = TRUE; | |
| 8201 else | |
| 8202 out_str(aep->ae_u.term.stop); | |
| 8203 } | |
| 8204 } | |
| 8205 if (aep == NULL) /* did ":syntax clear" */ | |
| 8206 screen_attr = 0; | |
| 8207 else | |
| 8208 screen_attr = aep->ae_attr; | |
| 8209 } | |
| 8210 | |
| 8211 /* | |
| 8212 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8213 * same sequence several times. | |
| 8214 */ | |
| 8215 if (screen_attr & HL_STANDOUT) | |
| 8216 { | |
| 8217 if (STRCMP(T_SE, T_ME) == 0) | |
| 8218 do_ME = TRUE; | |
| 8219 else | |
| 8220 out_str(T_SE); | |
| 8221 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8222 if ((screen_attr & HL_UNDERCURL) && *T_UCE != NUL) |
|
12964
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8223 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8224 if (STRCMP(T_UCE, T_ME) == 0) |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8225 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8226 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8227 out_str(T_UCE); |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8228 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8229 if ((screen_attr & HL_UNDERLINE) |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8230 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8231 { |
| 8232 if (STRCMP(T_UE, T_ME) == 0) | |
| 8233 do_ME = TRUE; | |
| 8234 else | |
| 8235 out_str(T_UE); | |
| 8236 } | |
| 8237 if (screen_attr & HL_ITALIC) | |
| 8238 { | |
| 8239 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8240 do_ME = TRUE; | |
| 8241 else | |
| 8242 out_str(T_CZR); | |
| 8243 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8244 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8245 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8246 if (STRCMP(T_STE, T_ME) == 0) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8247 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8248 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8249 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8250 } |
| 7 | 8251 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8252 out_str(T_ME); | |
| 8253 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8254 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8255 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8256 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8257 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
|
8258 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
|
8259 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
|
8260 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
|
8261 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8262 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8263 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8264 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8265 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8266 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8267 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8268 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8269 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
|
8270 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8271 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
|
8272 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8273 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8274 } |
| 7 | 8275 } |
| 8276 } | |
| 8277 } | |
| 8278 screen_attr = 0; | |
| 8279 } | |
| 8280 | |
| 8281 /* | |
| 8282 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8283 * The machine specific code may override this again. | |
| 8284 */ | |
| 8285 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8286 reset_cterm_colors(void) |
| 7 | 8287 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8288 if (IS_CTERM) |
| 7 | 8289 { |
| 8290 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8291 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8292 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
|
8293 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8294 : (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
|
8295 #else |
| 7 | 8296 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
|
8297 #endif |
| 7 | 8298 { |
| 8299 out_str(T_OP); | |
| 8300 screen_attr = -1; | |
| 8301 } | |
| 8302 if (cterm_normal_fg_bold) | |
| 8303 { | |
| 8304 out_str(T_ME); | |
| 8305 screen_attr = -1; | |
| 8306 } | |
| 8307 } | |
| 8308 } | |
| 8309 | |
| 8310 /* | |
| 8311 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8312 * using the attributes from ScreenAttrs["off"]. | |
| 8313 */ | |
| 8314 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8315 screen_char(unsigned off, int row, int col) |
| 7 | 8316 { |
| 8317 int attr; | |
| 8318 | |
| 8319 /* Check for illegal values, just in case (could happen just after | |
| 8320 * resizing). */ | |
| 8321 if (row >= screen_Rows || col >= screen_Columns) | |
| 8322 return; | |
| 8323 | |
| 6602 | 8324 /* Outputting a character in the last cell on the screen may scroll the |
| 8325 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8326 * mark the character invalid (update it when scrolled up). */ | |
| 8327 if (*T_XN == NUL | |
| 8328 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8329 #ifdef FEAT_RIGHTLEFT |
| 8330 /* account for first command-line character in rightleft mode */ | |
| 8331 && !cmdmsg_rl | |
| 8332 #endif | |
| 8333 ) | |
| 8334 { | |
| 8335 ScreenAttrs[off] = (sattr_T)-1; | |
| 8336 return; | |
| 8337 } | |
| 8338 | |
| 8339 /* | |
| 8340 * Stop highlighting first, so it's easier to move the cursor. | |
| 8341 */ | |
| 8342 if (screen_char_attr != 0) | |
| 8343 attr = screen_char_attr; | |
| 8344 else | |
| 8345 attr = ScreenAttrs[off]; | |
| 8346 if (screen_attr != attr) | |
| 8347 screen_stop_highlight(); | |
| 8348 | |
| 8349 windgoto(row, col); | |
| 8350 | |
| 8351 if (screen_attr != attr) | |
| 8352 screen_start_highlight(attr); | |
| 8353 | |
| 8354 #ifdef FEAT_MBYTE | |
| 8355 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8356 { | |
| 8357 char_u buf[MB_MAXBYTES + 1]; | |
| 8358 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8359 if (utf_ambiguous_width(ScreenLinesUC[off])) |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8360 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8361 if (*p_ambw == 'd' |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8362 # ifdef FEAT_GUI |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8363 && !gui.in_use |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8364 # endif |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8365 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8366 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8367 /* Clear the two screen cells. If the character is actually |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8368 * single width it won't change the second cell. */ |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8369 out_str((char_u *)" "); |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8370 term_windgoto(row, col); |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8371 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8372 /* not sure where the cursor is after drawing the ambiguous width |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8373 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8374 screen_cur_col = 9999; |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8375 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8376 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8377 ++screen_cur_col; |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8378 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8379 /* Convert the UTF-8 character to bytes and write it. */ |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8380 buf[utfc_char2bytes(off, buf)] = NUL; |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8381 out_str(buf); |
| 7 | 8382 } |
| 8383 else | |
| 8384 #endif | |
| 8385 { | |
| 8386 #ifdef FEAT_MBYTE | |
| 8387 out_flush_check(); | |
| 8388 #endif | |
| 8389 out_char(ScreenLines[off]); | |
| 8390 #ifdef FEAT_MBYTE | |
| 8391 /* double-byte character in single-width cell */ | |
| 8392 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8393 out_char(ScreenLines2[off]); | |
| 8394 #endif | |
| 8395 } | |
| 8396 | |
| 8397 screen_cur_col++; | |
| 8398 } | |
| 8399 | |
| 8400 #ifdef FEAT_MBYTE | |
| 8401 | |
| 8402 /* | |
| 8403 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8404 * on the screen at position 'row' and 'col'. | |
| 8405 * The attributes of the first byte is used for all. This is required to | |
| 8406 * output the two bytes of a double-byte character with nothing in between. | |
| 8407 */ | |
| 8408 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8409 screen_char_2(unsigned off, int row, int col) |
| 7 | 8410 { |
| 8411 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8412 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8413 return; | |
| 8414 | |
| 8415 /* Outputting the last character on the screen may scrollup the screen. | |
| 8416 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8417 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8418 { | |
| 8419 ScreenAttrs[off] = (sattr_T)-1; | |
| 8420 return; | |
| 8421 } | |
| 8422 | |
| 8423 /* Output the first byte normally (positions the cursor), then write the | |
| 8424 * second byte directly. */ | |
| 8425 screen_char(off, row, col); | |
| 8426 out_char(ScreenLines[off + 1]); | |
| 8427 ++screen_cur_col; | |
| 8428 } | |
| 8429 #endif | |
| 8430 | |
| 8431 /* | |
| 8432 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8433 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8434 */ | |
| 8435 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8436 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8437 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8438 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8439 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8440 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8441 int invert) |
| 7 | 8442 { |
| 8443 int r, c; | |
| 8444 int off; | |
| 1378 | 8445 #ifdef FEAT_MBYTE |
| 8446 int max_off; | |
| 8447 #endif | |
| 7 | 8448 |
| 534 | 8449 /* Can't use ScreenLines unless initialized */ |
| 8450 if (ScreenLines == NULL) | |
| 8451 return; | |
| 8452 | |
| 7 | 8453 if (invert) |
| 8454 screen_char_attr = HL_INVERSE; | |
| 8455 for (r = row; r < row + height; ++r) | |
| 8456 { | |
| 8457 off = LineOffset[r]; | |
| 1378 | 8458 #ifdef FEAT_MBYTE |
| 8459 max_off = off + screen_Columns; | |
| 8460 #endif | |
| 7 | 8461 for (c = col; c < col + width; ++c) |
| 8462 { | |
| 8463 #ifdef FEAT_MBYTE | |
| 1378 | 8464 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8465 { |
| 8466 screen_char_2(off + c, r, c); | |
| 8467 ++c; | |
| 8468 } | |
| 8469 else | |
| 8470 #endif | |
| 8471 { | |
| 8472 screen_char(off + c, r, c); | |
| 8473 #ifdef FEAT_MBYTE | |
| 1378 | 8474 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8475 ++c; |
| 8476 #endif | |
| 8477 } | |
| 8478 } | |
| 8479 } | |
| 8480 screen_char_attr = 0; | |
| 8481 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8482 |
| 7 | 8483 /* |
| 8484 * Redraw the characters for a vertically split window. | |
| 8485 */ | |
| 8486 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8487 redraw_block(int row, int end, win_T *wp) |
| 7 | 8488 { |
| 8489 int col; | |
| 8490 int width; | |
| 8491 | |
| 8492 # ifdef FEAT_CLIPBOARD | |
| 8493 clip_may_clear_selection(row, end - 1); | |
| 8494 # endif | |
| 8495 | |
| 8496 if (wp == NULL) | |
| 8497 { | |
| 8498 col = 0; | |
| 8499 width = Columns; | |
| 8500 } | |
| 8501 else | |
| 8502 { | |
| 8503 col = wp->w_wincol; | |
| 8504 width = wp->w_width; | |
| 8505 } | |
| 8506 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8507 } | |
| 8508 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8509 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8510 space_to_screenline(int off, int attr) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8511 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8512 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8513 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8514 # ifdef FEAT_MBYTE |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8515 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8516 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8517 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8518 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8519 |
| 7 | 8520 /* |
| 8521 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8522 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8523 * Use attributes 'attr'. | |
| 8524 */ | |
| 8525 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8526 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8527 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8528 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8529 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8530 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8531 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8532 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8533 int attr) |
| 7 | 8534 { |
| 8535 int row; | |
| 8536 int col; | |
| 8537 int off; | |
| 8538 int end_off; | |
| 8539 int did_delete; | |
| 8540 int c; | |
| 8541 int norm_term; | |
| 8542 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8543 int force_next = FALSE; | |
| 8544 #endif | |
| 8545 | |
| 8546 if (end_row > screen_Rows) /* safety check */ | |
| 8547 end_row = screen_Rows; | |
| 8548 if (end_col > screen_Columns) /* safety check */ | |
| 8549 end_col = screen_Columns; | |
| 8550 if (ScreenLines == NULL | |
| 8551 || start_row >= end_row | |
| 8552 || start_col >= end_col) /* nothing to do */ | |
| 8553 return; | |
| 8554 | |
| 8555 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8556 norm_term = ( | |
| 8557 #ifdef FEAT_GUI | |
| 8558 !gui.in_use && | |
| 8559 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8560 !IS_CTERM); |
| 7 | 8561 for (row = start_row; row < end_row; ++row) |
| 8562 { | |
| 1668 | 8563 #ifdef FEAT_MBYTE |
| 8564 if (has_mbyte | |
| 8565 # ifdef FEAT_GUI | |
| 8566 && !gui.in_use | |
| 8567 # endif | |
| 8568 ) | |
| 8569 { | |
| 8570 /* When drawing over the right halve of a double-wide char clear | |
| 8571 * out the left halve. When drawing over the left halve of a | |
| 8572 * double wide-char clear out the right halve. Only needed in a | |
| 8573 * terminal. */ | |
| 1685 | 8574 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8575 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8576 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8577 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8578 } |
| 8579 #endif | |
| 7 | 8580 /* |
| 8581 * Try to use delete-line termcap code, when no attributes or in a | |
| 8582 * "normal" terminal, where a bold/italic space is just a | |
| 8583 * space. | |
| 8584 */ | |
| 8585 did_delete = FALSE; | |
| 8586 if (c2 == ' ' | |
| 8587 && end_col == Columns | |
| 8588 && can_clear(T_CE) | |
| 8589 && (attr == 0 | |
| 8590 || (norm_term | |
| 8591 && attr <= HL_ALL | |
| 8592 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8593 { | |
| 8594 /* | |
| 8595 * check if we really need to clear something | |
| 8596 */ | |
| 8597 col = start_col; | |
| 8598 if (c1 != ' ') /* don't clear first char */ | |
| 8599 ++col; | |
| 8600 | |
| 8601 off = LineOffset[row] + col; | |
| 8602 end_off = LineOffset[row] + end_col; | |
| 8603 | |
| 8604 /* skip blanks (used often, keep it fast!) */ | |
| 8605 #ifdef FEAT_MBYTE | |
| 8606 if (enc_utf8) | |
| 8607 while (off < end_off && ScreenLines[off] == ' ' | |
| 8608 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8609 ++off; | |
| 8610 else | |
| 8611 #endif | |
| 8612 while (off < end_off && ScreenLines[off] == ' ' | |
| 8613 && ScreenAttrs[off] == 0) | |
| 8614 ++off; | |
| 8615 if (off < end_off) /* something to be cleared */ | |
| 8616 { | |
| 8617 col = off - LineOffset[row]; | |
| 8618 screen_stop_highlight(); | |
| 8619 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8620 out_str(T_CE); | |
| 8621 screen_start(); /* don't know where cursor is now */ | |
| 8622 col = end_col - col; | |
| 8623 while (col--) /* clear chars in ScreenLines */ | |
| 8624 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8625 space_to_screenline(off, 0); |
| 7 | 8626 ++off; |
| 8627 } | |
| 8628 } | |
| 8629 did_delete = TRUE; /* the chars are cleared now */ | |
| 8630 } | |
| 8631 | |
| 8632 off = LineOffset[row] + start_col; | |
| 8633 c = c1; | |
| 8634 for (col = start_col; col < end_col; ++col) | |
| 8635 { | |
| 8636 if (ScreenLines[off] != c | |
| 8637 #ifdef FEAT_MBYTE | |
| 714 | 8638 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8639 != (c >= 0x80 ? c : 0)) | |
| 7 | 8640 #endif |
| 8641 || ScreenAttrs[off] != attr | |
| 8642 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8643 || force_next | |
| 8644 #endif | |
| 8645 ) | |
| 8646 { | |
| 8647 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8648 /* The bold trick may make a single row of pixels appear in | |
| 8649 * the next character. When a bold character is removed, the | |
| 8650 * next character should be redrawn too. This happens for our | |
| 8651 * own GUI and for some xterms. */ | |
| 8652 if ( | |
| 8653 # ifdef FEAT_GUI | |
| 8654 gui.in_use | |
| 8655 # endif | |
| 8656 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8657 || | |
| 8658 # endif | |
| 8659 # ifdef UNIX | |
| 8660 term_is_xterm | |
| 8661 # endif | |
| 8662 ) | |
| 8663 { | |
| 8664 if (ScreenLines[off] != ' ' | |
| 8665 && (ScreenAttrs[off] > HL_ALL | |
| 8666 || ScreenAttrs[off] & HL_BOLD)) | |
| 8667 force_next = TRUE; | |
| 8668 else | |
| 8669 force_next = FALSE; | |
| 8670 } | |
| 8671 #endif | |
| 8672 ScreenLines[off] = c; | |
| 8673 #ifdef FEAT_MBYTE | |
| 8674 if (enc_utf8) | |
| 8675 { | |
| 8676 if (c >= 0x80) | |
| 8677 { | |
| 8678 ScreenLinesUC[off] = c; | |
| 714 | 8679 ScreenLinesC[0][off] = 0; |
| 7 | 8680 } |
| 8681 else | |
| 8682 ScreenLinesUC[off] = 0; | |
| 8683 } | |
| 8684 #endif | |
| 8685 ScreenAttrs[off] = attr; | |
| 8686 if (!did_delete || c != ' ') | |
| 8687 screen_char(off, row, col); | |
| 8688 } | |
| 8689 ++off; | |
| 8690 if (col == start_col) | |
| 8691 { | |
| 8692 if (did_delete) | |
| 8693 break; | |
| 8694 c = c2; | |
| 8695 } | |
| 8696 } | |
| 8697 if (end_col == Columns) | |
| 8698 LineWraps[row] = FALSE; | |
| 8699 if (row == Rows - 1) /* overwritten the command line */ | |
| 8700 { | |
| 8701 redraw_cmdline = TRUE; | |
|
13666
57da3d873f20
patch 8.0.1705: when making a vertical split the mode message isn't updated
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
8702 if (start_col == 0 && end_col == Columns |
|
57da3d873f20
patch 8.0.1705: when making a vertical split the mode message isn't updated
Christian Brabandt <cb@256bit.org>
parents:
13632
diff
changeset
|
8703 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8704 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8705 if (start_col == 0) |
| 8706 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8707 } |
| 8708 } | |
| 8709 } | |
| 8710 | |
| 8711 /* | |
| 8712 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8713 * screen or the command line. | |
| 8714 */ | |
| 8715 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8716 check_for_delay(int check_msg_scroll) |
| 7 | 8717 { |
| 8718 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8719 && !did_wait_return | |
| 8720 && emsg_silent == 0) | |
| 8721 { | |
| 8722 out_flush(); | |
| 8723 ui_delay(1000L, TRUE); | |
| 8724 emsg_on_display = FALSE; | |
| 8725 if (check_msg_scroll) | |
| 8726 msg_scroll = FALSE; | |
| 8727 } | |
| 8728 } | |
| 8729 | |
| 8730 /* | |
| 8731 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8732 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8733 * Returns TRUE if there is a valid screen to write to. |
| 8734 * Returns FALSE when starting up and screen not initialized yet. | |
| 8735 */ | |
| 8736 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8737 screen_valid(int doclear) |
| 7 | 8738 { |
| 3263 | 8739 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8740 return (ScreenLines != NULL); |
| 8741 } | |
| 8742 | |
| 8743 /* | |
| 8744 * Resize the shell to Rows and Columns. | |
| 8745 * Allocate ScreenLines[] and associated items. | |
| 8746 * | |
| 8747 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8748 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8749 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8750 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8751 * final size of the shell is needed. | |
| 8752 */ | |
| 8753 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8754 screenalloc(int doclear) |
| 7 | 8755 { |
| 8756 int new_row, old_row; | |
| 8757 #ifdef FEAT_GUI | |
| 8758 int old_Rows; | |
| 8759 #endif | |
| 8760 win_T *wp; | |
| 8761 int outofmem = FALSE; | |
| 8762 int len; | |
| 8763 schar_T *new_ScreenLines; | |
| 8764 #ifdef FEAT_MBYTE | |
| 8765 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8766 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8767 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8768 int i; |
| 7 | 8769 #endif |
| 8770 sattr_T *new_ScreenAttrs; | |
| 8771 unsigned *new_LineOffset; | |
| 8772 char_u *new_LineWraps; | |
| 681 | 8773 short *new_TabPageIdxs; |
| 671 | 8774 tabpage_T *tp; |
| 7 | 8775 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8776 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8777 int retry_count = 0; |
| 8778 | |
| 8779 retry: | |
| 7 | 8780 /* |
| 8781 * Allocation of the screen buffers is done only when the size changes and | |
| 8782 * when Rows and Columns have been set and we have started doing full | |
| 8783 * screen stuff. | |
| 8784 */ | |
| 8785 if ((ScreenLines != NULL | |
| 8786 && Rows == screen_Rows | |
| 8787 && Columns == screen_Columns | |
| 8788 #ifdef FEAT_MBYTE | |
| 8789 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8790 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8791 && p_mco == Screen_mco |
| 7 | 8792 #endif |
| 8793 ) | |
| 8794 || Rows == 0 | |
| 8795 || Columns == 0 | |
| 8796 || (!full_screen && ScreenLines == NULL)) | |
| 8797 return; | |
| 8798 | |
| 8799 /* | |
| 8800 * It's possible that we produce an out-of-memory message below, which | |
| 8801 * will cause this function to be called again. To break the loop, just | |
| 8802 * return here. | |
| 8803 */ | |
| 8804 if (entered) | |
| 8805 return; | |
| 8806 entered = TRUE; | |
| 8807 | |
| 911 | 8808 /* |
| 8809 * Note that the window sizes are updated before reallocating the arrays, | |
| 8810 * thus we must not redraw here! | |
| 8811 */ | |
| 8812 ++RedrawingDisabled; | |
| 8813 | |
| 7 | 8814 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8815 | |
| 8816 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8817 | |
| 8818 /* | |
| 8819 * We're changing the size of the screen. | |
| 8820 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8821 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8822 * lines (unless the screen is going to be cleared). | |
| 8823 * - Free the old arrays. | |
| 8824 * | |
| 8825 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8826 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8827 * size is wrong. | |
| 8828 */ | |
| 671 | 8829 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8830 win_free_lsize(wp); |
| 1946 | 8831 if (aucmd_win != NULL) |
| 8832 win_free_lsize(aucmd_win); | |
| 7 | 8833 |
| 8834 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8835 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8836 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8837 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8838 if (enc_utf8) |
| 8839 { | |
| 8840 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8841 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8842 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8843 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8844 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8845 } | |
| 8846 if (enc_dbcs == DBCS_JPNU) | |
| 8847 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8848 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8849 #endif | |
| 8850 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8851 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8852 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8853 Rows * sizeof(unsigned)), FALSE); | |
| 8854 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 681 | 8855 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 7 | 8856 |
| 677 | 8857 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8858 { |
| 8859 if (win_alloc_lines(wp) == FAIL) | |
| 8860 { | |
| 8861 outofmem = TRUE; | |
| 1819 | 8862 goto give_up; |
| 8863 } | |
| 8864 } | |
| 1946 | 8865 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8866 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8867 outofmem = TRUE; |
| 1819 | 8868 give_up: |
| 7 | 8869 |
| 714 | 8870 #ifdef FEAT_MBYTE |
| 8871 for (i = 0; i < p_mco; ++i) | |
| 8872 if (new_ScreenLinesC[i] == NULL) | |
| 8873 break; | |
| 8874 #endif | |
| 7 | 8875 if (new_ScreenLines == NULL |
| 8876 #ifdef FEAT_MBYTE | |
| 714 | 8877 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8878 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8879 #endif | |
| 8880 || new_ScreenAttrs == NULL | |
| 8881 || new_LineOffset == NULL | |
| 8882 || new_LineWraps == NULL | |
| 671 | 8883 || new_TabPageIdxs == NULL |
| 7 | 8884 || outofmem) |
| 8885 { | |
| 944 | 8886 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8887 { |
| 8888 /* guess the size */ | |
| 8889 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8890 | |
| 8891 /* Remember we did this to avoid getting outofmem messages over | |
| 8892 * and over again. */ | |
| 944 | 8893 done_outofmem_msg = TRUE; |
| 534 | 8894 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8895 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8896 #ifdef FEAT_MBYTE |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8897 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 8898 for (i = 0; i < p_mco; ++i) |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8899 VIM_CLEAR(new_ScreenLinesC[i]); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8900 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8901 #endif |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8902 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8903 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8904 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8905 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 8906 } |
| 8907 else | |
| 8908 { | |
| 944 | 8909 done_outofmem_msg = FALSE; |
| 534 | 8910 |
| 7 | 8911 for (new_row = 0; new_row < Rows; ++new_row) |
| 8912 { | |
| 8913 new_LineOffset[new_row] = new_row * Columns; | |
| 8914 new_LineWraps[new_row] = FALSE; | |
| 8915 | |
| 8916 /* | |
| 8917 * If the screen is not going to be cleared, copy as much as | |
| 8918 * possible from the old screen to the new one and clear the rest | |
| 8919 * (used when resizing the window at the "--more--" prompt or when | |
| 8920 * executing an external command, for the GUI). | |
| 8921 */ | |
| 3263 | 8922 if (!doclear) |
| 7 | 8923 { |
| 8924 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8925 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8926 #ifdef FEAT_MBYTE | |
| 8927 if (enc_utf8) | |
| 8928 { | |
| 8929 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8930 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8931 for (i = 0; i < p_mco; ++i) |
| 8932 (void)vim_memset(new_ScreenLinesC[i] | |
| 8933 + new_row * Columns, | |
| 7 | 8934 0, (size_t)Columns * sizeof(u8char_T)); |
| 8935 } | |
| 8936 if (enc_dbcs == DBCS_JPNU) | |
| 8937 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8938 0, (size_t)Columns * sizeof(schar_T)); | |
| 8939 #endif | |
| 8940 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8941 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8942 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8943 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8944 { |
| 8945 if (screen_Columns < Columns) | |
| 8946 len = screen_Columns; | |
| 8947 else | |
| 8948 len = Columns; | |
| 26 | 8949 #ifdef FEAT_MBYTE |
| 571 | 8950 /* When switching to utf-8 don't copy characters, they |
| 714 | 8951 * may be invalid now. Also when p_mco changes. */ |
| 8952 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8953 && p_mco == Screen_mco) | |
| 26 | 8954 #endif |
| 8955 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8956 ScreenLines + LineOffset[old_row], | |
| 8957 (size_t)len * sizeof(schar_T)); | |
| 7 | 8958 #ifdef FEAT_MBYTE |
| 714 | 8959 if (enc_utf8 && ScreenLinesUC != NULL |
| 8960 && p_mco == Screen_mco) | |
| 7 | 8961 { |
| 8962 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8963 ScreenLinesUC + LineOffset[old_row], | |
| 8964 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8965 for (i = 0; i < p_mco; ++i) |
| 8966 mch_memmove(new_ScreenLinesC[i] | |
| 8967 + new_LineOffset[new_row], | |
| 8968 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8969 (size_t)len * sizeof(u8char_T)); |
| 8970 } | |
| 8971 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8972 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8973 ScreenLines2 + LineOffset[old_row], | |
| 8974 (size_t)len * sizeof(schar_T)); | |
| 8975 #endif | |
| 8976 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8977 ScreenAttrs + LineOffset[old_row], | |
| 8978 (size_t)len * sizeof(sattr_T)); | |
| 8979 } | |
| 8980 } | |
| 8981 } | |
| 8982 /* Use the last line of the screen for the current line. */ | |
| 8983 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8984 } | |
| 8985 | |
| 356 | 8986 free_screenlines(); |
| 8987 | |
| 7 | 8988 ScreenLines = new_ScreenLines; |
| 8989 #ifdef FEAT_MBYTE | |
| 8990 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8991 for (i = 0; i < p_mco; ++i) |
| 8992 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8993 Screen_mco = p_mco; | |
| 7 | 8994 ScreenLines2 = new_ScreenLines2; |
| 8995 #endif | |
| 8996 ScreenAttrs = new_ScreenAttrs; | |
| 8997 LineOffset = new_LineOffset; | |
| 8998 LineWraps = new_LineWraps; | |
| 671 | 8999 TabPageIdxs = new_TabPageIdxs; |
| 7 | 9000 |
| 9001 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9002 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9003 #ifdef FEAT_GUI | |
| 9004 old_Rows = screen_Rows; | |
| 9005 #endif | |
| 9006 screen_Rows = Rows; | |
| 9007 screen_Columns = Columns; | |
| 9008 | |
| 9009 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9010 if (doclear) |
| 7 | 9011 screenclear2(); |
| 9012 | |
| 9013 #ifdef FEAT_GUI | |
| 9014 else if (gui.in_use | |
| 9015 && !gui.starting | |
| 9016 && ScreenLines != NULL | |
| 9017 && old_Rows != Rows) | |
| 9018 { | |
| 9019 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9020 /* | |
| 9021 * Adjust the position of the cursor, for when executing an external | |
| 9022 * command. | |
| 9023 */ | |
| 9024 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9025 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9026 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9027 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9028 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9029 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9030 } | |
| 9031 #endif | |
| 9032 | |
| 9033 entered = FALSE; | |
| 911 | 9034 --RedrawingDisabled; |
| 766 | 9035 |
| 1824 | 9036 /* |
| 9037 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9038 * in case applying autocommands always changes Rows or Columns. | |
| 9039 */ | |
| 9040 if (starting == 0 && ++retry_count <= 3) | |
| 9041 { | |
| 766 | 9042 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9043 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9044 * jump back to check if we need to allocate the screen again. */ | |
| 9045 goto retry; | |
| 9046 } | |
| 7 | 9047 } |
| 9048 | |
| 9049 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9050 free_screenlines(void) |
| 356 | 9051 { |
| 9052 #ifdef FEAT_MBYTE | |
| 714 | 9053 int i; |
| 9054 | |
| 356 | 9055 vim_free(ScreenLinesUC); |
| 714 | 9056 for (i = 0; i < Screen_mco; ++i) |
| 9057 vim_free(ScreenLinesC[i]); | |
| 356 | 9058 vim_free(ScreenLines2); |
| 9059 #endif | |
| 714 | 9060 vim_free(ScreenLines); |
| 356 | 9061 vim_free(ScreenAttrs); |
| 9062 vim_free(LineOffset); | |
| 9063 vim_free(LineWraps); | |
| 671 | 9064 vim_free(TabPageIdxs); |
| 356 | 9065 } |
| 9066 | |
| 9067 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9068 screenclear(void) |
| 7 | 9069 { |
| 9070 check_for_delay(FALSE); | |
| 9071 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9072 screenclear2(); /* clear the screen */ | |
| 9073 } | |
| 9074 | |
| 9075 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9076 screenclear2(void) |
| 7 | 9077 { |
| 9078 int i; | |
| 9079 | |
| 9080 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9081 #ifdef FEAT_GUI | |
| 9082 || (gui.in_use && gui.starting) | |
| 9083 #endif | |
| 9084 ) | |
| 9085 return; | |
| 9086 | |
| 9087 #ifdef FEAT_GUI | |
| 9088 if (!gui.in_use) | |
| 9089 #endif | |
| 9090 screen_attr = -1; /* force setting the Normal colors */ | |
| 9091 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9092 | |
| 9093 #ifdef FEAT_CLIPBOARD | |
| 9094 /* disable selection without redrawing it */ | |
| 9095 clip_scroll_selection(9999); | |
| 9096 #endif | |
| 9097 | |
| 9098 /* blank out ScreenLines */ | |
| 9099 for (i = 0; i < Rows; ++i) | |
| 9100 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9101 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9102 LineWraps[i] = FALSE; |
| 9103 } | |
| 9104 | |
| 9105 if (can_clear(T_CL)) | |
| 9106 { | |
| 9107 out_str(T_CL); /* clear the display */ | |
| 9108 clear_cmdline = FALSE; | |
| 644 | 9109 mode_displayed = FALSE; |
| 7 | 9110 } |
| 9111 else | |
| 9112 { | |
| 9113 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9114 for (i = 0; i < Rows; ++i) | |
| 9115 lineinvalid(LineOffset[i], (int)Columns); | |
| 9116 clear_cmdline = TRUE; | |
| 9117 } | |
| 9118 | |
| 9119 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9120 | |
| 9121 win_rest_invalid(firstwin); | |
| 9122 redraw_cmdline = TRUE; | |
| 673 | 9123 redraw_tabline = TRUE; |
| 7 | 9124 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9125 must_redraw = NOT_VALID; | |
| 9126 compute_cmdrow(); | |
| 9127 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9128 msg_col = 0; | |
| 9129 screen_start(); /* don't know where cursor is now */ | |
| 9130 msg_scrolled = 0; /* can't scroll back */ | |
| 9131 msg_didany = FALSE; | |
| 9132 msg_didout = FALSE; | |
| 9133 } | |
| 9134 | |
| 9135 /* | |
| 9136 * Clear one line in ScreenLines. | |
| 9137 */ | |
| 9138 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9139 lineclear(unsigned off, int width, int attr) |
| 7 | 9140 { |
| 9141 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9142 #ifdef FEAT_MBYTE | |
| 9143 if (enc_utf8) | |
| 9144 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9145 (size_t)width * sizeof(u8char_T)); | |
| 9146 #endif | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9147 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9148 } |
| 9149 | |
| 9150 /* | |
| 9151 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9152 * invalid value. | |
| 9153 */ | |
| 9154 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9155 lineinvalid(unsigned off, int width) |
| 7 | 9156 { |
| 9157 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9158 } | |
| 9159 | |
| 9160 /* | |
| 9161 * Copy part of a Screenline for vertically split window "wp". | |
| 9162 */ | |
| 9163 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9164 linecopy(int to, int from, win_T *wp) |
| 7 | 9165 { |
| 9166 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9167 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9168 | |
| 9169 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9170 wp->w_width * sizeof(schar_T)); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9171 #ifdef FEAT_MBYTE |
| 7 | 9172 if (enc_utf8) |
| 9173 { | |
| 714 | 9174 int i; |
| 9175 | |
| 7 | 9176 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9177 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9178 for (i = 0; i < p_mco; ++i) |
| 9179 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9180 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9181 } |
| 9182 if (enc_dbcs == DBCS_JPNU) | |
| 9183 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9184 wp->w_width * sizeof(schar_T)); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9185 #endif |
| 7 | 9186 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, |
| 9187 wp->w_width * sizeof(sattr_T)); | |
| 9188 } | |
| 9189 | |
| 9190 /* | |
| 9191 * Return TRUE if clearing with term string "p" would work. | |
| 9192 * It can't work when the string is empty or it won't set the right background. | |
| 9193 */ | |
| 9194 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9195 can_clear(char_u *p) |
| 7 | 9196 { |
| 9197 return (*p != NUL && (t_colors <= 1 | |
| 9198 #ifdef FEAT_GUI | |
| 9199 || gui.in_use | |
| 9200 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9201 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9202 || (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
|
9203 || (!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
|
9204 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9205 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9206 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9207 || *T_UT != NUL)); |
| 7 | 9208 } |
| 9209 | |
| 9210 /* | |
| 9211 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9212 * something directly to the screen (shell commands) or a terminal control | |
| 9213 * code. | |
| 9214 */ | |
| 9215 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9216 screen_start(void) |
| 7 | 9217 { |
| 9218 screen_cur_row = screen_cur_col = 9999; | |
| 9219 } | |
| 9220 | |
| 9221 /* | |
| 9222 * Move the cursor to position "row","col" in the screen. | |
| 9223 * This tries to find the most efficient way to move, minimizing the number of | |
| 9224 * characters sent to the terminal. | |
| 9225 */ | |
| 9226 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9227 windgoto(int row, int col) |
| 7 | 9228 { |
| 205 | 9229 sattr_T *p; |
| 7 | 9230 int i; |
| 9231 int plan; | |
| 9232 int cost; | |
| 9233 int wouldbe_col; | |
| 9234 int noinvcurs; | |
| 9235 char_u *bs; | |
| 9236 int goto_cost; | |
| 9237 int attr; | |
| 9238 | |
| 1213 | 9239 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9240 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9241 | |
| 9242 #define PLAN_LE 1 | |
| 9243 #define PLAN_CR 2 | |
| 9244 #define PLAN_NL 3 | |
| 9245 #define PLAN_WRITE 4 | |
| 9246 /* Can't use ScreenLines unless initialized */ | |
| 9247 if (ScreenLines == NULL) | |
| 9248 return; | |
| 9249 | |
| 9250 if (col != screen_cur_col || row != screen_cur_row) | |
| 9251 { | |
| 9252 /* Check for valid position. */ | |
| 9253 if (row < 0) /* window without text lines? */ | |
| 9254 row = 0; | |
| 9255 if (row >= screen_Rows) | |
| 9256 row = screen_Rows - 1; | |
| 9257 if (col >= screen_Columns) | |
| 9258 col = screen_Columns - 1; | |
| 9259 | |
| 9260 /* check if no cursor movement is allowed in highlight mode */ | |
| 9261 if (screen_attr && *T_MS == NUL) | |
| 9262 noinvcurs = HIGHL_COST; | |
| 9263 else | |
| 9264 noinvcurs = 0; | |
| 9265 goto_cost = GOTO_COST + noinvcurs; | |
| 9266 | |
| 9267 /* | |
| 9268 * Plan how to do the positioning: | |
| 9269 * 1. Use CR to move it to column 0, same row. | |
| 9270 * 2. Use T_LE to move it a few columns to the left. | |
| 9271 * 3. Use NL to move a few lines down, column 0. | |
| 9272 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9273 * | |
| 9274 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9275 * position is unknown then (some terminals wrap, some don't ) | |
| 9276 * | |
| 1213 | 9277 * First check if the highlighting attributes allow us to write |
| 7 | 9278 * characters to move the cursor to the right. |
| 9279 */ | |
| 9280 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9281 { | |
| 9282 /* | |
| 9283 * If the cursor is in the same row, bigger col, we can use CR | |
| 9284 * or T_LE. | |
| 9285 */ | |
| 9286 bs = NULL; /* init for GCC */ | |
| 9287 attr = screen_attr; | |
| 9288 if (row == screen_cur_row && col < screen_cur_col) | |
| 9289 { | |
| 9290 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9291 if (*T_LE) | |
| 9292 bs = T_LE; /* "cursor left" */ | |
| 9293 else | |
| 9294 bs = T_BC; /* "backspace character (old) */ | |
| 9295 if (*bs) | |
| 9296 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9297 else | |
| 9298 cost = 999; | |
| 9299 if (col + 1 < cost) /* using CR is less characters */ | |
| 9300 { | |
| 9301 plan = PLAN_CR; | |
| 9302 wouldbe_col = 0; | |
| 9303 cost = 1; /* CR is just one character */ | |
| 9304 } | |
| 9305 else | |
| 9306 { | |
| 9307 plan = PLAN_LE; | |
| 9308 wouldbe_col = col; | |
| 9309 } | |
| 9310 if (noinvcurs) /* will stop highlighting */ | |
| 9311 { | |
| 9312 cost += noinvcurs; | |
| 9313 attr = 0; | |
| 9314 } | |
| 9315 } | |
| 9316 | |
| 9317 /* | |
| 9318 * If the cursor is above where we want to be, we can use CR LF. | |
| 9319 */ | |
| 9320 else if (row > screen_cur_row) | |
| 9321 { | |
| 9322 plan = PLAN_NL; | |
| 9323 wouldbe_col = 0; | |
| 9324 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9325 if (noinvcurs) /* will stop highlighting */ | |
| 9326 { | |
| 9327 cost += noinvcurs; | |
| 9328 attr = 0; | |
| 9329 } | |
| 9330 } | |
| 9331 | |
| 9332 /* | |
| 9333 * If the cursor is in the same row, smaller col, just use write. | |
| 9334 */ | |
| 9335 else | |
| 9336 { | |
| 9337 plan = PLAN_WRITE; | |
| 9338 wouldbe_col = screen_cur_col; | |
| 9339 cost = 0; | |
| 9340 } | |
| 9341 | |
| 9342 /* | |
| 9343 * Check if any characters that need to be written have the | |
| 9344 * correct attributes. Also avoid UTF-8 characters. | |
| 9345 */ | |
| 9346 i = col - wouldbe_col; | |
| 9347 if (i > 0) | |
| 9348 cost += i; | |
| 9349 if (cost < goto_cost && i > 0) | |
| 9350 { | |
| 9351 /* | |
| 9352 * Check if the attributes are correct without additionally | |
| 9353 * stopping highlighting. | |
| 9354 */ | |
| 9355 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9356 while (i && *p++ == attr) | |
| 9357 --i; | |
| 9358 if (i != 0) | |
| 9359 { | |
| 9360 /* | |
| 9361 * Try if it works when highlighting is stopped here. | |
| 9362 */ | |
| 9363 if (*--p == 0) | |
| 9364 { | |
| 9365 cost += noinvcurs; | |
| 9366 while (i && *p++ == 0) | |
| 9367 --i; | |
| 9368 } | |
| 9369 if (i != 0) | |
| 9370 cost = 999; /* different attributes, don't do it */ | |
| 9371 } | |
| 9372 #ifdef FEAT_MBYTE | |
| 9373 if (enc_utf8) | |
| 9374 { | |
| 9375 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9376 for (i = wouldbe_col; i < col; ++i) | |
| 9377 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9378 { | |
| 9379 cost = 999; | |
| 9380 break; | |
| 9381 } | |
| 9382 } | |
| 9383 #endif | |
| 9384 } | |
| 9385 | |
| 9386 /* | |
| 9387 * We can do it without term_windgoto()! | |
| 9388 */ | |
| 9389 if (cost < goto_cost) | |
| 9390 { | |
| 9391 if (plan == PLAN_LE) | |
| 9392 { | |
| 9393 if (noinvcurs) | |
| 9394 screen_stop_highlight(); | |
| 9395 while (screen_cur_col > col) | |
| 9396 { | |
| 9397 out_str(bs); | |
| 9398 --screen_cur_col; | |
| 9399 } | |
| 9400 } | |
| 9401 else if (plan == PLAN_CR) | |
| 9402 { | |
| 9403 if (noinvcurs) | |
| 9404 screen_stop_highlight(); | |
| 9405 out_char('\r'); | |
| 9406 screen_cur_col = 0; | |
| 9407 } | |
| 9408 else if (plan == PLAN_NL) | |
| 9409 { | |
| 9410 if (noinvcurs) | |
| 9411 screen_stop_highlight(); | |
| 9412 while (screen_cur_row < row) | |
| 9413 { | |
| 9414 out_char('\n'); | |
| 9415 ++screen_cur_row; | |
| 9416 } | |
| 9417 screen_cur_col = 0; | |
| 9418 } | |
| 9419 | |
| 9420 i = col - screen_cur_col; | |
| 9421 if (i > 0) | |
| 9422 { | |
| 9423 /* | |
| 9424 * Use cursor-right if it's one character only. Avoids | |
| 9425 * removing a line of pixels from the last bold char, when | |
| 9426 * using the bold trick in the GUI. | |
| 9427 */ | |
| 9428 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9429 { | |
| 9430 while (i-- > 0) | |
| 9431 out_char(*T_ND); | |
| 9432 } | |
| 9433 else | |
| 9434 { | |
| 9435 int off; | |
| 9436 | |
| 9437 off = LineOffset[row] + screen_cur_col; | |
| 9438 while (i-- > 0) | |
| 9439 { | |
| 9440 if (ScreenAttrs[off] != screen_attr) | |
| 9441 screen_stop_highlight(); | |
| 9442 #ifdef FEAT_MBYTE | |
| 9443 out_flush_check(); | |
| 9444 #endif | |
| 9445 out_char(ScreenLines[off]); | |
| 9446 #ifdef FEAT_MBYTE | |
| 9447 if (enc_dbcs == DBCS_JPNU | |
| 9448 && ScreenLines[off] == 0x8e) | |
| 9449 out_char(ScreenLines2[off]); | |
| 9450 #endif | |
| 9451 ++off; | |
| 9452 } | |
| 9453 } | |
| 9454 } | |
| 9455 } | |
| 9456 } | |
| 9457 else | |
| 9458 cost = 999; | |
| 9459 | |
| 9460 if (cost >= goto_cost) | |
| 9461 { | |
| 9462 if (noinvcurs) | |
| 9463 screen_stop_highlight(); | |
| 5995 | 9464 if (row == screen_cur_row && (col > screen_cur_col) |
| 9465 && *T_CRI != NUL) | |
| 7 | 9466 term_cursor_right(col - screen_cur_col); |
| 9467 else | |
| 9468 term_windgoto(row, col); | |
| 9469 } | |
| 9470 screen_cur_row = row; | |
| 9471 screen_cur_col = col; | |
| 9472 } | |
| 9473 } | |
| 9474 | |
| 9475 /* | |
| 9476 * Set cursor to its position in the current window. | |
| 9477 */ | |
| 9478 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9479 setcursor(void) |
| 7 | 9480 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9481 setcursor_mayforce(FALSE); |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9482 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9483 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9484 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9485 * Set cursor to its position in the current window. |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9486 * When "force" is TRUE also when not redrawing. |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9487 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9488 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9489 setcursor_mayforce(int force) |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9490 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9491 if (force || redrawing()) |
| 7 | 9492 { |
| 9493 validate_cursor(); | |
| 9494 windgoto(W_WINROW(curwin) + curwin->w_wrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9495 curwin->w_wincol + ( |
| 7 | 9496 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9497 /* With 'rightleft' set and the cursor on a double-wide |
| 9498 * character, position it on the leftmost column. */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9499 curwin->w_p_rl ? ((int)curwin->w_width - curwin->w_wcol - ( |
| 7 | 9500 # ifdef FEAT_MBYTE |
| 1545 | 9501 (has_mbyte |
| 9502 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9503 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9504 # endif |
| 9505 1)) : | |
| 9506 #endif | |
| 9507 curwin->w_wcol)); | |
| 9508 } | |
| 9509 } | |
| 9510 | |
| 9511 | |
| 9512 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9513 * Insert 'line_count' lines at 'row' in window 'wp'. |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9514 * If 'invalid' is TRUE the wp->w_lines[].wl_lnum is invalidated. |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9515 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9516 * scrolling. |
| 9517 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9518 */ | |
| 9519 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9520 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9521 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9522 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9523 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9524 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9525 int mayclear) |
| 7 | 9526 { |
| 9527 int did_delete; | |
| 9528 int nextrow; | |
| 9529 int lastrow; | |
| 9530 int retval; | |
| 9531 | |
| 9532 if (invalid) | |
| 9533 wp->w_lines_valid = 0; | |
| 9534 | |
| 9535 if (wp->w_height < 5) | |
| 9536 return FAIL; | |
| 9537 | |
| 9538 if (line_count > wp->w_height - row) | |
| 9539 line_count = wp->w_height - row; | |
| 9540 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9541 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9542 if (retval != MAYBE) |
| 9543 return retval; | |
| 9544 | |
| 9545 /* | |
| 9546 * If there is a next window or a status line, we first try to delete the | |
| 9547 * lines at the bottom to avoid messing what is after the window. | |
| 9548 * If this fails and there are following windows, don't do anything to avoid | |
| 9549 * messing up those windows, better just redraw. | |
| 9550 */ | |
| 9551 did_delete = FALSE; | |
| 9552 if (wp->w_next != NULL || wp->w_status_height) | |
| 9553 { | |
| 9554 if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9555 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9556 did_delete = TRUE; |
| 9557 else if (wp->w_next) | |
| 9558 return FAIL; | |
| 9559 } | |
| 9560 /* | |
| 9561 * if no lines deleted, blank the lines that will end up below the window | |
| 9562 */ | |
| 9563 if (!did_delete) | |
| 9564 { | |
| 9565 wp->w_redr_status = TRUE; | |
| 9566 redraw_cmdline = TRUE; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
9567 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9568 lastrow = nextrow + line_count; |
| 9569 if (lastrow > Rows) | |
| 9570 lastrow = Rows; | |
| 9571 screen_fill(nextrow - line_count, lastrow - line_count, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9572 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9573 ' ', ' ', 0); |
| 9574 } | |
| 9575 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9576 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9577 == FAIL) |
| 9578 { | |
| 9579 /* deletion will have messed up other windows */ | |
| 9580 if (did_delete) | |
| 9581 { | |
| 9582 wp->w_redr_status = TRUE; | |
| 9583 win_rest_invalid(W_NEXT(wp)); | |
| 9584 } | |
| 9585 return FAIL; | |
| 9586 } | |
| 9587 | |
| 9588 return OK; | |
| 9589 } | |
| 9590 | |
| 9591 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9592 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9593 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9594 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9595 * scrolling | |
| 9596 * Return OK for success, FAIL if the lines are not deleted. | |
| 9597 */ | |
| 9598 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9599 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9600 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9601 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9602 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9603 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9604 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9605 int clear_attr) /* for clearing lines */ |
| 7 | 9606 { |
| 9607 int retval; | |
| 9608 | |
| 9609 if (invalid) | |
| 9610 wp->w_lines_valid = 0; | |
| 9611 | |
| 9612 if (line_count > wp->w_height - row) | |
| 9613 line_count = wp->w_height - row; | |
| 9614 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9615 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9616 if (retval != MAYBE) |
| 9617 return retval; | |
| 9618 | |
| 9619 if (screen_del_lines(0, W_WINROW(wp) + row, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9620 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9621 return FAIL; |
| 9622 | |
| 9623 /* | |
| 9624 * If there are windows or status lines below, try to put them at the | |
| 9625 * correct place. If we can't do that, they have to be redrawn. | |
| 9626 */ | |
| 9627 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9628 { | |
| 9629 if (screen_ins_lines(0, W_WINROW(wp) + wp->w_height - line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9630 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9631 { |
| 9632 wp->w_redr_status = TRUE; | |
| 9633 win_rest_invalid(wp->w_next); | |
| 9634 } | |
| 9635 } | |
| 9636 /* | |
| 9637 * If this is the last window and there is no status line, redraw the | |
| 9638 * command line later. | |
| 9639 */ | |
| 9640 else | |
| 9641 redraw_cmdline = TRUE; | |
| 9642 return OK; | |
| 9643 } | |
| 9644 | |
| 9645 /* | |
| 9646 * Common code for win_ins_lines() and win_del_lines(). | |
| 9647 * Returns OK or FAIL when the work has been done. | |
| 9648 * Returns MAYBE when not finished yet. | |
| 9649 */ | |
| 9650 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9651 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9652 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9653 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9654 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9655 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9656 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9657 int clear_attr) |
| 7 | 9658 { |
| 9659 int retval; | |
| 9660 | |
| 9661 if (!redrawing() || line_count <= 0) | |
| 9662 return FAIL; | |
| 9663 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9664 /* When inserting lines would result in loss of command output, just redraw |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9665 * the lines. */ |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9666 if (no_win_do_lines_ins && !del) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9667 return FAIL; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9668 |
| 7 | 9669 /* only a few lines left: redraw is faster */ |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9670 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9671 { |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9672 if (!no_win_do_lines_ins) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9673 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9674 return FAIL; |
| 9675 } | |
| 9676 | |
| 9677 /* | |
| 9678 * Delete all remaining lines | |
| 9679 */ | |
| 9680 if (row + line_count >= wp->w_height) | |
| 9681 { | |
| 9682 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
9683 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9684 ' ', ' ', 0); |
| 9685 return OK; | |
| 9686 } | |
| 9687 | |
| 9688 /* | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9689 * When scrolling, the message on the command line should be cleared, |
| 7 | 9690 * otherwise it will stay there forever. |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9691 * Don't do this when avoiding to insert lines. |
| 7 | 9692 */ |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9693 if (!no_win_do_lines_ins) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9694 clear_cmdline = TRUE; |
| 7 | 9695 |
| 9696 /* | |
| 9697 * If the terminal can set a scroll region, use that. | |
| 9698 * Always do this in a vertically split window. This will redraw from | |
| 9699 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9700 * win_line(). | |
| 9701 * 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
|
9702 * 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
|
9703 * scroll-up . |
| 7 | 9704 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9705 if (scroll_region || wp->w_width != Columns) |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9706 { |
| 7 | 9707 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9708 scroll_region_set(wp, row); | |
| 9709 if (del) | |
| 9710 retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9711 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9712 else |
| 9713 retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9714 wp->w_height - row, clear_attr, wp); |
| 7 | 9715 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9716 scroll_region_reset(); | |
| 9717 return retval; | |
| 9718 } | |
| 9719 | |
| 9720 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9721 return FAIL; | |
| 9722 | |
| 9723 return MAYBE; | |
| 9724 } | |
| 9725 | |
| 9726 /* | |
| 9727 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9728 */ | |
| 9729 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9730 win_rest_invalid(win_T *wp) |
| 7 | 9731 { |
| 9732 while (wp != NULL) | |
| 9733 { | |
| 9734 redraw_win_later(wp, NOT_VALID); | |
| 9735 wp->w_redr_status = TRUE; | |
| 9736 wp = wp->w_next; | |
| 9737 } | |
| 9738 redraw_cmdline = TRUE; | |
| 9739 } | |
| 9740 | |
| 9741 /* | |
| 9742 * The rest of the routines in this file perform screen manipulations. The | |
| 9743 * given operation is performed physically on the screen. The corresponding | |
| 9744 * change is also made to the internal screen image. In this way, the editor | |
| 9745 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9746 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9747 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9748 * screen changes, and in the meantime, everything still works. | |
| 9749 */ | |
| 9750 | |
| 9751 /* | |
| 9752 * types for inserting or deleting lines | |
| 9753 */ | |
| 9754 #define USE_T_CAL 1 | |
| 9755 #define USE_T_CDL 2 | |
| 9756 #define USE_T_AL 3 | |
| 9757 #define USE_T_CE 4 | |
| 9758 #define USE_T_DL 5 | |
| 9759 #define USE_T_SR 6 | |
| 9760 #define USE_NL 7 | |
| 9761 #define USE_T_CD 8 | |
| 9762 #define USE_REDRAW 9 | |
| 9763 | |
| 9764 /* | |
| 9765 * insert lines on the screen and update ScreenLines[] | |
| 9766 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9767 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9768 * 'row' and 'end' are relative to the start of the region. | |
| 9769 * | |
| 9770 * return FAIL for failure, OK for success. | |
| 9771 */ | |
| 446 | 9772 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9773 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9774 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9775 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9776 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9777 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9778 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9779 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9780 { |
| 9781 int i; | |
| 9782 int j; | |
| 9783 unsigned temp; | |
| 9784 int cursor_row; | |
| 9785 int type; | |
| 9786 int result_empty; | |
| 9787 int can_ce = can_clear(T_CE); | |
| 9788 | |
| 9789 /* | |
| 9790 * FAIL if | |
| 9791 * - there is no valid screen | |
| 9792 * - the screen has to be redrawn completely | |
| 9793 * - the line count is less than one | |
| 9794 * - the line count is more than 'ttyscroll' | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9795 * - redrawing for a callback and there is a modeless selection |
| 7 | 9796 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9797 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9798 #ifdef FEAT_CLIPBOARD |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9799 || (clip_star.state != SELECT_CLEARED |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9800 && redrawing_for_callback > 0) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9801 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9802 ) |
| 7 | 9803 return FAIL; |
| 9804 | |
| 9805 /* | |
| 9806 * There are seven ways to insert lines: | |
| 9807 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9808 * characters from ScreenLines[]. | |
| 9809 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9810 * the insert is just empty lines | |
| 9811 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9812 * present or line_count > 1. It looks better if we do all the inserts | |
| 9813 * at once. | |
| 9814 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9815 * insert is just empty lines and T_CE is not present or line_count > | |
| 9816 * 1. | |
| 9817 * 4. Use T_AL (insert line) if it exists. | |
| 9818 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9819 * just empty lines. | |
| 9820 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9821 * just empty lines. | |
| 9822 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9823 * the 'da' flag is not set or we have clear line capability. | |
| 9824 * 8. redraw the characters from ScreenLines[]. | |
| 9825 * | |
| 9826 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9827 * the scrollbar for the window. It does have insert line, use that if it | |
| 9828 * exists. | |
| 9829 */ | |
| 9830 result_empty = (row + line_count >= end); | |
| 9831 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9832 type = USE_REDRAW; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9833 else if (can_clear(T_CD) && result_empty) |
| 7 | 9834 type = USE_T_CD; |
| 9835 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9836 type = USE_T_CAL; | |
| 9837 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9838 type = USE_T_CDL; | |
| 9839 else if (*T_AL != NUL) | |
| 9840 type = USE_T_AL; | |
| 9841 else if (can_ce && result_empty) | |
| 9842 type = USE_T_CE; | |
| 9843 else if (*T_DL != NUL && result_empty) | |
| 9844 type = USE_T_DL; | |
| 9845 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9846 type = USE_T_SR; | |
| 9847 else | |
| 9848 return FAIL; | |
| 9849 | |
| 9850 /* | |
| 9851 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9852 * care of t_db if necessary. | |
| 9853 */ | |
| 9854 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9855 type == USE_T_CE || type == USE_T_DL) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9856 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9857 |
| 9858 /* | |
| 9859 * If text is retained below the screen, first clear or delete as many | |
| 9860 * lines at the bottom of the window as are about to be inserted so that | |
| 9861 * the deleted lines won't later surface during a screen_del_lines. | |
| 9862 */ | |
| 9863 if (*T_DB) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9864 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9865 |
| 9866 #ifdef FEAT_CLIPBOARD | |
| 9867 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9868 * or not the full width of the screen. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9869 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9870 clip_clear_selection(&clip_star); |
| 7 | 9871 else |
| 9872 clip_scroll_selection(-line_count); | |
| 9873 #endif | |
| 9874 | |
| 9875 #ifdef FEAT_GUI | |
| 9876 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9877 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9878 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9879 #endif |
| 9880 | |
| 9881 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9882 cursor_row = row; | |
| 9883 else | |
| 9884 cursor_row = row + off; | |
| 9885 | |
| 9886 /* | |
| 9887 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9888 * Clear the inserted lines in ScreenLines[]. | |
| 9889 */ | |
| 9890 row += off; | |
| 9891 end += off; | |
| 9892 for (i = 0; i < line_count; ++i) | |
| 9893 { | |
| 9894 if (wp != NULL && wp->w_width != Columns) | |
| 9895 { | |
| 9896 /* need to copy part of a line */ | |
| 9897 j = end - 1 - i; | |
| 9898 while ((j -= line_count) >= row) | |
| 9899 linecopy(j + line_count, j, wp); | |
| 9900 j += line_count; | |
| 9901 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9902 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9903 clear_attr); |
| 7 | 9904 else |
| 9905 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9906 LineWraps[j] = FALSE; | |
| 9907 } | |
| 9908 else | |
| 9909 { | |
| 9910 j = end - 1 - i; | |
| 9911 temp = LineOffset[j]; | |
| 9912 while ((j -= line_count) >= row) | |
| 9913 { | |
| 9914 LineOffset[j + line_count] = LineOffset[j]; | |
| 9915 LineWraps[j + line_count] = LineWraps[j]; | |
| 9916 } | |
| 9917 LineOffset[j + line_count] = temp; | |
| 9918 LineWraps[j + line_count] = FALSE; | |
| 9919 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9920 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9921 else |
| 9922 lineinvalid(temp, (int)Columns); | |
| 9923 } | |
| 9924 } | |
| 9925 | |
| 9926 screen_stop_highlight(); | |
| 9927 windgoto(cursor_row, 0); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9928 if (clear_attr != 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9929 screen_start_highlight(clear_attr); |
| 7 | 9930 |
| 9931 /* redraw the characters */ | |
| 9932 if (type == USE_REDRAW) | |
| 9933 redraw_block(row, end, wp); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
9934 else if (type == USE_T_CAL) |
| 7 | 9935 { |
| 9936 term_append_lines(line_count); | |
| 9937 screen_start(); /* don't know where cursor is now */ | |
| 9938 } | |
| 9939 else | |
| 9940 { | |
| 9941 for (i = 0; i < line_count; i++) | |
| 9942 { | |
| 9943 if (type == USE_T_AL) | |
| 9944 { | |
| 9945 if (i && cursor_row != 0) | |
| 9946 windgoto(cursor_row, 0); | |
| 9947 out_str(T_AL); | |
| 9948 } | |
| 9949 else /* type == USE_T_SR */ | |
| 9950 out_str(T_SR); | |
| 9951 screen_start(); /* don't know where cursor is now */ | |
| 9952 } | |
| 9953 } | |
| 9954 | |
| 9955 /* | |
| 9956 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9957 * have been scrolled down into the region. | |
| 9958 */ | |
| 9959 if (type == USE_T_SR && *T_DA) | |
| 9960 { | |
| 9961 for (i = 0; i < line_count; ++i) | |
| 9962 { | |
| 9963 windgoto(off + i, 0); | |
| 9964 out_str(T_CE); | |
| 9965 screen_start(); /* don't know where cursor is now */ | |
| 9966 } | |
| 9967 } | |
| 9968 | |
| 9969 #ifdef FEAT_GUI | |
| 9970 gui_can_update_cursor(); | |
| 9971 if (gui.in_use) | |
| 9972 out_flush(); /* always flush after a scroll */ | |
| 9973 #endif | |
| 9974 return OK; | |
| 9975 } | |
| 9976 | |
| 9977 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9978 * 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
|
9979 * "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
|
9980 * 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
|
9981 * "row" and "end" are relative to the start of the region. |
| 7 | 9982 * |
| 9983 * Return OK for success, FAIL if the lines are not deleted. | |
| 9984 */ | |
| 9985 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9986 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9987 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9988 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9989 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9990 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9991 int force, /* even when line_count > p_ttyscroll */ |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9992 int clear_attr, /* used for clearing lines */ |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9993 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9994 { |
| 9995 int j; | |
| 9996 int i; | |
| 9997 unsigned temp; | |
| 9998 int cursor_row; | |
| 9999 int cursor_end; | |
| 10000 int result_empty; /* result is empty until end of region */ | |
| 10001 int can_delete; /* deleting line codes can be used */ | |
| 10002 int type; | |
| 10003 | |
| 10004 /* | |
| 10005 * FAIL if | |
| 10006 * - there is no valid screen | |
| 10007 * - the screen has to be redrawn completely | |
| 10008 * - the line count is less than one | |
| 10009 * - the line count is more than 'ttyscroll' | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10010 * - redrawing for a callback and there is a modeless selection |
| 7 | 10011 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10012 if (!screen_valid(TRUE) || line_count <= 0 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10013 || (!force && line_count > p_ttyscroll) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10014 #ifdef FEAT_CLIPBOARD |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10015 || (clip_star.state != SELECT_CLEARED |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10016 && redrawing_for_callback > 0) |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10017 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10018 ) |
| 7 | 10019 return FAIL; |
| 10020 | |
| 10021 /* | |
| 10022 * Check if the rest of the current region will become empty. | |
| 10023 */ | |
| 10024 result_empty = row + line_count >= end; | |
| 10025 | |
| 10026 /* | |
| 10027 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10028 * available. | |
| 10029 */ | |
| 10030 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10031 | |
| 10032 /* | |
| 10033 * There are six ways to delete lines: | |
| 10034 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10035 * characters from ScreenLines[]. | |
| 10036 * 1. Use T_CD if it exists and the result is empty. | |
| 10037 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10038 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10039 * none of the other ways work. | |
| 10040 * 4. Use T_CE (erase line) if the result is empty. | |
| 10041 * 5. Use T_DL (delete line) if it exists. | |
| 10042 * 6. redraw the characters from ScreenLines[]. | |
| 10043 */ | |
| 10044 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10045 type = USE_REDRAW; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10046 else if (can_clear(T_CD) && result_empty) |
| 7 | 10047 type = USE_T_CD; |
| 10048 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10049 /* | |
| 10050 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10051 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10052 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10053 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10054 * the trick... | |
| 10055 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10056 * (Olaf Seibert) | |
| 10057 */ | |
| 10058 else if (row == 0 && T_DB == empty_option | |
| 10059 && (line_count == 1 || *T_CDL == NUL)) | |
| 10060 #else | |
| 10061 else if (row == 0 && ( | |
| 10062 #ifndef AMIGA | |
| 10063 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10064 * up, so use delete-line command */ | |
| 10065 line_count == 1 || | |
| 10066 #endif | |
| 10067 *T_CDL == NUL)) | |
| 10068 #endif | |
| 10069 type = USE_NL; | |
| 10070 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10071 type = USE_T_CDL; | |
| 10072 else if (can_clear(T_CE) && result_empty | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10073 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10074 type = USE_T_CE; |
| 10075 else if (*T_DL != NUL && can_delete) | |
| 10076 type = USE_T_DL; | |
| 10077 else if (*T_CDL != NUL && can_delete) | |
| 10078 type = USE_T_CDL; | |
| 10079 else | |
| 10080 return FAIL; | |
| 10081 | |
| 10082 #ifdef FEAT_CLIPBOARD | |
| 10083 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10084 * not the full width of the screen. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10085 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10086 clip_clear_selection(&clip_star); |
| 7 | 10087 else |
| 10088 clip_scroll_selection(line_count); | |
| 10089 #endif | |
| 10090 | |
| 10091 #ifdef FEAT_GUI | |
| 10092 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10093 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10094 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
|
10095 && gui.cursor_row < end + off); |
| 7 | 10096 #endif |
| 10097 | |
| 10098 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 10099 { | |
| 10100 cursor_row = row; | |
| 10101 cursor_end = end; | |
| 10102 } | |
| 10103 else | |
| 10104 { | |
| 10105 cursor_row = row + off; | |
| 10106 cursor_end = end + off; | |
| 10107 } | |
| 10108 | |
| 10109 /* | |
| 10110 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10111 * Clear the inserted lines in ScreenLines[]. | |
| 10112 */ | |
| 10113 row += off; | |
| 10114 end += off; | |
| 10115 for (i = 0; i < line_count; ++i) | |
| 10116 { | |
| 10117 if (wp != NULL && wp->w_width != Columns) | |
| 10118 { | |
| 10119 /* need to copy part of a line */ | |
| 10120 j = row + i; | |
| 10121 while ((j += line_count) <= end - 1) | |
| 10122 linecopy(j - line_count, j, wp); | |
| 10123 j -= line_count; | |
| 10124 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10125 lineclear(LineOffset[j] + wp->w_wincol, wp->w_width, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10126 clear_attr); |
| 7 | 10127 else |
| 10128 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10129 LineWraps[j] = FALSE; | |
| 10130 } | |
| 10131 else | |
| 10132 { | |
| 10133 /* whole width, moving the line pointers is faster */ | |
| 10134 j = row + i; | |
| 10135 temp = LineOffset[j]; | |
| 10136 while ((j += line_count) <= end - 1) | |
| 10137 { | |
| 10138 LineOffset[j - line_count] = LineOffset[j]; | |
| 10139 LineWraps[j - line_count] = LineWraps[j]; | |
| 10140 } | |
| 10141 LineOffset[j - line_count] = temp; | |
| 10142 LineWraps[j - line_count] = FALSE; | |
| 10143 if (can_clear((char_u *)" ")) | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10144 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10145 else |
| 10146 lineinvalid(temp, (int)Columns); | |
| 10147 } | |
| 10148 } | |
| 10149 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10150 if (screen_attr != clear_attr) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10151 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10152 if (clear_attr != 0) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10153 screen_start_highlight(clear_attr); |
| 7 | 10154 |
| 10155 /* redraw the characters */ | |
| 10156 if (type == USE_REDRAW) | |
| 10157 redraw_block(row, end, wp); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10158 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10159 { |
| 10160 windgoto(cursor_row, 0); | |
| 10161 out_str(T_CD); | |
| 10162 screen_start(); /* don't know where cursor is now */ | |
| 10163 } | |
| 10164 else if (type == USE_T_CDL) | |
| 10165 { | |
| 10166 windgoto(cursor_row, 0); | |
| 10167 term_delete_lines(line_count); | |
| 10168 screen_start(); /* don't know where cursor is now */ | |
| 10169 } | |
| 10170 /* | |
| 10171 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10172 * the whole screen (scroll region) up by outputting newlines on the | |
| 10173 * last line. | |
| 10174 */ | |
| 10175 else if (type == USE_NL) | |
| 10176 { | |
| 10177 windgoto(cursor_end - 1, 0); | |
| 10178 for (i = line_count; --i >= 0; ) | |
| 10179 out_char('\n'); /* cursor will remain on same line */ | |
| 10180 } | |
| 10181 else | |
| 10182 { | |
| 10183 for (i = line_count; --i >= 0; ) | |
| 10184 { | |
| 10185 if (type == USE_T_DL) | |
| 10186 { | |
| 10187 windgoto(cursor_row, 0); | |
| 10188 out_str(T_DL); /* delete a line */ | |
| 10189 } | |
| 10190 else /* type == USE_T_CE */ | |
| 10191 { | |
| 10192 windgoto(cursor_row + i, 0); | |
| 10193 out_str(T_CE); /* erase a line */ | |
| 10194 } | |
| 10195 screen_start(); /* don't know where cursor is now */ | |
| 10196 } | |
| 10197 } | |
| 10198 | |
| 10199 /* | |
| 10200 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10201 * scrolled up at the bottom of the region. | |
| 10202 */ | |
| 10203 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10204 { | |
| 10205 for (i = line_count; i > 0; --i) | |
| 10206 { | |
| 10207 windgoto(cursor_end - i, 0); | |
| 10208 out_str(T_CE); /* erase a line */ | |
| 10209 screen_start(); /* don't know where cursor is now */ | |
| 10210 } | |
| 10211 } | |
| 10212 | |
| 10213 #ifdef FEAT_GUI | |
| 10214 gui_can_update_cursor(); | |
| 10215 if (gui.in_use) | |
| 10216 out_flush(); /* always flush after a scroll */ | |
| 10217 #endif | |
| 10218 | |
| 10219 return OK; | |
| 10220 } | |
| 10221 | |
| 10222 /* | |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10223 * Show the current mode and ruler. |
| 7 | 10224 * |
| 10225 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10226 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10227 * cleared only if a mode is shown. | |
| 10228 * Return the length of the message (0 if no message). | |
| 10229 */ | |
| 10230 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10231 showmode(void) |
| 7 | 10232 { |
| 10233 int need_clear; | |
| 10234 int length = 0; | |
| 10235 int do_mode; | |
| 10236 int attr; | |
| 10237 int nwr_save; | |
| 10238 #ifdef FEAT_INS_EXPAND | |
| 10239 int sub_attr; | |
| 10240 #endif | |
| 10241 | |
| 642 | 10242 do_mode = ((p_smd && msg_silent == 0) |
| 10243 && ((State & INSERT) | |
| 10244 || restart_edit | |
| 5735 | 10245 || VIsual_active)); |
| 7 | 10246 if (do_mode || Recording) |
| 10247 { | |
| 10248 /* | |
| 10249 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10250 * Call char_avail() only when we are going to show something, because | |
| 10251 * it takes a bit of time. | |
| 10252 */ | |
| 10253 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10254 { | |
| 10255 redraw_cmdline = TRUE; /* show mode later */ | |
| 10256 return 0; | |
| 10257 } | |
| 10258 | |
| 10259 nwr_save = need_wait_return; | |
| 10260 | |
| 10261 /* wait a bit before overwriting an important message */ | |
| 10262 check_for_delay(FALSE); | |
| 10263 | |
| 10264 /* if the cmdline is more than one line high, erase top lines */ | |
| 10265 need_clear = clear_cmdline; | |
| 10266 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10267 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10268 | |
| 10269 /* Position on the last line in the window, column 0 */ | |
| 10270 msg_pos_mode(); | |
| 10271 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10272 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10273 if (do_mode) |
| 10274 { | |
| 10275 MSG_PUTS_ATTR("--", attr); | |
| 10276 #if defined(FEAT_XIM) | |
| 2520 | 10277 if ( |
| 10278 # ifdef FEAT_GUI_GTK | |
| 10279 preedit_get_status() | |
| 1668 | 10280 # else |
| 10281 im_get_status() | |
| 2520 | 10282 # endif |
| 1668 | 10283 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10284 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10285 MSG_PUTS_ATTR(" IM", attr); |
| 10286 # else | |
| 10287 MSG_PUTS_ATTR(" XIM", attr); | |
| 10288 # endif | |
| 10289 #endif | |
| 10290 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10291 if (gui.in_use) | |
| 10292 { | |
| 10293 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10294 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10295 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10296 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10297 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
|
10298 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10299 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
|
10300 } |
| 7 | 10301 } |
| 10302 #endif | |
| 10303 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10304 /* CTRL-X in Insert mode */ |
| 10305 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10306 { |
| 10307 /* These messages can get long, avoid a wrap in a narrow | |
| 10308 * window. Prefer showing edit_submode_extra. */ | |
| 10309 length = (Rows - msg_row) * Columns - 3; | |
| 10310 if (edit_submode_extra != NULL) | |
| 10311 length -= vim_strsize(edit_submode_extra); | |
| 10312 if (length > 0) | |
| 10313 { | |
| 10314 if (edit_submode_pre != NULL) | |
| 10315 length -= vim_strsize(edit_submode_pre); | |
| 10316 if (length - vim_strsize(edit_submode) > 0) | |
| 10317 { | |
| 10318 if (edit_submode_pre != NULL) | |
| 10319 msg_puts_attr(edit_submode_pre, attr); | |
| 10320 msg_puts_attr(edit_submode, attr); | |
| 10321 } | |
| 10322 if (edit_submode_extra != NULL) | |
| 10323 { | |
| 10324 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10325 if ((int)edit_submode_highl < (int)HLF_COUNT) | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10326 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10327 else |
| 10328 sub_attr = attr; | |
| 10329 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10330 } | |
| 10331 } | |
| 10332 } | |
| 10333 else | |
| 10334 #endif | |
| 10335 { | |
| 10336 #ifdef FEAT_VREPLACE | |
| 10337 if (State & VREPLACE_FLAG) | |
| 10338 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10339 else | |
| 10340 #endif | |
| 10341 if (State & REPLACE_FLAG) | |
| 10342 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10343 else if (State & INSERT) | |
| 10344 { | |
| 10345 #ifdef FEAT_RIGHTLEFT | |
| 10346 if (p_ri) | |
| 10347 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10348 #endif | |
| 10349 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10350 } | |
| 10351 else if (restart_edit == 'I') | |
| 10352 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10353 else if (restart_edit == 'R') | |
| 10354 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10355 else if (restart_edit == 'V') | |
| 10356 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10357 #ifdef FEAT_RIGHTLEFT | |
| 10358 if (p_hkmap) | |
| 10359 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10360 # ifdef FEAT_FKMAP | |
| 10361 if (p_fkmap) | |
| 10362 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10363 # endif | |
| 10364 #endif | |
| 10365 #ifdef FEAT_KEYMAP | |
| 10366 if (State & LANGMAP) | |
| 10367 { | |
| 10368 # ifdef FEAT_ARABIC | |
| 10369 if (curwin->w_p_arab) | |
| 10370 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10371 else | |
| 10372 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10373 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
|
10374 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10375 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10376 } |
| 10377 #endif | |
| 10378 if ((State & INSERT) && p_paste) | |
| 10379 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10380 | |
| 10381 if (VIsual_active) | |
| 10382 { | |
| 10383 char *p; | |
| 10384 | |
| 10385 /* Don't concatenate separate words to avoid translation | |
| 10386 * problems. */ | |
| 10387 switch ((VIsual_select ? 4 : 0) | |
| 10388 + (VIsual_mode == Ctrl_V) * 2 | |
| 10389 + (VIsual_mode == 'V')) | |
| 10390 { | |
| 10391 case 0: p = N_(" VISUAL"); break; | |
| 10392 case 1: p = N_(" VISUAL LINE"); break; | |
| 10393 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10394 case 4: p = N_(" SELECT"); break; | |
| 10395 case 5: p = N_(" SELECT LINE"); break; | |
| 10396 default: p = N_(" SELECT BLOCK"); break; | |
| 10397 } | |
| 10398 MSG_PUTS_ATTR(_(p), attr); | |
| 10399 } | |
| 10400 MSG_PUTS_ATTR(" --", attr); | |
| 10401 } | |
| 644 | 10402 |
| 7 | 10403 need_clear = TRUE; |
| 10404 } | |
| 10405 if (Recording | |
| 10406 #ifdef FEAT_INS_EXPAND | |
| 10407 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10408 #endif | |
| 10409 ) | |
| 10410 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10411 recording_mode(attr); |
| 7 | 10412 need_clear = TRUE; |
| 10413 } | |
| 644 | 10414 |
| 10415 mode_displayed = TRUE; | |
| 7 | 10416 if (need_clear || clear_cmdline) |
| 10417 msg_clr_eos(); | |
| 10418 msg_didout = FALSE; /* overwrite this message */ | |
| 10419 length = msg_col; | |
| 10420 msg_col = 0; | |
| 10421 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10422 } | |
| 10423 else if (clear_cmdline && msg_silent == 0) | |
| 10424 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10425 msg_clr_cmdline(); | |
| 10426 | |
| 10427 #ifdef FEAT_CMDL_INFO | |
| 10428 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10429 if (VIsual_active) | |
| 10430 clear_showcmd(); | |
| 10431 | |
| 10432 /* If the last window has no status line, the ruler is after the mode | |
| 10433 * message and must be redrawn */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10434 if (redrawing() && lastwin->w_status_height == 0) |
| 7 | 10435 win_redr_ruler(lastwin, TRUE); |
| 10436 #endif | |
| 10437 redraw_cmdline = FALSE; | |
| 10438 clear_cmdline = FALSE; | |
| 10439 | |
| 10440 return length; | |
| 10441 } | |
| 10442 | |
| 10443 /* | |
| 10444 * Position for a mode message. | |
| 10445 */ | |
| 10446 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10447 msg_pos_mode(void) |
| 7 | 10448 { |
| 10449 msg_col = 0; | |
| 10450 msg_row = Rows - 1; | |
| 10451 } | |
| 10452 | |
| 10453 /* | |
| 10454 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10455 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10456 * Caller should check "mode_displayed". |
| 7 | 10457 */ |
| 10458 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10459 unshowmode(int force) |
| 7 | 10460 { |
| 10461 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10462 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10463 */ |
| 10464 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10465 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10466 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10467 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10468 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10469 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10470 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10471 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10472 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10473 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10474 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10475 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10476 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10477 if (Recording) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10478 recording_mode(HL_ATTR(HLF_CM)); |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10479 msg_clr_eos(); |
| 7 | 10480 } |
| 10481 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10482 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10483 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10484 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10485 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10486 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10487 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10488 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10489 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10490 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10491 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10492 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10493 |
| 667 | 10494 /* |
| 10495 * Draw the tab pages line at the top of the Vim window. | |
| 10496 */ | |
| 10497 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10498 draw_tabline(void) |
| 667 | 10499 { |
| 10500 int tabcount = 0; | |
| 10501 tabpage_T *tp; | |
| 10502 int tabwidth; | |
| 10503 int col = 0; | |
| 673 | 10504 int scol = 0; |
| 667 | 10505 int attr; |
| 10506 win_T *wp; | |
| 671 | 10507 win_T *cwp; |
| 10508 int wincount; | |
| 10509 int modified; | |
| 667 | 10510 int c; |
| 10511 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10512 int attr_sel = HL_ATTR(HLF_TPS); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10513 int attr_nosel = HL_ATTR(HLF_TP); |
|
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10514 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10515 char_u *p; |
| 677 | 10516 int room; |
| 10517 int use_sep_chars = (t_colors < 8 | |
| 10518 #ifdef FEAT_GUI | |
| 10519 && !gui.in_use | |
| 10520 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10521 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10522 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10523 #endif |
| 677 | 10524 ); |
| 673 | 10525 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10526 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10527 return; |
| 673 | 10528 redraw_tabline = FALSE; |
| 667 | 10529 |
| 685 | 10530 #ifdef FEAT_GUI_TABLINE |
| 798 | 10531 /* Take care of a GUI tabline. */ |
| 685 | 10532 if (gui_use_tabline()) |
| 10533 { | |
| 10534 gui_update_tabline(); | |
| 10535 return; | |
| 10536 } | |
| 10537 #endif | |
| 10538 | |
| 10539 if (tabline_height() < 1) | |
| 667 | 10540 return; |
| 10541 | |
| 677 | 10542 #if defined(FEAT_STL_OPT) |
| 681 | 10543 |
| 10544 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10545 for (scol = 0; scol < Columns; ++scol) | |
| 10546 TabPageIdxs[scol] = 0; | |
| 10547 | |
| 677 | 10548 /* Use the 'tabline' option if it's set. */ |
| 10549 if (*p_tal != NUL) | |
| 10550 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10551 int saved_did_emsg = did_emsg; |
| 680 | 10552 |
| 10553 /* Check for an error. If there is one we would loop in redrawing the | |
| 10554 * 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
|
10555 did_emsg = FALSE; |
| 677 | 10556 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10557 if (did_emsg) |
| 680 | 10558 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10559 (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
|
10560 did_emsg |= saved_did_emsg; |
| 680 | 10561 } |
| 10562 else | |
| 10563 #endif | |
| 10564 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10565 FOR_ALL_TABPAGES(tp) |
| 680 | 10566 ++tabcount; |
| 10567 | |
| 10568 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10569 if (tabwidth < 6) | |
| 10570 tabwidth = 6; | |
| 10571 | |
| 10572 attr = attr_nosel; | |
| 10573 tabcount = 0; | |
| 681 | 10574 scol = 0; |
| 699 | 10575 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10576 tp = tp->tp_next) | |
| 680 | 10577 { |
| 10578 scol = col; | |
| 10579 | |
| 10580 if (tp->tp_topframe == topframe) | |
| 10581 attr = attr_sel; | |
| 10582 if (use_sep_chars && col > 0) | |
| 10583 screen_putchar('|', 0, col++, attr); | |
| 10584 | |
| 10585 if (tp->tp_topframe != topframe) | |
| 10586 attr = attr_nosel; | |
| 10587 | |
| 10588 screen_putchar(' ', 0, col++, attr); | |
| 10589 | |
| 10590 if (tp == curtab) | |
| 10591 { | |
| 10592 cwp = curwin; | |
| 10593 wp = firstwin; | |
| 10594 } | |
| 10595 else | |
| 10596 { | |
| 10597 cwp = tp->tp_curwin; | |
| 10598 wp = tp->tp_firstwin; | |
| 10599 } | |
| 10600 | |
| 10601 modified = FALSE; | |
| 10602 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10603 if (bufIsChanged(wp->w_buffer)) | |
| 10604 modified = TRUE; | |
| 10605 if (modified || wincount > 1) | |
| 10606 { | |
| 10607 if (wincount > 1) | |
| 10608 { | |
| 10609 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10610 len = (int)STRLEN(NameBuff); |
| 699 | 10611 if (col + len >= Columns - 3) |
| 10612 break; | |
| 680 | 10613 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10614 #if defined(FEAT_SYN_HL) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10615 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10616 #else |
| 6106 | 10617 attr |
| 680 | 10618 #endif |
| 10619 ); | |
| 10620 col += len; | |
| 10621 } | |
| 10622 if (modified) | |
| 10623 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10624 screen_putchar(' ', 0, col++, attr); | |
| 10625 } | |
| 10626 | |
| 10627 room = scol - col + tabwidth - 1; | |
| 10628 if (room > 0) | |
| 10629 { | |
| 685 | 10630 /* Get buffer name in NameBuff[] */ |
| 10631 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10632 shorten_dir(NameBuff); |
| 680 | 10633 len = vim_strsize(NameBuff); |
| 10634 p = NameBuff; | |
| 677 | 10635 #ifdef FEAT_MBYTE |
| 680 | 10636 if (has_mbyte) |
| 10637 while (len > room) | |
| 10638 { | |
| 10639 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10640 MB_PTR_ADV(p); |
| 680 | 10641 } |
| 10642 else | |
| 10643 #endif | |
| 10644 if (len > room) | |
| 677 | 10645 { |
| 680 | 10646 p += len - room; |
| 10647 len = room; | |
| 677 | 10648 } |
| 699 | 10649 if (len > Columns - col - 1) |
| 10650 len = Columns - col - 1; | |
| 680 | 10651 |
| 835 | 10652 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10653 col += len; |
| 10654 } | |
| 10655 screen_putchar(' ', 0, col++, attr); | |
| 10656 | |
| 10657 /* Store the tab page number in TabPageIdxs[], so that | |
| 10658 * jump_to_mouse() knows where each one is. */ | |
| 10659 ++tabcount; | |
| 10660 while (scol < col) | |
| 10661 TabPageIdxs[scol++] = tabcount; | |
| 10662 } | |
| 10663 | |
| 10664 if (use_sep_chars) | |
| 10665 c = '_'; | |
| 10666 else | |
| 10667 c = ' '; | |
| 10668 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10669 |
| 10670 /* Put an "X" for closing the current tab if there are several. */ | |
| 10671 if (first_tabpage->tp_next != NULL) | |
| 10672 { | |
| 10673 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10674 TabPageIdxs[Columns - 1] = -999; | |
| 10675 } | |
| 10676 } | |
| 834 | 10677 |
| 10678 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10679 * set. */ | |
| 10680 redraw_tabline = FALSE; | |
| 667 | 10681 } |
| 685 | 10682 |
| 10683 /* | |
| 10684 * Get buffer name for "buf" into NameBuff[]. | |
| 10685 * Takes care of special buffer names and translates special characters. | |
| 10686 */ | |
| 10687 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10688 get_trans_bufname(buf_T *buf) |
| 685 | 10689 { |
| 10690 if (buf_spname(buf) != NULL) | |
| 3839 | 10691 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10692 else |
| 10693 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10694 trans_characters(NameBuff, MAXPATHL); | |
| 10695 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10696 |
| 7 | 10697 /* |
| 10698 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10699 */ | |
| 10700 static int | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10701 fillchar_status(int *attr, win_T *wp) |
| 7 | 10702 { |
| 10703 int fill; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10704 |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10705 #ifdef FEAT_TERMINAL |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10706 if (bt_terminal(wp->w_buffer)) |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10707 { |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10708 if (wp == curwin) |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10709 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10710 *attr = HL_ATTR(HLF_ST); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10711 fill = fill_stl; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10712 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10713 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10714 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10715 *attr = HL_ATTR(HLF_STNC); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10716 fill = fill_stlnc; |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10717 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10718 } |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10719 else |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10720 #endif |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10721 if (wp == curwin) |
| 7 | 10722 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10723 *attr = HL_ATTR(HLF_S); |
| 7 | 10724 fill = fill_stl; |
| 10725 } | |
| 10726 else | |
| 10727 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10728 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10729 fill = fill_stlnc; |
| 10730 } | |
| 10731 /* Use fill when there is highlighting, and highlighting of current | |
| 10732 * window differs, or the fillchars differ, or this is not the | |
| 10733 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10734 if (*attr != 0 && ((HL_ATTR(HLF_S) != HL_ATTR(HLF_SNC) |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10735 || wp != curwin || ONE_WINDOW) |
| 7 | 10736 || (fill_stl != fill_stlnc))) |
| 10737 return fill; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10738 if (wp == curwin) |
| 7 | 10739 return '^'; |
| 10740 return '='; | |
| 10741 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10742 |
| 7 | 10743 /* |
| 10744 * Get the character to use in a separator between vertically split windows. | |
| 10745 * Get its attributes in "*attr". | |
| 10746 */ | |
| 10747 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10748 fillchar_vsep(int *attr) |
| 7 | 10749 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10750 *attr = HL_ATTR(HLF_C); |
| 7 | 10751 if (*attr == 0 && fill_vert == ' ') |
| 10752 return '|'; | |
| 10753 else | |
| 10754 return fill_vert; | |
| 10755 } | |
| 10756 | |
| 10757 /* | |
| 10758 * Return TRUE if redrawing should currently be done. | |
| 10759 */ | |
| 10760 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10761 redrawing(void) |
| 7 | 10762 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10763 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10764 if (disable_redraw_for_testing) |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10765 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10766 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10767 #endif |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10768 return (!RedrawingDisabled |
| 7 | 10769 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 10770 } | |
| 10771 | |
| 10772 /* | |
| 10773 * Return TRUE if printing messages should currently be done. | |
| 10774 */ | |
| 10775 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10776 messaging(void) |
| 7 | 10777 { |
| 10778 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10779 } | |
| 10780 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10781 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10782 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10783 * Draw the window toolbar. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10784 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10785 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10786 redraw_win_toolbar(win_T *wp) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10787 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10788 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10789 int item_idx = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10790 int item_count = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10791 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10792 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10793 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10794 int fill_attr = syn_name2attr((char_u *)"ToolbarLine"); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10795 int button_attr = syn_name2attr((char_u *)"ToolbarButton"); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10796 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10797 vim_free(wp->w_winbar_items); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10798 for (menu = wp->w_winbar->children; menu != NULL; menu = menu->next) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10799 ++item_count; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10800 wp->w_winbar_items = (winbar_item_T *)alloc_clear( |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10801 (unsigned)sizeof(winbar_item_T) * (item_count + 1)); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10802 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10803 /* TODO: use fewer spaces if there is not enough room */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10804 for (menu = wp->w_winbar->children; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10805 menu != NULL && col < wp->w_width; menu = menu->next) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10806 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10807 space_to_screenline(off + col, fill_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10808 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10809 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10810 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10811 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10812 space_to_screenline(off + col, fill_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10813 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10814 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10815 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10816 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10817 wp->w_winbar_items[item_idx].wb_startcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10818 space_to_screenline(off + col, button_attr); |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10819 if (++col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10820 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10821 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10822 next_col = text_to_screenline(wp, menu->name, col); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10823 while (col < next_col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10824 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10825 ScreenAttrs[off + col] = button_attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10826 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10827 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10828 wp->w_winbar_items[item_idx].wb_endcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10829 wp->w_winbar_items[item_idx].wb_menu = menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10830 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10831 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10832 if (col >= wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10833 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10834 space_to_screenline(off + col, button_attr); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10835 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10836 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10837 while (col < wp->w_width) |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10838 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10839 space_to_screenline(off + col, fill_attr); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10840 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10841 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10842 wp->w_winbar_items[item_idx].wb_menu = NULL; /* end marker */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10843 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10844 screen_line(wp->w_winrow, wp->w_wincol, (int)wp->w_width, |
|
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10845 (int)wp->w_width, FALSE); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10846 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10847 #endif |
| 7 | 10848 /* |
| 10849 * Show current status info in ruler and various other places | |
| 10850 * If always is FALSE, only show ruler if position has changed. | |
| 10851 */ | |
| 10852 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10853 showruler(int always) |
| 7 | 10854 { |
| 10855 if (!always && !redrawing()) | |
| 10856 return; | |
| 574 | 10857 #ifdef FEAT_INS_EXPAND |
| 10858 if (pum_visible()) | |
| 10859 { | |
| 10860 /* Don't redraw right now, do it later. */ | |
| 10861 curwin->w_redr_status = TRUE; | |
| 10862 return; | |
| 10863 } | |
| 10864 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10865 #if defined(FEAT_STL_OPT) |
| 40 | 10866 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10867 { |
| 1983 | 10868 redraw_custom_statusline(curwin); |
| 680 | 10869 } |
| 7 | 10870 else |
| 10871 #endif | |
| 10872 #ifdef FEAT_CMDL_INFO | |
| 10873 win_redr_ruler(curwin, always); | |
| 10874 #endif | |
| 10875 | |
| 10876 #ifdef FEAT_TITLE | |
| 10877 if (need_maketitle | |
| 10878 # ifdef FEAT_STL_OPT | |
| 10879 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10880 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10881 # endif | |
| 10882 ) | |
| 10883 maketitle(); | |
| 10884 #endif | |
| 1588 | 10885 /* Redraw the tab pages line if needed. */ |
| 10886 if (redraw_tabline) | |
| 10887 draw_tabline(); | |
| 7 | 10888 } |
| 10889 | |
| 10890 #ifdef FEAT_CMDL_INFO | |
| 10891 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10892 win_redr_ruler(win_T *wp, int always) |
| 7 | 10893 { |
| 1869 | 10894 #define RULER_BUF_LEN 70 |
| 10895 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10896 int row; |
| 10897 int fillchar; | |
| 10898 int attr; | |
| 10899 int empty_line = FALSE; | |
| 10900 colnr_T virtcol; | |
| 10901 int i; | |
| 1869 | 10902 size_t len; |
| 7 | 10903 int o; |
| 10904 int this_ru_col; | |
| 10905 int off = 0; | |
| 10906 int width = Columns; | |
| 10907 | |
| 10908 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10909 if (!p_ru) | |
| 10910 return; | |
| 10911 | |
| 10912 /* | |
| 10913 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10914 * after deleting lines, before cursor.lnum is corrected. | |
| 10915 */ | |
| 10916 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10917 return; | |
| 10918 | |
| 10919 #ifdef FEAT_INS_EXPAND | |
| 10920 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10921 * the (long) mode message. */ | |
| 10922 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10923 if (edit_submode != NULL) | |
| 10924 return; | |
| 540 | 10925 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10926 if (pum_visible()) | |
| 10927 return; | |
| 7 | 10928 #endif |
| 10929 | |
| 10930 #ifdef FEAT_STL_OPT | |
| 10931 if (*p_ruf) | |
| 10932 { | |
| 680 | 10933 int save_called_emsg = called_emsg; |
| 10934 | |
| 10935 called_emsg = FALSE; | |
| 7 | 10936 win_redr_custom(wp, TRUE); |
| 680 | 10937 if (called_emsg) |
| 10938 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10939 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10940 called_emsg |= save_called_emsg; |
| 7 | 10941 return; |
| 10942 } | |
| 10943 #endif | |
| 10944 | |
| 10945 /* | |
| 10946 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10947 */ | |
| 10948 if (!(State & INSERT) | |
| 10949 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10950 empty_line = TRUE; | |
| 10951 | |
| 10952 /* | |
| 10953 * Only draw the ruler when something changed. | |
| 10954 */ | |
| 10955 validate_virtcol_win(wp); | |
| 10956 if ( redraw_cmdline | |
| 10957 || always | |
| 10958 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10959 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10960 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10961 #ifdef FEAT_VIRTUALEDIT | |
| 10962 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10963 #endif | |
| 10964 || wp->w_topline != wp->w_ru_topline | |
| 10965 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10966 #ifdef FEAT_DIFF | |
| 10967 || wp->w_topfill != wp->w_ru_topfill | |
| 10968 #endif | |
| 10969 || empty_line != wp->w_ru_empty) | |
| 10970 { | |
| 10971 cursor_off(); | |
| 10972 if (wp->w_status_height) | |
| 10973 { | |
| 10974 row = W_WINROW(wp) + wp->w_height; | |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10975 fillchar = fillchar_status(&attr, wp); |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
10976 off = wp->w_wincol; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10977 width = wp->w_width; |
| 7 | 10978 } |
| 10979 else | |
| 10980 { | |
| 10981 row = Rows - 1; | |
| 10982 fillchar = ' '; | |
| 10983 attr = 0; | |
| 10984 width = Columns; | |
| 10985 off = 0; | |
| 10986 } | |
| 10987 | |
| 10988 /* In list mode virtcol needs to be recomputed */ | |
| 10989 virtcol = wp->w_virtcol; | |
| 10990 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10991 { | |
| 10992 wp->w_p_list = FALSE; | |
| 10993 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10994 wp->w_p_list = TRUE; | |
| 10995 } | |
| 10996 | |
| 10997 /* | |
| 10998 * Some sprintfs return the length, some return a pointer. | |
| 10999 * To avoid portability problems we use strlen() here. | |
| 11000 */ | |
| 1869 | 11001 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11002 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11003 ? 0L | |
| 11004 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11005 len = STRLEN(buffer); |
| 11006 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11007 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11008 (int)virtcol + 1); | |
| 11009 | |
| 11010 /* | |
| 11011 * Add a "50%" if there is room for it. | |
| 11012 * On the last line, don't print in the last column (scrolls the | |
| 11013 * screen up on some terminals). | |
| 11014 */ | |
| 11015 i = (int)STRLEN(buffer); | |
| 1869 | 11016 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11017 o = i + vim_strsize(buffer + i + 1); |
| 11018 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11019 ++o; | |
| 11020 this_ru_col = ru_col - (Columns - width); | |
| 11021 if (this_ru_col < 0) | |
| 11022 this_ru_col = 0; | |
| 11023 /* Never use more than half the window/screen width, leave the other | |
| 11024 * half for the filename. */ | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11025 if (this_ru_col < (width + 1) / 2) |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11026 this_ru_col = (width + 1) / 2; |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11027 if (this_ru_col + o < width) |
| 7 | 11028 { |
| 6466 | 11029 /* need at least 3 chars left for get_rel_pos() + NUL */ |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11030 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11031 { |
| 11032 #ifdef FEAT_MBYTE | |
| 11033 if (has_mbyte) | |
| 11034 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11035 else | |
| 11036 #endif | |
| 11037 buffer[i++] = fillchar; | |
| 11038 ++o; | |
| 11039 } | |
| 1869 | 11040 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11041 } |
| 11042 /* Truncate at window boundary. */ | |
| 11043 #ifdef FEAT_MBYTE | |
| 11044 if (has_mbyte) | |
| 11045 { | |
| 11046 o = 0; | |
| 474 | 11047 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11048 { |
| 11049 o += (*mb_ptr2cells)(buffer + i); | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11050 if (this_ru_col + o > width) |
| 7 | 11051 { |
| 11052 buffer[i] = NUL; | |
| 11053 break; | |
| 11054 } | |
| 11055 } | |
| 11056 } | |
| 11057 else | |
| 11058 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11059 if (this_ru_col + (int)STRLEN(buffer) > width) |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11060 buffer[width - this_ru_col] = NUL; |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11061 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11062 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11063 i = redraw_cmdline; |
| 11064 screen_fill(row, row + 1, | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11065 this_ru_col + off + (int)STRLEN(buffer), |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11066 (int)(off + width), |
| 7 | 11067 fillchar, fillchar, attr); |
| 11068 /* don't redraw the cmdline because of showing the ruler */ | |
| 11069 redraw_cmdline = i; | |
| 11070 wp->w_ru_cursor = wp->w_cursor; | |
| 11071 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11072 wp->w_ru_empty = empty_line; | |
| 11073 wp->w_ru_topline = wp->w_topline; | |
| 11074 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11075 #ifdef FEAT_DIFF | |
| 11076 wp->w_ru_topfill = wp->w_topfill; | |
| 11077 #endif | |
| 11078 } | |
| 11079 } | |
| 11080 #endif | |
| 13 | 11081 |
| 11082 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11083 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11084 * 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
|
11085 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11086 * Otherwise it depends on 'numberwidth' and the line count. |
| 11087 */ | |
| 11088 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11089 number_width(win_T *wp) |
| 13 | 11090 { |
| 11091 int n; | |
| 11092 linenr_T lnum; | |
| 11093 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11094 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
|
11095 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11096 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11097 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11098 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11099 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
|
11100 |
| 6679 | 11101 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11102 return wp->w_nrwidth_width; |
| 11103 wp->w_nrwidth_line_count = lnum; | |
| 11104 | |
| 11105 n = 0; | |
| 11106 do | |
| 11107 { | |
| 856 | 11108 lnum /= 10; |
| 11109 ++n; | |
| 13 | 11110 } while (lnum > 0); |
| 11111 | |
| 11112 /* 'numberwidth' gives the minimal width plus one */ | |
| 11113 if (n < wp->w_p_nuw - 1) | |
| 11114 n = wp->w_p_nuw - 1; | |
| 11115 | |
| 11116 wp->w_nrwidth_width = n; | |
| 6679 | 11117 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11118 return n; |
| 11119 } | |
| 11120 #endif | |
| 3986 | 11121 |
| 11122 /* | |
| 11123 * Return the current cursor column. This is the actual position on the | |
| 11124 * screen. First column is 0. | |
| 11125 */ | |
| 11126 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11127 screen_screencol(void) |
| 3986 | 11128 { |
| 11129 return screen_cur_col; | |
| 11130 } | |
| 11131 | |
| 11132 /* | |
| 11133 * Return the current cursor row. This is the actual position on the screen. | |
| 11134 * First row is 0. | |
| 11135 */ | |
| 11136 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11137 screen_screenrow(void) |
| 3986 | 11138 { |
| 11139 return screen_cur_row; | |
| 11140 } |