Mercurial > vim
annotate src/screen.c @ 13851:3edac4cd1c0a v8.0.1797
patch 8.0.1797: terminal window is redrawn too often
commit https://github.com/vim/vim/commit/6eddadff13164b98fe8198153cc656897b2cbcb3
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 6 16:40:16 2018 +0200
patch 8.0.1797: terminal window is redrawn too often
Problem: Terminal window is redrawn too often and scrolling is repeated.
Solution: Don't scroll immediately but only when redrawing. Avoid redrawing
the whole terminal window on every change.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 06 May 2018 16:45:05 +0200 |
| parents | 0e9b2971d7c3 |
| children | 156ebdcb8ef5 |
| 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 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
570 /* May need to update w_lines[]. */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
571 if (curwin->w_lines_valid == 0 && type < NOT_VALID |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
572 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
573 && !term_do_update_window(curwin) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
574 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
575 ) |
| 7 | 576 type = NOT_VALID; |
| 577 | |
| 2008 | 578 /* Postpone the redrawing when it's not needed and when being called |
| 579 * recursively. */ | |
| 580 if (!redrawing() || updating_screen) | |
| 7 | 581 { |
| 582 redraw_later(type); /* remember type for next time */ | |
| 583 must_redraw = type; | |
| 584 if (type > INVERTED_ALL) | |
| 585 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
|
586 return FAIL; |
| 7 | 587 } |
| 588 | |
| 589 updating_screen = TRUE; | |
| 590 #ifdef FEAT_SYN_HL | |
| 591 ++display_tick; /* let syntax code know we're in a next round of | |
| 592 * display updating */ | |
| 593 #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
|
594 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
|
595 ++no_win_do_lines_ins; |
| 7 | 596 |
| 597 /* | |
| 598 * if the screen was scrolled up when displaying a message, scroll it down | |
| 599 */ | |
| 600 if (msg_scrolled) | |
| 601 { | |
| 602 clear_cmdline = TRUE; | |
| 603 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 604 type = CLEAR; | |
| 605 else if (type != CLEAR) | |
| 606 { | |
| 607 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
|
608 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
|
609 == FAIL) |
| 7 | 610 type = CLEAR; |
| 611 FOR_ALL_WINDOWS(wp) | |
| 612 { | |
| 613 if (W_WINROW(wp) < msg_scrolled) | |
| 614 { | |
| 615 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 616 && wp->w_redr_type < REDRAW_TOP | |
| 617 && wp->w_lines_valid > 0 | |
| 618 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 619 { | |
| 620 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 621 wp->w_redr_type = REDRAW_TOP; | |
| 622 } | |
| 623 else | |
| 624 { | |
| 625 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
|
626 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
|
627 <= msg_scrolled) |
| 7 | 628 wp->w_redr_status = TRUE; |
| 629 } | |
| 630 } | |
| 631 } | |
|
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
|
632 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
|
633 redraw_cmdline = TRUE; |
| 673 | 634 redraw_tabline = TRUE; |
| 7 | 635 } |
| 636 msg_scrolled = 0; | |
| 637 need_wait_return = FALSE; | |
| 638 } | |
| 639 | |
| 640 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 641 compute_cmdrow(); | |
| 642 | |
| 643 /* Check for changed highlighting */ | |
| 644 if (need_highlight_changed) | |
| 645 highlight_changed(); | |
| 646 | |
| 647 if (type == CLEAR) /* first clear screen */ | |
| 648 { | |
| 649 screenclear(); /* will reset clear_cmdline */ | |
| 650 type = NOT_VALID; | |
|
11607
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
651 /* must_redraw may be set indirectly, avoid another redraw later */ |
|
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
652 must_redraw = 0; |
| 7 | 653 } |
| 654 | |
| 655 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 656 check_for_delay(FALSE); | |
| 657 | |
| 13 | 658 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
659 /* Force redraw when width of 'number' or 'relativenumber' column |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
660 * changes. */ |
| 13 | 661 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
662 && curwin->w_nrwidth != ((curwin->w_p_nu || curwin->w_p_rnu) |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
663 ? number_width(curwin) : 0)) |
| 13 | 664 curwin->w_redr_type = NOT_VALID; |
| 665 #endif | |
| 666 | |
| 7 | 667 /* |
| 668 * Only start redrawing if there is really something to do. | |
| 669 */ | |
| 670 if (type == INVERTED) | |
| 671 update_curswant(); | |
| 672 if (curwin->w_redr_type < type | |
| 673 && !((type == VALID | |
| 674 && curwin->w_lines[0].wl_valid | |
| 675 #ifdef FEAT_DIFF | |
| 676 && curwin->w_topfill == curwin->w_old_topfill | |
| 677 && curwin->w_botfill == curwin->w_old_botfill | |
| 678 #endif | |
| 679 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 680 || (type == INVERTED | |
| 1043 | 681 && VIsual_active |
| 7 | 682 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 683 && curwin->w_old_visual_mode == VIsual_mode | |
| 684 && (curwin->w_valid & VALID_VIRTCOL) | |
| 685 && curwin->w_old_curswant == curwin->w_curswant) | |
| 686 )) | |
| 687 curwin->w_redr_type = type; | |
| 688 | |
| 849 | 689 /* Redraw the tab pages line if needed. */ |
| 690 if (redraw_tabline || type >= NOT_VALID) | |
| 691 draw_tabline(); | |
| 692 | |
| 7 | 693 #ifdef FEAT_SYN_HL |
| 694 /* | |
| 695 * Correct stored syntax highlighting info for changes in each displayed | |
| 696 * buffer. Each buffer must only be done once. | |
| 697 */ | |
| 698 FOR_ALL_WINDOWS(wp) | |
| 699 { | |
| 700 if (wp->w_buffer->b_mod_set) | |
| 701 { | |
| 702 win_T *wwp; | |
| 703 | |
| 704 /* Check if we already did this buffer. */ | |
| 705 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 706 if (wwp->w_buffer == wp->w_buffer) | |
| 707 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
708 if (wwp == wp && syntax_present(wp)) |
| 7 | 709 syn_stack_apply_changes(wp->w_buffer); |
| 710 } | |
| 711 } | |
| 712 #endif | |
| 713 | |
| 714 /* | |
| 715 * Go from top to bottom through the windows, redrawing the ones that need | |
| 716 * it. | |
| 717 */ | |
| 718 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 719 did_one = FALSE; | |
| 720 #endif | |
| 721 #ifdef FEAT_SEARCH_EXTRA | |
| 722 search_hl.rm.regprog = NULL; | |
| 723 #endif | |
| 724 FOR_ALL_WINDOWS(wp) | |
| 725 { | |
| 726 if (wp->w_redr_type != 0) | |
| 727 { | |
| 728 cursor_off(); | |
| 729 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 730 if (!did_one) | |
| 731 { | |
| 732 did_one = TRUE; | |
| 733 # ifdef FEAT_SEARCH_EXTRA | |
| 734 start_search_hl(); | |
| 735 # endif | |
| 736 # ifdef FEAT_CLIPBOARD | |
| 737 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 738 if (clip_star.available && clip_isautosel_star()) |
| 739 clip_update_selection(&clip_star); | |
| 740 if (clip_plus.available && clip_isautosel_plus()) | |
| 741 clip_update_selection(&clip_plus); | |
| 7 | 742 # endif |
| 743 #ifdef FEAT_GUI | |
| 744 /* Remove the cursor before starting to do anything, because | |
| 745 * scrolling may make it difficult to redraw the text under | |
| 746 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
747 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
|
748 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
749 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
750 gui_cursor_row = gui.cursor_row; |
| 7 | 751 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
752 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
753 } |
| 7 | 754 #endif |
| 755 } | |
| 756 #endif | |
| 757 win_update(wp); | |
| 758 } | |
| 759 | |
| 760 /* redraw status line after the window to minimize cursor movement */ | |
| 761 if (wp->w_redr_status) | |
| 762 { | |
| 763 cursor_off(); | |
| 764 win_redr_status(wp); | |
| 765 } | |
| 766 } | |
| 767 #if defined(FEAT_SEARCH_EXTRA) | |
| 768 end_search_hl(); | |
| 769 #endif | |
| 4107 | 770 #ifdef FEAT_INS_EXPAND |
| 771 /* May need to redraw the popup menu. */ | |
| 772 if (pum_visible()) | |
| 773 pum_redraw(); | |
| 774 #endif | |
| 7 | 775 |
| 776 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 777 * 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
|
778 FOR_ALL_WINDOWS(wp) |
| 7 | 779 wp->w_buffer->b_mod_set = FALSE; |
| 780 | |
| 781 updating_screen = FALSE; | |
| 782 #ifdef FEAT_GUI | |
| 783 gui_may_resize_shell(); | |
| 784 #endif | |
| 785 | |
| 786 /* Clear or redraw the command line. Done last, because scrolling may | |
| 787 * mess up the command line. */ | |
| 788 if (clear_cmdline || redraw_cmdline) | |
| 789 showmode(); | |
| 790 | |
|
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
|
791 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
|
792 --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
|
793 |
| 7 | 794 /* 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
|
795 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
796 maybe_intro_message(); |
| 7 | 797 did_intro = TRUE; |
| 798 | |
| 799 #ifdef FEAT_GUI | |
| 800 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 801 * done. */ | |
| 802 if (gui.in_use) | |
| 803 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
804 if (did_undraw && !gui_mch_is_blink_off()) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
805 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
806 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
807 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
|
808 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
809 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
810 /* 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
|
811 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
812 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
813 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
814 # ifdef FEAT_MBYTE |
|
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
815 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
|
816 # endif |
| 7 | 817 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
818 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
819 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
820 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
821 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
822 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
823 out_flush(); |
| 7 | 824 gui_update_scrollbars(FALSE); |
| 825 } | |
| 826 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
827 return OK; |
| 7 | 828 } |
| 829 | |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
830 #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
|
831 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
832 * 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
|
833 * 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
|
834 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
835 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
836 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
837 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
838 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
839 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
840 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
841 /* 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
|
842 * 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
|
843 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
844 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
845 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
846 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
847 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
848 #endif |
|
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 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
851 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
852 * 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
|
853 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
854 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
855 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
856 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
857 if (redraw_cmdline) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 showmode(); |
|
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 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 updating_screen = FALSE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 gui_may_resize_shell(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 /* 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
|
870 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
873 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
|
874 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
880 #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
|
881 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
882 * 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
|
883 * 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
|
884 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
885 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
886 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
|
887 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
888 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
|
889 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
890 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
|
891 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
|
892 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
|
893 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
|
894 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
|
895 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
|
896 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
|
897 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
898 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
899 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
|
900 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
901 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
|
902 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
|
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 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
905 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
906 * 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
|
907 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
908 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
909 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
|
910 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
911 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
|
912 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
913 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
|
914 /* 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
|
915 * 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
|
916 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
|
917 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
918 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
919 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
920 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
921 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
|
922 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
923 int row; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
924 int j; |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
925 #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
|
926 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
|
927 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
928 |
|
9100
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
929 /* 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
|
930 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
|
931 return; |
|
ddccff0480d2
commit https://github.com/vim/vim/commit/908be438794619f10ef7fa25e24e5893b2ae0189
Christian Brabandt <cb@256bit.org>
parents:
9027
diff
changeset
|
932 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
933 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
|
934 && foldedCount(wp, lnum, &win_foldinfo) == 0) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
935 { |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
936 #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
|
937 /* 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
|
938 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
|
939 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
|
940 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
941 update_prepare(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
942 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
943 row = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
944 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
|
945 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
946 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
|
947 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
948 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
|
949 # ifdef FEAT_SEARCH_EXTRA |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
950 init_search_hl(wp); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
951 start_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
952 prepare_search_hl(wp, lnum); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
953 # endif |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
954 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
|
955 # if defined(FEAT_SEARCH_EXTRA) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
956 end_search_hl(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
957 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
958 break; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
959 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
960 row += wp->w_lines[j].wl_size; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
961 } |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
962 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
963 update_finish(); |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
964 |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
965 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
966 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
967 #endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
968 } |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
969 need_cursor_line_redraw = FALSE; |
| 7 | 970 } |
| 971 #endif | |
| 972 | |
| 973 #if defined(FEAT_SIGNS) || defined(PROTO) | |
| 974 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
975 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 976 { |
| 977 win_T *wp; | |
| 978 int doit = FALSE; | |
| 979 | |
| 980 # ifdef FEAT_FOLDING | |
| 981 win_foldinfo.fi_level = 0; | |
| 982 # endif | |
| 983 | |
| 984 /* update/delete a specific mark */ | |
| 985 FOR_ALL_WINDOWS(wp) | |
| 986 { | |
| 987 if (buf != NULL && lnum > 0) | |
| 988 { | |
| 989 if (wp->w_buffer == buf && lnum >= wp->w_topline | |
| 990 && lnum < wp->w_botline) | |
| 991 { | |
| 992 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) | |
| 993 wp->w_redraw_top = lnum; | |
| 994 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) | |
| 995 wp->w_redraw_bot = lnum; | |
| 996 redraw_win_later(wp, VALID); | |
| 997 } | |
| 998 } | |
| 999 else | |
| 1000 redraw_win_later(wp, VALID); | |
| 1001 if (wp->w_redr_type != 0) | |
| 1002 doit = TRUE; | |
| 1003 } | |
| 1004 | |
| 3250 | 1005 /* 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
|
1006 * 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
|
1007 */ |
| 3250 | 1008 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
|
1009 || 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
|
1010 || msg_scrolled |
| 3250 | 1011 #ifdef FEAT_GUI |
| 1012 || gui.starting | |
| 1013 #endif | |
| 1014 || starting) | |
| 7 | 1015 return; |
| 1016 | |
| 1017 /* update all windows that need updating */ | |
| 1018 update_prepare(); | |
| 1019 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
1020 FOR_ALL_WINDOWS(wp) |
| 7 | 1021 { |
| 1022 if (wp->w_redr_type != 0) | |
| 1023 win_update(wp); | |
| 1024 if (wp->w_redr_status) | |
| 1025 win_redr_status(wp); | |
| 1026 } | |
| 1027 | |
| 1028 update_finish(); | |
| 1029 } | |
| 1030 #endif | |
| 1031 | |
| 1032 | |
| 1033 #if defined(FEAT_GUI) || defined(PROTO) | |
| 1034 /* | |
| 1035 * Update a single window, its status line and maybe the command line msg. | |
| 1036 * Used for the GUI scrollbar. | |
| 1037 */ | |
| 1038 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1039 updateWindow(win_T *wp) |
| 7 | 1040 { |
| 2008 | 1041 /* return if already busy updating */ |
| 1042 if (updating_screen) | |
| 1043 return; | |
| 1044 | |
| 7 | 1045 update_prepare(); |
| 1046 | |
| 1047 #ifdef FEAT_CLIPBOARD | |
| 1048 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1049 if (clip_star.available && clip_isautosel_star()) |
| 1050 clip_update_selection(&clip_star); | |
| 1051 if (clip_plus.available && clip_isautosel_plus()) | |
| 1052 clip_update_selection(&clip_plus); | |
| 7 | 1053 #endif |
| 670 | 1054 |
| 7 | 1055 win_update(wp); |
| 670 | 1056 |
| 1057 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1058 if (redraw_tabline) |
| 677 | 1059 draw_tabline(); |
| 670 | 1060 |
| 7 | 1061 if (wp->w_redr_status |
| 1062 # ifdef FEAT_CMDL_INFO | |
| 1063 || p_ru | |
| 1064 # endif | |
| 1065 # ifdef FEAT_STL_OPT | |
| 40 | 1066 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1067 # endif |
| 1068 ) | |
| 1069 win_redr_status(wp); | |
| 1070 | |
| 1071 update_finish(); | |
| 1072 } | |
| 1073 #endif | |
| 1074 | |
| 1075 /* | |
| 1076 * Update a single window. | |
| 1077 * | |
| 1078 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1079 * screen or scrolling lines). | |
| 1080 * | |
| 1081 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1082 * implies the one below it. | |
| 1083 * NOT_VALID redraw the whole window | |
| 743 | 1084 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1085 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1086 * INVERTED redraw the changed part of the Visual area | |
| 1087 * INVERTED_ALL redraw the whole Visual area | |
| 1088 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1089 * 2. update lines at the top when scrolled down | |
| 1090 * 3. redraw changed text: | |
| 301 | 1091 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1092 * b_mod_top and b_mod_bot. |
| 1093 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1094 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1095 * - continue redrawing when syntax status is invalid. | |
| 1096 * 4. if scrolled up, update lines at the bottom. | |
| 1097 * This results in three areas that may need updating: | |
| 1098 * top: from first row to top_end (when scrolled down) | |
| 1099 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1100 * bot: from bot_start to last row (when scrolled up) | |
| 1101 */ | |
| 1102 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1103 win_update(win_T *wp) |
| 7 | 1104 { |
| 1105 buf_T *buf = wp->w_buffer; | |
| 1106 int type; | |
| 1107 int top_end = 0; /* Below last row of the top area that needs | |
| 1108 updating. 0 when no top area updating. */ | |
| 1109 int mid_start = 999;/* first row of the mid area that needs | |
| 1110 updating. 999 when no mid area updating. */ | |
| 1111 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1112 updating. 0 when no mid area updating. */ | |
| 1113 int bot_start = 999;/* first row of the bot area that needs | |
| 1114 updating. 999 when no bot area updating */ | |
| 1115 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1116 w_topline got smaller a bit */ | |
| 1117 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1118 matchitem_T *cur; /* points to the match list */ |
| 7 | 1119 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1120 #endif | |
| 1121 | |
| 1122 int row; /* current window row to display */ | |
| 1123 linenr_T lnum; /* current buffer lnum to display */ | |
| 1124 int idx; /* current index in w_lines[] */ | |
| 1125 int srow; /* starting row of the current line */ | |
| 1126 | |
| 1127 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1128 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1129 int i; | |
| 1130 long j; | |
| 1131 static int recursive = FALSE; /* being called recursively */ | |
| 1132 int old_botline = wp->w_botline; | |
| 1133 #ifdef FEAT_FOLDING | |
| 1134 long fold_count; | |
| 1135 #endif | |
| 1136 #ifdef FEAT_SYN_HL | |
| 1137 /* remember what happened to the previous line, to know if | |
| 1138 * check_visual_highlight() can be used */ | |
| 1139 #define DID_NONE 1 /* didn't update a line */ | |
| 1140 #define DID_LINE 2 /* updated a normal line */ | |
| 1141 #define DID_FOLD 3 /* updated a folded line */ | |
| 1142 int did_update = DID_NONE; | |
| 1143 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1144 #endif | |
| 1145 linenr_T mod_top = 0; | |
| 1146 linenr_T mod_bot = 0; | |
| 1147 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1148 int save_got_int; | |
| 1149 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1150 #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
|
1151 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
|
1152 #endif |
| 7 | 1153 |
| 1154 type = wp->w_redr_type; | |
| 1155 | |
| 1156 if (type == NOT_VALID) | |
| 1157 { | |
| 1158 wp->w_redr_status = TRUE; | |
| 1159 wp->w_lines_valid = 0; | |
| 1160 } | |
| 1161 | |
| 1162 /* 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
|
1163 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1164 { |
| 1165 wp->w_redr_type = 0; | |
| 1166 return; | |
| 1167 } | |
| 1168 | |
| 1169 /* Window is zero-width: Only need to draw the separator. */ | |
| 1170 if (wp->w_width == 0) | |
| 1171 { | |
| 1172 /* draw the vertical separator right of this window */ | |
| 1173 draw_vsep_win(wp, 0); | |
| 1174 wp->w_redr_type = 0; | |
| 1175 return; | |
| 1176 } | |
| 1177 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1178 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1179 // If this window contains a terminal, redraw works completely differently. |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1180 if (term_do_update_window(wp)) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1181 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1182 term_update_window(wp); |
|
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
|
1183 # 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
|
1184 /* 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
|
1185 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
|
1186 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
|
1187 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1188 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
|
1189 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1190 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1191 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1192 |
| 7 | 1193 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1194 init_search_hl(wp); |
| 7 | 1195 #endif |
| 1196 | |
| 13 | 1197 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1198 /* 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
|
1199 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1200 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1201 if (wp->w_nrwidth != i) |
| 13 | 1202 { |
| 1203 type = NOT_VALID; | |
| 677 | 1204 wp->w_nrwidth = i; |
| 13 | 1205 } |
| 1206 else | |
| 1207 #endif | |
| 1208 | |
| 7 | 1209 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1210 { | |
| 1211 /* | |
| 1212 * When there are both inserted/deleted lines and specific lines to be | |
| 1213 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1214 * everything (only happens when redrawing is off for while). | |
| 1215 */ | |
| 1216 type = NOT_VALID; | |
| 1217 } | |
| 1218 else | |
| 1219 { | |
| 1220 /* | |
| 1221 * Set mod_top to the first line that needs displaying because of | |
| 1222 * changes. Set mod_bot to the first line after the changes. | |
| 1223 */ | |
| 1224 mod_top = wp->w_redraw_top; | |
| 1225 if (wp->w_redraw_bot != 0) | |
| 1226 mod_bot = wp->w_redraw_bot + 1; | |
| 1227 else | |
| 1228 mod_bot = 0; | |
| 1229 wp->w_redraw_top = 0; /* reset for next time */ | |
| 1230 wp->w_redraw_bot = 0; | |
| 1231 if (buf->b_mod_set) | |
| 1232 { | |
| 1233 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1234 { | |
| 1235 mod_top = buf->b_mod_top; | |
| 1236 #ifdef FEAT_SYN_HL | |
| 1237 /* Need to redraw lines above the change that may be included | |
| 1238 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1239 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1240 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1241 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1242 if (mod_top < 1) |
| 1243 mod_top = 1; | |
| 1244 } | |
| 1245 #endif | |
| 1246 } | |
| 1247 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1248 mod_bot = buf->b_mod_bot; | |
| 1249 | |
| 1250 #ifdef FEAT_SEARCH_EXTRA | |
| 1251 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1252 * change in one line may make the Search highlighting in a | |
| 1253 * previous line invalid. Simple solution: redraw all visible | |
| 1254 * lines above the change. | |
| 1326 | 1255 * Same for a match pattern. |
| 7 | 1256 */ |
| 699 | 1257 if (search_hl.rm.regprog != NULL |
| 1258 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1259 top_to_mod = TRUE; |
| 699 | 1260 else |
| 1326 | 1261 { |
| 1262 cur = wp->w_match_head; | |
| 1263 while (cur != NULL) | |
| 1264 { | |
| 1265 if (cur->match.regprog != NULL | |
| 1266 && re_multiline(cur->match.regprog)) | |
| 699 | 1267 { |
| 1268 top_to_mod = TRUE; | |
| 1269 break; | |
| 1270 } | |
| 1326 | 1271 cur = cur->next; |
| 1272 } | |
| 1273 } | |
| 7 | 1274 #endif |
| 1275 } | |
| 1276 #ifdef FEAT_FOLDING | |
| 1277 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1278 { | |
| 1279 linenr_T lnumt, lnumb; | |
| 1280 | |
| 1281 /* | |
| 1282 * A change in a line can cause lines above it to become folded or | |
| 1283 * unfolded. Find the top most buffer line that may be affected. | |
| 1284 * If the line was previously folded and displayed, get the first | |
| 1285 * line of that fold. If the line is folded now, get the first | |
| 1286 * folded line. Use the minimum of these two. | |
| 1287 */ | |
| 1288 | |
| 1289 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1290 * the line below it. If there is no valid entry, use w_topline. | |
| 1291 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1292 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1293 lnumt = wp->w_topline; | |
| 1294 lnumb = MAXLNUM; | |
| 1295 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1296 if (wp->w_lines[i].wl_valid) | |
| 1297 { | |
| 1298 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1299 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1300 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1301 { | |
| 1302 lnumb = wp->w_lines[i].wl_lnum; | |
| 1303 /* When there is a fold column it might need updating | |
| 1304 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1305 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1306 ++lnumb; |
| 1307 } | |
| 1308 } | |
| 1309 | |
| 1310 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1311 if (mod_top > lnumt) | |
| 1312 mod_top = lnumt; | |
| 1313 | |
| 1314 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1315 --mod_bot; | |
| 1316 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1317 ++mod_bot; | |
| 1318 if (mod_bot < lnumb) | |
| 1319 mod_bot = lnumb; | |
| 1320 } | |
| 1321 #endif | |
| 1322 | |
| 1323 /* When a change starts above w_topline and the end is below | |
| 1324 * w_topline, start redrawing at w_topline. | |
| 36 | 1325 * If the end of the change is above w_topline: do like no change was |
| 1326 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1327 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1328 { | |
| 1329 if (mod_bot > wp->w_topline) | |
| 1330 mod_top = wp->w_topline; | |
| 1331 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1332 else if (syntax_present(wp)) |
| 7 | 1333 top_end = 1; |
| 1334 #endif | |
| 1335 } | |
| 36 | 1336 |
| 1337 /* When line numbers are displayed need to redraw all lines below | |
| 1338 * inserted/deleted lines. */ | |
| 1339 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1340 mod_bot = MAXLNUM; | |
| 7 | 1341 } |
| 1342 | |
| 1343 /* | |
| 1344 * When only displaying the lines at the top, set top_end. Used when | |
| 1345 * window has scrolled down for msg_scrolled. | |
| 1346 */ | |
| 1347 if (type == REDRAW_TOP) | |
| 1348 { | |
| 1349 j = 0; | |
| 1350 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1351 { | |
| 1352 j += wp->w_lines[i].wl_size; | |
| 1353 if (j >= wp->w_upd_rows) | |
| 1354 { | |
| 1355 top_end = j; | |
| 1356 break; | |
| 1357 } | |
| 1358 } | |
| 1359 if (top_end == 0) | |
| 1360 /* not found (cannot happen?): redraw everything */ | |
| 1361 type = NOT_VALID; | |
| 1362 else | |
| 1363 /* top area defined, the rest is VALID */ | |
| 1364 type = VALID; | |
| 1365 } | |
| 1366 | |
| 1378 | 1367 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1368 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1369 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1370 * called. */ | |
| 1371 if (screen_cleared) | |
| 1372 screen_cleared = MAYBE; | |
| 1373 | |
| 7 | 1374 /* |
| 1375 * If there are no changes on the screen that require a complete redraw, | |
| 1376 * handle three cases: | |
| 1377 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1378 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1379 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1380 * w_lines[] that needs updating. | |
| 1381 */ | |
| 743 | 1382 if ((type == VALID || type == SOME_VALID |
| 1383 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1384 #ifdef FEAT_DIFF |
| 1385 && !wp->w_botfill && !wp->w_old_botfill | |
| 1386 #endif | |
| 1387 ) | |
| 1388 { | |
| 1389 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1390 { | |
| 1391 /* | |
| 1392 * w_topline is the first changed line, the scrolling will be done | |
| 1393 * further down. | |
| 1394 */ | |
| 1395 } | |
| 1396 else if (wp->w_lines[0].wl_valid | |
| 1397 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1398 #ifdef FEAT_DIFF | |
| 1399 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1400 && wp->w_topfill > wp->w_old_topfill) | |
| 1401 #endif | |
| 1402 )) | |
| 1403 { | |
| 1404 /* | |
| 1405 * New topline is above old topline: May scroll down. | |
| 1406 */ | |
| 1407 #ifdef FEAT_FOLDING | |
| 1408 if (hasAnyFolding(wp)) | |
| 1409 { | |
| 1410 linenr_T ln; | |
| 1411 | |
| 1412 /* count the number of lines we are off, counting a sequence | |
| 1413 * of folded lines as one */ | |
| 1414 j = 0; | |
| 1415 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1416 { | |
| 1417 ++j; | |
| 1418 if (j >= wp->w_height - 2) | |
| 1419 break; | |
| 1420 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1421 } | |
| 1422 } | |
| 1423 else | |
| 1424 #endif | |
| 1425 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1426 if (j < wp->w_height - 2) /* not too far off */ | |
| 1427 { | |
| 1428 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1429 #ifdef FEAT_DIFF | |
| 1430 /* insert extra lines for previously invisible filler lines */ | |
| 1431 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1432 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1433 - wp->w_old_topfill; | |
| 1434 #endif | |
| 1435 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1436 { | |
| 1437 /* | |
| 1438 * Try to insert the correct number of lines. | |
| 1439 * If not the last window, delete the lines at the bottom. | |
| 1440 * win_ins_lines may fail when the terminal can't do it. | |
| 1441 */ | |
| 1442 if (i > 0) | |
| 1443 check_for_delay(FALSE); | |
| 1444 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1445 { | |
| 1446 if (wp->w_lines_valid != 0) | |
| 1447 { | |
| 1448 /* Need to update rows that are new, stop at the | |
| 1449 * first one that scrolled down. */ | |
| 1450 top_end = i; | |
| 1451 scrolled_down = TRUE; | |
| 1452 | |
| 1453 /* Move the entries that were scrolled, disable | |
| 1454 * the entries for the lines to be redrawn. */ | |
| 1455 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1456 wp->w_lines_valid = wp->w_height; | |
| 1457 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1458 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1459 while (idx >= 0) | |
| 1460 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1461 } | |
| 1462 } | |
| 1463 else | |
| 1464 mid_start = 0; /* redraw all lines */ | |
| 1465 } | |
| 1466 else | |
| 1467 mid_start = 0; /* redraw all lines */ | |
| 1468 } | |
| 1469 else | |
| 1470 mid_start = 0; /* redraw all lines */ | |
| 1471 } | |
| 1472 else | |
| 1473 { | |
| 1474 /* | |
| 1475 * New topline is at or below old topline: May scroll up. | |
| 1476 * When topline didn't change, find first entry in w_lines[] that | |
| 1477 * needs updating. | |
| 1478 */ | |
| 1479 | |
| 1480 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1481 j = -1; | |
| 1482 row = 0; | |
| 1483 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1484 { | |
| 1485 if (wp->w_lines[i].wl_valid | |
| 1486 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1487 { | |
| 1488 j = i; | |
| 1489 break; | |
| 1490 } | |
| 1491 row += wp->w_lines[i].wl_size; | |
| 1492 } | |
| 1493 if (j == -1) | |
| 1494 { | |
| 1495 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1496 * lines */ | |
| 1497 mid_start = 0; | |
| 1498 } | |
| 1499 else | |
| 1500 { | |
| 1501 /* | |
| 1502 * Try to delete the correct number of lines. | |
| 1503 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1504 */ | |
| 1505 #ifdef FEAT_DIFF | |
| 1506 /* If the topline didn't change, delete old filler lines, | |
| 1507 * otherwise delete filler lines of the new topline... */ | |
| 1508 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1509 row += wp->w_old_topfill; | |
| 1510 else | |
| 1511 row += diff_check_fill(wp, wp->w_topline); | |
| 1512 /* ... but don't delete new filler lines. */ | |
| 1513 row -= wp->w_topfill; | |
| 1514 #endif | |
| 1515 if (row > 0) | |
| 1516 { | |
| 1517 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
|
1518 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
|
1519 == OK) |
| 7 | 1520 bot_start = wp->w_height - row; |
| 1521 else | |
| 1522 mid_start = 0; /* redraw all lines */ | |
| 1523 } | |
| 1524 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1525 { | |
| 1526 /* | |
| 1527 * Skip the lines (below the deleted lines) that are still | |
| 1528 * valid and don't need redrawing. Copy their info | |
| 1529 * upwards, to compensate for the deleted lines. Set | |
| 1530 * bot_start to the first row that needs redrawing. | |
| 1531 */ | |
| 1532 bot_start = 0; | |
| 1533 idx = 0; | |
| 1534 for (;;) | |
| 1535 { | |
| 1536 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1537 /* stop at line that didn't fit, unless it is still | |
| 1538 * valid (no lines deleted) */ | |
| 1539 if (row > 0 && bot_start + row | |
| 1540 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1541 { | |
| 1542 wp->w_lines_valid = idx + 1; | |
| 1543 break; | |
| 1544 } | |
| 1545 bot_start += wp->w_lines[idx++].wl_size; | |
| 1546 | |
| 1547 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1548 if (++j >= wp->w_lines_valid) | |
| 1549 { | |
| 1550 wp->w_lines_valid = idx; | |
| 1551 break; | |
| 1552 } | |
| 1553 } | |
| 1554 #ifdef FEAT_DIFF | |
| 1555 /* Correct the first entry for filler lines at the top | |
| 1556 * when it won't get updated below. */ | |
| 1557 if (wp->w_p_diff && bot_start > 0) | |
| 1558 wp->w_lines[0].wl_size = | |
| 1559 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1560 + wp->w_topfill; | |
| 1561 #endif | |
| 1562 } | |
| 1563 } | |
| 1564 } | |
| 1565 | |
| 1566 /* When starting redraw in the first line, redraw all lines. When | |
| 1567 * there is only one window it's probably faster to clear the screen | |
| 1568 * first. */ | |
| 1569 if (mid_start == 0) | |
| 1570 { | |
| 1571 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1572 if (ONE_WINDOW) |
| 981 | 1573 { |
| 1331 | 1574 /* Clear the screen when it was not done by win_del_lines() or |
| 1575 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1576 * then. */ | |
| 1577 if (screen_cleared != TRUE) | |
| 1578 screenclear(); | |
| 981 | 1579 /* The screen was cleared, redraw the tab pages line. */ |
| 1580 if (redraw_tabline) | |
| 1581 draw_tabline(); | |
| 1582 } | |
| 7 | 1583 } |
| 1331 | 1584 |
| 1585 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1586 * cleared (only happens for the first window) or when screenclear() | |
| 1587 * was called directly above, "must_redraw" will have been set to | |
| 1588 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1589 if (screen_cleared == TRUE) | |
| 1590 must_redraw = 0; | |
| 7 | 1591 } |
| 1592 else | |
| 1593 { | |
| 1594 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1595 mid_start = 0; | |
| 1596 mid_end = wp->w_height; | |
| 1597 } | |
| 1598 | |
| 743 | 1599 if (type == SOME_VALID) |
| 1600 { | |
| 1601 /* SOME_VALID: redraw all lines. */ | |
| 1602 mid_start = 0; | |
| 1603 mid_end = wp->w_height; | |
| 1604 type = NOT_VALID; | |
| 1605 } | |
| 1606 | |
| 7 | 1607 /* check if we are updating or removing the inverted part */ |
| 1608 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1609 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1610 { | |
| 1611 linenr_T from, to; | |
| 1612 | |
| 1613 if (VIsual_active) | |
| 1614 { | |
| 1615 if (VIsual_active | |
| 1616 && (VIsual_mode != wp->w_old_visual_mode | |
| 1617 || type == INVERTED_ALL)) | |
| 1618 { | |
| 1619 /* | |
| 1620 * If the type of Visual selection changed, redraw the whole | |
| 1621 * selection. Also when the ownership of the X selection is | |
| 1622 * gained or lost. | |
| 1623 */ | |
| 1624 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1625 { | |
| 1626 from = curwin->w_cursor.lnum; | |
| 1627 to = VIsual.lnum; | |
| 1628 } | |
| 1629 else | |
| 1630 { | |
| 1631 from = VIsual.lnum; | |
| 1632 to = curwin->w_cursor.lnum; | |
| 1633 } | |
| 1634 /* redraw more when the cursor moved as well */ | |
| 1635 if (wp->w_old_cursor_lnum < from) | |
| 1636 from = wp->w_old_cursor_lnum; | |
| 1637 if (wp->w_old_cursor_lnum > to) | |
| 1638 to = wp->w_old_cursor_lnum; | |
| 1639 if (wp->w_old_visual_lnum < from) | |
| 1640 from = wp->w_old_visual_lnum; | |
| 1641 if (wp->w_old_visual_lnum > to) | |
| 1642 to = wp->w_old_visual_lnum; | |
| 1643 } | |
| 1644 else | |
| 1645 { | |
| 1646 /* | |
| 1647 * Find the line numbers that need to be updated: The lines | |
| 1648 * between the old cursor position and the current cursor | |
| 1649 * position. Also check if the Visual position changed. | |
| 1650 */ | |
| 1651 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1652 { | |
| 1653 from = curwin->w_cursor.lnum; | |
| 1654 to = wp->w_old_cursor_lnum; | |
| 1655 } | |
| 1656 else | |
| 1657 { | |
| 1658 from = wp->w_old_cursor_lnum; | |
| 1659 to = curwin->w_cursor.lnum; | |
| 1660 if (from == 0) /* Visual mode just started */ | |
| 1661 from = to; | |
| 1662 } | |
| 1663 | |
| 422 | 1664 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1665 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1666 { |
| 1667 if (wp->w_old_visual_lnum < from | |
| 1668 && wp->w_old_visual_lnum != 0) | |
| 1669 from = wp->w_old_visual_lnum; | |
| 1670 if (wp->w_old_visual_lnum > to) | |
| 1671 to = wp->w_old_visual_lnum; | |
| 1672 if (VIsual.lnum < from) | |
| 1673 from = VIsual.lnum; | |
| 1674 if (VIsual.lnum > to) | |
| 1675 to = VIsual.lnum; | |
| 1676 } | |
| 1677 } | |
| 1678 | |
| 1679 /* | |
| 1680 * If in block mode and changed column or curwin->w_curswant: | |
| 1681 * update all lines. | |
| 1682 * First compute the actual start and end column. | |
| 1683 */ | |
| 1684 if (VIsual_mode == Ctrl_V) | |
| 1685 { | |
| 6266 | 1686 colnr_T fromc, toc; |
| 1687 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) | |
| 1688 int save_ve_flags = ve_flags; | |
| 1689 | |
| 1690 if (curwin->w_p_lbr) | |
| 1691 ve_flags = VE_ALL; | |
| 1692 #endif | |
| 7 | 1693 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
| 6266 | 1694 #if defined(FEAT_VIRTUALEDIT) && defined(FEAT_LINEBREAK) |
| 1695 ve_flags = save_ve_flags; | |
| 1696 #endif | |
| 7 | 1697 ++toc; |
| 1698 if (curwin->w_curswant == MAXCOL) | |
| 1699 toc = MAXCOL; | |
| 1700 | |
| 1701 if (fromc != wp->w_old_cursor_fcol | |
| 1702 || toc != wp->w_old_cursor_lcol) | |
| 1703 { | |
| 1704 if (from > VIsual.lnum) | |
| 1705 from = VIsual.lnum; | |
| 1706 if (to < VIsual.lnum) | |
| 1707 to = VIsual.lnum; | |
| 1708 } | |
| 1709 wp->w_old_cursor_fcol = fromc; | |
| 1710 wp->w_old_cursor_lcol = toc; | |
| 1711 } | |
| 1712 } | |
| 1713 else | |
| 1714 { | |
| 1715 /* Use the line numbers of the old Visual area. */ | |
| 1716 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1717 { | |
| 1718 from = wp->w_old_cursor_lnum; | |
| 1719 to = wp->w_old_visual_lnum; | |
| 1720 } | |
| 1721 else | |
| 1722 { | |
| 1723 from = wp->w_old_visual_lnum; | |
| 1724 to = wp->w_old_cursor_lnum; | |
| 1725 } | |
| 1726 } | |
| 1727 | |
| 1728 /* | |
| 1729 * There is no need to update lines above the top of the window. | |
| 1730 */ | |
| 1731 if (from < wp->w_topline) | |
| 1732 from = wp->w_topline; | |
| 1733 | |
| 1734 /* | |
| 1735 * If we know the value of w_botline, use it to restrict the update to | |
| 1736 * the lines that are visible in the window. | |
| 1737 */ | |
| 1738 if (wp->w_valid & VALID_BOTLINE) | |
| 1739 { | |
| 1740 if (from >= wp->w_botline) | |
| 1741 from = wp->w_botline - 1; | |
| 1742 if (to >= wp->w_botline) | |
| 1743 to = wp->w_botline - 1; | |
| 1744 } | |
| 1745 | |
| 1746 /* | |
| 1747 * Find the minimal part to be updated. | |
| 1748 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1749 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1750 * top_end; need to redraw from top_end to the "to" line. | |
| 1751 * A middle mouse click with a Visual selection may change the text | |
| 1752 * above the Visual area and reset wl_valid, do count these for | |
| 1753 * mid_end (in srow). | |
| 1754 */ | |
| 1755 if (mid_start > 0) | |
| 1756 { | |
| 1757 lnum = wp->w_topline; | |
| 1758 idx = 0; | |
| 1759 srow = 0; | |
| 1760 if (scrolled_down) | |
| 1761 mid_start = top_end; | |
| 1762 else | |
| 1763 mid_start = 0; | |
| 1764 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1765 { | |
| 1766 if (wp->w_lines[idx].wl_valid) | |
| 1767 mid_start += wp->w_lines[idx].wl_size; | |
| 1768 else if (!scrolled_down) | |
| 1769 srow += wp->w_lines[idx].wl_size; | |
| 1770 ++idx; | |
| 1771 # ifdef FEAT_FOLDING | |
| 1772 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1773 lnum = wp->w_lines[idx].wl_lnum; | |
| 1774 else | |
| 1775 # endif | |
| 1776 ++lnum; | |
| 1777 } | |
| 1778 srow += mid_start; | |
| 1779 mid_end = wp->w_height; | |
| 1780 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1781 { | |
| 1782 if (wp->w_lines[idx].wl_valid | |
| 1783 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1784 { | |
| 1785 /* Only update until first row of this line */ | |
| 1786 mid_end = srow; | |
| 1787 break; | |
| 1788 } | |
| 1789 srow += wp->w_lines[idx].wl_size; | |
| 1790 } | |
| 1791 } | |
| 1792 } | |
| 1793 | |
| 1794 if (VIsual_active && buf == curwin->w_buffer) | |
| 1795 { | |
| 1796 wp->w_old_visual_mode = VIsual_mode; | |
| 1797 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1798 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1799 wp->w_old_visual_col = VIsual.col; |
| 7 | 1800 wp->w_old_curswant = curwin->w_curswant; |
| 1801 } | |
| 1802 else | |
| 1803 { | |
| 1804 wp->w_old_visual_mode = 0; | |
| 1805 wp->w_old_cursor_lnum = 0; | |
| 1806 wp->w_old_visual_lnum = 0; | |
| 422 | 1807 wp->w_old_visual_col = 0; |
| 7 | 1808 } |
| 1809 | |
| 1810 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1811 /* reset got_int, otherwise regexp won't work */ | |
| 1812 save_got_int = got_int; | |
| 1813 got_int = 0; | |
| 1814 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1815 #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
|
1816 /* 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
|
1817 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
|
1818 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
|
1819 #endif |
| 7 | 1820 #ifdef FEAT_FOLDING |
| 1821 win_foldinfo.fi_level = 0; | |
| 1822 #endif | |
| 1823 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1824 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1825 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1826 * 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
|
1827 * 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
|
1828 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1829 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
|
1830 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
|
1831 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1832 |
| 7 | 1833 /* |
| 1834 * Update all the window rows. | |
| 1835 */ | |
| 1836 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1837 row = 0; | |
| 1838 srow = 0; | |
| 1839 lnum = wp->w_topline; /* first line shown in window */ | |
| 1840 for (;;) | |
| 1841 { | |
| 1842 /* stop updating when reached the end of the window (check for _past_ | |
| 1843 * the end of the window is at the end of the loop) */ | |
| 1844 if (row == wp->w_height) | |
| 1845 { | |
| 1846 didline = TRUE; | |
| 1847 break; | |
| 1848 } | |
| 1849 | |
| 1850 /* stop updating when hit the end of the file */ | |
| 1851 if (lnum > buf->b_ml.ml_line_count) | |
| 1852 { | |
| 1853 eof = TRUE; | |
| 1854 break; | |
| 1855 } | |
| 1856 | |
| 1857 /* Remember the starting row of the line that is going to be dealt | |
| 1858 * with. It is used further down when the line doesn't fit. */ | |
| 1859 srow = row; | |
| 1860 | |
| 1861 /* | |
| 1862 * Update a line when it is in an area that needs updating, when it | |
| 1863 * has changes or w_lines[idx] is invalid. | |
| 1864 * bot_start may be halfway a wrapped line after using | |
| 1865 * win_del_lines(), check if the current line includes it. | |
| 1866 * When syntax folding is being used, the saved syntax states will | |
| 1867 * already have been updated, we can't see where the syntax state is | |
| 1868 * the same again, just update until the end of the window. | |
| 1869 */ | |
| 1870 if (row < top_end | |
| 1871 || (row >= mid_start && row < mid_end) | |
| 1872 #ifdef FEAT_SEARCH_EXTRA | |
| 1873 || top_to_mod | |
| 1874 #endif | |
| 1875 || idx >= wp->w_lines_valid | |
| 1876 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1877 || (mod_top != 0 | |
| 1878 && (lnum == mod_top | |
| 1879 || (lnum >= mod_top | |
| 1880 && (lnum < mod_bot | |
| 1881 #ifdef FEAT_SYN_HL | |
| 1882 || did_update == DID_FOLD | |
| 1883 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1884 && syntax_present(wp) |
| 7 | 1885 && ( |
| 1886 # ifdef FEAT_FOLDING | |
| 1887 (foldmethodIsSyntax(wp) | |
| 1888 && hasAnyFolding(wp)) || | |
| 1889 # endif | |
| 1890 syntax_check_changed(lnum))) | |
| 1891 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1892 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1893 /* match in fixed position might need redraw |
| 1894 * if lines were inserted or deleted */ | |
| 1895 || (wp->w_match_head != NULL | |
| 1896 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1897 #endif |
| 7 | 1898 ))))) |
| 1899 { | |
| 1900 #ifdef FEAT_SEARCH_EXTRA | |
| 1901 if (lnum == mod_top) | |
| 1902 top_to_mod = FALSE; | |
| 1903 #endif | |
| 1904 | |
| 1905 /* | |
| 1906 * When at start of changed lines: May scroll following lines | |
| 1907 * up or down to minimize redrawing. | |
| 1908 * Don't do this when the change continues until the end. | |
| 3318 | 1909 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1910 */ |
| 1911 if (lnum == mod_top | |
| 1912 && mod_bot != MAXLNUM | |
| 3318 | 1913 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1914 { |
| 1915 int old_rows = 0; | |
| 1916 int new_rows = 0; | |
| 1917 int xtra_rows; | |
| 1918 linenr_T l; | |
| 1919 | |
| 1920 /* Count the old number of window rows, using w_lines[], which | |
| 1921 * should still contain the sizes for the lines as they are | |
| 1922 * currently displayed. */ | |
| 1923 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1924 { | |
| 1925 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1926 * lines are part of the changed area. */ | |
| 1927 if (wp->w_lines[i].wl_valid | |
| 1928 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1929 break; | |
| 1930 old_rows += wp->w_lines[i].wl_size; | |
| 1931 #ifdef FEAT_FOLDING | |
| 1932 if (wp->w_lines[i].wl_valid | |
| 1933 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1934 { | |
| 1935 /* Must have found the last valid entry above mod_bot. | |
| 1936 * Add following invalid entries. */ | |
| 1937 ++i; | |
| 1938 while (i < wp->w_lines_valid | |
| 1939 && !wp->w_lines[i].wl_valid) | |
| 1940 old_rows += wp->w_lines[i++].wl_size; | |
| 1941 break; | |
| 1942 } | |
| 1943 #endif | |
| 1944 } | |
| 1945 | |
| 1946 if (i >= wp->w_lines_valid) | |
| 1947 { | |
| 1948 /* We can't find a valid line below the changed lines, | |
| 1949 * need to redraw until the end of the window. | |
| 1950 * Inserting/deleting lines has no use. */ | |
| 1951 bot_start = 0; | |
| 1952 } | |
| 1953 else | |
| 1954 { | |
| 1955 /* Able to count old number of rows: Count new window | |
| 1956 * rows, and may insert/delete lines */ | |
| 1957 j = idx; | |
| 1958 for (l = lnum; l < mod_bot; ++l) | |
| 1959 { | |
| 1960 #ifdef FEAT_FOLDING | |
| 1961 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1962 ++new_rows; | |
| 1963 else | |
| 1964 #endif | |
| 1965 #ifdef FEAT_DIFF | |
| 1966 if (l == wp->w_topline) | |
| 1967 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1968 + wp->w_topfill; | |
| 1969 else | |
| 1970 #endif | |
| 1971 new_rows += plines_win(wp, l, TRUE); | |
| 1972 ++j; | |
| 1973 if (new_rows > wp->w_height - row - 2) | |
| 1974 { | |
| 1975 /* it's getting too much, must redraw the rest */ | |
| 1976 new_rows = 9999; | |
| 1977 break; | |
| 1978 } | |
| 1979 } | |
| 1980 xtra_rows = new_rows - old_rows; | |
| 1981 if (xtra_rows < 0) | |
| 1982 { | |
| 1983 /* May scroll text up. If there is not enough | |
| 1984 * remaining text or scrolling fails, must redraw the | |
| 1985 * rest. If scrolling works, must redraw the text | |
| 1986 * below the scrolled text. */ | |
| 1987 if (row - xtra_rows >= wp->w_height - 2) | |
| 1988 mod_bot = MAXLNUM; | |
| 1989 else | |
| 1990 { | |
| 1991 check_for_delay(FALSE); | |
| 1992 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
|
1993 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1994 mod_bot = MAXLNUM; |
| 1995 else | |
| 1996 bot_start = wp->w_height + xtra_rows; | |
| 1997 } | |
| 1998 } | |
| 1999 else if (xtra_rows > 0) | |
| 2000 { | |
| 2001 /* May scroll text down. If there is not enough | |
| 2002 * remaining text of scrolling fails, must redraw the | |
| 2003 * rest. */ | |
| 2004 if (row + xtra_rows >= wp->w_height - 2) | |
| 2005 mod_bot = MAXLNUM; | |
| 2006 else | |
| 2007 { | |
| 2008 check_for_delay(FALSE); | |
| 2009 if (win_ins_lines(wp, row + old_rows, | |
| 2010 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2011 mod_bot = MAXLNUM; | |
| 2012 else if (top_end > row + old_rows) | |
| 2013 /* Scrolled the part at the top that requires | |
| 2014 * updating down. */ | |
| 2015 top_end += xtra_rows; | |
| 2016 } | |
| 2017 } | |
| 2018 | |
| 2019 /* When not updating the rest, may need to move w_lines[] | |
| 2020 * entries. */ | |
| 2021 if (mod_bot != MAXLNUM && i != j) | |
| 2022 { | |
| 2023 if (j < i) | |
| 2024 { | |
| 2025 int x = row + new_rows; | |
| 2026 | |
| 2027 /* move entries in w_lines[] upwards */ | |
| 2028 for (;;) | |
| 2029 { | |
| 2030 /* stop at last valid entry in w_lines[] */ | |
| 2031 if (i >= wp->w_lines_valid) | |
| 2032 { | |
| 2033 wp->w_lines_valid = j; | |
| 2034 break; | |
| 2035 } | |
| 2036 wp->w_lines[j] = wp->w_lines[i]; | |
| 2037 /* stop at a line that won't fit */ | |
| 2038 if (x + (int)wp->w_lines[j].wl_size | |
| 2039 > wp->w_height) | |
| 2040 { | |
| 2041 wp->w_lines_valid = j + 1; | |
| 2042 break; | |
| 2043 } | |
| 2044 x += wp->w_lines[j++].wl_size; | |
| 2045 ++i; | |
| 2046 } | |
| 2047 if (bot_start > x) | |
| 2048 bot_start = x; | |
| 2049 } | |
| 2050 else /* j > i */ | |
| 2051 { | |
| 2052 /* move entries in w_lines[] downwards */ | |
| 2053 j -= i; | |
| 2054 wp->w_lines_valid += j; | |
| 2055 if (wp->w_lines_valid > wp->w_height) | |
| 2056 wp->w_lines_valid = wp->w_height; | |
| 2057 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2058 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2059 | |
| 2060 /* The w_lines[] entries for inserted lines are | |
| 2061 * now invalid, but wl_size may be used above. | |
| 2062 * Reset to zero. */ | |
| 2063 while (i >= idx) | |
| 2064 { | |
| 2065 wp->w_lines[i].wl_size = 0; | |
| 2066 wp->w_lines[i--].wl_valid = FALSE; | |
| 2067 } | |
| 2068 } | |
| 2069 } | |
| 2070 } | |
| 2071 } | |
| 2072 | |
| 2073 #ifdef FEAT_FOLDING | |
| 2074 /* | |
| 2075 * When lines are folded, display one line for all of them. | |
| 2076 * Otherwise, display normally (can be several display lines when | |
| 2077 * 'wrap' is on). | |
| 2078 */ | |
| 2079 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2080 if (fold_count != 0) | |
| 2081 { | |
| 2082 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2083 ++row; | |
| 2084 --fold_count; | |
| 2085 wp->w_lines[idx].wl_folded = TRUE; | |
| 2086 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2087 # ifdef FEAT_SYN_HL | |
| 2088 did_update = DID_FOLD; | |
| 2089 # endif | |
| 2090 } | |
| 2091 else | |
| 2092 #endif | |
| 2093 if (idx < wp->w_lines_valid | |
| 2094 && wp->w_lines[idx].wl_valid | |
| 2095 && wp->w_lines[idx].wl_lnum == lnum | |
| 2096 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2097 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2098 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2099 #ifdef FEAT_DIFF | |
| 2100 && diff_check_fill(wp, lnum) == 0 | |
| 2101 #endif | |
| 2102 ) | |
| 2103 { | |
| 2104 /* This line is not going to fit. Don't draw anything here, | |
| 2105 * will draw "@ " lines below. */ | |
| 2106 row = wp->w_height + 1; | |
| 2107 } | |
| 2108 else | |
| 2109 { | |
| 2110 #ifdef FEAT_SEARCH_EXTRA | |
| 2111 prepare_search_hl(wp, lnum); | |
| 2112 #endif | |
| 2113 #ifdef FEAT_SYN_HL | |
| 2114 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2115 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
|
2116 && syntax_present(wp)) |
| 7 | 2117 syntax_end_parsing(syntax_last_parsed + 1); |
| 2118 #endif | |
| 2119 | |
| 2120 /* | |
| 2121 * Display one line. | |
| 2122 */ | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2123 row = win_line(wp, lnum, srow, wp->w_height, mod_top == 0); |
| 7 | 2124 |
| 2125 #ifdef FEAT_FOLDING | |
| 2126 wp->w_lines[idx].wl_folded = FALSE; | |
| 2127 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2128 #endif | |
| 2129 #ifdef FEAT_SYN_HL | |
| 2130 did_update = DID_LINE; | |
| 2131 syntax_last_parsed = lnum; | |
| 2132 #endif | |
| 2133 } | |
| 2134 | |
| 2135 wp->w_lines[idx].wl_lnum = lnum; | |
| 2136 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
|
2137 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2138 /* 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
|
2139 * 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
|
2140 * 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
|
2141 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2142 { |
| 2143 /* we may need the size of that too long line later on */ | |
| 3318 | 2144 if (dollar_vcol == -1) |
| 7 | 2145 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2146 ++idx; | |
| 2147 break; | |
| 2148 } | |
| 3318 | 2149 if (dollar_vcol == -1) |
| 7 | 2150 wp->w_lines[idx].wl_size = row - srow; |
| 2151 ++idx; | |
| 2152 #ifdef FEAT_FOLDING | |
| 2153 lnum += fold_count + 1; | |
| 2154 #else | |
| 2155 ++lnum; | |
| 2156 #endif | |
| 2157 } | |
| 2158 else | |
| 2159 { | |
| 2160 /* This line does not need updating, advance to the next one */ | |
| 2161 row += wp->w_lines[idx++].wl_size; | |
| 2162 if (row > wp->w_height) /* past end of screen */ | |
| 2163 break; | |
| 2164 #ifdef FEAT_FOLDING | |
| 2165 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2166 #else | |
| 2167 ++lnum; | |
| 2168 #endif | |
| 2169 #ifdef FEAT_SYN_HL | |
| 2170 did_update = DID_NONE; | |
| 2171 #endif | |
| 2172 } | |
| 2173 | |
| 2174 if (lnum > buf->b_ml.ml_line_count) | |
| 2175 { | |
| 2176 eof = TRUE; | |
| 2177 break; | |
| 2178 } | |
| 2179 } | |
| 2180 /* | |
| 2181 * End of loop over all window lines. | |
| 2182 */ | |
| 2183 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2184 #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
|
2185 /* 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
|
2186 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
|
2187 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2188 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
|
2189 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2190 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
|
2191 # 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
|
2192 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
|
2193 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
|
2194 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
|
2195 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
|
2196 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2197 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
|
2198 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2199 # endif |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2200 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
|
2201 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2202 #endif |
| 7 | 2203 |
| 2204 if (idx > wp->w_lines_valid) | |
| 2205 wp->w_lines_valid = idx; | |
| 2206 | |
| 2207 #ifdef FEAT_SYN_HL | |
| 2208 /* | |
| 2209 * Let the syntax stuff know we stop parsing here. | |
| 2210 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2211 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2212 syntax_end_parsing(syntax_last_parsed + 1); |
| 2213 #endif | |
| 2214 | |
| 2215 /* | |
| 2216 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2217 * line we were working on, then the line didn't fit. | |
| 2218 */ | |
| 2219 wp->w_empty_rows = 0; | |
| 2220 #ifdef FEAT_DIFF | |
| 2221 wp->w_filler_rows = 0; | |
| 2222 #endif | |
| 2223 if (!eof && !didline) | |
| 2224 { | |
| 2225 if (lnum == wp->w_topline) | |
| 2226 { | |
| 2227 /* | |
| 2228 * Single line that does not fit! | |
| 2229 * Don't overwrite it, it can be edited. | |
| 2230 */ | |
| 2231 wp->w_botline = lnum + 1; | |
| 2232 } | |
| 2233 #ifdef FEAT_DIFF | |
| 2234 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2235 { | |
| 2236 /* Window ends in filler lines. */ | |
| 2237 wp->w_botline = lnum; | |
| 2238 wp->w_filler_rows = wp->w_height - srow; | |
| 2239 } | |
| 2240 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2241 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
|
2242 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2243 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
|
2244 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2245 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2246 * 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
|
2247 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2248 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
|
2249 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2250 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
|
2251 (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
|
2252 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2253 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2254 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2255 } |
| 7 | 2256 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2257 { | |
| 2258 /* | |
| 2259 * Last line isn't finished: Display "@@@" at the end. | |
| 2260 */ | |
| 2261 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2262 W_WINROW(wp) + wp->w_height, | |
| 2263 (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
|
2264 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2265 set_empty_rows(wp, srow); |
| 2266 wp->w_botline = lnum; | |
| 2267 } | |
| 2268 else | |
| 2269 { | |
| 2270 win_draw_end(wp, '@', ' ', srow, wp->w_height, HLF_AT); | |
| 2271 wp->w_botline = lnum; | |
| 2272 } | |
| 2273 } | |
| 2274 else | |
| 2275 { | |
| 2276 draw_vsep_win(wp, row); | |
| 2277 if (eof) /* we hit the end of the file */ | |
| 2278 { | |
| 2279 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2280 #ifdef FEAT_DIFF | |
| 2281 j = diff_check_fill(wp, wp->w_botline); | |
| 2282 if (j > 0 && !wp->w_botfill) | |
| 2283 { | |
| 2284 /* | |
| 2285 * Display filler lines at the end of the file | |
| 2286 */ | |
| 2287 if (char2cells(fill_diff) > 1) | |
| 2288 i = '-'; | |
| 2289 else | |
| 2290 i = fill_diff; | |
| 2291 if (row + j > wp->w_height) | |
| 2292 j = wp->w_height - row; | |
| 2293 win_draw_end(wp, i, i, row, row + (int)j, HLF_DED); | |
| 2294 row += j; | |
| 2295 } | |
| 2296 #endif | |
| 2297 } | |
| 3318 | 2298 else if (dollar_vcol == -1) |
| 7 | 2299 wp->w_botline = lnum; |
| 2300 | |
| 2301 /* make sure the rest of the screen is blank */ | |
| 2302 /* 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
|
2303 win_draw_end(wp, '~', ' ', row, wp->w_height, HLF_EOB); |
| 7 | 2304 } |
| 2305 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2306 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2307 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2308 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2309 |
| 7 | 2310 /* Reset the type of redrawing required, the window has been updated. */ |
| 2311 wp->w_redr_type = 0; | |
| 2312 #ifdef FEAT_DIFF | |
| 2313 wp->w_old_topfill = wp->w_topfill; | |
| 2314 wp->w_old_botfill = wp->w_botfill; | |
| 2315 #endif | |
| 2316 | |
| 3318 | 2317 if (dollar_vcol == -1) |
| 7 | 2318 { |
| 2319 /* | |
| 2320 * There is a trick with w_botline. If we invalidate it on each | |
| 2321 * change that might modify it, this will cause a lot of expensive | |
| 2322 * calls to plines() in update_topline() each time. Therefore the | |
| 2323 * value of w_botline is often approximated, and this value is used to | |
| 2324 * compute the value of w_topline. If the value of w_botline was | |
| 2325 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2326 * the visible part of the text). If it's not, we need to redraw | |
| 2327 * again. Mostly this just means scrolling up a few lines, so it | |
| 2328 * doesn't look too bad. Only do this for the current window (where | |
| 2329 * changes are relevant). | |
| 2330 */ | |
| 2331 wp->w_valid |= VALID_BOTLINE; | |
| 2332 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2333 { | |
| 2334 recursive = TRUE; | |
| 2335 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2336 update_topline(); /* may invalidate w_botline again */ | |
| 2337 if (must_redraw != 0) | |
| 2338 { | |
| 2339 /* Don't update for changes in buffer again. */ | |
| 2340 i = curbuf->b_mod_set; | |
| 2341 curbuf->b_mod_set = FALSE; | |
| 2342 win_update(curwin); | |
| 2343 must_redraw = 0; | |
| 2344 curbuf->b_mod_set = i; | |
| 2345 } | |
| 2346 recursive = FALSE; | |
| 2347 } | |
| 2348 } | |
| 2349 | |
| 2350 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2351 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2352 if (!got_int) | |
| 2353 got_int = save_got_int; | |
| 2354 #endif | |
| 2355 } | |
| 2356 | |
| 2357 /* | |
| 2358 * Clear the rest of the window and mark the unused lines with "c1". use "c2" | |
| 2359 * as the filler character. | |
| 2360 */ | |
| 2361 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2362 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2363 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2364 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2365 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2366 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2367 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2368 hlf_T hl) |
| 7 | 2369 { |
| 2370 #if defined(FEAT_FOLDING) || defined(FEAT_SIGNS) || defined(FEAT_CMDWIN) | |
| 2371 int n = 0; | |
| 2372 # define FDC_OFF n | |
| 2373 #else | |
| 2374 # define FDC_OFF 0 | |
| 2375 #endif | |
| 6553 | 2376 #ifdef FEAT_FOLDING |
| 2377 int fdc = compute_foldcolumn(wp, 0); | |
| 2378 #endif | |
| 7 | 2379 |
| 2380 #ifdef FEAT_RIGHTLEFT | |
| 2381 if (wp->w_p_rl) | |
| 2382 { | |
| 2383 /* No check for cmdline window: should never be right-left. */ | |
| 2384 # ifdef FEAT_FOLDING | |
| 6553 | 2385 n = fdc; |
| 7 | 2386 |
| 2387 if (n > 0) | |
| 2388 { | |
| 2389 /* 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
|
2390 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
|
2391 n = wp->w_width; |
| 7 | 2392 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2393 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
|
2394 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2395 } |
| 2396 # endif | |
| 2397 # ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2398 if (signcolumn_on(wp)) |
| 7 | 2399 { |
| 2400 int nn = n + 2; | |
| 2401 | |
| 2402 /* 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
|
2403 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
|
2404 nn = wp->w_width; |
| 7 | 2405 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2406 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
|
2407 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2408 n = nn; |
| 2409 } | |
| 2410 # endif | |
| 2411 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2412 wp->w_wincol, 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
|
2413 c2, c2, HL_ATTR(hl)); |
| 7 | 2414 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
| 2415 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
|
2416 c1, c2, HL_ATTR(hl)); |
| 7 | 2417 } |
| 2418 else | |
| 2419 #endif | |
| 2420 { | |
| 2421 #ifdef FEAT_CMDWIN | |
| 2422 if (cmdwin_type != 0 && wp == curwin) | |
| 2423 { | |
| 2424 /* draw the cmdline character in the leftmost column */ | |
| 2425 n = 1; | |
| 2426 if (n > wp->w_width) | |
| 2427 n = wp->w_width; | |
| 2428 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
|
2429 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
|
2430 cmdwin_type, ' ', HL_ATTR(HLF_AT)); |
| 7 | 2431 } |
| 2432 #endif | |
| 2433 #ifdef FEAT_FOLDING | |
| 6553 | 2434 if (fdc > 0) |
| 2435 { | |
| 2436 int nn = n + fdc; | |
| 7 | 2437 |
| 2438 /* 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
|
2439 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
|
2440 nn = wp->w_width; |
| 7 | 2441 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
|
2442 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
|
2443 ' ', ' ', HL_ATTR(HLF_FC)); |
| 7 | 2444 n = nn; |
| 2445 } | |
| 2446 #endif | |
| 2447 #ifdef FEAT_SIGNS | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
2448 if (signcolumn_on(wp)) |
| 7 | 2449 { |
| 2450 int nn = n + 2; | |
| 2451 | |
| 2452 /* 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
|
2453 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
|
2454 nn = wp->w_width; |
| 7 | 2455 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
|
2456 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
|
2457 ' ', ' ', HL_ATTR(HLF_SC)); |
| 7 | 2458 n = nn; |
| 2459 } | |
| 2460 #endif | |
| 2461 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
|
2462 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
|
2463 c1, c2, HL_ATTR(hl)); |
| 7 | 2464 } |
| 2465 set_empty_rows(wp, row); | |
| 2466 } | |
| 2467 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2468 #ifdef FEAT_SYN_HL |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
2469 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
|
2470 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2471 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2472 * 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
|
2473 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2474 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2475 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
|
2476 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2477 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2478 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2479 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2480 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2481 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2482 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2483 #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
|
2484 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2485 * 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
|
2486 * 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
|
2487 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2488 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2489 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
|
2490 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2491 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
|
2492 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2493 #ifdef FEAT_MBYTE |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2494 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2495 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2497 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
|
2498 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2499 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2500 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2502 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2503 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
|
2504 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
|
2505 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2508 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
|
2509 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2510 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2511 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2512 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2513 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2514 /* 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
|
2515 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
|
2516 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 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
|
2518 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
|
2519 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
|
2520 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 - (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
|
2522 # endif |
|
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 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2525 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2526 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2528 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
|
2529 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
|
2530 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2531 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2532 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2533 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2535 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2537 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2538 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2539 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
|
2540 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2542 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
|
2543 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
|
2544 int firstbyte = *p; |
|
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 /* 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
|
2547 * 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
|
2548 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
|
2549 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2550 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 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
|
2553 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
|
2554 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2555 else |
|
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 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
|
2558 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2559 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2560 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2561 prev_c = u8c; |
|
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 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
|
2564 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2565 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2566 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2567 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2568 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2569 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2570 /* 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
|
2571 #ifdef UNICODE16 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 if (u8c >= 0x10000) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2573 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
|
2574 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2575 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2576 ScreenLinesUC[idx] = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 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
|
2578 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2579 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
|
2580 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
|
2581 break; |
|
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 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2584 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2585 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
|
2586 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2587 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
|
2588 /* 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
|
2589 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
|
2590 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
|
2591 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2592 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
|
2593 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2594 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2595 p += c_len; |
|
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 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2598 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2599 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2600 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2601 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
|
2602 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2603 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
|
2604 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
|
2605 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2606 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2607 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2608 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
|
2609 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
|
2610 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2611 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2612 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
|
2613 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2614 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2615 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2616 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2617 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2618 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2619 |
| 7 | 2620 #ifdef FEAT_FOLDING |
| 2621 /* | |
| 6553 | 2622 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2623 * space is available for window "wp", minus "col". | |
| 2624 */ | |
| 2625 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2626 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2627 { |
| 2628 int fdc = wp->w_p_fdc; | |
| 2629 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
|
2630 int wwidth = wp->w_width; |
| 6553 | 2631 |
| 2632 if (fdc > wwidth - (col + wmw)) | |
| 2633 fdc = wwidth - (col + wmw); | |
| 2634 return fdc; | |
| 2635 } | |
| 2636 | |
| 2637 /* | |
| 7 | 2638 * Display one folded line. |
| 2639 */ | |
| 2640 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2641 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2642 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2643 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2644 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2645 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2646 int row) |
| 7 | 2647 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2648 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2649 pos_T *top, *bot; |
| 2650 linenr_T lnume = lnum + fold_count - 1; | |
| 2651 int len; | |
| 29 | 2652 char_u *text; |
| 7 | 2653 int fdc; |
| 2654 int col; | |
| 2655 int txtcol; | |
| 2656 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2657 int ri; |
| 7 | 2658 |
| 2659 /* Build the fold line: | |
| 2660 * 1. Add the cmdwin_type for the command-line window | |
| 2661 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2662 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2663 * 4. Compose the text |
| 2664 * 5. Add the text | |
| 2665 * 6. set highlighting for the Visual area an other text | |
| 2666 */ | |
| 2667 col = 0; | |
| 2668 | |
| 2669 /* | |
| 2670 * 1. Add the cmdwin_type for the command-line window | |
| 2671 * Ignores 'rightleft', this window is never right-left. | |
| 2672 */ | |
| 2673 #ifdef FEAT_CMDWIN | |
| 2674 if (cmdwin_type != 0 && wp == curwin) | |
| 2675 { | |
| 2676 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
|
2677 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2678 #ifdef FEAT_MBYTE |
| 2679 if (enc_utf8) | |
| 2680 ScreenLinesUC[off] = 0; | |
| 2681 #endif | |
| 2682 ++col; | |
| 2683 } | |
| 2684 #endif | |
| 2685 | |
| 2686 /* | |
| 2687 * 2. Add the 'foldcolumn' | |
| 6553 | 2688 * Reduce the width when there is not enough space. |
| 7 | 2689 */ |
| 6553 | 2690 fdc = compute_foldcolumn(wp, col); |
| 7 | 2691 if (fdc > 0) |
| 2692 { | |
| 2693 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2694 #ifdef FEAT_RIGHTLEFT | |
| 2695 if (wp->w_p_rl) | |
| 2696 { | |
| 2697 int i; | |
| 2698 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2699 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
|
2700 HL_ATTR(HLF_FC)); |
| 7 | 2701 /* reverse the fold column */ |
| 2702 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
|
2703 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2704 } |
| 2705 else | |
| 2706 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2707 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2708 col += fdc; |
| 2709 } | |
| 2710 | |
| 2711 #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
|
2712 # 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
|
2713 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2714 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
|
2715 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
|
2716 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
|
2717 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2718 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
|
2719 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
|
2720 } while (0) |
| 7 | 2721 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2722 # 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
|
2723 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2724 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
|
2725 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
|
2726 } while (0) |
| 7 | 2727 #endif |
| 2728 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2729 /* 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
|
2730 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2731 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2732 |
| 2733 #ifdef FEAT_SIGNS | |
| 2734 /* 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
|
2735 if (signcolumn_on(wp)) |
| 7 | 2736 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2737 len = wp->w_width - col; |
| 7 | 2738 if (len > 0) |
| 2739 { | |
| 2740 if (len > 2) | |
| 2741 len = 2; | |
| 2742 # ifdef FEAT_RIGHTLEFT | |
| 2743 if (wp->w_p_rl) | |
| 2744 /* 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
|
2745 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
|
2746 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2747 else |
| 2748 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2749 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2750 col += len; |
| 2751 } | |
| 2752 } | |
| 2753 #endif | |
| 2754 | |
| 2755 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2756 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2757 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2758 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2759 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2760 len = wp->w_width - col; |
| 7 | 2761 if (len > 0) |
| 2762 { | |
| 13 | 2763 int w = number_width(wp); |
| 5905 | 2764 long num; |
| 2765 char *fmt = "%*ld "; | |
| 13 | 2766 |
| 2767 if (len > w + 1) | |
| 2768 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2769 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2770 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
|
2771 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2772 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2773 else |
| 4065 | 2774 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2775 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2776 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
|
2777 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
|
2778 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2779 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2780 * line number */ |
| 4065 | 2781 num = lnum; |
| 2782 fmt = "%-*ld "; | |
| 2783 } | |
| 2784 } | |
| 2785 | |
| 2786 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2787 #ifdef FEAT_RIGHTLEFT |
| 2788 if (wp->w_p_rl) | |
| 2789 /* 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
|
2790 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
|
2791 HL_ATTR(HLF_FL)); |
| 7 | 2792 else |
| 2793 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2794 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2795 col += len; |
| 2796 } | |
| 2797 } | |
| 2798 | |
| 2799 /* | |
| 2800 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2801 */ | |
| 29 | 2802 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2803 |
| 2804 txtcol = col; /* remember where text starts */ | |
| 2805 | |
| 2806 /* | |
| 2807 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2808 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2809 * in columns number-col - window-width. | |
| 2810 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2811 col = text_to_screenline(wp, text, col); |
| 7 | 2812 |
| 2813 /* Fill the rest of the line with the fold filler */ | |
| 2814 #ifdef FEAT_RIGHTLEFT | |
| 2815 if (wp->w_p_rl) | |
| 2816 col -= txtcol; | |
| 2817 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2818 while (col < wp->w_width |
| 7 | 2819 #ifdef FEAT_RIGHTLEFT |
| 2820 - (wp->w_p_rl ? txtcol : 0) | |
| 2821 #endif | |
| 2822 ) | |
| 2823 { | |
| 2824 #ifdef FEAT_MBYTE | |
| 2825 if (enc_utf8) | |
| 2826 { | |
| 2827 if (fill_fold >= 0x80) | |
| 2828 { | |
| 2829 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2830 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
|
2831 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2832 } |
| 2833 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2834 { |
| 7 | 2835 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2836 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2837 } |
|
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
|
2838 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
|
2839 } |
|
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
|
2840 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
|
2841 #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
|
2842 ScreenLines[off + col++] = fill_fold; |
| 7 | 2843 } |
| 2844 | |
| 2845 if (text != buf) | |
| 2846 vim_free(text); | |
| 2847 | |
| 2848 /* | |
| 2849 * 6. set highlighting for the Visual area an other text. | |
| 2850 * If all folded lines are in the Visual area, highlight the line. | |
| 2851 */ | |
| 2852 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2853 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2854 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2855 { |
| 2856 /* Visual is after curwin->w_cursor */ | |
| 2857 top = &curwin->w_cursor; | |
| 2858 bot = &VIsual; | |
| 2859 } | |
| 2860 else | |
| 2861 { | |
| 2862 /* Visual is before curwin->w_cursor */ | |
| 2863 top = &VIsual; | |
| 2864 bot = &curwin->w_cursor; | |
| 2865 } | |
| 2866 if (lnum >= top->lnum | |
| 2867 && lnume <= bot->lnum | |
| 2868 && (VIsual_mode != 'v' | |
| 2869 || ((lnum > top->lnum | |
| 2870 || (lnum == top->lnum | |
| 2871 && top->col == 0)) | |
| 2872 && (lnume < bot->lnum | |
| 2873 || (lnume == bot->lnum | |
| 2874 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2875 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2876 { |
| 2877 if (VIsual_mode == Ctrl_V) | |
| 2878 { | |
| 2879 /* 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
|
2880 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2881 { |
| 3040 | 2882 if (wp->w_old_cursor_lcol != MAXCOL |
| 2883 && 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
|
2884 < (colnr_T)wp->w_width) |
| 7 | 2885 len = wp->w_old_cursor_lcol; |
| 2886 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2887 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
|
2888 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2889 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2890 } |
| 2891 } | |
| 2892 else | |
| 216 | 2893 { |
| 7 | 2894 /* 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
|
2895 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2896 } |
| 7 | 2897 } |
| 2898 } | |
| 2899 | |
| 743 | 2900 #ifdef FEAT_SYN_HL |
| 6685 | 2901 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2902 if (wp->w_p_cc_cols) | |
| 2903 { | |
| 2904 int i = 0; | |
| 2905 int j = wp->w_p_cc_cols[i]; | |
| 2906 int old_txtcol = txtcol; | |
| 2907 | |
| 2908 while (j > -1) | |
| 2909 { | |
| 2910 txtcol += j; | |
| 2911 if (wp->w_p_wrap) | |
| 2912 txtcol -= wp->w_skipcol; | |
| 2913 else | |
| 2914 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
|
2915 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2916 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
|
2917 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2918 txtcol = old_txtcol; |
| 2919 j = wp->w_p_cc_cols[++i]; | |
| 2920 } | |
| 2921 } | |
| 2922 | |
| 743 | 2923 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2924 if (wp->w_p_cuc) |
| 2925 { | |
| 2926 txtcol += wp->w_virtcol; | |
| 2927 if (wp->w_p_wrap) | |
| 2928 txtcol -= wp->w_skipcol; | |
| 2929 else | |
| 2930 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
|
2931 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2932 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
|
2933 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2934 } |
| 743 | 2935 #endif |
| 7 | 2936 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2937 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
|
2938 (int)wp->w_width, FALSE); |
| 7 | 2939 |
| 2940 /* | |
| 2941 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2942 * updated (saves a call to plines() later). | |
| 2943 */ | |
| 2944 if (wp == curwin | |
| 2945 && lnum <= curwin->w_cursor.lnum | |
| 2946 && lnume >= curwin->w_cursor.lnum) | |
| 2947 { | |
| 2948 curwin->w_cline_row = row; | |
| 2949 curwin->w_cline_height = 1; | |
| 2950 curwin->w_cline_folded = TRUE; | |
| 2951 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2952 } | |
| 2953 } | |
| 2954 | |
| 2955 /* | |
| 2956 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2957 */ | |
| 2958 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2959 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2960 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2961 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2962 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2963 int attr) |
| 7 | 2964 { |
| 216 | 2965 int i; |
| 2966 | |
| 7 | 2967 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2968 # ifdef FEAT_MBYTE | |
| 2969 if (enc_utf8) | |
| 2970 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 2971 # endif | |
| 216 | 2972 for (i = 0; i < len; ++i) |
| 2973 ScreenAttrs[off + i] = attr; | |
| 7 | 2974 } |
| 2975 | |
| 2976 /* | |
| 2977 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2978 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2979 */ |
| 2980 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2981 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2982 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2983 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2984 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2985 linenr_T lnum) /* current line number */ |
| 7 | 2986 { |
| 2987 int i = 0; | |
| 2988 int level; | |
| 2989 int first_level; | |
| 519 | 2990 int empty; |
| 6553 | 2991 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2992 |
| 2993 /* Init to all spaces. */ | |
| 6929 | 2994 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2995 |
| 2996 level = win_foldinfo.fi_level; | |
| 2997 if (level > 0) | |
| 2998 { | |
| 519 | 2999 /* If there is only one column put more info in it. */ |
| 6553 | 3000 empty = (fdc == 1) ? 0 : 1; |
| 519 | 3001 |
| 7 | 3002 /* If the column is too narrow, we start at the lowest level that |
| 3003 * fits and use numbers to indicated the depth. */ | |
| 6553 | 3004 first_level = level - fdc - closed + 1 + empty; |
| 7 | 3005 if (first_level < 1) |
| 3006 first_level = 1; | |
| 3007 | |
| 6553 | 3008 for (i = 0; i + empty < fdc; ++i) |
| 7 | 3009 { |
| 3010 if (win_foldinfo.fi_lnum == lnum | |
| 3011 && first_level + i >= win_foldinfo.fi_low_level) | |
| 3012 p[i] = '-'; | |
| 3013 else if (first_level == 1) | |
| 3014 p[i] = '|'; | |
| 3015 else if (first_level + i <= 9) | |
| 3016 p[i] = '0' + first_level + i; | |
| 3017 else | |
| 3018 p[i] = '>'; | |
| 3019 if (first_level + i == level) | |
| 3020 break; | |
| 3021 } | |
| 3022 } | |
| 3023 if (closed) | |
| 6553 | 3024 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3025 } |
| 3026 #endif /* FEAT_FOLDING */ | |
| 3027 | |
| 3028 /* | |
| 3029 * Display line "lnum" of window 'wp' on the screen. | |
| 3030 * Start at row "startrow", stop when "endrow" is reached. | |
| 3031 * wp->w_virtcol needs to be valid. | |
| 3032 * | |
| 3033 * Return the number of last row the line occupies. | |
| 3034 */ | |
| 3035 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3036 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3037 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3038 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3039 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3040 int endrow, |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3041 int nochange UNUSED) /* not updating for changed text */ |
| 7 | 3042 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3043 int col = 0; /* visual column on screen */ |
| 7 | 3044 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3045 int c = 0; /* init for GCC */ | |
| 3046 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3047 #ifdef FEAT_LINEBREAK |
| 3048 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3049 #endif | |
| 7 | 3050 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3051 char_u *line; /* current line */ | |
| 3052 char_u *ptr; /* current position in "line" */ | |
| 3053 int row; /* row in the window, excl w_winrow */ | |
| 3054 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3055 | |
| 3056 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3057 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3058 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3059 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3060 int c_extra = NUL; /* extra chars, all the same */ |
| 3061 int extra_attr = 0; /* attributes when n_extra != 0 */ | |
| 3062 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3063 displaying lcs_eol at end-of-line */ | |
| 3064 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3065 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3066 | |
| 3067 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3068 int saved_n_extra = 0; | |
| 3069 char_u *saved_p_extra = NULL; | |
| 3070 int saved_c_extra = 0; | |
| 3071 int saved_char_attr = 0; | |
| 3072 | |
| 3073 int n_attr = 0; /* chars with special attr */ | |
| 3074 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3075 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3076 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3077 | |
| 3078 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3079 | |
| 3080 int fromcol, tocol; /* start/end of inverting */ | |
| 3081 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3082 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3083 pos_T *top, *bot; | |
| 1813 | 3084 int lnum_in_visual_area = FALSE; |
| 7 | 3085 pos_T pos; |
| 3086 long v; | |
| 3087 | |
| 3088 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3089 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3090 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3091 in this line */ | |
| 3092 int attr = 0; /* attributes for area highlighting */ | |
| 3093 int area_attr = 0; /* attributes desired by highlighting */ | |
| 3094 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3095 #ifdef FEAT_SYN_HL | |
| 743 | 3096 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3097 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3098 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3099 int save_did_emsg; | |
| 1437 | 3100 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
|
3101 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3102 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3103 #endif |
| 3104 #ifdef FEAT_SPELL | |
| 221 | 3105 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3106 # define SPWORDLEN 150 |
| 3107 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3108 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3109 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3110 starts */ |
| 221 | 3111 int spell_attr = 0; /* attributes desired by spelling */ |
| 3112 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3113 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3114 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3115 * there are no spell errors */ |
| 386 | 3116 static int cap_col = -1; /* column to check for Cap word */ |
| 3117 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3118 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3119 #endif |
| 3120 int extra_check; /* has syntax or linebreak */ | |
| 3121 #ifdef FEAT_MBYTE | |
| 3122 int multi_attr = 0; /* attributes desired by multibyte */ | |
| 3123 int mb_l = 1; /* multi-byte byte length */ | |
| 3124 int mb_c = 0; /* decoded multi-byte character */ | |
| 3125 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3126 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3127 #endif |
| 3128 #ifdef FEAT_DIFF | |
| 3129 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3130 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3131 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3132 int change_start = MAXCOL; /* first col of changed area */ |
| 3133 int change_end = -1; /* last col of changed area */ | |
| 3134 #endif | |
| 3135 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3136 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3137 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
|
3138 chars */ |
| 7 | 3139 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3140 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3141 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3142 # define LINE_ATTR |
| 1536 | 3143 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3144 #endif |
| 3145 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3146 matchitem_T *cur; /* points to the match list */ |
| 3147 match_T *shl; /* points to search_hl or a match */ | |
| 3148 int shl_flag; /* flag to indicate whether search_hl | |
| 3149 has been processed or not */ | |
| 5979 | 3150 int pos_inprogress; /* marks that position match search is |
| 3151 in progress */ | |
| 1326 | 3152 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3153 equals startcol of search_hl or one | |
| 3154 of the matches */ | |
| 7 | 3155 #endif |
| 3156 #ifdef FEAT_ARABIC | |
| 3157 int prev_c = 0; /* previous Arabic character */ | |
| 3158 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3159 #endif | |
| 910 | 3160 #if defined(LINE_ATTR) |
| 867 | 3161 int did_line_attr = 0; |
| 3162 #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
|
3163 #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
|
3164 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
|
3165 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
|
3166 #endif |
| 7 | 3167 |
| 3168 /* draw_state: items that are drawn in sequence: */ | |
| 3169 #define WL_START 0 /* nothing done yet */ | |
| 3170 #ifdef FEAT_CMDWIN | |
| 3171 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3172 #else | |
| 3173 # define WL_CMDLINE WL_START | |
| 3174 #endif | |
| 3175 #ifdef FEAT_FOLDING | |
| 3176 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3177 #else | |
| 3178 # define WL_FOLD WL_CMDLINE | |
| 3179 #endif | |
| 3180 #ifdef FEAT_SIGNS | |
| 3181 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3182 #else | |
| 3183 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3184 #endif | |
| 3185 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3186 #ifdef FEAT_LINEBREAK |
| 3187 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3188 #else | |
| 3189 # define WL_BRI WL_NR | |
| 3190 #endif | |
| 7 | 3191 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3192 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3193 #else |
| 5995 | 3194 # define WL_SBR WL_BRI |
| 7 | 3195 #endif |
| 3196 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3197 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3198 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3199 int feedback_col = 0; |
| 3200 int feedback_old_attr = -1; | |
| 3201 #endif | |
| 3202 | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3203 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3204 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
|
3205 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
|
3206 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
|
3207 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
|
3208 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3209 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
|
3210 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3211 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
|
3212 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3213 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
|
3214 int has_match_conc = 0; /* match wants to conceal */ |
| 6520 | 3215 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3216 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3217 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3218 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3219 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3220 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3221 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3222 col -= boguscols; \ |
| 6520 | 3223 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3224 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3225 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3226 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3227 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3228 #endif |
| 7 | 3229 |
| 3230 if (startrow > endrow) /* past the end already! */ | |
| 3231 return startrow; | |
| 3232 | |
| 3233 row = startrow; | |
| 3234 screen_row = row + W_WINROW(wp); | |
| 3235 | |
| 3236 /* | |
| 3237 * To speed up the loop below, set extra_check when there is linebreak, | |
| 3238 * trailing white space and/or syntax processing to be done. | |
| 3239 */ | |
| 3240 #ifdef FEAT_LINEBREAK | |
| 3241 extra_check = wp->w_p_lbr; | |
| 3242 #else | |
| 3243 extra_check = 0; | |
| 3244 #endif | |
| 3245 #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
|
3246 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
|
3247 # 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
|
3248 && !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
|
3249 # endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3250 ) |
| 7 | 3251 { |
| 3252 /* Prepare for syntax highlighting in this line. When there is an | |
| 3253 * error, stop syntax highlighting. */ | |
| 3254 save_did_emsg = did_emsg; | |
| 3255 did_emsg = FALSE; | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3256 syntax_start(wp, lnum); |
| 7 | 3257 if (did_emsg) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3258 wp->w_s->b_syn_error = TRUE; |
| 7 | 3259 else |
| 3260 { | |
| 3261 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
|
3262 #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
|
3263 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
|
3264 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3265 { |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3266 has_syntax = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3267 extra_check = TRUE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3268 } |
| 7 | 3269 } |
| 3270 } | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3271 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3272 /* Check for columns to display for 'colorcolumn'. */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3273 color_cols = wp->w_p_cc_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3274 if (color_cols != NULL) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3275 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3276 #endif |
| 3277 | |
|
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
|
3278 #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
|
3279 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
|
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 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
|
3282 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
|
3283 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
|
3284 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
3285 #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
|
3286 |
| 743 | 3287 #ifdef FEAT_SPELL |
| 258 | 3288 if (wp->w_p_spell |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3289 && *wp->w_s->b_p_spl != NUL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3290 && 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
|
3291 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
| 221 | 3292 { |
| 3293 /* Prepare for spell checking. */ | |
| 3294 has_spell = TRUE; | |
| 3295 extra_check = TRUE; | |
| 348 | 3296 |
| 3297 /* Get the start of the next line, so that words that wrap to the next | |
| 3298 * line are found too: "et<line-break>al.". | |
| 3299 * Trick: skip a few chars for C/shell/Vim comments */ | |
| 3300 nextline[SPWORDLEN] = NUL; | |
| 3301 if (lnum < wp->w_buffer->b_ml.ml_line_count) | |
| 3302 { | |
| 3303 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); | |
| 3304 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); | |
| 3305 } | |
| 3306 | |
| 3307 /* When a word wrapped from the previous line the start of the current | |
| 3308 * line is valid. */ | |
| 3309 if (lnum == checked_lnum) | |
| 3310 cur_checked_col = checked_col; | |
| 3311 checked_lnum = 0; | |
| 386 | 3312 |
| 3313 /* When there was a sentence end in the previous line may require a | |
| 3314 * word starting with capital in this line. In line 1 always check | |
| 3315 * the first word. */ | |
| 3316 if (lnum != capcol_lnum) | |
| 3317 cap_col = -1; | |
| 3318 if (lnum == 1) | |
| 3319 cap_col = 0; | |
| 3320 capcol_lnum = 0; | |
| 221 | 3321 } |
| 7 | 3322 #endif |
| 3323 | |
| 3324 /* | |
| 3325 * handle visual active in this window | |
| 3326 */ | |
| 3327 fromcol = -10; | |
| 3328 tocol = MAXCOL; | |
| 3329 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3330 { | |
| 3331 /* 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
|
3332 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3333 { |
| 3334 top = &curwin->w_cursor; | |
| 3335 bot = &VIsual; | |
| 3336 } | |
| 3337 else /* Visual is before curwin->w_cursor */ | |
| 3338 { | |
| 3339 top = &VIsual; | |
| 3340 bot = &curwin->w_cursor; | |
| 3341 } | |
| 1813 | 3342 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
| 7 | 3343 if (VIsual_mode == Ctrl_V) /* block mode */ |
| 3344 { | |
| 1813 | 3345 if (lnum_in_visual_area) |
| 7 | 3346 { |
| 3347 fromcol = wp->w_old_cursor_fcol; | |
| 3348 tocol = wp->w_old_cursor_lcol; | |
| 3349 } | |
| 3350 } | |
| 3351 else /* non-block mode */ | |
| 3352 { | |
| 3353 if (lnum > top->lnum && lnum <= bot->lnum) | |
| 3354 fromcol = 0; | |
| 3355 else if (lnum == top->lnum) | |
| 3356 { | |
| 3357 if (VIsual_mode == 'V') /* linewise */ | |
| 3358 fromcol = 0; | |
| 3359 else | |
| 3360 { | |
| 3361 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); | |
| 3362 if (gchar_pos(top) == NUL) | |
| 3363 tocol = fromcol + 1; | |
| 3364 } | |
| 3365 } | |
| 3366 if (VIsual_mode != 'V' && lnum == bot->lnum) | |
| 3367 { | |
| 3368 if (*p_sel == 'e' && bot->col == 0 | |
| 3369 #ifdef FEAT_VIRTUALEDIT | |
| 3370 && bot->coladd == 0 | |
| 3371 #endif | |
| 3372 ) | |
| 3373 { | |
| 3374 fromcol = -10; | |
| 3375 tocol = MAXCOL; | |
| 3376 } | |
| 36 | 3377 else if (bot->col == MAXCOL) |
| 3378 tocol = MAXCOL; | |
| 7 | 3379 else |
| 3380 { | |
| 3381 pos = *bot; | |
| 3382 if (*p_sel == 'e') | |
| 3383 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3384 else | |
| 3385 { | |
| 3386 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); | |
| 3387 ++tocol; | |
| 3388 } | |
| 3389 } | |
| 3390 } | |
| 3391 } | |
| 3392 | |
| 3393 /* Check if the character under the cursor should not be inverted */ | |
| 3394 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
|
3395 #ifdef FEAT_GUI |
| 7 | 3396 && !gui.in_use |
|
8212
05b88224cea1
commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents:
7833
diff
changeset
|
3397 #endif |
| 7 | 3398 ) |
| 3399 noinvcur = TRUE; | |
| 3400 | |
| 3401 /* if inverting in this line set area_highlighting */ | |
| 3402 if (fromcol >= 0) | |
| 3403 { | |
| 3404 area_highlighting = TRUE; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3405 attr = HL_ATTR(HLF_V); |
| 7 | 3406 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 3674 | 3407 if ((clip_star.available && !clip_star.owned |
| 3408 && clip_isautosel_star()) | |
| 3409 || (clip_plus.available && !clip_plus.owned | |
| 3410 && 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
|
3411 attr = HL_ATTR(HLF_VNC); |
| 7 | 3412 #endif |
| 3413 } | |
| 3414 } | |
| 3415 | |
| 3416 /* | |
| 674 | 3417 * handle 'incsearch' and ":s///c" highlighting |
| 7 | 3418 */ |
| 5735 | 3419 else if (highlight_match |
| 7 | 3420 && wp == curwin |
| 3421 && lnum >= curwin->w_cursor.lnum | |
| 3422 && lnum <= curwin->w_cursor.lnum + search_match_lines) | |
| 3423 { | |
| 3424 if (lnum == curwin->w_cursor.lnum) | |
| 3425 getvcol(curwin, &(curwin->w_cursor), | |
| 3426 (colnr_T *)&fromcol, NULL, NULL); | |
| 3427 else | |
| 3428 fromcol = 0; | |
| 3429 if (lnum == curwin->w_cursor.lnum + search_match_lines) | |
| 3430 { | |
| 3431 pos.lnum = lnum; | |
| 3432 pos.col = search_match_endcol; | |
| 3433 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); | |
| 3434 } | |
| 3435 else | |
| 3436 tocol = MAXCOL; | |
| 1850 | 3437 /* do at least one character; happens when past end of line */ |
| 3438 if (fromcol == tocol) | |
| 3439 tocol = fromcol + 1; | |
| 7 | 3440 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
|
3441 attr = HL_ATTR(HLF_I); |
| 7 | 3442 } |
| 3443 | |
| 3444 #ifdef FEAT_DIFF | |
| 3445 filler_lines = diff_check(wp, lnum); | |
| 3446 if (filler_lines < 0) | |
| 3447 { | |
| 3448 if (filler_lines == -1) | |
| 3449 { | |
| 3450 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3451 diff_hlf = HLF_ADD; /* added line */ | |
| 3452 else if (change_start == 0) | |
| 3453 diff_hlf = HLF_TXD; /* changed text */ | |
| 3454 else | |
| 3455 diff_hlf = HLF_CHD; /* changed line */ | |
| 3456 } | |
| 3457 else | |
| 3458 diff_hlf = HLF_ADD; /* added line */ | |
| 3459 filler_lines = 0; | |
| 3460 area_highlighting = TRUE; | |
| 3461 } | |
| 3462 if (lnum == wp->w_topline) | |
| 3463 filler_lines = wp->w_topfill; | |
| 3464 filler_todo = filler_lines; | |
| 3465 #endif | |
| 3466 | |
| 3467 #ifdef LINE_ATTR | |
| 3468 # ifdef FEAT_SIGNS | |
| 3469 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3470 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3471 if (v != 0) | |
| 3472 line_attr = sign_get_attr((int)v, TRUE); | |
| 3473 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3474 # if defined(FEAT_QUICKFIX) |
| 7 | 3475 /* Highlight the current line in the quickfix window. */ |
| 644 | 3476 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
|
3477 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3478 # endif |
| 3479 if (line_attr != 0) | |
| 3480 area_highlighting = TRUE; | |
| 3481 #endif | |
| 3482 | |
| 3483 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3484 ptr = line; | |
| 3485 | |
| 743 | 3486 #ifdef FEAT_SPELL |
| 348 | 3487 if (has_spell) |
| 3488 { | |
| 386 | 3489 /* For checking first word with a capital skip white space. */ |
| 3490 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
|
3491 cap_col = getwhitecols(line); |
| 386 | 3492 |
| 348 | 3493 /* To be able to spell-check over line boundaries copy the end of the |
| 3494 * current line into nextline[]. Above the start of the next line was | |
| 3495 * copied to nextline[SPWORDLEN]. */ | |
| 3496 if (nextline[SPWORDLEN] == NUL) | |
| 3497 { | |
| 3498 /* No next line or it is empty. */ | |
| 3499 nextlinecol = MAXCOL; | |
| 3500 nextline_idx = 0; | |
| 3501 } | |
| 3502 else | |
| 3503 { | |
| 835 | 3504 v = (long)STRLEN(line); |
| 348 | 3505 if (v < SPWORDLEN) |
| 3506 { | |
| 3507 /* Short line, use it completely and append the start of the | |
| 3508 * next line. */ | |
| 3509 nextlinecol = 0; | |
| 3510 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3511 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3512 nextline_idx = v + 1; |
| 3513 } | |
| 3514 else | |
| 3515 { | |
| 3516 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3517 nextlinecol = v - SPWORDLEN; | |
| 3518 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3519 nextline_idx = SPWORDLEN + 1; | |
| 3520 } | |
| 3521 } | |
| 3522 } | |
| 3523 #endif | |
| 3524 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3525 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3526 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3527 if (lcs_space || lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3528 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3529 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3530 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3531 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3532 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
|
3533 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
|
3534 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3535 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3536 } |
| 7 | 3537 } |
| 3538 | |
| 3539 /* | |
| 3540 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3541 * first character to be displayed. | |
| 3542 */ | |
| 3543 if (wp->w_p_wrap) | |
| 3544 v = wp->w_skipcol; | |
| 3545 else | |
| 3546 v = wp->w_leftcol; | |
| 3547 if (v > 0) | |
| 3548 { | |
| 3549 #ifdef FEAT_MBYTE | |
| 3550 char_u *prev_ptr = ptr; | |
| 3551 #endif | |
| 3552 while (vcol < v && *ptr != NUL) | |
| 3553 { | |
| 5995 | 3554 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3555 vcol += c; |
| 3556 #ifdef FEAT_MBYTE | |
| 3557 prev_ptr = ptr; | |
| 39 | 3558 #endif |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3559 MB_PTR_ADV(ptr); |
| 7 | 3560 } |
| 3561 | |
| 1984 | 3562 /* When: |
| 3563 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3564 * - 'colorcolumn' is set, or |
| 1984 | 3565 * - 'virtualedit' is set, or |
| 3566 * - the visual mode is active, | |
| 3567 * the end of the line may be before the start of the displayed part. | |
| 3568 */ | |
| 3569 if (vcol < v && ( | |
| 5735 | 3570 #ifdef FEAT_SYN_HL |
| 3571 wp->w_p_cuc || draw_color_col || | |
| 3572 #endif | |
| 3573 #ifdef FEAT_VIRTUALEDIT | |
| 3574 virtual_active() || | |
| 3575 #endif | |
| 3576 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 1984 | 3577 { |
| 7 | 3578 vcol = v; |
| 1984 | 3579 } |
| 7 | 3580 |
| 3581 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3582 * that character but skip the first few screen characters. */ | |
| 3583 if (vcol > v) | |
| 3584 { | |
| 3585 vcol -= c; | |
| 3586 #ifdef FEAT_MBYTE | |
| 3587 ptr = prev_ptr; | |
| 3588 #else | |
| 3589 --ptr; | |
| 3590 #endif | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3591 /* 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
|
3592 * 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
|
3593 if (( |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3594 #ifdef FEAT_MBYTE |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3595 (*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
|
3596 #endif |
|
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3597 *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
|
3598 n_skip = v - vcol; |
| 7 | 3599 } |
| 3600 | |
| 3601 /* | |
| 3602 * Adjust for when the inverted text is before the screen, | |
| 3603 * and when the start of the inverted text is before the screen. | |
| 3604 */ | |
| 3605 if (tocol <= vcol) | |
| 3606 fromcol = 0; | |
| 3607 else if (fromcol >= 0 && fromcol < vcol) | |
| 3608 fromcol = vcol; | |
| 3609 | |
| 3610 #ifdef FEAT_LINEBREAK | |
| 3611 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3612 if (wp->w_p_wrap) | |
| 3613 need_showbreak = TRUE; | |
| 3614 #endif | |
| 743 | 3615 #ifdef FEAT_SPELL |
| 499 | 3616 /* When spell checking a word we need to figure out the start of the |
| 3617 * word and if it's badly spelled or not. */ | |
| 3618 if (has_spell) | |
| 3619 { | |
| 3620 int len; | |
| 1536 | 3621 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3622 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3623 |
| 3624 pos = wp->w_cursor; | |
| 3625 wp->w_cursor.lnum = lnum; | |
| 1536 | 3626 wp->w_cursor.col = linecol; |
| 534 | 3627 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3628 |
| 3629 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3630 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3631 ptr = line + linecol; | |
| 3632 | |
| 530 | 3633 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3634 { |
| 3635 /* no bad word found at line start, don't check until end of a | |
| 3636 * word */ | |
| 534 | 3637 spell_hlf = HLF_COUNT; |
| 3572 | 3638 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3639 } |
| 3640 else | |
| 534 | 3641 { |
| 499 | 3642 /* bad word found, use attributes until end of word */ |
| 3643 word_end = wp->w_cursor.col + len + 1; | |
| 3644 | |
| 534 | 3645 /* Turn index into actual attributes. */ |
| 3646 if (spell_hlf != HLF_COUNT) | |
| 3647 spell_attr = highlight_attr[spell_hlf]; | |
| 3648 } | |
| 499 | 3649 wp->w_cursor = pos; |
| 501 | 3650 |
| 743 | 3651 # ifdef FEAT_SYN_HL |
| 501 | 3652 /* Need to restart syntax highlighting for this line. */ |
| 3653 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3654 syntax_start(wp, lnum); |
| 743 | 3655 # endif |
| 499 | 3656 } |
| 3657 #endif | |
| 7 | 3658 } |
| 3659 | |
| 3660 /* | |
| 3661 * Correct highlighting for cursor that can't be disabled. | |
| 3662 * Avoids having to check this for each character. | |
| 3663 */ | |
| 3664 if (fromcol >= 0) | |
| 3665 { | |
| 3666 if (noinvcur) | |
| 3667 { | |
| 3668 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3669 { | |
| 3670 /* highlighting starts at cursor, let it start just after the | |
| 3671 * cursor */ | |
| 3672 fromcol_prev = fromcol; | |
| 3673 fromcol = -1; | |
| 3674 } | |
| 3675 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3676 /* restart highlighting after the cursor */ | |
| 3677 fromcol_prev = wp->w_virtcol; | |
| 3678 } | |
| 3679 if (fromcol >= tocol) | |
| 3680 fromcol = -1; | |
| 3681 } | |
| 3682 | |
| 3683 #ifdef FEAT_SEARCH_EXTRA | |
| 3684 /* | |
| 1326 | 3685 * Handle highlighting the last used search pattern and matches. |
| 3686 * Do this for both search_hl and the match list. | |
| 7 | 3687 */ |
| 1326 | 3688 cur = wp->w_match_head; |
| 3689 shl_flag = FALSE; | |
| 3690 while (cur != NULL || shl_flag == FALSE) | |
| 3691 { | |
| 3692 if (shl_flag == FALSE) | |
| 3693 { | |
| 3694 shl = &search_hl; | |
| 3695 shl_flag = TRUE; | |
| 3696 } | |
| 3697 else | |
| 3698 shl = &cur->hl; | |
| 36 | 3699 shl->startcol = MAXCOL; |
| 3700 shl->endcol = MAXCOL; | |
| 7 | 3701 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3702 shl->is_addpos = FALSE; |
| 5979 | 3703 v = (long)(ptr - line); |
| 3704 if (cur != NULL) | |
| 3705 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3706 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
|
3707 shl == &search_hl ? NULL : cur); |
| 5979 | 3708 |
| 3709 /* Need to get the line again, a multi-line regexp may have made it | |
| 3710 * invalid. */ | |
| 3711 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3712 ptr = line + v; | |
| 3713 | |
| 3714 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3715 { | |
| 3716 if (shl->lnum == lnum) | |
| 3717 shl->startcol = shl->rm.startpos[0].col; | |
| 3718 else | |
| 3719 shl->startcol = 0; | |
| 3720 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3721 - shl->rm.startpos[0].lnum) | |
| 3722 shl->endcol = shl->rm.endpos[0].col; | |
| 3723 else | |
| 3724 shl->endcol = MAXCOL; | |
| 3725 /* Highlight one character for an empty match. */ | |
| 3726 if (shl->startcol == shl->endcol) | |
| 3727 { | |
| 3728 #ifdef FEAT_MBYTE | |
| 3729 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3730 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3731 else |
| 5979 | 3732 #endif |
| 3733 ++shl->endcol; | |
| 3734 } | |
| 3735 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3736 { | |
| 3737 shl->attr_cur = shl->attr; | |
| 3738 search_attr = shl->attr; | |
| 3739 } | |
| 3740 area_highlighting = TRUE; | |
| 7 | 3741 } |
| 1326 | 3742 if (shl != &search_hl && cur != NULL) |
| 3743 cur = cur->next; | |
| 7 | 3744 } |
| 3745 #endif | |
| 3746 | |
| 743 | 3747 #ifdef FEAT_SYN_HL |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
3748 /* 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
|
3749 * 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
|
3750 * then. */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3751 if (wp->w_p_cul && lnum == wp->w_cursor.lnum |
| 5979 | 3752 && !(wp == curwin && VIsual_active)) |
| 743 | 3753 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3754 line_attr = HL_ATTR(HLF_CUL); |
| 743 | 3755 area_highlighting = TRUE; |
| 3756 } | |
| 3757 #endif | |
| 3758 | |
| 504 | 3759 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3760 col = 0; |
| 3761 #ifdef FEAT_RIGHTLEFT | |
| 3762 if (wp->w_p_rl) | |
| 3763 { | |
| 3764 /* Rightleft window: process the text in the normal direction, but put | |
| 3765 * it in current_ScreenLine[] from right to left. Start at the | |
| 3766 * 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
|
3767 col = wp->w_width - 1; |
| 7 | 3768 off += col; |
| 3769 } | |
| 3770 #endif | |
| 3771 | |
| 3772 /* | |
| 3773 * Repeat for the whole displayed line. | |
| 3774 */ | |
| 3775 for (;;) | |
| 3776 { | |
| 6947 | 3777 #ifdef FEAT_CONCEAL |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3778 has_match_conc = 0; |
| 6947 | 3779 #endif |
| 7 | 3780 /* Skip this quickly when working on the text. */ |
| 3781 if (draw_state != WL_LINE) | |
| 3782 { | |
| 3783 #ifdef FEAT_CMDWIN | |
| 3784 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3785 { | |
| 3786 draw_state = WL_CMDLINE; | |
| 3787 if (cmdwin_type != 0 && wp == curwin) | |
| 3788 { | |
| 3789 /* Draw the cmdline character. */ | |
| 3790 n_extra = 1; | |
| 1340 | 3791 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
|
3792 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3793 } |
| 3794 } | |
| 3795 #endif | |
| 3796 | |
| 3797 #ifdef FEAT_FOLDING | |
| 3798 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3799 { | |
| 6553 | 3800 int fdc = compute_foldcolumn(wp, 0); |
| 3801 | |
| 7 | 3802 draw_state = WL_FOLD; |
| 6553 | 3803 if (fdc > 0) |
| 7 | 3804 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3805 /* 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
|
3806 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3807 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3808 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3809 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3810 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3811 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3812 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
|
3813 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3814 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3815 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3816 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
|
3817 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
|
3818 } |
| 7 | 3819 } |
| 3820 } | |
| 3821 #endif | |
| 3822 | |
| 3823 #ifdef FEAT_SIGNS | |
| 3824 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3825 { | |
| 3826 draw_state = WL_SIGN; | |
| 3827 /* Show the sign column when there are any signs in this | |
| 3828 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3829 if (signcolumn_on(wp)) |
| 7 | 3830 { |
| 2661 | 3831 int text_sign; |
| 7 | 3832 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3833 int icon_sign; |
| 7 | 3834 # endif |
| 3835 | |
| 3836 /* Draw two cells with the sign value or blank. */ | |
| 3837 c_extra = ' '; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3838 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3839 n_extra = 2; |
| 3840 | |
| 5921 | 3841 if (row == startrow |
| 3842 #ifdef FEAT_DIFF | |
| 3843 + filler_lines && filler_todo <= 0 | |
| 3844 #endif | |
| 3845 ) | |
| 7 | 3846 { |
| 3847 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3848 SIGN_TEXT); | |
| 3849 # ifdef FEAT_SIGN_ICONS | |
| 3850 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3851 SIGN_ICON); | |
| 3852 if (gui.in_use && icon_sign != 0) | |
| 3853 { | |
| 3854 /* Use the image in this position. */ | |
| 3855 c_extra = SIGN_BYTE; | |
| 3856 # ifdef FEAT_NETBEANS_INTG | |
| 3857 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
| 3858 c_extra = MULTISIGN_BYTE; | |
| 3859 # endif | |
| 3860 char_attr = icon_sign; | |
| 3861 } | |
| 3862 else | |
| 3863 # endif | |
| 3864 if (text_sign != 0) | |
| 3865 { | |
| 3866 p_extra = sign_get_text(text_sign); | |
| 3867 if (p_extra != NULL) | |
| 3868 { | |
| 3869 c_extra = NUL; | |
| 835 | 3870 n_extra = (int)STRLEN(p_extra); |
| 7 | 3871 } |
| 3872 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3873 } | |
| 3874 } | |
| 3875 } | |
| 3876 } | |
| 3877 #endif | |
| 3878 | |
| 3879 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3880 { | |
| 3881 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3882 /* 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
|
3883 * 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
|
3884 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3885 && (row == startrow |
| 3886 #ifdef FEAT_DIFF | |
| 3887 + filler_lines | |
| 3888 #endif | |
| 3889 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3890 { | |
| 3891 /* Draw the line number (empty space after wrapping). */ | |
| 3892 if (row == startrow | |
| 3893 #ifdef FEAT_DIFF | |
| 3894 + filler_lines | |
| 3895 #endif | |
| 3896 ) | |
| 3897 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3898 long num; |
| 4065 | 3899 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3900 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3901 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
|
3902 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3903 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3904 else |
| 4065 | 3905 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3906 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3907 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
|
3908 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3909 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3910 /* 'number' + 'relativenumber' */ |
| 4065 | 3911 num = lnum; |
| 3912 fmt = "%-*ld "; | |
| 3913 } | |
| 3914 } | |
| 3915 | |
| 3916 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3917 number_width(wp), num); |
| 7 | 3918 if (wp->w_skipcol > 0) |
| 3919 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3920 *p_extra = '-'; | |
| 3921 #ifdef FEAT_RIGHTLEFT | |
| 3922 if (wp->w_p_rl) /* reverse line numbers */ | |
| 3923 rl_mirror(extra); | |
| 3924 #endif | |
| 3925 p_extra = extra; | |
| 3926 c_extra = NUL; | |
| 3927 } | |
| 3928 else | |
| 3929 c_extra = ' '; | |
| 13 | 3930 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
|
3931 char_attr = HL_ATTR(HLF_N); |
| 743 | 3932 #ifdef FEAT_SYN_HL |
| 3933 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 3934 * the current line differently. |
| 3935 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 3936 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
3937 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 3938 && 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
|
3939 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 3940 #endif |
| 7 | 3941 } |
| 3942 } | |
| 3943 | |
| 5995 | 3944 #ifdef FEAT_LINEBREAK |
| 3945 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 3946 && n_extra == 0 && *p_sbr != NUL) | |
| 3947 /* draw indent after showbreak value */ | |
| 3948 draw_state = WL_BRI; | |
| 3949 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 3950 /* After the showbreak, draw the breakindent */ | |
| 3951 draw_state = WL_BRI - 1; | |
| 3952 | |
| 3953 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 3954 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 3955 { | |
| 3956 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3957 /* 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
|
3958 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
|
3959 && (row != startrow || need_showbreak) |
| 5995 | 3960 # ifdef FEAT_DIFF |
| 3961 && filler_lines == 0 | |
| 6834 | 3962 # endif |
| 5995 | 3963 ) |
| 3964 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3965 char_attr = 0; |
| 6834 | 3966 # ifdef FEAT_DIFF |
| 5995 | 3967 if (diff_hlf != (hlf_T)0) |
| 6106 | 3968 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3969 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 3970 # ifdef FEAT_SYN_HL |
| 6106 | 3971 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 3972 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
|
3973 HL_ATTR(HLF_CUL)); |
| 6834 | 3974 # endif |
| 6106 | 3975 } |
| 6834 | 3976 # endif |
| 6028 | 3977 p_extra = NULL; |
| 5995 | 3978 c_extra = ' '; |
| 3979 n_extra = get_breakindent_win(wp, | |
| 3980 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 3981 /* Correct end of highlighted area for 'breakindent', | |
| 3982 * required when 'linebreak' is also set. */ | |
| 3983 if (tocol == vcol) | |
| 3984 tocol += n_extra; | |
| 3985 } | |
| 3986 } | |
| 3987 #endif | |
| 3988 | |
| 7 | 3989 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 3990 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 3991 { | |
| 3992 draw_state = WL_SBR; | |
| 3993 # ifdef FEAT_DIFF | |
| 3994 if (filler_todo > 0) | |
| 3995 { | |
| 3996 /* Draw "deleted" diff line(s). */ | |
| 3997 if (char2cells(fill_diff) > 1) | |
| 3998 c_extra = '-'; | |
| 3999 else | |
| 4000 c_extra = fill_diff; | |
| 4001 # ifdef FEAT_RIGHTLEFT | |
| 4002 if (wp->w_p_rl) | |
| 4003 n_extra = col + 1; | |
| 4004 else | |
| 4005 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4006 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
|
4007 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4008 } |
| 4009 # endif | |
| 4010 # ifdef FEAT_LINEBREAK | |
| 4011 if (*p_sbr != NUL && need_showbreak) | |
| 4012 { | |
| 4013 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4014 p_extra = p_sbr; | |
| 4015 c_extra = NUL; | |
| 4016 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
|
4017 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4018 need_showbreak = FALSE; |
| 6503 | 4019 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4020 /* Correct end of highlighted area for 'showbreak', |
| 4021 * required when 'linebreak' is also set. */ | |
| 4022 if (tocol == vcol) | |
| 4023 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4024 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4025 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4026 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4027 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
|
4028 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4029 #endif |
| 7 | 4030 } |
| 4031 # endif | |
| 4032 } | |
| 4033 #endif | |
| 4034 | |
| 4035 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4036 { | |
| 4037 draw_state = WL_LINE; | |
| 4038 if (saved_n_extra) | |
| 4039 { | |
| 4040 /* Continue item from end of wrapped line. */ | |
| 4041 n_extra = saved_n_extra; | |
| 4042 c_extra = saved_c_extra; | |
| 4043 p_extra = saved_p_extra; | |
| 4044 char_attr = saved_char_attr; | |
| 4045 } | |
| 4046 else | |
| 4047 char_attr = 0; | |
| 4048 } | |
| 4049 } | |
| 4050 | |
| 4051 /* When still displaying '$' of change command, stop at cursor */ | |
| 3318 | 4052 if (dollar_vcol >= 0 && wp == curwin |
| 819 | 4053 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4054 #ifdef FEAT_DIFF |
| 4055 && filler_todo <= 0 | |
| 4056 #endif | |
| 4057 ) | |
| 4058 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4059 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
|
4060 HAS_RIGHTLEFT(wp->w_p_rl)); |
| 819 | 4061 /* Pretend we have finished updating the window. Except when |
| 4062 * 'cursorcolumn' is set. */ | |
| 4063 #ifdef FEAT_SYN_HL | |
| 4064 if (wp->w_p_cuc) | |
| 4065 row = wp->w_cline_row + wp->w_cline_height; | |
| 4066 else | |
| 4067 #endif | |
| 4068 row = wp->w_height; | |
| 7 | 4069 break; |
| 4070 } | |
| 4071 | |
| 4072 if (draw_state == WL_LINE && area_highlighting) | |
| 4073 { | |
| 4074 /* handle Visual or match highlighting in this line */ | |
| 4075 if (vcol == fromcol | |
| 4076 #ifdef FEAT_MBYTE | |
| 4077 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4078 && (*mb_ptr2cells)(ptr) > 1) | |
| 4079 #endif | |
| 4080 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4081 && vcol_prev < vcol /* not at margin */ |
| 7 | 4082 && vcol < tocol)) |
| 4083 area_attr = attr; /* start highlighting */ | |
| 4084 else if (area_attr != 0 | |
| 4085 && (vcol == tocol | |
| 4086 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4087 area_attr = 0; /* stop highlighting */ | |
| 4088 | |
| 4089 #ifdef FEAT_SEARCH_EXTRA | |
| 4090 if (!n_extra) | |
| 4091 { | |
| 4092 /* | |
| 4093 * Check for start/end of search pattern match. | |
| 4094 * After end, check for start/end of next match. | |
| 4095 * When another match, have to check for start again. | |
| 4096 * Watch out for matching an empty string! | |
| 1326 | 4097 * Do this for 'search_hl' and the match list (ordered by |
| 4098 * priority). | |
| 7 | 4099 */ |
| 36 | 4100 v = (long)(ptr - line); |
| 1326 | 4101 cur = wp->w_match_head; |
| 4102 shl_flag = FALSE; | |
| 4103 while (cur != NULL || shl_flag == FALSE) | |
| 4104 { | |
| 4105 if (shl_flag == FALSE | |
| 4106 && ((cur != NULL | |
| 4107 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4108 || cur == NULL)) | |
| 4109 { | |
| 4110 shl = &search_hl; | |
| 4111 shl_flag = TRUE; | |
| 4112 } | |
| 4113 else | |
| 4114 shl = &cur->hl; | |
| 5979 | 4115 if (cur != NULL) |
| 4116 cur->pos.cur = 0; | |
| 4117 pos_inprogress = TRUE; | |
| 4118 while (shl->rm.regprog != NULL | |
| 4119 || (cur != NULL && pos_inprogress)) | |
| 7 | 4120 { |
| 36 | 4121 if (shl->startcol != MAXCOL |
| 4122 && v >= (long)shl->startcol | |
| 4123 && v < (long)shl->endcol) | |
| 7 | 4124 { |
| 6430 | 4125 #ifdef FEAT_MBYTE |
| 4126 int tmp_col = v + MB_PTR2LEN(ptr); | |
| 4127 | |
| 4128 if (shl->endcol < tmp_col) | |
| 4129 shl->endcol = tmp_col; | |
| 4130 #endif | |
| 7 | 4131 shl->attr_cur = shl->attr; |
| 6947 | 4132 #ifdef FEAT_CONCEAL |
| 4133 if (cur != NULL && syn_name2id((char_u *)"Conceal") | |
| 4134 == cur->hlg_id) | |
| 4135 { | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4136 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4137 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4138 match_conc = cur->conceal_char; |
| 4139 } | |
| 4140 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4141 has_match_conc = match_conc = 0; |
| 6947 | 4142 #endif |
| 7 | 4143 } |
| 6430 | 4144 else if (v == (long)shl->endcol) |
| 7 | 4145 { |
| 4146 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4147 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
|
4148 shl == &search_hl ? NULL : cur); |
| 5979 | 4149 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4150 ? FALSE : TRUE; |
| 7 | 4151 |
| 4152 /* Need to get the line again, a multi-line regexp | |
| 4153 * may have made it invalid. */ | |
| 4154 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4155 ptr = line + v; | |
| 4156 | |
| 4157 if (shl->lnum == lnum) | |
| 4158 { | |
| 36 | 4159 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4160 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4161 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4162 else |
| 36 | 4163 shl->endcol = MAXCOL; |
| 4164 | |
| 4165 if (shl->startcol == shl->endcol) | |
| 7 | 4166 { |
| 4167 /* highlight empty match, try again after | |
| 4168 * it */ | |
| 4169 #ifdef FEAT_MBYTE | |
| 4170 if (has_mbyte) | |
| 474 | 4171 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4172 + shl->endcol); |
| 7 | 4173 else |
| 4174 #endif | |
| 36 | 4175 ++shl->endcol; |
| 7 | 4176 } |
| 4177 | |
| 4178 /* Loop to check if the match starts at the | |
| 4179 * current position */ | |
| 4180 continue; | |
| 4181 } | |
| 4182 } | |
| 4183 break; | |
| 4184 } | |
| 1326 | 4185 if (shl != &search_hl && cur != NULL) |
| 4186 cur = cur->next; | |
| 4187 } | |
| 4188 | |
| 4189 /* Use attributes from match with highest priority among | |
| 4190 * 'search_hl' and the match list. */ | |
| 4191 search_attr = search_hl.attr_cur; | |
| 4192 cur = wp->w_match_head; | |
| 4193 shl_flag = FALSE; | |
| 4194 while (cur != NULL || shl_flag == FALSE) | |
| 4195 { | |
| 4196 if (shl_flag == FALSE | |
| 4197 && ((cur != NULL | |
| 4198 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4199 || cur == NULL)) | |
| 699 | 4200 { |
| 1326 | 4201 shl = &search_hl; |
| 4202 shl_flag = TRUE; | |
| 699 | 4203 } |
| 1326 | 4204 else |
| 4205 shl = &cur->hl; | |
| 4206 if (shl->attr_cur != 0) | |
| 4207 search_attr = shl->attr_cur; | |
| 4208 if (shl != &search_hl && cur != NULL) | |
| 4209 cur = cur->next; | |
| 4210 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4211 /* 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
|
4212 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
|
4213 || (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
|
4214 search_attr = 0; |
| 7 | 4215 } |
| 4216 #endif | |
| 4217 | |
| 4218 #ifdef FEAT_DIFF | |
| 674 | 4219 if (diff_hlf != (hlf_T)0) |
| 7 | 4220 { |
| 1295 | 4221 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4222 && n_extra == 0) | |
| 7 | 4223 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4224 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4225 && n_extra == 0) | |
| 7 | 4226 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
|
4227 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4228 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
|
4229 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4230 } |
| 4231 #endif | |
| 4232 | |
| 4233 /* Decide which of the highlight attributes to use. */ | |
| 4234 attr_pri = TRUE; | |
| 6717 | 4235 #ifdef LINE_ATTR |
| 674 | 4236 if (area_attr != 0) |
| 6717 | 4237 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4238 else if (search_attr != 0) |
| 6717 | 4239 char_attr = hl_combine_attr(line_attr, search_attr); |
| 674 | 4240 /* Use line_attr when not in the Visual or 'incsearch' area |
| 4241 * (area_attr may be 0 when "noinvcur" is set). */ | |
| 4242 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) | |
| 1842 | 4243 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4244 || vcol >= tocol)) | |
| 674 | 4245 char_attr = line_attr; |
| 6717 | 4246 #else |
| 4247 if (area_attr != 0) | |
| 4248 char_attr = area_attr; | |
| 4249 else if (search_attr != 0) | |
| 4250 char_attr = search_attr; | |
| 674 | 4251 #endif |
| 4252 else | |
| 4253 { | |
| 4254 attr_pri = FALSE; | |
| 4255 #ifdef FEAT_SYN_HL | |
| 4256 if (has_syntax) | |
| 4257 char_attr = syntax_attr; | |
| 4258 else | |
| 4259 #endif | |
| 4260 char_attr = 0; | |
| 4261 } | |
| 7 | 4262 } |
| 4263 | |
| 4264 /* | |
| 4265 * Get the next character to put on the screen. | |
| 4266 */ | |
| 4267 /* | |
| 1340 | 4268 * The "p_extra" points to the extra stuff that is inserted to |
| 4269 * represent special characters (non-printable stuff) and other | |
| 4270 * things. When all characters are the same, c_extra is used. | |
| 4271 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past | |
| 4272 * "p_extra[n_extra]". | |
| 7 | 4273 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4274 */ | |
| 4275 if (n_extra > 0) | |
| 4276 { | |
| 4277 if (c_extra != NUL) | |
| 4278 { | |
| 4279 c = c_extra; | |
| 4280 #ifdef FEAT_MBYTE | |
| 4281 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
|
4282 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4283 { |
| 4284 mb_utf8 = TRUE; | |
| 714 | 4285 u8cc[0] = 0; |
| 819 | 4286 c = 0xc0; |
| 7 | 4287 } |
| 4288 else | |
| 4289 mb_utf8 = FALSE; | |
| 4290 #endif | |
| 4291 } | |
| 4292 else | |
| 4293 { | |
| 4294 c = *p_extra; | |
| 4295 #ifdef FEAT_MBYTE | |
| 4296 if (has_mbyte) | |
| 4297 { | |
| 4298 mb_c = c; | |
| 4299 if (enc_utf8) | |
| 4300 { | |
| 4301 /* If the UTF-8 character is more than one byte: | |
| 4302 * 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
|
4303 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4304 mb_utf8 = FALSE; |
| 4305 if (mb_l > n_extra) | |
| 4306 mb_l = 1; | |
| 4307 else if (mb_l > 1) | |
| 4308 { | |
| 714 | 4309 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4310 mb_utf8 = TRUE; |
| 819 | 4311 c = 0xc0; |
| 7 | 4312 } |
| 4313 } | |
| 4314 else | |
| 4315 { | |
| 4316 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4317 mb_l = MB_BYTE2LEN(c); | |
| 4318 if (mb_l >= n_extra) | |
| 4319 mb_l = 1; | |
| 4320 else if (mb_l > 1) | |
| 4321 mb_c = (c << 8) + p_extra[1]; | |
| 4322 } | |
| 504 | 4323 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4324 mb_l = 1; | |
| 4325 | |
| 7 | 4326 /* If a double-width char doesn't fit display a '>' in the |
| 4327 * last column. */ | |
| 504 | 4328 if (( |
| 7 | 4329 # ifdef FEAT_RIGHTLEFT |
| 4330 wp->w_p_rl ? (col <= 0) : | |
| 4331 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4332 (col >= wp->w_width - 1)) |
| 7 | 4333 && (*mb_char2cells)(mb_c) == 2) |
| 4334 { | |
| 4335 c = '>'; | |
| 4336 mb_c = c; | |
| 4337 mb_l = 1; | |
| 4338 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
|
4339 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4340 /* put the pointer back to output the double-width |
| 4341 * character at the start of the next line. */ | |
| 4342 ++n_extra; | |
| 4343 --p_extra; | |
| 4344 } | |
| 4345 else | |
| 4346 { | |
| 4347 n_extra -= mb_l - 1; | |
| 4348 p_extra += mb_l - 1; | |
| 4349 } | |
| 4350 } | |
| 4351 #endif | |
| 4352 ++p_extra; | |
| 4353 } | |
| 4354 --n_extra; | |
| 4355 } | |
| 4356 else | |
| 4357 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4358 #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
|
4359 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4360 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4361 |
| 6026 | 4362 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
|
4363 VIM_CLEAR(p_extra_free); |
| 7 | 4364 /* |
| 4365 * Get a character from the line itself. | |
| 4366 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4367 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4368 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4369 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4370 #endif |
| 7 | 4371 #ifdef FEAT_MBYTE |
| 4372 if (has_mbyte) | |
| 4373 { | |
| 4374 mb_c = c; | |
| 4375 if (enc_utf8) | |
| 4376 { | |
| 4377 /* If the UTF-8 character is more than one byte: Decode it | |
| 4378 * 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
|
4379 mb_l = utfc_ptr2len(ptr); |
| 7 | 4380 mb_utf8 = FALSE; |
| 4381 if (mb_l > 1) | |
| 4382 { | |
| 714 | 4383 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4384 /* Overlong encoded ASCII or ASCII with composing char |
| 4385 * is displayed normally, except a NUL. */ | |
| 4386 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
|
4387 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4388 c = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4389 # ifdef FEAT_LINEBREAK |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4390 c0 = mb_c; |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4391 # endif |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4392 } |
| 7 | 4393 mb_utf8 = TRUE; |
| 507 | 4394 |
| 4395 /* At start of the line we can have a composing char. | |
| 4396 * Draw it as a space with a composing char. */ | |
| 4397 if (utf_iscomposing(mb_c)) | |
| 4398 { | |
| 1326 | 4399 int i; |
| 4400 | |
| 714 | 4401 for (i = Screen_mco - 1; i > 0; --i) |
| 4402 u8cc[i] = u8cc[i - 1]; | |
| 4403 u8cc[0] = mb_c; | |
| 507 | 4404 mb_c = ' '; |
| 4405 } | |
| 7 | 4406 } |
| 4407 | |
| 4408 if ((mb_l == 1 && c >= 0x80) | |
| 4409 || (mb_l >= 1 && mb_c == 0) | |
| 4410 || (mb_l > 1 && (!vim_isprintc(mb_c) | |
| 1401 | 4411 # ifdef UNICODE16 |
| 4412 || mb_c >= 0x10000 | |
| 4413 # endif | |
| 4414 ))) | |
| 7 | 4415 { |
| 4416 /* | |
| 4417 * Illegal UTF-8 byte: display as <xx>. | |
| 4418 * Non-BMP character : display as ? or fullwidth ?. | |
| 4419 */ | |
| 1401 | 4420 # ifdef UNICODE16 |
| 7 | 4421 if (mb_c < 0x10000) |
| 1401 | 4422 # endif |
| 7 | 4423 { |
| 4424 transchar_hex(extra, mb_c); | |
| 714 | 4425 # ifdef FEAT_RIGHTLEFT |
| 7 | 4426 if (wp->w_p_rl) /* reverse */ |
| 4427 rl_mirror(extra); | |
| 714 | 4428 # endif |
| 7 | 4429 } |
| 1401 | 4430 # ifdef UNICODE16 |
| 7 | 4431 else if (utf_char2cells(mb_c) != 2) |
| 4432 STRCPY(extra, "?"); | |
| 4433 else | |
| 4434 /* 0xff1f in UTF-8: full-width '?' */ | |
| 4435 STRCPY(extra, "\357\274\237"); | |
| 1401 | 4436 # endif |
| 7 | 4437 |
| 4438 p_extra = extra; | |
| 4439 c = *p_extra; | |
| 4440 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4441 mb_utf8 = (c >= 0x80); | |
| 4442 n_extra = (int)STRLEN(p_extra); | |
| 4443 c_extra = NUL; | |
| 4444 if (area_attr == 0 && search_attr == 0) | |
| 4445 { | |
| 4446 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
|
4447 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4448 saved_attr2 = char_attr; /* save current attr */ |
| 4449 } | |
| 4450 } | |
| 4451 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4452 mb_l = 1; | |
| 4453 #ifdef FEAT_ARABIC | |
| 4454 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4455 { | |
| 4456 /* Do Arabic shaping. */ | |
| 714 | 4457 int pc, pc1, nc; |
| 4458 int pcc[MAX_MCO]; | |
| 7 | 4459 |
| 4460 /* The idea of what is the previous and next | |
| 4461 * character depends on 'rightleft'. */ | |
| 4462 if (wp->w_p_rl) | |
| 4463 { | |
| 4464 pc = prev_c; | |
| 4465 pc1 = prev_c1; | |
| 4466 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4467 prev_c1 = u8cc[0]; |
| 7 | 4468 } |
| 4469 else | |
| 4470 { | |
| 714 | 4471 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4472 nc = prev_c; |
| 714 | 4473 pc1 = pcc[0]; |
| 7 | 4474 } |
| 4475 prev_c = mb_c; | |
| 4476 | |
| 714 | 4477 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4478 } |
| 4479 else | |
| 4480 prev_c = mb_c; | |
| 4481 #endif | |
| 4482 } | |
| 4483 else /* enc_dbcs */ | |
| 4484 { | |
| 4485 mb_l = MB_BYTE2LEN(c); | |
| 4486 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4487 mb_l = 1; | |
| 4488 else if (mb_l > 1) | |
| 4489 { | |
| 4490 /* We assume a second byte below 32 is illegal. | |
| 4491 * Hopefully this is OK for all double-byte encodings! | |
| 4492 */ | |
| 4493 if (ptr[1] >= 32) | |
| 4494 mb_c = (c << 8) + ptr[1]; | |
| 4495 else | |
| 4496 { | |
| 4497 if (ptr[1] == NUL) | |
| 4498 { | |
| 4499 /* head byte at end of line */ | |
| 4500 mb_l = 1; | |
| 4501 transchar_nonprint(extra, c); | |
| 4502 } | |
| 4503 else | |
| 4504 { | |
| 4505 /* illegal tail byte */ | |
| 4506 mb_l = 2; | |
| 4507 STRCPY(extra, "XX"); | |
| 4508 } | |
| 4509 p_extra = extra; | |
| 4510 n_extra = (int)STRLEN(extra) - 1; | |
| 4511 c_extra = NUL; | |
| 4512 c = *p_extra++; | |
| 4513 if (area_attr == 0 && search_attr == 0) | |
| 4514 { | |
| 4515 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
|
4516 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4517 saved_attr2 = char_attr; /* save current attr */ |
| 4518 } | |
| 4519 mb_c = c; | |
| 4520 } | |
| 4521 } | |
| 4522 } | |
| 4523 /* If a double-width char doesn't fit display a '>' in the | |
| 4524 * last column; the character is displayed at the start of the | |
| 4525 * next line. */ | |
| 4526 if (( | |
| 4527 # ifdef FEAT_RIGHTLEFT | |
| 4528 wp->w_p_rl ? (col <= 0) : | |
| 4529 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4530 (col >= wp->w_width - 1)) |
| 7 | 4531 && (*mb_char2cells)(mb_c) == 2) |
| 4532 { | |
| 4533 c = '>'; | |
| 4534 mb_c = c; | |
| 4535 mb_utf8 = FALSE; | |
| 4536 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
|
4537 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4538 /* Put pointer back so that the character will be |
| 4539 * displayed at the start of the next line. */ | |
| 4540 --ptr; | |
| 4541 } | |
| 4542 else if (*ptr != NUL) | |
| 4543 ptr += mb_l - 1; | |
| 4544 | |
| 4545 /* 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
|
4546 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4547 * 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
|
4548 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4549 { |
| 4550 n_extra = 1; | |
| 3586 | 4551 c_extra = MB_FILLER_CHAR; |
| 7 | 4552 c = ' '; |
| 4553 if (area_attr == 0 && search_attr == 0) | |
| 4554 { | |
| 4555 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
|
4556 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4557 saved_attr2 = char_attr; /* save current attr */ |
| 4558 } | |
| 4559 mb_c = c; | |
| 4560 mb_utf8 = FALSE; | |
| 4561 mb_l = 1; | |
| 4562 } | |
| 4563 | |
| 4564 } | |
| 4565 #endif | |
| 4566 ++ptr; | |
| 4567 | |
| 4568 if (extra_check) | |
| 4569 { | |
| 743 | 4570 #ifdef FEAT_SPELL |
| 221 | 4571 int can_spell = TRUE; |
| 743 | 4572 #endif |
| 4573 | |
|
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 #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
|
4575 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
|
4576 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4577 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
|
4578 |
|
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 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
|
4580 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
|
4581 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
|
4582 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
|
4583 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4584 #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
|
4585 |
| 743 | 4586 #ifdef FEAT_SYN_HL |
| 7 | 4587 /* Get syntax attribute, unless still at the start of the line |
| 4588 * (double-wide char that doesn't fit). */ | |
| 221 | 4589 v = (long)(ptr - line); |
| 4590 if (has_syntax && v > 0) | |
| 7 | 4591 { |
| 4592 /* Get the syntax attribute for the character. If there | |
| 4593 * is an error, disable syntax highlighting. */ | |
| 4594 save_did_emsg = did_emsg; | |
| 4595 did_emsg = FALSE; | |
| 4596 | |
| 221 | 4597 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4598 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4599 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4600 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4601 NULL, FALSE); |
| 7 | 4602 |
| 4603 if (did_emsg) | |
| 482 | 4604 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4605 wp->w_s->b_syn_error = TRUE; |
| 482 | 4606 has_syntax = FALSE; |
| 4607 } | |
| 7 | 4608 else |
| 4609 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
|
4610 #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
|
4611 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
|
4612 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4613 #endif |
| 7 | 4614 |
| 4615 /* Need to get the line again, a multi-line regexp may | |
| 4616 * have made it invalid. */ | |
| 4617 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4618 ptr = line + v; | |
| 4619 | |
| 674 | 4620 if (!attr_pri) |
| 7 | 4621 char_attr = syntax_attr; |
| 301 | 4622 else |
| 303 | 4623 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
|
4624 # 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
|
4625 /* 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
|
4626 * 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
|
4627 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
|
4628 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
|
4629 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
|
4630 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
|
4631 # endif |
| 7 | 4632 } |
| 743 | 4633 #endif |
| 4634 | |
| 4635 #ifdef FEAT_SPELL | |
| 301 | 4636 /* Check spelling (unless at the end of the line). |
| 319 | 4637 * Only do this when there is no syntax highlighting, the |
| 4638 * @Spell cluster is not used or the current syntax item | |
| 4639 * contains the @Spell cluster. */ | |
| 348 | 4640 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4641 { |
| 230 | 4642 spell_attr = 0; |
| 743 | 4643 # ifdef FEAT_SYN_HL |
| 674 | 4644 if (!attr_pri) |
| 230 | 4645 char_attr = syntax_attr; |
| 743 | 4646 # endif |
| 4647 if (c != 0 && ( | |
| 4648 # ifdef FEAT_SYN_HL | |
| 4649 !has_syntax || | |
| 4650 # endif | |
| 4651 can_spell)) | |
| 221 | 4652 { |
| 348 | 4653 char_u *prev_ptr, *p; |
| 4654 int len; | |
| 534 | 4655 hlf_T spell_hlf = HLF_COUNT; |
| 221 | 4656 # ifdef FEAT_MBYTE |
| 336 | 4657 if (has_mbyte) |
| 4658 { | |
| 4659 prev_ptr = ptr - mb_l; | |
| 4660 v -= mb_l - 1; | |
| 4661 } | |
| 4662 else | |
| 221 | 4663 # endif |
| 336 | 4664 prev_ptr = ptr - 1; |
| 348 | 4665 |
| 4666 /* Use nextline[] if possible, it has the start of the | |
| 4667 * next line concatenated. */ | |
| 4668 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4669 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4670 else | |
| 4671 p = prev_ptr; | |
| 835 | 4672 cap_col -= (int)(prev_ptr - line); |
| 625 | 4673 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4674 nochange); | |
| 348 | 4675 word_end = v + len; |
| 301 | 4676 |
| 4677 /* In Insert mode only highlight a word that | |
| 4678 * doesn't touch the cursor. */ | |
| 534 | 4679 if (spell_hlf != HLF_COUNT |
| 301 | 4680 && (State & INSERT) != 0 |
| 4681 && wp->w_cursor.lnum == lnum | |
| 4682 && wp->w_cursor.col >= | |
| 4683 (colnr_T)(prev_ptr - line) | |
| 4684 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4685 { |
| 534 | 4686 spell_hlf = HLF_COUNT; |
| 301 | 4687 spell_redraw_lnum = lnum; |
| 221 | 4688 } |
| 348 | 4689 |
| 534 | 4690 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4691 && (p - nextline) + len > nextline_idx) |
| 4692 { | |
| 4693 /* Remember that the good word continues at the | |
| 4694 * start of the next line. */ | |
| 4695 checked_lnum = lnum + 1; | |
| 835 | 4696 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4697 } |
| 386 | 4698 |
| 534 | 4699 /* Turn index into actual attributes. */ |
| 4700 if (spell_hlf != HLF_COUNT) | |
| 4701 spell_attr = highlight_attr[spell_hlf]; | |
| 4702 | |
| 386 | 4703 if (cap_col > 0) |
| 4704 { | |
| 4705 if (p != prev_ptr | |
| 4706 && (p - nextline) + cap_col >= nextline_idx) | |
| 4707 { | |
| 4708 /* Remember that the word in the next line | |
| 4709 * must start with a capital. */ | |
| 4710 capcol_lnum = lnum + 1; | |
| 835 | 4711 cap_col = (int)((p - nextline) + cap_col |
| 4712 - nextline_idx); | |
| 386 | 4713 } |
| 4714 else | |
| 4715 /* Compute the actual column. */ | |
| 835 | 4716 cap_col += (int)(prev_ptr - line); |
| 386 | 4717 } |
| 221 | 4718 } |
| 4719 } | |
| 4720 if (spell_attr != 0) | |
| 348 | 4721 { |
| 674 | 4722 if (!attr_pri) |
| 348 | 4723 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4724 else | |
| 4725 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4726 } | |
| 7 | 4727 #endif |
| 4728 #ifdef FEAT_LINEBREAK | |
| 4729 /* | |
| 221 | 4730 * Found last space before word: check for line break. |
| 7 | 4731 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4732 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
|
4733 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4734 { |
| 6681 | 4735 # ifdef FEAT_MBYTE |
| 6693 | 4736 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
| 6681 | 4737 # endif |
| 5995 | 4738 char_u *p = ptr - ( |
| 7 | 4739 # ifdef FEAT_MBYTE |
| 6693 | 4740 mb_off + |
| 7 | 4741 # endif |
| 5995 | 4742 1); |
| 6681 | 4743 |
| 5995 | 4744 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4745 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4746 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4747 if (c == TAB && n_extra + col > wp->w_width) |
| 6371 | 4748 n_extra = (int)wp->w_buffer->b_p_ts |
| 4749 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
| 4750 | |
| 6681 | 4751 # ifdef FEAT_MBYTE |
| 6693 | 4752 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
| 6681 | 4753 # else |
| 7 | 4754 c_extra = ' '; |
| 6681 | 4755 # endif |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4756 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4757 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4758 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4759 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4760 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4761 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4762 #endif |
| 6026 | 4763 if (!wp->w_p_list) |
| 4764 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4765 } |
| 7 | 4766 } |
| 4767 #endif | |
| 4768 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4769 /* '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
|
4770 */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4771 if (wp->w_p_list |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4772 && (((c == 160 |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4773 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4774 || (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
|
4775 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4776 ) && lcs_nbsp) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4777 || (c == ' ' && lcs_space && ptr - line <= trailcol))) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4778 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4779 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4780 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
|
4781 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4782 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
|
4783 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
|
4784 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
|
4785 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4786 #ifdef FEAT_MBYTE |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4787 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
|
4788 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
|
4789 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4790 mb_utf8 = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4791 u8cc[0] = 0; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4792 c = 0xc0; |
|
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 else |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4795 mb_utf8 = FALSE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4796 #endif |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4797 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4798 |
| 7 | 4799 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4800 { | |
| 4801 c = lcs_trail; | |
| 674 | 4802 if (!attr_pri) |
| 7 | 4803 { |
| 4804 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
|
4805 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4806 saved_attr2 = char_attr; /* save current attr */ |
| 4807 } | |
| 4808 #ifdef FEAT_MBYTE | |
| 4809 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
|
4810 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4811 { |
| 4812 mb_utf8 = TRUE; | |
| 714 | 4813 u8cc[0] = 0; |
| 819 | 4814 c = 0xc0; |
| 7 | 4815 } |
| 4816 else | |
| 4817 mb_utf8 = FALSE; | |
| 4818 #endif | |
| 4819 } | |
| 4820 } | |
| 4821 | |
| 4822 /* | |
| 4823 * Handling of non-printable characters. | |
| 4824 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4825 if (!vim_isprintc(c)) |
| 7 | 4826 { |
| 4827 /* | |
| 4828 * when getting a character from the file, we may have to | |
| 4829 * turn it into something else on the way to putting it | |
| 4830 * into "ScreenLines". | |
| 4831 */ | |
| 4832 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4833 { | |
| 6026 | 4834 int tab_len = 0; |
| 6503 | 4835 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 4836 #ifdef FEAT_LINEBREAK | |
| 4837 /* only adjust the tab_len, when at the first column | |
| 4838 * after the showbreak value was drawn */ | |
| 4839 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 4840 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 4841 #endif | |
| 7 | 4842 /* tab amount depends on current column */ |
| 6026 | 4843 tab_len = (int)wp->w_buffer->b_p_ts |
| 6503 | 4844 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
| 4845 | |
| 6026 | 4846 #ifdef FEAT_LINEBREAK |
| 6100 | 4847 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 4848 #endif |
| 4849 /* tab amount depends on current column */ | |
| 4850 n_extra = tab_len; | |
| 4851 #ifdef FEAT_LINEBREAK | |
| 4852 else | |
| 4853 { | |
| 4854 char_u *p; | |
| 4855 int len = n_extra; | |
| 4856 int i; | |
| 4857 int saved_nextra = n_extra; | |
| 4858 | |
| 6172 | 4859 #ifdef FEAT_CONCEAL |
| 6627 | 4860 if (vcol_off > 0) |
| 6172 | 4861 /* there are characters to conceal */ |
| 4862 tab_len += vcol_off; | |
| 6520 | 4863 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 4864 */ | |
| 4865 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 4866 && n_extra > tab_len) | |
| 4867 tab_len += n_extra - tab_len; | |
| 4868 #endif | |
| 4869 | |
| 6026 | 4870 /* if n_extra > 0, it gives the number of chars, to |
| 4871 * use for a tab, else we need to calculate the width | |
| 4872 * for a tab */ | |
| 4873 #ifdef FEAT_MBYTE | |
| 4874 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 4875 if (n_extra > 0) | |
| 4876 len += n_extra - tab_len; | |
| 4877 #endif | |
| 4878 c = lcs_tab1; | |
| 4879 p = alloc((unsigned)(len + 1)); | |
| 4880 vim_memset(p, ' ', len); | |
| 4881 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4882 vim_free(p_extra_free); |
| 6026 | 4883 p_extra_free = p; |
| 4884 for (i = 0; i < tab_len; i++) | |
| 4885 { | |
| 4886 #ifdef FEAT_MBYTE | |
| 4887 mb_char2bytes(lcs_tab2, p); | |
| 4888 p += mb_char2len(lcs_tab2); | |
| 4889 n_extra += mb_char2len(lcs_tab2) | |
| 4890 - (saved_nextra > 0 ? 1 : 0); | |
| 4891 #else | |
| 4892 p[i] = lcs_tab2; | |
| 4893 #endif | |
| 4894 } | |
| 4895 p_extra = p_extra_free; | |
| 6172 | 4896 #ifdef FEAT_CONCEAL |
| 4897 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 4898 * macro below, so need to adjust for that here */ | |
| 6627 | 4899 if (vcol_off > 0) |
| 6172 | 4900 n_extra -= vcol_off; |
| 4901 #endif | |
| 6026 | 4902 } |
| 4903 #endif | |
| 3984 | 4904 #ifdef FEAT_CONCEAL |
| 6627 | 4905 { |
| 4906 int vc_saved = vcol_off; | |
| 4907 | |
| 4908 /* Tab alignment should be identical regardless of | |
| 4909 * 'conceallevel' value. So tab compensates of all | |
| 4910 * previous concealed characters, and thus resets | |
| 4911 * vcol_off and boguscols accumulated so far in the | |
| 4912 * line. Note that the tab can be longer than | |
| 4913 * 'tabstop' when there are concealed characters. */ | |
| 4914 FIX_FOR_BOGUSCOLS; | |
| 4915 | |
| 4916 /* Make sure, the highlighting for the tab char will be | |
| 4917 * correctly set further below (effectively reverts the | |
| 4918 * FIX_FOR_BOGSUCOLS macro */ | |
| 4919 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 4920 && lcs_tab1) |
| 6627 | 4921 tab_len += vc_saved; |
| 4922 } | |
| 3984 | 4923 #endif |
| 7 | 4924 #ifdef FEAT_MBYTE |
| 4925 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 4926 #endif | |
| 4927 if (wp->w_p_list) | |
| 4928 { | |
| 4929 c = lcs_tab1; | |
| 6026 | 4930 #ifdef FEAT_LINEBREAK |
| 4931 if (wp->w_p_lbr) | |
| 4932 c_extra = NUL; /* using p_extra from above */ | |
| 4933 else | |
| 4934 #endif | |
| 4935 c_extra = lcs_tab2; | |
| 4936 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
|
4937 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4938 saved_attr2 = char_attr; /* save current attr */ |
| 4939 #ifdef FEAT_MBYTE | |
| 4940 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
|
4941 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4942 { |
| 4943 mb_utf8 = TRUE; | |
| 714 | 4944 u8cc[0] = 0; |
| 819 | 4945 c = 0xc0; |
| 7 | 4946 } |
| 4947 #endif | |
| 4948 } | |
| 4949 else | |
| 4950 { | |
| 4951 c_extra = ' '; | |
| 4952 c = ' '; | |
| 4953 } | |
| 4954 } | |
| 36 | 4955 else if (c == NUL |
| 6799 | 4956 && (wp->w_p_list |
| 36 | 4957 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 4958 && tocol > vcol | |
| 4959 && VIsual_mode != Ctrl_V | |
| 4960 && ( | |
| 4961 # ifdef FEAT_RIGHTLEFT | |
| 4962 wp->w_p_rl ? (col >= 0) : | |
| 4963 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4964 (col < wp->w_width)) |
| 36 | 4965 && !(noinvcur |
| 1850 | 4966 && lnum == wp->w_cursor.lnum |
| 36 | 4967 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 4968 && lcs_eol_one > 0) |
| 7 | 4969 { |
| 36 | 4970 /* Display a '$' after the line or highlight an extra |
| 4971 * character if the line break is included. */ | |
| 7 | 4972 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 4973 /* For a diff line the highlighting continues after the | |
| 4974 * "$". */ | |
| 4975 if ( | |
| 4976 # ifdef FEAT_DIFF | |
| 534 | 4977 diff_hlf == (hlf_T)0 |
| 7 | 4978 # ifdef LINE_ATTR |
| 4979 && | |
| 4980 # endif | |
| 4981 # endif | |
| 4982 # ifdef LINE_ATTR | |
| 4983 line_attr == 0 | |
| 4984 # endif | |
| 4985 ) | |
| 4986 #endif | |
| 4987 { | |
| 4988 #ifdef FEAT_VIRTUALEDIT | |
| 4989 /* In virtualedit, visual selections may extend | |
| 4990 * beyond end of line. */ | |
| 4991 if (area_highlighting && virtual_active() | |
| 4992 && tocol != MAXCOL && vcol < tocol) | |
| 4993 n_extra = 0; | |
| 4994 else | |
| 4995 #endif | |
| 4996 { | |
| 4997 p_extra = at_end_str; | |
| 4998 n_extra = 1; | |
| 4999 c_extra = NUL; | |
| 5000 } | |
| 5001 } | |
| 6799 | 5002 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5003 c = lcs_eol; |
| 5004 else | |
| 5005 c = ' '; | |
| 7 | 5006 lcs_eol_one = -1; |
| 5007 --ptr; /* put it back at the NUL */ | |
| 674 | 5008 if (!attr_pri) |
| 7 | 5009 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5010 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5011 n_attr = 1; |
| 5012 } | |
| 5013 #ifdef FEAT_MBYTE | |
| 5014 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
|
5015 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5016 { |
| 5017 mb_utf8 = TRUE; | |
| 714 | 5018 u8cc[0] = 0; |
| 819 | 5019 c = 0xc0; |
| 7 | 5020 } |
| 5021 else | |
| 5022 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5023 #endif | |
| 5024 } | |
| 5025 else if (c != NUL) | |
| 5026 { | |
| 5027 p_extra = transchar(c); | |
| 6064 | 5028 if (n_extra == 0) |
| 5029 n_extra = byte2cells(c) - 1; | |
| 7 | 5030 #ifdef FEAT_RIGHTLEFT |
| 5031 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5032 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5033 #endif | |
| 5034 c_extra = NUL; | |
| 6026 | 5035 #ifdef FEAT_LINEBREAK |
| 5036 if (wp->w_p_lbr) | |
| 5037 { | |
| 5038 char_u *p; | |
| 5039 | |
| 5040 c = *p_extra; | |
| 5041 p = alloc((unsigned)n_extra + 1); | |
| 5042 vim_memset(p, ' ', n_extra); | |
| 5043 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5044 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5045 vim_free(p_extra_free); |
| 6026 | 5046 p_extra_free = p_extra = p; |
| 5047 } | |
| 5048 else | |
| 5049 #endif | |
| 5050 { | |
| 5051 n_extra = byte2cells(c) - 1; | |
| 5052 c = *p_extra++; | |
| 5053 } | |
| 674 | 5054 if (!attr_pri) |
| 7 | 5055 { |
| 5056 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
|
5057 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5058 saved_attr2 = char_attr; /* save current attr */ |
| 5059 } | |
| 5060 #ifdef FEAT_MBYTE | |
| 5061 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5062 #endif | |
| 5063 } | |
| 5064 #ifdef FEAT_VIRTUALEDIT | |
| 5065 else if (VIsual_active | |
| 5066 && (VIsual_mode == Ctrl_V | |
| 5067 || VIsual_mode == 'v') | |
| 5068 && virtual_active() | |
| 5069 && tocol != MAXCOL | |
| 5070 && vcol < tocol | |
| 5071 && ( | |
| 5072 # ifdef FEAT_RIGHTLEFT | |
| 5073 wp->w_p_rl ? (col >= 0) : | |
| 5074 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5075 (col < wp->w_width))) |
| 7 | 5076 { |
| 5077 c = ' '; | |
| 5078 --ptr; /* put it back at the NUL */ | |
| 5079 } | |
| 5080 #endif | |
| 910 | 5081 #if defined(LINE_ATTR) |
| 7 | 5082 else if (( |
| 5083 # ifdef FEAT_DIFF | |
| 910 | 5084 diff_hlf != (hlf_T)0 || |
| 7 | 5085 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5086 # 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
|
5087 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
|
5088 # endif |
| 7 | 5089 line_attr != 0 |
| 5090 ) && ( | |
| 5091 # ifdef FEAT_RIGHTLEFT | |
| 5092 wp->w_p_rl ? (col >= 0) : | |
| 5093 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5094 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5095 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5096 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5097 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5098 < wp->w_width))) |
| 7 | 5099 { |
| 5100 /* Highlight until the right side of the window */ | |
| 5101 c = ' '; | |
| 5102 --ptr; /* put it back at the NUL */ | |
| 867 | 5103 |
| 5104 /* Remember we do the char for line highlighting. */ | |
| 5105 ++did_line_attr; | |
| 5106 | |
| 5107 /* 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
|
5108 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
|
5109 && (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
|
5110 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5111 char_attr = line_attr; |
| 7 | 5112 # ifdef FEAT_DIFF |
| 5113 if (diff_hlf == HLF_TXD) | |
| 5114 { | |
| 5115 diff_hlf = HLF_CHD; | |
| 5116 if (attr == 0 || char_attr != attr) | |
| 6106 | 5117 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5118 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5119 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5120 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
|
5121 HL_ATTR(HLF_CUL)); |
| 6106 | 5122 } |
| 7 | 5123 } |
| 5124 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5125 # 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
|
5126 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
|
5127 { |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5128 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
|
5129 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
|
5130 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
|
5131 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
|
5132 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5133 # endif |
| 7 | 5134 } |
| 5135 #endif | |
| 5136 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5137 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5138 #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
|
5139 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
|
5140 && (wp != curwin || lnum != wp->w_cursor.lnum || |
| 6947 | 5141 conceal_cursor_line(wp) ) |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5142 && ( (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
|
5143 && !(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
|
5144 && 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
|
5145 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5146 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5147 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5148 && (syn_get_sub_char() != NUL || match_conc |
| 5149 || 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
|
5150 && 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
|
5151 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5152 /* 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
|
5153 * character. */ |
| 6947 | 5154 if (match_conc) |
| 5155 c = match_conc; | |
| 5156 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
|
5157 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5158 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5159 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5160 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5161 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5162 |
|
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
|
5163 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5164 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5165 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5166 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5167 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5168 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
|
5169 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5170 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5171 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5172 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5173 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5174 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5175 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5176 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5177 # endif |
|
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 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5180 col += n_extra; |
|
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 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5183 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5184 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5185 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5186 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5187 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5188 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5189 n_skip = 1; |
|
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 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5192 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
|
5193 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
|
5194 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5195 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5196 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5197 c = 0xc0; |
|
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 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
|
5201 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5202 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5203 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5204 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5205 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
|
5206 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5207 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5208 #endif /* FEAT_CONCEAL */ |
| 7 | 5209 } |
| 5210 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5211 #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
|
5212 /* 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
|
5213 * 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
|
5214 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
|
5215 && 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
|
5216 && 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
|
5217 && (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
|
5218 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5219 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5220 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
|
5221 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
|
5222 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5223 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5224 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
|
5225 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
|
5226 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
|
5227 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5228 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5229 |
| 7 | 5230 /* Don't override visual selection highlighting. */ |
| 5231 if (n_attr > 0 | |
| 5232 && draw_state == WL_LINE | |
| 674 | 5233 && !attr_pri) |
| 7 | 5234 char_attr = extra_attr; |
| 5235 | |
| 42 | 5236 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5237 /* XIM don't send preedit_start and preedit_end, but they send |
| 5238 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5239 * 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
|
5240 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
|
5241 && xic != NULL |
| 1850 | 5242 && lnum == wp->w_cursor.lnum |
| 7 | 5243 && (State & INSERT) |
| 5244 && !p_imdisable | |
| 5245 && im_is_preediting() | |
| 5246 && draw_state == WL_LINE) | |
| 5247 { | |
| 5248 colnr_T tcol; | |
| 5249 | |
| 5250 if (preedit_end_col == MAXCOL) | |
| 1850 | 5251 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5252 else |
| 5253 tcol = preedit_end_col; | |
| 5254 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5255 { | |
| 5256 if (feedback_old_attr < 0) | |
| 5257 { | |
| 5258 feedback_col = 0; | |
| 5259 feedback_old_attr = char_attr; | |
| 5260 } | |
| 5261 char_attr = im_get_feedback_attr(feedback_col); | |
| 5262 if (char_attr < 0) | |
| 5263 char_attr = feedback_old_attr; | |
| 5264 feedback_col++; | |
| 5265 } | |
| 5266 else if (feedback_old_attr >= 0) | |
| 5267 { | |
| 5268 char_attr = feedback_old_attr; | |
| 5269 feedback_old_attr = -1; | |
| 5270 feedback_col = 0; | |
| 5271 } | |
| 5272 } | |
| 5273 #endif | |
| 5274 /* | |
| 5275 * Handle the case where we are in column 0 but not on the first | |
| 5276 * character of the line and the user wants us to show us a | |
| 5277 * special character (via 'listchars' option "precedes:<char>". | |
| 5278 */ | |
| 5279 if (lcs_prec_todo != NUL | |
| 6276 | 5280 && wp->w_p_list |
| 7 | 5281 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5282 #ifdef FEAT_DIFF | |
| 5283 && filler_todo <= 0 | |
| 5284 #endif | |
| 5285 && draw_state > WL_NR | |
| 5286 && c != NUL) | |
| 5287 { | |
| 5288 c = lcs_prec; | |
| 5289 lcs_prec_todo = NUL; | |
| 5290 #ifdef FEAT_MBYTE | |
| 3586 | 5291 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5292 { | |
| 5293 /* Double-width character being overwritten by the "precedes" | |
| 5294 * character, need to fill up half the character. */ | |
| 5295 c_extra = MB_FILLER_CHAR; | |
| 5296 n_extra = 1; | |
| 5297 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
|
5298 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5299 } |
| 7 | 5300 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
|
5301 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5302 { |
| 5303 mb_utf8 = TRUE; | |
| 714 | 5304 u8cc[0] = 0; |
| 819 | 5305 c = 0xc0; |
| 7 | 5306 } |
| 5307 else | |
| 5308 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5309 #endif | |
| 674 | 5310 if (!attr_pri) |
| 7 | 5311 { |
| 5312 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
|
5313 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5314 n_attr3 = 1; |
| 5315 } | |
| 5316 } | |
| 5317 | |
| 5318 /* | |
| 867 | 5319 * At end of the text line or just after the last character. |
| 7 | 5320 */ |
| 867 | 5321 if (c == NUL |
| 910 | 5322 #if defined(LINE_ATTR) |
| 867 | 5323 || did_line_attr == 1 |
| 5324 #endif | |
| 5325 ) | |
| 5326 { | |
| 5327 #ifdef FEAT_SEARCH_EXTRA | |
| 5328 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5329 |
| 5330 /* we're not really at that column when skipping some text */ | |
| 1439 | 5331 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5332 ++prevcol; |
| 867 | 5333 #endif |
| 5334 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5335 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5336 * highlight match at end of line. If it's beyond the last |
| 5337 * char on the screen, just overwrite that one (tricky!) Not | |
| 5338 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5339 #ifdef FEAT_SEARCH_EXTRA |
| 5340 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5341 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5342 prevcol_hl_flag = TRUE; |
| 5343 else | |
| 5344 { | |
| 5345 cur = wp->w_match_head; | |
| 5346 while (cur != NULL) | |
| 5347 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5348 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5349 { |
| 5350 prevcol_hl_flag = TRUE; | |
| 5351 break; | |
| 5352 } | |
| 5353 cur = cur->next; | |
| 5354 } | |
| 5355 } | |
| 5356 #endif | |
| 7 | 5357 if (lcs_eol == lcs_eol_one |
| 1850 | 5358 && ((area_attr != 0 && vcol == fromcol |
| 5359 && (VIsual_mode != Ctrl_V | |
| 5360 || lnum == VIsual.lnum | |
| 5361 || lnum == curwin->w_cursor.lnum) | |
| 5362 && c == NUL) | |
| 7 | 5363 #ifdef FEAT_SEARCH_EXTRA |
| 5364 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5365 || (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
|
5366 # 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
|
5367 && !(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
|
5368 && !(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
|
5369 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5370 # 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
|
5371 && 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
|
5372 # endif |
| 910 | 5373 # if defined(LINE_ATTR) |
| 867 | 5374 && did_line_attr <= 1 |
| 5375 # endif | |
| 5376 ) | |
| 7 | 5377 #endif |
| 5378 )) | |
| 5379 { | |
| 5380 int n = 0; | |
| 5381 | |
| 5382 #ifdef FEAT_RIGHTLEFT | |
| 5383 if (wp->w_p_rl) | |
| 5384 { | |
| 5385 if (col < 0) | |
| 5386 n = 1; | |
| 5387 } | |
| 5388 else | |
| 5389 #endif | |
| 5390 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5391 if (col >= wp->w_width) |
| 7 | 5392 n = -1; |
| 5393 } | |
| 5394 if (n != 0) | |
| 5395 { | |
| 5396 /* At the window boundary, highlight the last character | |
| 5397 * instead (better than nothing). */ | |
| 5398 off += n; | |
| 5399 col += n; | |
| 5400 } | |
| 5401 else | |
| 5402 { | |
| 5403 /* Add a blank character to highlight. */ | |
| 5404 ScreenLines[off] = ' '; | |
| 5405 #ifdef FEAT_MBYTE | |
| 5406 if (enc_utf8) | |
| 5407 ScreenLinesUC[off] = 0; | |
| 5408 #endif | |
| 5409 } | |
| 5410 #ifdef FEAT_SEARCH_EXTRA | |
| 5411 if (area_attr == 0) | |
| 5412 { | |
| 1326 | 5413 /* Use attributes from match with highest priority among |
| 5414 * 'search_hl' and the match list. */ | |
| 5415 char_attr = search_hl.attr; | |
| 5416 cur = wp->w_match_head; | |
| 5417 shl_flag = FALSE; | |
| 5418 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5419 { |
| 1326 | 5420 if (shl_flag == FALSE |
| 5421 && ((cur != NULL | |
| 5422 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5423 || cur == NULL)) | |
| 699 | 5424 { |
| 1326 | 5425 shl = &search_hl; |
| 5426 shl_flag = TRUE; | |
| 699 | 5427 } |
| 1326 | 5428 else |
| 5429 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5430 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
|
5431 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5432 char_attr = shl->attr; |
| 5433 if (shl != &search_hl && cur != NULL) | |
| 5434 cur = cur->next; | |
| 699 | 5435 } |
| 7 | 5436 } |
| 5437 #endif | |
| 5438 ScreenAttrs[off] = char_attr; | |
| 5439 #ifdef FEAT_RIGHTLEFT | |
| 5440 if (wp->w_p_rl) | |
| 1437 | 5441 { |
| 7 | 5442 --col; |
| 1437 | 5443 --off; |
| 5444 } | |
| 7 | 5445 else |
| 5446 #endif | |
| 1437 | 5447 { |
| 7 | 5448 ++col; |
| 1437 | 5449 ++off; |
| 5450 } | |
| 743 | 5451 ++vcol; |
| 1437 | 5452 #ifdef FEAT_SYN_HL |
| 5453 eol_hl_off = 1; | |
| 5454 #endif | |
| 743 | 5455 } |
| 867 | 5456 } |
| 5457 | |
| 5458 /* | |
| 5459 * At end of the text line. | |
| 5460 */ | |
| 5461 if (c == NUL) | |
| 5462 { | |
| 743 | 5463 #ifdef FEAT_SYN_HL |
| 1850 | 5464 if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol |
| 5465 && lnum == wp->w_cursor.lnum) | |
| 1437 | 5466 { |
| 5467 /* highlight last char after line */ | |
| 5468 --col; | |
| 5469 --off; | |
| 5470 --vcol; | |
| 5471 } | |
| 5472 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5473 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5474 if (wp->w_p_wrap) |
| 5475 v = wp->w_skipcol; | |
| 5476 else | |
| 5477 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5478 |
| 820 | 5479 /* check if line ends before left margin */ |
| 5480 if (vcol < v + col - win_col_off(wp)) | |
| 5481 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
|
5482 #ifdef FEAT_CONCEAL |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5483 /* 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
|
5484 * edge for 'cursorcolumn'. */ |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5485 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5486 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5487 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5488 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5489 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5490 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
|
5491 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5492 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5493 && (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
|
5494 && (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
|
5495 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
|
5496 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5497 || draw_color_col) |
| 743 | 5498 # ifdef FEAT_RIGHTLEFT |
| 5499 && !wp->w_p_rl | |
| 5500 # endif | |
| 5501 ) | |
| 5502 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5503 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5504 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5505 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5506 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5507 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5508 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5509 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5510 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
|
5511 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5512 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5513 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5514 while (col < wp->w_width) |
| 743 | 5515 { |
| 5516 ScreenLines[off] = ' '; | |
| 5517 #ifdef FEAT_MBYTE | |
| 5518 if (enc_utf8) | |
| 5519 ScreenLinesUC[off] = 0; | |
| 5520 #endif | |
| 5521 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5522 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5523 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
|
5524 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5525 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5526 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
|
5527 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
|
5528 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
|
5529 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5530 else |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5531 ScreenAttrs[off++] = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5532 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5533 if (VCOL_HLC >= rightmost_vcol) |
| 743 | 5534 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5535 |
| 743 | 5536 ++vcol; |
| 5537 } | |
| 5538 } | |
| 5539 #endif | |
| 7 | 5540 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5541 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
|
5542 (int)wp->w_width, HAS_RIGHTLEFT(wp->w_p_rl)); |
| 7 | 5543 row++; |
| 5544 | |
| 5545 /* | |
| 5546 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5547 * updated (saves a call to plines() later). | |
| 5548 */ | |
| 5549 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5550 { | |
| 5551 curwin->w_cline_row = startrow; | |
| 5552 curwin->w_cline_height = row - startrow; | |
| 5553 #ifdef FEAT_FOLDING | |
| 5554 curwin->w_cline_folded = FALSE; | |
| 5555 #endif | |
| 5556 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5557 } | |
| 5558 | |
| 5559 break; | |
| 5560 } | |
| 5561 | |
| 5562 /* line continues beyond line end */ | |
| 5563 if (lcs_ext | |
| 5564 && !wp->w_p_wrap | |
| 5565 #ifdef FEAT_DIFF | |
| 5566 && filler_todo <= 0 | |
| 5567 #endif | |
| 5568 && ( | |
| 5569 #ifdef FEAT_RIGHTLEFT | |
| 5570 wp->w_p_rl ? col == 0 : | |
| 5571 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5572 col == wp->w_width - 1) |
| 7 | 5573 && (*ptr != NUL |
| 1555 | 5574 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5575 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5576 { | |
| 5577 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
|
5578 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5579 #ifdef FEAT_MBYTE |
| 5580 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
|
5581 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5582 { |
| 5583 mb_utf8 = TRUE; | |
| 714 | 5584 u8cc[0] = 0; |
| 819 | 5585 c = 0xc0; |
| 7 | 5586 } |
| 5587 else | |
| 5588 mb_utf8 = FALSE; | |
| 5589 #endif | |
| 5590 } | |
| 5591 | |
| 743 | 5592 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5593 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5594 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5595 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
|
5596 |
| 743 | 5597 /* 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
|
5598 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5599 * 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
|
5600 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5601 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
|
5602 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
|
5603 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5604 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5605 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
|
5606 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5607 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5608 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
|
5609 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
|
5610 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5611 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
|
5612 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5613 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
|
5614 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
|
5615 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5616 } |
| 743 | 5617 #endif |
| 5618 | |
| 7 | 5619 /* |
| 5620 * Store character to be displayed. | |
| 5621 * Skip characters that are left of the screen for 'nowrap'. | |
| 5622 */ | |
| 5623 vcol_prev = vcol; | |
| 5624 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5625 { | |
| 5626 /* | |
| 5627 * Store the character. | |
| 5628 */ | |
| 5629 #if defined(FEAT_RIGHTLEFT) && defined(FEAT_MBYTE) | |
| 5630 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) | |
| 5631 { | |
| 5632 /* A double-wide character is: put first halve in left cell. */ | |
| 5633 --off; | |
| 5634 --col; | |
| 5635 } | |
| 5636 #endif | |
| 5637 ScreenLines[off] = c; | |
| 5638 #ifdef FEAT_MBYTE | |
| 5639 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5640 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5641 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5642 ScreenLines[off] = 0x8e; |
| 7 | 5643 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5644 } |
| 7 | 5645 else if (enc_utf8) |
| 5646 { | |
| 5647 if (mb_utf8) | |
| 5648 { | |
| 1326 | 5649 int i; |
| 5650 | |
| 7 | 5651 ScreenLinesUC[off] = mb_c; |
| 819 | 5652 if ((c & 0xff) == 0) |
| 5653 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5654 for (i = 0; i < Screen_mco; ++i) |
| 5655 { | |
| 5656 ScreenLinesC[i][off] = u8cc[i]; | |
| 5657 if (u8cc[i] == 0) | |
| 5658 break; | |
| 5659 } | |
| 7 | 5660 } |
| 5661 else | |
| 5662 ScreenLinesUC[off] = 0; | |
| 5663 } | |
| 5664 if (multi_attr) | |
| 5665 { | |
| 5666 ScreenAttrs[off] = multi_attr; | |
| 5667 multi_attr = 0; | |
| 5668 } | |
| 5669 else | |
| 5670 #endif | |
| 5671 ScreenAttrs[off] = char_attr; | |
| 5672 | |
| 5673 #ifdef FEAT_MBYTE | |
| 5674 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5675 { | |
| 5676 /* Need to fill two screen columns. */ | |
| 5677 ++off; | |
| 5678 ++col; | |
| 5679 if (enc_utf8) | |
| 5680 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5681 ScreenLines[off] = 0; | |
| 5682 else | |
| 5683 /* DBCS: Put second byte in the second screen char. */ | |
| 5684 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5685 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5686 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5687 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5688 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5689 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5690 ++vcol; |
| 7 | 5691 /* When "tocol" is halfway a character, set it to the end of |
| 5692 * the character, otherwise highlighting won't stop. */ | |
| 5693 if (tocol == vcol) | |
| 5694 ++tocol; | |
| 5695 #ifdef FEAT_RIGHTLEFT | |
| 5696 if (wp->w_p_rl) | |
| 5697 { | |
| 5698 /* now it's time to backup one cell */ | |
| 5699 --off; | |
| 5700 --col; | |
| 5701 } | |
| 5702 #endif | |
| 5703 } | |
| 5704 #endif | |
| 5705 #ifdef FEAT_RIGHTLEFT | |
| 5706 if (wp->w_p_rl) | |
| 5707 { | |
| 5708 --off; | |
| 5709 --col; | |
| 5710 } | |
| 5711 else | |
| 5712 #endif | |
| 5713 { | |
| 5714 ++off; | |
| 5715 ++col; | |
| 5716 } | |
| 5717 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5718 #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
|
5719 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
|
5720 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5721 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5722 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5723 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5724 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5725 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5726 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5727 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5728 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5729 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5730 * 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
|
5731 * 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
|
5732 * 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
|
5733 * 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
|
5734 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5735 * 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
|
5736 * 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
|
5737 * 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
|
5738 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5739 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5740 if (n_extra > 0) |
|
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 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5743 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5744 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5745 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5746 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5747 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5748 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5749 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5750 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5751 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5752 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5753 boguscols += n_extra; |
|
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 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5756 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5757 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5758 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5759 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5760 # ifdef FEAT_MBYTE |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5761 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
|
5762 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5763 /* Need to fill two screen columns. */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5764 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5765 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5766 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5767 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5768 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5769 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5770 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5771 # endif |
|
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 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5774 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5775 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5776 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5777 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5778 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5779 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5780 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5781 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5782 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5783 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5784 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5785 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5786 # endif |
|
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 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5789 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5790 } |
|
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 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5793 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5794 if (n_extra > 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 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5797 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5798 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5799 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5800 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5801 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5802 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5803 #endif /* FEAT_CONCEAL */ |
| 7 | 5804 else |
| 5805 --n_skip; | |
| 5806 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5807 /* 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
|
5808 * column. */ |
| 1849 | 5809 if (draw_state > WL_NR |
| 7 | 5810 #ifdef FEAT_DIFF |
| 5811 && filler_todo <= 0 | |
| 5812 #endif | |
| 5813 ) | |
| 5814 ++vcol; | |
| 5815 | |
| 743 | 5816 #ifdef FEAT_SYN_HL |
| 5817 if (vcol_save_attr >= 0) | |
| 5818 char_attr = vcol_save_attr; | |
| 5819 #endif | |
| 5820 | |
| 7 | 5821 /* restore attributes after "predeces" in 'listchars' */ |
| 5822 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5823 char_attr = saved_attr3; | |
| 5824 | |
| 5825 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5826 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5827 char_attr = saved_attr2; | |
| 5828 | |
| 5829 /* | |
| 5830 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5831 * so far. If there is no more to display it is caught above. |
| 7 | 5832 */ |
| 5833 if (( | |
| 5834 #ifdef FEAT_RIGHTLEFT | |
| 5835 wp->w_p_rl ? (col < 0) : | |
| 5836 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5837 (col >= wp->w_width)) |
| 7 | 5838 && (*ptr != NUL |
| 5839 #ifdef FEAT_DIFF | |
| 5840 || filler_todo > 0 | |
| 5841 #endif | |
| 2724 | 5842 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5843 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5844 ) | |
| 5845 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5846 #ifdef FEAT_CONCEAL |
|
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 - boguscols, |
|
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 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5850 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5851 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
|
5852 (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
|
5853 #endif |
| 7 | 5854 ++row; |
| 5855 ++screen_row; | |
| 5856 | |
| 5857 /* When not wrapping and finished diff lines, or when displayed | |
| 5858 * '$' and highlighting until last column, break here. */ | |
| 5859 if ((!wp->w_p_wrap | |
| 5860 #ifdef FEAT_DIFF | |
| 5861 && filler_todo <= 0 | |
| 5862 #endif | |
| 5863 ) || lcs_eol_one == -1) | |
| 5864 break; | |
| 5865 | |
| 5866 /* When the window is too narrow draw all "@" lines. */ | |
| 5867 if (draw_state != WL_LINE | |
| 5868 #ifdef FEAT_DIFF | |
| 5869 && filler_todo <= 0 | |
| 5870 #endif | |
| 5871 ) | |
| 5872 { | |
| 5873 win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); | |
| 5874 draw_vsep_win(wp, row); | |
| 5875 row = endrow; | |
| 5876 } | |
| 5877 | |
| 5878 /* When line got too long for screen break here. */ | |
| 5879 if (row == endrow) | |
| 5880 { | |
| 5881 ++row; | |
| 5882 break; | |
| 5883 } | |
| 5884 | |
| 5885 if (screen_cur_row == screen_row - 1 | |
| 5886 #ifdef FEAT_DIFF | |
| 5887 && filler_todo <= 0 | |
| 5888 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5889 && wp->w_width == Columns) |
| 7 | 5890 { |
| 5891 /* Remember that the line wraps, used for modeless copy. */ | |
| 5892 LineWraps[screen_row - 1] = TRUE; | |
| 5893 | |
| 5894 /* | |
| 5895 * Special trick to make copy/paste of wrapped lines work with | |
| 5896 * xterm/screen: write an extra character beyond the end of | |
| 5897 * the line. This will work with all terminal types | |
| 5898 * (regardless of the xn,am settings). | |
| 5899 * Only do this on a fast tty. | |
| 5900 * Only do this if the cursor is on the current line | |
| 5901 * (something has been written in it). | |
| 5902 * Don't do this for the GUI. | |
| 5903 * Don't do this for double-width characters. | |
| 5904 * Don't do this for a window not at the right screen border. | |
| 5905 */ | |
| 5906 if (p_tf | |
| 5907 #ifdef FEAT_GUI | |
| 5908 && !gui.in_use | |
| 5909 #endif | |
| 5910 #ifdef FEAT_MBYTE | |
| 5911 && !(has_mbyte | |
| 1378 | 5912 && ((*mb_off2cells)(LineOffset[screen_row], |
| 5913 LineOffset[screen_row] + screen_Columns) | |
| 5914 == 2 | |
| 7 | 5915 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 5916 + (int)Columns - 2, |
| 5917 LineOffset[screen_row] + screen_Columns) | |
| 5918 == 2)) | |
| 7 | 5919 #endif |
| 5920 ) | |
| 5921 { | |
| 5922 /* First make sure we are at the end of the screen line, | |
| 5923 * then output the same character again to let the | |
| 5924 * terminal know about the wrap. If the terminal doesn't | |
| 5925 * 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
|
5926 if (screen_cur_col != wp->w_width) |
| 7 | 5927 screen_char(LineOffset[screen_row - 1] |
| 5928 + (unsigned)Columns - 1, | |
| 5929 screen_row - 1, (int)(Columns - 1)); | |
| 5930 | |
| 5931 #ifdef FEAT_MBYTE | |
| 5932 /* When there is a multi-byte character, just output a | |
| 5933 * space to keep it simple. */ | |
| 148 | 5934 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 5935 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 5936 out_char(' '); |
| 5937 else | |
| 5938 #endif | |
| 5939 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 5940 + (Columns - 1)]); | |
| 5941 /* force a redraw of the first char on the next line */ | |
| 5942 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 5943 screen_start(); /* don't know where cursor is now */ | |
| 5944 } | |
| 5945 } | |
| 5946 | |
| 5947 col = 0; | |
| 5948 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 5949 #ifdef FEAT_RIGHTLEFT | |
| 5950 if (wp->w_p_rl) | |
| 5951 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5952 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 5953 off += col; |
| 5954 } | |
| 5955 #endif | |
| 5956 | |
| 5957 /* reset the drawing state for the start of a wrapped line */ | |
| 5958 draw_state = WL_START; | |
| 5959 saved_n_extra = n_extra; | |
| 5960 saved_p_extra = p_extra; | |
| 5961 saved_c_extra = c_extra; | |
| 5962 saved_char_attr = char_attr; | |
| 5963 n_extra = 0; | |
| 5964 lcs_prec_todo = lcs_prec; | |
| 5965 #ifdef FEAT_LINEBREAK | |
| 5966 # ifdef FEAT_DIFF | |
| 5967 if (filler_todo <= 0) | |
| 5968 # endif | |
| 5969 need_showbreak = TRUE; | |
| 5970 #endif | |
| 5971 #ifdef FEAT_DIFF | |
| 5972 --filler_todo; | |
| 5973 /* When the filler lines are actually below the last line of the | |
| 5974 * file, don't draw the line itself, break here. */ | |
| 5975 if (filler_todo == 0 && wp->w_botfill) | |
| 5976 break; | |
| 5977 #endif | |
| 5978 } | |
| 5979 | |
| 5980 } /* for every character in the line */ | |
| 5981 | |
| 743 | 5982 #ifdef FEAT_SPELL |
| 386 | 5983 /* After an empty line check first word for capital. */ |
| 5984 if (*skipwhite(line) == NUL) | |
| 5985 { | |
| 5986 capcol_lnum = lnum + 1; | |
| 5987 cap_col = 0; | |
| 5988 } | |
| 5989 #endif | |
| 5990 | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5991 vim_free(p_extra_free); |
| 7 | 5992 return row; |
| 5993 } | |
| 5994 | |
| 714 | 5995 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
5996 static int comp_char_differs(int, int); |
| 714 | 5997 |
| 5998 /* | |
| 5999 * 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
|
6000 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6001 */ |
| 6002 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6003 comp_char_differs(int off_from, int off_to) |
| 714 | 6004 { |
| 6005 int i; | |
| 6006 | |
| 6007 for (i = 0; i < Screen_mco; ++i) | |
| 6008 { | |
| 6009 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6010 return TRUE; | |
| 6011 if (ScreenLinesC[i][off_from] == 0) | |
| 6012 break; | |
| 6013 } | |
| 6014 return FALSE; | |
| 6015 } | |
| 6016 #endif | |
| 6017 | |
| 7 | 6018 /* |
| 6019 * Check whether the given character needs redrawing: | |
| 6020 * - the (first byte of the) character is different | |
| 6021 * - the attributes are different | |
| 6022 * - the character is multi-byte and the next byte is different | |
| 1616 | 6023 * - the character is two cells wide and the second cell differs. |
| 7 | 6024 */ |
| 6025 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6026 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6027 { |
| 6028 if (cols > 0 | |
| 6029 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6030 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6031 | |
| 6032 #ifdef FEAT_MBYTE | |
| 6033 || (enc_dbcs != 0 | |
| 6034 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6035 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6036 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6037 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6038 != ScreenLines[off_to + 1]))) | |
| 6039 || (enc_utf8 | |
| 6040 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6041 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6042 && comp_char_differs(off_from, off_to)) |
| 3759 | 6043 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6044 && ScreenLines[off_from + 1] | |
| 6045 != ScreenLines[off_to + 1]))) | |
| 7 | 6046 #endif |
| 6047 )) | |
| 6048 return TRUE; | |
| 6049 return FALSE; | |
| 6050 } | |
| 6051 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6052 #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
|
6053 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6054 * 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
|
6055 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6056 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6057 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
|
6058 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6059 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
|
6060 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6061 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6062 |
| 7 | 6063 /* |
| 6064 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6065 * have actually changed. Handle insert/delete character. | |
| 6066 * "coloff" gives the first column on the screen for this line. | |
| 6067 * "endcol" gives the columns where valid characters are. | |
| 6068 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6069 * needs to be cleared, negative otherwise. | |
| 6070 * "rlflag" is TRUE in a rightleft window: | |
| 6071 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" | |
| 6072 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6073 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6074 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6075 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6076 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6077 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6078 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
|
6079 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
|
6080 int rlflag UNUSED) |
| 7 | 6081 { |
| 6082 unsigned off_from; | |
| 6083 unsigned off_to; | |
| 1378 | 6084 #ifdef FEAT_MBYTE |
| 6085 unsigned max_off_from; | |
| 6086 unsigned max_off_to; | |
| 6087 #endif | |
| 7 | 6088 int col = 0; |
| 6089 int hl; | |
| 6090 int force = FALSE; /* force update rest of the line */ | |
| 6091 int redraw_this /* bool: does character need redraw? */ | |
| 6092 #ifdef FEAT_GUI | |
| 6093 = TRUE /* For GUI when while-loop empty */ | |
| 6094 #endif | |
| 6095 ; | |
| 6096 int redraw_next; /* redraw_this for next character */ | |
| 6097 #ifdef FEAT_MBYTE | |
| 6098 int clear_next = FALSE; | |
| 6099 int char_cells; /* 1: normal char */ | |
| 6100 /* 2: occupies two display cells */ | |
| 6101 # define CHAR_CELLS char_cells | |
| 6102 #else | |
| 6103 # define CHAR_CELLS 1 | |
| 6104 #endif | |
| 6105 | |
| 3413 | 6106 /* Check for illegal row and col, just in case. */ |
| 6107 if (row >= Rows) | |
| 6108 row = Rows - 1; | |
| 6109 if (endcol > Columns) | |
| 6110 endcol = Columns; | |
| 6111 | |
| 7 | 6112 # ifdef FEAT_CLIPBOARD |
| 6113 clip_may_clear_selection(row, row); | |
| 6114 # endif | |
| 6115 | |
| 6116 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6117 off_to = LineOffset[row] + coloff; | |
| 1378 | 6118 #ifdef FEAT_MBYTE |
| 6119 max_off_from = off_from + screen_Columns; | |
| 6120 max_off_to = LineOffset[row] + screen_Columns; | |
| 6121 #endif | |
| 7 | 6122 |
| 6123 #ifdef FEAT_RIGHTLEFT | |
| 6124 if (rlflag) | |
| 6125 { | |
| 6126 /* Clear rest first, because it's left of the text. */ | |
| 6127 if (clear_width > 0) | |
| 6128 { | |
| 6129 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6130 && ScreenAttrs[off_to] == 0 | |
| 6131 # ifdef FEAT_MBYTE | |
| 6132 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6133 # endif | |
| 6134 ) | |
| 6135 { | |
| 6136 ++off_to; | |
| 6137 ++col; | |
| 6138 } | |
| 6139 if (col <= endcol) | |
| 6140 screen_fill(row, row + 1, col + coloff, | |
| 6141 endcol + coloff + 1, ' ', ' ', 0); | |
| 6142 } | |
| 6143 col = endcol + 1; | |
| 6144 off_to = LineOffset[row] + col + coloff; | |
| 6145 off_from += col; | |
| 6146 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6147 } | |
| 6148 #endif /* FEAT_RIGHTLEFT */ | |
| 6149 | |
| 6150 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6151 | |
| 6152 while (col < endcol) | |
| 6153 { | |
| 6154 #ifdef FEAT_MBYTE | |
| 6155 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6156 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6157 else |
| 6158 char_cells = 1; | |
| 6159 #endif | |
| 6160 | |
| 6161 redraw_this = redraw_next; | |
| 6162 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6163 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6164 | |
| 6165 #ifdef FEAT_GUI | |
| 6166 /* If the next character was bold, then redraw the current character to | |
| 6167 * remove any pixels that might have spilt over into us. This only | |
| 6168 * happens in the GUI. | |
| 6169 */ | |
| 6170 if (redraw_next && gui.in_use) | |
| 6171 { | |
| 6172 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6173 if (hl > HL_ALL) |
| 6174 hl = syn_attr2attr(hl); | |
| 6175 if (hl & HL_BOLD) | |
| 7 | 6176 redraw_this = TRUE; |
| 6177 } | |
| 6178 #endif | |
| 6179 | |
| 6180 if (redraw_this) | |
| 6181 { | |
| 6182 /* | |
| 6183 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6184 * Attributes for characters are stored at the position where the | |
| 6185 * cursor is when writing the highlighting code. The | |
| 6186 * start-highlighting code must be written with the cursor on the | |
| 6187 * first highlighted character. The stop-highlighting code must | |
| 6188 * be written with the cursor just after the last highlighted | |
| 6189 * character. | |
| 6190 * Overwriting a character doesn't remove it's highlighting. Need | |
| 6191 * to clear the rest of the line, and force redrawing it | |
| 6192 * completely. | |
| 6193 */ | |
| 6194 if ( p_wiv | |
| 6195 && !force | |
| 6196 #ifdef FEAT_GUI | |
| 6197 && !gui.in_use | |
| 6198 #endif | |
| 6199 && ScreenAttrs[off_to] != 0 | |
| 6200 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6201 { | |
| 6202 /* | |
| 6203 * Need to remove highlighting attributes here. | |
| 6204 */ | |
| 6205 windgoto(row, col + coloff); | |
| 6206 out_str(T_CE); /* clear rest of this screen line */ | |
| 6207 screen_start(); /* don't know where cursor is now */ | |
| 6208 force = TRUE; /* force redraw of rest of the line */ | |
| 6209 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6210 | |
| 6211 /* | |
| 6212 * If the previous character was highlighted, need to stop | |
| 6213 * highlighting at this character. | |
| 6214 */ | |
| 6215 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6216 { | |
| 6217 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6218 term_windgoto(row, col + coloff); | |
| 6219 screen_stop_highlight(); | |
| 6220 } | |
| 6221 else | |
| 6222 screen_attr = 0; /* highlighting has stopped */ | |
| 6223 } | |
| 6224 #ifdef FEAT_MBYTE | |
| 6225 if (enc_dbcs != 0) | |
| 6226 { | |
| 6227 /* Check if overwriting a double-byte with a single-byte or | |
| 6228 * the other way around requires another character to be | |
| 6229 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6230 * ScreenLinesUC[] is sufficient. */ | |
| 6231 if (char_cells == 1 | |
| 6232 && col + 1 < endcol | |
| 1378 | 6233 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6234 { |
| 6235 /* Writing a single-cell character over a double-cell | |
| 6236 * character: need to redraw the next cell. */ | |
| 6237 ScreenLines[off_to + 1] = 0; | |
| 6238 redraw_next = TRUE; | |
| 6239 } | |
| 6240 else if (char_cells == 2 | |
| 6241 && col + 2 < endcol | |
| 1378 | 6242 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6243 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6244 { |
| 6245 /* Writing the second half of a double-cell character over | |
| 6246 * a double-cell character: need to redraw the second | |
| 6247 * cell. */ | |
| 6248 ScreenLines[off_to + 2] = 0; | |
| 6249 redraw_next = TRUE; | |
| 6250 } | |
| 6251 | |
| 6252 if (enc_dbcs == DBCS_JPNU) | |
| 6253 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6254 } | |
| 6255 /* When writing a single-width character over a double-width | |
| 6256 * character and at the end of the redrawn text, need to clear out | |
| 6257 * the right halve of the old character. | |
| 6258 * Also required when writing the right halve of a double-width | |
| 6259 * char over the left halve of an existing one. */ | |
| 6260 if (has_mbyte && col + char_cells == endcol | |
| 6261 && ((char_cells == 1 | |
| 1378 | 6262 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6263 || (char_cells == 2 |
| 1378 | 6264 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6265 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6266 clear_next = TRUE; |
| 6267 #endif | |
| 6268 | |
| 6269 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6270 #ifdef FEAT_MBYTE | |
| 6271 if (enc_utf8) | |
| 6272 { | |
| 6273 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6274 if (ScreenLinesUC[off_from] != 0) | |
| 6275 { | |
| 714 | 6276 int i; |
| 6277 | |
| 6278 for (i = 0; i < Screen_mco; ++i) | |
| 6279 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6280 } |
| 6281 } | |
| 6282 if (char_cells == 2) | |
| 6283 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6284 #endif | |
| 6285 | |
| 6286 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6287 /* The bold trick makes a single column of pixels appear in the |
| 6288 * next character. When a bold character is removed, the next | |
| 7 | 6289 * character should be redrawn too. This happens for our own GUI |
| 6290 * and for some xterms. */ | |
| 6291 if ( | |
| 6292 # ifdef FEAT_GUI | |
| 6293 gui.in_use | |
| 6294 # endif | |
| 6295 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6296 || | |
| 6297 # endif | |
| 6298 # ifdef UNIX | |
| 6299 term_is_xterm | |
| 6300 # endif | |
| 6301 ) | |
| 6302 { | |
| 6303 hl = ScreenAttrs[off_to]; | |
| 743 | 6304 if (hl > HL_ALL) |
| 6305 hl = syn_attr2attr(hl); | |
| 6306 if (hl & HL_BOLD) | |
| 7 | 6307 redraw_next = TRUE; |
| 6308 } | |
| 6309 #endif | |
| 6310 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
| 6311 #ifdef FEAT_MBYTE | |
| 819 | 6312 /* For simplicity set the attributes of second half of a |
| 6313 * double-wide character equal to the first half. */ | |
| 6314 if (char_cells == 2) | |
| 6315 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6316 | |
| 7 | 6317 if (enc_dbcs != 0 && char_cells == 2) |
| 6318 screen_char_2(off_to, row, col + coloff); | |
| 6319 else | |
| 6320 #endif | |
| 6321 screen_char(off_to, row, col + coloff); | |
| 6322 } | |
| 6323 else if ( p_wiv | |
| 6324 #ifdef FEAT_GUI | |
| 6325 && !gui.in_use | |
| 6326 #endif | |
| 6327 && col + coloff > 0) | |
| 6328 { | |
| 6329 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6330 { | |
| 6331 /* | |
| 6332 * Don't output stop-highlight when moving the cursor, it will | |
| 6333 * stop the highlighting when it should continue. | |
| 6334 */ | |
| 6335 screen_attr = 0; | |
| 6336 } | |
| 6337 else if (screen_attr != 0) | |
| 6338 screen_stop_highlight(); | |
| 6339 } | |
| 6340 | |
| 6341 off_to += CHAR_CELLS; | |
| 6342 off_from += CHAR_CELLS; | |
| 6343 col += CHAR_CELLS; | |
| 6344 } | |
| 6345 | |
| 6346 #ifdef FEAT_MBYTE | |
| 6347 if (clear_next) | |
| 6348 { | |
| 6349 /* Clear the second half of a double-wide character of which the left | |
| 6350 * half was overwritten with a single-wide character. */ | |
| 6351 ScreenLines[off_to] = ' '; | |
| 6352 if (enc_utf8) | |
| 6353 ScreenLinesUC[off_to] = 0; | |
| 6354 screen_char(off_to, row, col + coloff); | |
| 6355 } | |
| 6356 #endif | |
| 6357 | |
| 6358 if (clear_width > 0 | |
| 6359 #ifdef FEAT_RIGHTLEFT | |
| 6360 && !rlflag | |
| 6361 #endif | |
| 6362 ) | |
| 6363 { | |
| 6364 #ifdef FEAT_GUI | |
| 6365 int startCol = col; | |
| 6366 #endif | |
| 6367 | |
| 6368 /* blank out the rest of the line */ | |
| 6369 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6370 && ScreenAttrs[off_to] == 0 | |
| 6371 #ifdef FEAT_MBYTE | |
| 6372 && (!enc_utf8 || ScreenLinesUC[off_to] == 0) | |
| 6373 #endif | |
| 6374 ) | |
| 6375 { | |
| 6376 ++off_to; | |
| 6377 ++col; | |
| 6378 } | |
| 6379 if (col < clear_width) | |
| 6380 { | |
| 6381 #ifdef FEAT_GUI | |
| 6382 /* | |
| 6383 * In the GUI, clearing the rest of the line may leave pixels | |
| 6384 * behind if the first character cleared was bold. Some bold | |
| 6385 * fonts spill over the left. In this case we redraw the previous | |
| 6386 * character too. If we didn't skip any blanks above, then we | |
| 6387 * only redraw if the character wasn't already redrawn anyway. | |
| 6388 */ | |
| 996 | 6389 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6390 { |
| 6391 hl = ScreenAttrs[off_to]; | |
| 6392 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6393 { |
| 6394 int prev_cells = 1; | |
| 6395 # ifdef FEAT_MBYTE | |
| 6396 if (enc_utf8) | |
| 6397 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6398 * that its width is 2. */ | |
| 6399 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6400 else if (enc_dbcs != 0) | |
| 6401 { | |
| 6402 /* find previous character by counting from first | |
| 6403 * column and get its width. */ | |
| 6404 unsigned off = LineOffset[row]; | |
| 1378 | 6405 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6406 |
| 6407 while (off < off_to) | |
| 6408 { | |
| 1378 | 6409 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6410 off += prev_cells; |
| 6411 } | |
| 6412 } | |
| 6413 | |
| 6414 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6415 screen_char_2(off_to - prev_cells, row, | |
| 6416 col + coloff - prev_cells); | |
| 6417 else | |
| 6418 # endif | |
| 6419 screen_char(off_to - prev_cells, row, | |
| 6420 col + coloff - prev_cells); | |
| 6421 } | |
| 7 | 6422 } |
| 6423 #endif | |
| 6424 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6425 ' ', ' ', 0); | |
| 6426 off_to += clear_width - col; | |
| 6427 col = clear_width; | |
| 6428 } | |
| 6429 } | |
| 6430 | |
| 6431 if (clear_width > 0) | |
| 6432 { | |
| 6433 /* For a window that's left of another, draw the separator char. */ | |
| 6434 if (col + coloff < Columns) | |
| 6435 { | |
| 6436 int c; | |
| 6437 | |
| 6438 c = fillchar_vsep(&hl); | |
| 6477 | 6439 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
|
6440 #ifdef FEAT_MBYTE |
| 714 | 6441 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6442 != (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
|
6443 #endif |
| 7 | 6444 || ScreenAttrs[off_to] != hl) |
| 6445 { | |
| 6446 ScreenLines[off_to] = c; | |
| 6447 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
|
6448 #ifdef FEAT_MBYTE |
| 7 | 6449 if (enc_utf8) |
| 6450 { | |
| 6451 if (c >= 0x80) | |
| 6452 { | |
| 6453 ScreenLinesUC[off_to] = c; | |
| 714 | 6454 ScreenLinesC[0][off_to] = 0; |
| 7 | 6455 } |
| 6456 else | |
| 6457 ScreenLinesUC[off_to] = 0; | |
| 6458 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6459 #endif |
| 7 | 6460 screen_char(off_to, row, col + coloff); |
| 6461 } | |
| 6462 } | |
| 6463 else | |
| 6464 LineWraps[row] = FALSE; | |
| 6465 } | |
| 6466 } | |
| 6467 | |
| 474 | 6468 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6469 /* |
| 474 | 6470 * Mirror text "str" for right-left displaying. |
| 6471 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6472 */ |
| 474 | 6473 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6474 rl_mirror(char_u *str) |
| 7 | 6475 { |
| 6476 char_u *p1, *p2; | |
| 6477 int t; | |
| 6478 | |
| 6479 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6480 { | |
| 6481 t = *p1; | |
| 6482 *p1 = *p2; | |
| 6483 *p2 = t; | |
| 6484 } | |
| 6485 } | |
| 6486 #endif | |
| 6487 | |
| 6488 /* | |
| 6489 * mark all status lines for redraw; used after first :cd | |
| 6490 */ | |
| 6491 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6492 status_redraw_all(void) |
| 7 | 6493 { |
| 6494 win_T *wp; | |
| 6495 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6496 FOR_ALL_WINDOWS(wp) |
| 7 | 6497 if (wp->w_status_height) |
| 6498 { | |
| 6499 wp->w_redr_status = TRUE; | |
| 6500 redraw_later(VALID); | |
| 6501 } | |
| 6502 } | |
| 6503 | |
| 6504 /* | |
| 6505 * mark all status lines of the current buffer for redraw | |
| 6506 */ | |
| 6507 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6508 status_redraw_curbuf(void) |
| 7 | 6509 { |
| 6510 win_T *wp; | |
| 6511 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6512 FOR_ALL_WINDOWS(wp) |
| 7 | 6513 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6514 { | |
| 6515 wp->w_redr_status = TRUE; | |
| 6516 redraw_later(VALID); | |
| 6517 } | |
| 6518 } | |
| 6519 | |
| 6520 /* | |
| 6521 * Redraw all status lines that need to be redrawn. | |
| 6522 */ | |
| 6523 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6524 redraw_statuslines(void) |
| 7 | 6525 { |
| 6526 win_T *wp; | |
| 6527 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6528 FOR_ALL_WINDOWS(wp) |
| 7 | 6529 if (wp->w_redr_status) |
| 6530 win_redr_status(wp); | |
| 673 | 6531 if (redraw_tabline) |
| 677 | 6532 draw_tabline(); |
| 7 | 6533 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6534 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6535 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6536 /* |
| 6537 * Redraw all status lines at the bottom of frame "frp". | |
| 6538 */ | |
| 6539 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6540 win_redraw_last_status(frame_T *frp) |
| 7 | 6541 { |
| 6542 if (frp->fr_layout == FR_LEAF) | |
| 6543 frp->fr_win->w_redr_status = TRUE; | |
| 6544 else if (frp->fr_layout == FR_ROW) | |
| 6545 { | |
| 6546 for (frp = frp->fr_child; frp != NULL; frp = frp->fr_next) | |
| 6547 win_redraw_last_status(frp); | |
| 6548 } | |
| 6549 else /* frp->fr_layout == FR_COL */ | |
| 6550 { | |
| 6551 frp = frp->fr_child; | |
| 6552 while (frp->fr_next != NULL) | |
| 6553 frp = frp->fr_next; | |
| 6554 win_redraw_last_status(frp); | |
| 6555 } | |
| 6556 } | |
| 6557 #endif | |
| 6558 | |
| 6559 /* | |
| 6560 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6561 */ | |
| 6562 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6563 draw_vsep_win(win_T *wp, int row) |
| 7 | 6564 { |
| 6565 int hl; | |
| 6566 int c; | |
| 6567 | |
| 6568 if (wp->w_vsep_width) | |
| 6569 { | |
| 6570 /* draw the vertical separator right of this window */ | |
| 6571 c = fillchar_vsep(&hl); | |
| 6572 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6573 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6574 c, ' ', hl); | |
| 6575 } | |
| 6576 } | |
| 6577 | |
| 6578 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6579 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
|
6580 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6581 |
| 6582 /* | |
| 1378 | 6583 * Get the length of an item as it will be shown in the status line. |
| 7 | 6584 */ |
| 6585 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6586 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6587 { |
| 6588 int len = 0; | |
| 6589 | |
| 6590 #ifdef FEAT_MENU | |
| 6591 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6592 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6593 | |
| 6594 /* Check for menu separators - replace with '|'. */ | |
| 6595 if (emenu && menu_is_separator(s)) | |
| 6596 return 1; | |
| 6597 #endif | |
| 6598 | |
| 6599 while (*s != NUL) | |
| 6600 { | |
| 1685 | 6601 s += skip_status_match_char(xp, s); |
| 42 | 6602 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6603 MB_PTR_ADV(s); |
| 7 | 6604 } |
| 6605 | |
| 6606 return len; | |
| 6607 } | |
| 6608 | |
| 6609 /* | |
| 1685 | 6610 * Return the number of characters that should be skipped in a status match. |
| 277 | 6611 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6612 */ | |
| 6613 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6614 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6615 { |
| 1685 | 6616 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6617 #ifdef FEAT_MENU |
| 6618 || ((xp->xp_context == EXPAND_MENUS | |
| 6619 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6620 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6621 #endif | |
| 1685 | 6622 ) |
| 6623 { | |
| 6624 #ifndef BACKSLASH_IN_FILENAME | |
| 6625 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6626 return 2; | |
| 6627 #endif | |
| 6628 return 1; | |
| 6629 } | |
| 6630 return 0; | |
| 277 | 6631 } |
| 6632 | |
| 6633 /* | |
| 7 | 6634 * Show wildchar matches in the status line. |
| 6635 * Show at least the "match" item. | |
| 6636 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6637 * | |
| 6638 * If inversion is possible we use it. Else '=' characters are used. | |
| 6639 */ | |
| 6640 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6641 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6642 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6643 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6644 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6645 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6646 int showtail) |
| 7 | 6647 { |
| 6648 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6649 int row; | |
| 6650 char_u *buf; | |
| 6651 int len; | |
| 1378 | 6652 int clen; /* length in screen cells */ |
| 7 | 6653 int fillchar; |
| 6654 int attr; | |
| 6655 int i; | |
| 6656 int highlight = TRUE; | |
| 6657 char_u *selstart = NULL; | |
| 6658 int selstart_col = 0; | |
| 6659 char_u *selend = NULL; | |
| 6660 static int first_match = 0; | |
| 6661 int add_left = FALSE; | |
| 6662 char_u *s; | |
| 6663 #ifdef FEAT_MENU | |
| 6664 int emenu; | |
| 6665 #endif | |
| 6666 #if defined(FEAT_MBYTE) || defined(FEAT_MENU) | |
| 6667 int l; | |
| 6668 #endif | |
| 6669 | |
| 6670 if (matches == NULL) /* interrupted completion? */ | |
| 6671 return; | |
| 6672 | |
| 39 | 6673 #ifdef FEAT_MBYTE |
| 6674 if (has_mbyte) | |
| 6675 buf = alloc((unsigned)Columns * MB_MAXBYTES + 1); | |
| 6676 else | |
| 6677 #endif | |
| 6678 buf = alloc((unsigned)Columns + 1); | |
| 7 | 6679 if (buf == NULL) |
| 6680 return; | |
| 6681 | |
| 6682 if (match == -1) /* don't show match but original text */ | |
| 6683 { | |
| 6684 match = 0; | |
| 6685 highlight = FALSE; | |
| 6686 } | |
| 6687 /* count 1 for the ending ">" */ | |
| 6688 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6689 if (match == 0) | |
| 6690 first_match = 0; | |
| 6691 else if (match < first_match) | |
| 6692 { | |
| 6693 /* jumping left, as far as we can go */ | |
| 6694 first_match = match; | |
| 6695 add_left = TRUE; | |
| 6696 } | |
| 6697 else | |
| 6698 { | |
| 6699 /* check if match fits on the screen */ | |
| 6700 for (i = first_match; i < match; ++i) | |
| 6701 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6702 if (first_match > 0) | |
| 6703 clen += 2; | |
| 6704 /* jumping right, put match at the left */ | |
| 6705 if ((long)clen > Columns) | |
| 6706 { | |
| 6707 first_match = match; | |
| 6708 /* if showing the last match, we can add some on the left */ | |
| 6709 clen = 2; | |
| 6710 for (i = match; i < num_matches; ++i) | |
| 6711 { | |
| 6712 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6713 if ((long)clen >= Columns) | |
| 6714 break; | |
| 6715 } | |
| 6716 if (i == num_matches) | |
| 6717 add_left = TRUE; | |
| 6718 } | |
| 6719 } | |
| 6720 if (add_left) | |
| 6721 while (first_match > 0) | |
| 6722 { | |
| 6723 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6724 if ((long)clen >= Columns) | |
| 6725 break; | |
| 6726 --first_match; | |
| 6727 } | |
| 6728 | |
|
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
|
6729 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6730 |
| 6731 if (first_match == 0) | |
| 6732 { | |
| 6733 *buf = NUL; | |
| 6734 len = 0; | |
| 6735 } | |
| 6736 else | |
| 6737 { | |
| 6738 STRCPY(buf, "< "); | |
| 6739 len = 2; | |
| 6740 } | |
| 6741 clen = len; | |
| 6742 | |
| 6743 i = first_match; | |
| 6744 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6745 { | |
| 6746 if (i == match) | |
| 6747 { | |
| 6748 selstart = buf + len; | |
| 6749 selstart_col = clen; | |
| 6750 } | |
| 6751 | |
| 6752 s = L_MATCH(i); | |
| 6753 /* Check for menu separators - replace with '|' */ | |
| 6754 #ifdef FEAT_MENU | |
| 6755 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6756 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6757 if (emenu && menu_is_separator(s)) | |
| 6758 { | |
| 6759 STRCPY(buf + len, transchar('|')); | |
| 6760 l = (int)STRLEN(buf + len); | |
| 6761 len += l; | |
| 6762 clen += l; | |
| 6763 } | |
| 6764 else | |
| 6765 #endif | |
| 6766 for ( ; *s != NUL; ++s) | |
| 6767 { | |
| 1685 | 6768 s += skip_status_match_char(xp, s); |
| 7 | 6769 clen += ptr2cells(s); |
| 6770 #ifdef FEAT_MBYTE | |
| 474 | 6771 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6772 { |
| 6773 STRNCPY(buf + len, s, l); | |
| 6774 s += l - 1; | |
| 6775 len += l; | |
| 6776 } | |
| 6777 else | |
| 6778 #endif | |
| 6779 { | |
| 6780 STRCPY(buf + len, transchar_byte(*s)); | |
| 6781 len += (int)STRLEN(buf + len); | |
| 6782 } | |
| 6783 } | |
| 6784 if (i == match) | |
| 6785 selend = buf + len; | |
| 6786 | |
| 6787 *(buf + len++) = ' '; | |
| 6788 *(buf + len++) = ' '; | |
| 6789 clen += 2; | |
| 6790 if (++i == num_matches) | |
| 6791 break; | |
| 6792 } | |
| 6793 | |
| 6794 if (i != num_matches) | |
| 6795 { | |
| 6796 *(buf + len++) = '>'; | |
| 6797 ++clen; | |
| 6798 } | |
| 6799 | |
| 6800 buf[len] = NUL; | |
| 6801 | |
| 6802 row = cmdline_row - 1; | |
| 6803 if (row >= 0) | |
| 6804 { | |
| 6805 if (wild_menu_showing == 0) | |
| 6806 { | |
| 6807 if (msg_scrolled > 0) | |
| 6808 { | |
| 6809 /* Put the wildmenu just above the command line. If there is | |
| 6810 * no room, scroll the screen one line up. */ | |
| 6811 if (cmdline_row == Rows - 1) | |
| 6812 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6813 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6814 ++msg_scrolled; |
| 6815 } | |
| 6816 else | |
| 6817 { | |
| 6818 ++cmdline_row; | |
| 6819 ++row; | |
| 6820 } | |
| 6821 wild_menu_showing = WM_SCROLLED; | |
| 6822 } | |
| 6823 else | |
| 6824 { | |
| 6825 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6826 * Set 'winminheight' to zero to avoid that the window is | |
| 6827 * resized. */ | |
| 6828 if (lastwin->w_status_height == 0) | |
| 6829 { | |
| 6830 save_p_ls = p_ls; | |
| 6831 save_p_wmh = p_wmh; | |
| 6832 p_ls = 2; | |
| 6833 p_wmh = 0; | |
| 6834 last_status(FALSE); | |
| 6835 } | |
| 6836 wild_menu_showing = WM_SHOWN; | |
| 6837 } | |
| 6838 } | |
| 6839 | |
| 6840 screen_puts(buf, row, 0, attr); | |
| 6841 if (selstart != NULL && highlight) | |
| 6842 { | |
| 6843 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6844 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6845 } |
| 6846 | |
| 6847 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6848 } | |
| 6849 | |
| 6850 win_redraw_last_status(topframe); | |
| 6851 vim_free(buf); | |
| 6852 } | |
| 6853 #endif | |
| 6854 | |
| 6855 /* | |
| 6856 * Redraw the status line of window wp. | |
| 6857 * | |
| 6858 * If inversion is possible we use it. Else '=' characters are used. | |
| 6859 */ | |
| 6860 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6861 win_redr_status(win_T *wp) |
| 7 | 6862 { |
| 6863 int row; | |
| 6864 char_u *p; | |
| 6865 int len; | |
| 6866 int fillchar; | |
| 6867 int attr; | |
| 6868 int this_ru_col; | |
| 1910 | 6869 static int busy = FALSE; |
| 6870 | |
| 6871 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6872 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6873 if (busy) | |
| 6874 return; | |
| 6875 busy = TRUE; | |
| 7 | 6876 |
| 6877 wp->w_redr_status = FALSE; | |
| 6878 if (wp->w_status_height == 0) | |
| 6879 { | |
| 6880 /* no status line, can only be last window */ | |
| 6881 redraw_cmdline = TRUE; | |
| 6882 } | |
| 540 | 6883 else if (!redrawing() |
| 6884 #ifdef FEAT_INS_EXPAND | |
| 6885 /* don't update status line when popup menu is visible and may be | |
| 6886 * drawn over it */ | |
| 6887 || pum_visible() | |
| 6888 #endif | |
| 6889 ) | |
| 7 | 6890 { |
| 6891 /* Don't redraw right now, do it later. */ | |
| 6892 wp->w_redr_status = TRUE; | |
| 6893 } | |
| 6894 #ifdef FEAT_STL_OPT | |
| 40 | 6895 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 6896 { |
| 6897 /* redraw custom status line */ | |
| 1983 | 6898 redraw_custom_statusline(wp); |
| 7 | 6899 } |
| 6900 #endif | |
| 6901 else | |
| 6902 { | |
|
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
|
6903 fillchar = fillchar_status(&attr, wp); |
| 7 | 6904 |
| 685 | 6905 get_trans_bufname(wp->w_buffer); |
| 7 | 6906 p = NameBuff; |
| 6907 len = (int)STRLEN(p); | |
| 6908 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
6909 if (bt_help(wp->w_buffer) |
| 7 | 6910 #ifdef FEAT_QUICKFIX |
| 6911 || wp->w_p_pvw | |
| 6912 #endif | |
| 6913 || bufIsChanged(wp->w_buffer) | |
| 6914 || wp->w_buffer->b_p_ro) | |
| 6915 *(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
|
6916 if (bt_help(wp->w_buffer)) |
| 7 | 6917 { |
| 809 | 6918 STRCPY(p + len, _("[Help]")); |
| 7 | 6919 len += (int)STRLEN(p + len); |
| 6920 } | |
| 6921 #ifdef FEAT_QUICKFIX | |
| 6922 if (wp->w_p_pvw) | |
| 6923 { | |
| 6924 STRCPY(p + len, _("[Preview]")); | |
| 6925 len += (int)STRLEN(p + len); | |
| 6926 } | |
| 6927 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6928 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
|
6929 #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
|
6930 && !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
|
6931 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
6932 ) |
| 7 | 6933 { |
| 6934 STRCPY(p + len, "[+]"); | |
| 6935 len += 3; | |
| 6936 } | |
| 6937 if (wp->w_buffer->b_p_ro) | |
| 6938 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
6939 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
|
6940 len += (int)STRLEN(p + len); |
| 7 | 6941 } |
| 6942 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6943 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
|
6944 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
|
6945 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 6946 if (this_ru_col <= 1) |
| 6947 { | |
| 6948 p = (char_u *)"<"; /* No room for file name! */ | |
| 6949 len = 1; | |
| 6950 } | |
| 6951 else | |
| 6952 #ifdef FEAT_MBYTE | |
| 6953 if (has_mbyte) | |
| 6954 { | |
| 6955 int clen = 0, i; | |
| 6956 | |
| 6957 /* Count total number of display cells. */ | |
|
2338
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6958 clen = mb_string2cells(p, -1); |
|
da6ec32d8d8f
Added strwidth() and strchars() functions.
Bram Moolenaar <bram@vim.org>
parents:
2332
diff
changeset
|
6959 |
| 7 | 6960 /* Find first character that will fit. |
| 6961 * Going from start to end is much faster for DBCS. */ | |
| 6962 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; | |
| 474 | 6963 i += (*mb_ptr2len)(p + i)) |
| 7 | 6964 clen -= (*mb_ptr2cells)(p + i); |
| 6965 len = clen; | |
| 6966 if (i > 0) | |
| 6967 { | |
| 6968 p = p + i - 1; | |
| 6969 *p = '<'; | |
| 6970 ++len; | |
| 6971 } | |
| 6972 | |
| 6973 } | |
| 6974 else | |
| 6975 #endif | |
| 6976 if (len > this_ru_col - 1) | |
| 6977 { | |
| 6978 p += len - (this_ru_col - 1); | |
| 6979 *p = '<'; | |
| 6980 len = this_ru_col - 1; | |
| 6981 } | |
| 6982 | |
| 6983 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
|
6984 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
|
6985 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
|
6986 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 6987 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
6988 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 6989 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 6990 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
|
6991 - 1 + wp->w_wincol), attr); |
| 7 | 6992 |
| 6993 #ifdef FEAT_CMDL_INFO | |
| 6994 win_redr_ruler(wp, TRUE); | |
| 6995 #endif | |
| 6996 } | |
| 6997 | |
| 6998 /* | |
| 6999 * May need to draw the character below the vertical separator. | |
| 7000 */ | |
| 7001 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7002 { | |
| 7003 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
|
7004 fillchar = fillchar_status(&attr, wp); |
| 7 | 7005 else |
| 7006 fillchar = fillchar_vsep(&attr); | |
| 7007 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7008 attr); | |
| 7009 } | |
| 1910 | 7010 busy = FALSE; |
| 7 | 7011 } |
| 7012 | |
| 680 | 7013 #ifdef FEAT_STL_OPT |
| 7014 /* | |
| 7015 * Redraw the status line according to 'statusline' and take care of any | |
| 7016 * errors encountered. | |
| 7017 */ | |
| 7018 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7019 redraw_custom_statusline(win_T *wp) |
| 680 | 7020 { |
| 1983 | 7021 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7022 int saved_did_emsg = did_emsg; |
| 1983 | 7023 |
| 7024 /* When called recursively return. This can happen when the statusline | |
| 7025 * contains an expression that triggers a redraw. */ | |
| 7026 if (entered) | |
| 7027 return; | |
| 7028 entered = TRUE; | |
| 680 | 7029 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7030 did_emsg = FALSE; |
| 680 | 7031 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7032 if (did_emsg) |
| 1983 | 7033 { |
| 7034 /* When there is an error disable the statusline, otherwise the | |
| 7035 * display is messed up with errors and a redraw triggers the problem | |
| 7036 * again and again. */ | |
| 680 | 7037 set_string_option_direct((char_u *)"statusline", -1, |
| 7038 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7039 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7040 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7041 did_emsg |= saved_did_emsg; |
| 1983 | 7042 entered = FALSE; |
| 680 | 7043 } |
| 7044 #endif | |
| 7045 | |
| 7 | 7046 /* |
| 7047 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7048 * line of the window right of it. If not, then it's a vertical separator. | |
| 7049 * Only call if (wp->w_vsep_width != 0). | |
| 7050 */ | |
| 7051 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7052 stl_connected(win_T *wp) |
| 7 | 7053 { |
| 7054 frame_T *fr; | |
| 7055 | |
| 7056 fr = wp->w_frame; | |
| 7057 while (fr->fr_parent != NULL) | |
| 7058 { | |
| 7059 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7060 { | |
| 7061 if (fr->fr_next != NULL) | |
| 7062 break; | |
| 7063 } | |
| 7064 else | |
| 7065 { | |
| 7066 if (fr->fr_next != NULL) | |
| 7067 return TRUE; | |
| 7068 } | |
| 7069 fr = fr->fr_parent; | |
| 7070 } | |
| 7071 return FALSE; | |
| 7072 } | |
| 7073 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7074 |
| 7 | 7075 /* |
| 7076 * Get the value to show for the language mappings, active 'keymap'. | |
| 7077 */ | |
| 7078 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7079 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7080 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7081 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
|
7082 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
|
7083 int len) /* length of buffer */ |
| 7 | 7084 { |
| 7085 char_u *p; | |
| 7086 | |
| 7087 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7088 return FALSE; | |
| 7089 | |
| 7090 { | |
| 7091 #ifdef FEAT_EVAL | |
| 7092 buf_T *old_curbuf = curbuf; | |
| 7093 win_T *old_curwin = curwin; | |
| 7094 char_u *s; | |
| 7095 | |
| 7096 curbuf = wp->w_buffer; | |
| 7097 curwin = wp; | |
| 7098 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7099 ++emsg_skip; | |
| 714 | 7100 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7101 --emsg_skip; |
| 7102 curbuf = old_curbuf; | |
| 7103 curwin = old_curwin; | |
| 7104 if (p == NULL || *p == NUL) | |
| 7105 #endif | |
| 7106 { | |
| 7107 #ifdef FEAT_KEYMAP | |
| 7108 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7109 p = wp->w_buffer->b_p_keymap; | |
| 7110 else | |
| 7111 #endif | |
| 7112 p = (char_u *)"lang"; | |
| 7113 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7114 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7115 buf[0] = NUL; |
| 7116 #ifdef FEAT_EVAL | |
| 7117 vim_free(s); | |
| 7118 #endif | |
| 7119 } | |
| 7120 return buf[0] != NUL; | |
| 7121 } | |
| 7122 | |
| 7123 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7124 /* | |
| 677 | 7125 * Redraw the status line or ruler of window "wp". |
| 7126 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7127 */ |
| 7128 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7129 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7130 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7131 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7132 { |
| 5539 | 7133 static int entered = FALSE; |
| 7 | 7134 int attr; |
| 7135 int curattr; | |
| 7136 int row; | |
| 7137 int col = 0; | |
| 7138 int maxwidth; | |
| 7139 int width; | |
| 7140 int n; | |
| 7141 int len; | |
| 7142 int fillchar; | |
| 7143 char_u buf[MAXPATHL]; | |
| 1983 | 7144 char_u *stl; |
| 7 | 7145 char_u *p; |
| 681 | 7146 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7147 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7148 int use_sandbox = FALSE; |
| 2693 | 7149 win_T *ewp; |
| 7150 int p_crb_save; | |
| 7 | 7151 |
| 5539 | 7152 /* There is a tiny chance that this gets called recursively: When |
| 7153 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7154 * Avoid trouble by not allowing recursion. */ | |
| 7155 if (entered) | |
| 7156 return; | |
| 7157 entered = TRUE; | |
| 7158 | |
| 7 | 7159 /* setup environment for the task at hand */ |
| 677 | 7160 if (wp == NULL) |
| 7161 { | |
| 7162 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7163 stl = p_tal; |
| 677 | 7164 row = 0; |
| 707 | 7165 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7166 attr = HL_ATTR(HLF_TPF); |
| 677 | 7167 maxwidth = Columns; |
| 7168 # ifdef FEAT_EVAL | |
| 681 | 7169 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7170 # endif |
| 7171 } | |
| 40 | 7172 else |
| 677 | 7173 { |
| 7174 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
|
7175 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
|
7176 maxwidth = wp->w_width; |
| 677 | 7177 |
| 7178 if (draw_ruler) | |
| 7179 { | |
| 1983 | 7180 stl = p_ruf; |
| 677 | 7181 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7182 if (*stl == '%') |
| 7183 { | |
| 7184 if (*++stl == '-') | |
| 7185 stl++; | |
| 7186 if (atoi((char *)stl)) | |
| 7187 while (VIM_ISDIGIT(*stl)) | |
| 7188 stl++; | |
| 7189 if (*stl++ != '(') | |
| 7190 stl = p_ruf; | |
| 677 | 7191 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7192 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
|
7193 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
|
7194 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
|
7195 maxwidth = wp->w_width - col; |
| 677 | 7196 if (!wp->w_status_height) |
| 7197 { | |
| 7198 row = Rows - 1; | |
| 7199 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7200 fillchar = ' '; | |
| 7201 attr = 0; | |
| 7202 } | |
| 7203 | |
| 7204 # ifdef FEAT_EVAL | |
| 681 | 7205 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7206 # endif |
| 7207 } | |
| 7208 else | |
| 7209 { | |
| 7210 if (*wp->w_p_stl != NUL) | |
| 1983 | 7211 stl = wp->w_p_stl; |
| 677 | 7212 else |
| 1983 | 7213 stl = p_stl; |
| 677 | 7214 # ifdef FEAT_EVAL |
| 681 | 7215 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7216 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7217 # endif |
| 7218 } | |
| 7219 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7220 col += wp->w_wincol; |
| 677 | 7221 } |
| 7222 | |
| 7 | 7223 if (maxwidth <= 0) |
| 5539 | 7224 goto theend; |
| 677 | 7225 |
| 2693 | 7226 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7227 * the cursor away and back. */ | |
| 7228 ewp = wp == NULL ? curwin : wp; | |
| 7229 p_crb_save = ewp->w_p_crb; | |
| 7230 ewp->w_p_crb = FALSE; | |
| 7231 | |
| 1983 | 7232 /* Make a copy, because the statusline may include a function call that |
| 7233 * might change the option value and free the memory. */ | |
| 7234 stl = vim_strsave(stl); | |
| 2693 | 7235 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7236 stl, use_sandbox, |
| 681 | 7237 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7238 vim_free(stl); |
| 2693 | 7239 ewp->w_p_crb = p_crb_save; |
| 2661 | 7240 |
| 7241 /* Make all characters printable. */ | |
| 7242 p = transstr(buf); | |
| 7243 if (p != NULL) | |
| 7244 { | |
| 7245 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7246 vim_free(p); | |
| 7247 } | |
| 7248 | |
| 7249 /* fill up with "fillchar" */ | |
| 835 | 7250 len = (int)STRLEN(buf); |
| 1883 | 7251 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7252 { |
| 7253 #ifdef FEAT_MBYTE | |
| 7254 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7255 #else | |
| 7256 buf[len++] = fillchar; | |
| 7257 #endif | |
| 7258 ++width; | |
| 7259 } | |
| 7260 buf[len] = NUL; | |
| 7261 | |
| 681 | 7262 /* |
| 7263 * Draw each snippet with the specified highlighting. | |
| 7264 */ | |
| 7 | 7265 curattr = attr; |
| 7266 p = buf; | |
| 681 | 7267 for (n = 0; hltab[n].start != NULL; n++) |
| 7268 { | |
| 7269 len = (int)(hltab[n].start - p); | |
| 7 | 7270 screen_puts_len(p, len, row, col, curattr); |
| 7271 col += vim_strnsize(p, len); | |
| 681 | 7272 p = hltab[n].start; |
| 7273 | |
| 7274 if (hltab[n].userhl == 0) | |
| 7 | 7275 curattr = attr; |
| 681 | 7276 else if (hltab[n].userhl < 0) |
| 7277 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
|
7278 #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
|
7279 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
|
7280 && 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
|
7281 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
|
7282 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
|
7283 && 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
|
7284 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
|
7285 #endif |
| 680 | 7286 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7287 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7288 else |
| 681 | 7289 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7290 } |
| 7291 screen_puts(p, row, col, curattr); | |
| 681 | 7292 |
| 7293 if (wp == NULL) | |
| 7294 { | |
| 7295 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7296 col = 0; | |
| 7297 len = 0; | |
| 7298 p = buf; | |
| 7299 fillchar = 0; | |
| 7300 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7301 { | |
| 7302 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7303 while (col < len) | |
| 7304 TabPageIdxs[col++] = fillchar; | |
| 7305 p = tabtab[n].start; | |
| 7306 fillchar = tabtab[n].userhl; | |
| 7307 } | |
| 7308 while (col < Columns) | |
| 7309 TabPageIdxs[col++] = fillchar; | |
| 7310 } | |
| 5539 | 7311 |
| 7312 theend: | |
| 7313 entered = FALSE; | |
| 7 | 7314 } |
| 7315 | |
| 7316 #endif /* FEAT_STL_OPT */ | |
| 7317 | |
| 7318 /* | |
| 7319 * Output a single character directly to the screen and update ScreenLines. | |
| 7320 */ | |
| 7321 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7322 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7323 { |
| 3549 | 7324 char_u buf[MB_MAXBYTES + 1]; |
| 7325 | |
| 7 | 7326 #ifdef FEAT_MBYTE |
| 3549 | 7327 if (has_mbyte) |
| 7328 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7329 else | |
| 7330 #endif | |
| 7331 { | |
| 7332 buf[0] = c; | |
| 7333 buf[1] = NUL; | |
| 7334 } | |
| 7 | 7335 screen_puts(buf, row, col, attr); |
| 7336 } | |
| 7337 | |
| 7338 /* | |
| 7339 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7340 * Also return its attribute in *attrp; | |
| 7341 */ | |
| 7342 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7343 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7344 { |
| 7345 unsigned off; | |
| 7346 | |
| 7347 /* safety check */ | |
| 7348 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7349 { | |
| 7350 off = LineOffset[row] + col; | |
| 7351 *attrp = ScreenAttrs[off]; | |
| 7352 bytes[0] = ScreenLines[off]; | |
| 7353 bytes[1] = NUL; | |
| 7354 | |
| 7355 #ifdef FEAT_MBYTE | |
| 7356 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7357 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7358 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7359 { | |
| 7360 bytes[0] = ScreenLines[off]; | |
| 7361 bytes[1] = ScreenLines2[off]; | |
| 7362 bytes[2] = NUL; | |
| 7363 } | |
| 7364 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7365 { | |
| 7366 bytes[1] = ScreenLines[off + 1]; | |
| 7367 bytes[2] = NUL; | |
| 7368 } | |
| 7369 #endif | |
| 7370 } | |
| 7371 } | |
| 7372 | |
| 714 | 7373 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
7374 static int screen_comp_differs(int, int*); |
| 714 | 7375 |
| 7376 /* | |
| 7377 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7378 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7379 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7380 */ |
| 7381 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7382 screen_comp_differs(int off, int *u8cc) |
| 714 | 7383 { |
| 7384 int i; | |
| 7385 | |
| 7386 for (i = 0; i < Screen_mco; ++i) | |
| 7387 { | |
| 7388 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7389 return TRUE; | |
| 7390 if (u8cc[i] == 0) | |
| 7391 break; | |
| 7392 } | |
| 7393 return FALSE; | |
| 7394 } | |
| 7395 #endif | |
| 7396 | |
| 7 | 7397 /* |
| 7398 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7399 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7400 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7401 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7402 */ | |
| 7403 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7404 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7405 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7406 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7407 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7408 int attr) |
| 7 | 7409 { |
| 7410 screen_puts_len(text, -1, row, col, attr); | |
| 7411 } | |
| 7412 | |
| 7413 /* | |
| 7414 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7415 * a NUL. | |
| 7416 */ | |
| 7417 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7418 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7419 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7420 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7421 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7422 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7423 int attr) |
| 7 | 7424 { |
| 7425 unsigned off; | |
| 7426 char_u *ptr = text; | |
| 5923 | 7427 int len = textlen; |
| 7 | 7428 int c; |
| 7429 #ifdef FEAT_MBYTE | |
| 1378 | 7430 unsigned max_off; |
| 7 | 7431 int mbyte_blen = 1; |
| 7432 int mbyte_cells = 1; | |
| 7433 int u8c = 0; | |
| 714 | 7434 int u8cc[MAX_MCO]; |
| 7 | 7435 int clear_next_cell = FALSE; |
| 7436 # ifdef FEAT_ARABIC | |
| 7437 int prev_c = 0; /* previous Arabic character */ | |
| 714 | 7438 int pc, nc, nc1; |
| 7439 int pcc[MAX_MCO]; | |
| 7 | 7440 # endif |
| 7441 #endif | |
| 1843 | 7442 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7443 int force_redraw_this; | |
| 7444 int force_redraw_next = FALSE; | |
| 7445 #endif | |
| 7446 int need_redraw; | |
| 7 | 7447 |
| 7448 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7449 return; | |
| 1843 | 7450 off = LineOffset[row] + col; |
| 7 | 7451 |
| 1668 | 7452 #ifdef FEAT_MBYTE |
| 7453 /* When drawing over the right halve of a double-wide char clear out the | |
| 7454 * left halve. Only needed in a terminal. */ | |
| 1685 | 7455 if (has_mbyte && col > 0 && col < screen_Columns |
| 1668 | 7456 # ifdef FEAT_GUI |
| 7457 && !gui.in_use | |
| 7458 # endif | |
| 7459 && mb_fix_col(col, row) != col) | |
| 1843 | 7460 { |
| 7461 ScreenLines[off - 1] = ' '; | |
| 7462 ScreenAttrs[off - 1] = 0; | |
| 7463 if (enc_utf8) | |
| 7464 { | |
| 7465 ScreenLinesUC[off - 1] = 0; | |
| 7466 ScreenLinesC[0][off - 1] = 0; | |
| 7467 } | |
| 7468 /* redraw the previous cell, make it empty */ | |
| 7469 screen_char(off - 1, row, col - 1); | |
| 7470 /* force the cell at "col" to be redrawn */ | |
| 7471 force_redraw_next = TRUE; | |
| 7472 } | |
| 7473 #endif | |
| 7474 | |
| 1378 | 7475 #ifdef FEAT_MBYTE |
| 7476 max_off = LineOffset[row] + screen_Columns; | |
| 7477 #endif | |
| 1340 | 7478 while (col < screen_Columns |
| 7479 && (len < 0 || (int)(ptr - text) < len) | |
| 7480 && *ptr != NUL) | |
| 7 | 7481 { |
| 7482 c = *ptr; | |
| 7483 #ifdef FEAT_MBYTE | |
| 7484 /* check if this is the first byte of a multibyte */ | |
| 7485 if (has_mbyte) | |
| 7486 { | |
| 7487 if (enc_utf8 && len > 0) | |
| 474 | 7488 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7489 else |
| 474 | 7490 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7491 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7492 mbyte_cells = 1; | |
| 7493 else if (enc_dbcs != 0) | |
| 7494 mbyte_cells = mbyte_blen; | |
| 7495 else /* enc_utf8 */ | |
| 7496 { | |
| 7497 if (len >= 0) | |
| 714 | 7498 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7499 (int)((text + len) - ptr)); |
| 7500 else | |
| 714 | 7501 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7502 mbyte_cells = utf_char2cells(u8c); |
| 1401 | 7503 # ifdef UNICODE16 |
| 7 | 7504 /* Non-BMP character: display as ? or fullwidth ?. */ |
| 7505 if (u8c >= 0x10000) | |
| 7506 { | |
| 7507 u8c = (mbyte_cells == 2) ? 0xff1f : (int)'?'; | |
| 7508 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
|
7509 attr = HL_ATTR(HLF_8); |
| 7 | 7510 } |
| 1401 | 7511 # endif |
| 7 | 7512 # ifdef FEAT_ARABIC |
| 7513 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) | |
| 7514 { | |
| 7515 /* Do Arabic shaping. */ | |
| 7516 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7517 { | |
| 7518 /* Past end of string to be displayed. */ | |
| 7519 nc = NUL; | |
| 7520 nc1 = NUL; | |
| 7521 } | |
| 7522 else | |
| 714 | 7523 { |
| 1994 | 7524 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7525 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7526 nc1 = pcc[0]; |
| 7527 } | |
| 7 | 7528 pc = prev_c; |
| 7529 prev_c = u8c; | |
| 714 | 7530 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7531 } |
| 7532 else | |
| 7533 prev_c = u8c; | |
| 7534 # endif | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7535 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7536 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7537 /* 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
|
7538 * 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
|
7539 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7540 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7541 } |
| 7 | 7542 } |
| 7543 } | |
| 7544 #endif | |
| 7545 | |
| 1843 | 7546 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) |
| 7547 force_redraw_this = force_redraw_next; | |
| 7548 force_redraw_next = FALSE; | |
| 7549 #endif | |
| 7550 | |
| 7551 need_redraw = ScreenLines[off] != c | |
| 7 | 7552 #ifdef FEAT_MBYTE |
| 7553 || (mbyte_cells == 2 | |
| 7554 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7555 || (enc_dbcs == DBCS_JPNU | |
| 7556 && c == 0x8e | |
| 7557 && ScreenLines2[off] != ptr[1]) | |
| 7558 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7559 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7560 (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
|
7561 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7562 && screen_comp_differs(off, u8cc)))) |
| 7 | 7563 #endif |
| 7564 || ScreenAttrs[off] != attr | |
| 1843 | 7565 || exmode_active; |
| 7566 | |
| 7567 if (need_redraw | |
| 7568 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7569 || force_redraw_this | |
| 7570 #endif | |
| 7 | 7571 ) |
| 7572 { | |
| 7573 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7574 /* The bold trick makes a single row of pixels appear in the next | |
| 7575 * character. When a bold character is removed, the next | |
| 7576 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7577 * and for some xterms. */ |
| 7578 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7579 # ifdef FEAT_GUI |
| 7580 gui.in_use | |
| 7581 # endif | |
| 7582 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7583 || | |
| 7584 # endif | |
| 7585 # ifdef UNIX | |
| 7586 term_is_xterm | |
| 7587 # endif | |
| 1843 | 7588 )) |
| 7589 { | |
| 7590 int n = ScreenAttrs[off]; | |
| 7591 | |
| 7592 if (n > HL_ALL) | |
| 7593 n = syn_attr2attr(n); | |
| 7594 if (n & HL_BOLD) | |
| 7595 force_redraw_next = TRUE; | |
| 7 | 7596 } |
| 7597 #endif | |
| 7598 #ifdef FEAT_MBYTE | |
| 7599 /* When at the end of the text and overwriting a two-cell | |
| 7600 * character with a one-cell character, need to clear the next | |
| 7601 * cell. Also when overwriting the left halve of a two-cell char | |
| 7602 * with the right halve of a two-cell char. Do this only once | |
| 7603 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7604 if (clear_next_cell) | |
| 7605 clear_next_cell = FALSE; | |
| 7606 else if (has_mbyte | |
| 7607 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7608 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7609 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7610 || (mbyte_cells == 2 |
| 1378 | 7611 && (*mb_off2cells)(off, max_off) == 1 |
| 7612 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7613 clear_next_cell = TRUE; |
| 7614 | |
| 7615 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7616 * it confuses mb_off2cells(). */ | |
| 7617 if (enc_dbcs | |
| 1378 | 7618 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7619 || (mbyte_cells == 2 |
| 1378 | 7620 && (*mb_off2cells)(off, max_off) == 1 |
| 7621 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7622 ScreenLines[off + mbyte_blen] = 0; |
| 7623 #endif | |
| 7624 ScreenLines[off] = c; | |
| 7625 ScreenAttrs[off] = attr; | |
| 7626 #ifdef FEAT_MBYTE | |
| 7627 if (enc_utf8) | |
| 7628 { | |
| 714 | 7629 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7630 ScreenLinesUC[off] = 0; |
| 7631 else | |
| 7632 { | |
| 714 | 7633 int i; |
| 7634 | |
| 7 | 7635 ScreenLinesUC[off] = u8c; |
| 714 | 7636 for (i = 0; i < Screen_mco; ++i) |
| 7637 { | |
| 7638 ScreenLinesC[i][off] = u8cc[i]; | |
| 7639 if (u8cc[i] == 0) | |
| 7640 break; | |
| 7641 } | |
| 7 | 7642 } |
| 7643 if (mbyte_cells == 2) | |
| 7644 { | |
| 7645 ScreenLines[off + 1] = 0; | |
| 7646 ScreenAttrs[off + 1] = attr; | |
| 7647 } | |
| 7648 screen_char(off, row, col); | |
| 7649 } | |
| 7650 else if (mbyte_cells == 2) | |
| 7651 { | |
| 7652 ScreenLines[off + 1] = ptr[1]; | |
| 7653 ScreenAttrs[off + 1] = attr; | |
| 7654 screen_char_2(off, row, col); | |
| 7655 } | |
| 7656 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7657 { | |
| 7658 ScreenLines2[off] = ptr[1]; | |
| 7659 screen_char(off, row, col); | |
| 7660 } | |
| 7661 else | |
| 7662 #endif | |
| 7663 screen_char(off, row, col); | |
| 7664 } | |
| 7665 #ifdef FEAT_MBYTE | |
| 7666 if (has_mbyte) | |
| 7667 { | |
| 7668 off += mbyte_cells; | |
| 7669 col += mbyte_cells; | |
| 7670 ptr += mbyte_blen; | |
| 7671 if (clear_next_cell) | |
| 5923 | 7672 { |
| 7673 /* This only happens at the end, display one space next. */ | |
| 7 | 7674 ptr = (char_u *)" "; |
| 5923 | 7675 len = -1; |
| 7676 } | |
| 7 | 7677 } |
| 7678 else | |
| 7679 #endif | |
| 7680 { | |
| 7681 ++off; | |
| 7682 ++col; | |
| 7683 ++ptr; | |
| 7684 } | |
| 7685 } | |
| 1843 | 7686 |
| 7687 #if defined(FEAT_MBYTE) || defined(FEAT_GUI) || defined(UNIX) | |
| 7688 /* If we detected the next character needs to be redrawn, but the text | |
| 7689 * doesn't extend up to there, update the character here. */ | |
| 7690 if (force_redraw_next && col < screen_Columns) | |
| 7691 { | |
| 7692 # ifdef FEAT_MBYTE | |
| 7693 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7694 screen_char_2(off, row, col); | |
| 7695 else | |
| 7696 # endif | |
| 7697 screen_char(off, row, col); | |
| 7698 } | |
| 7699 #endif | |
| 7 | 7700 } |
| 7701 | |
| 7702 #ifdef FEAT_SEARCH_EXTRA | |
| 7703 /* | |
| 1326 | 7704 * Prepare for 'hlsearch' highlighting. |
| 7 | 7705 */ |
| 7706 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7707 start_search_hl(void) |
| 7 | 7708 { |
| 7709 if (p_hls && !no_hlsearch) | |
| 7710 { | |
| 7711 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
|
7712 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7713 # ifdef FEAT_RELTIME |
| 7714 /* Set the time limit to 'redrawtime'. */ | |
| 7715 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7716 # endif | |
| 7 | 7717 } |
| 7718 } | |
| 7719 | |
| 7720 /* | |
| 1326 | 7721 * Clean up for 'hlsearch' highlighting. |
| 7 | 7722 */ |
| 7723 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7724 end_search_hl(void) |
| 7 | 7725 { |
| 7726 if (search_hl.rm.regprog != NULL) | |
| 7727 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7728 vim_regfree(search_hl.rm.regprog); |
| 7 | 7729 search_hl.rm.regprog = NULL; |
| 7730 } | |
| 7731 } | |
| 7732 | |
| 7733 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7734 * 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
|
7735 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7736 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7737 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
|
7738 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7739 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7740 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7741 /* 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
|
7742 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7743 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7744 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7745 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7746 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7747 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7748 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7749 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7750 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
|
7751 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
|
7752 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7753 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7754 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7755 /* 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
|
7756 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
|
7757 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7758 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7759 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7760 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
|
7761 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7762 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7763 /* 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
|
7764 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7765 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7766 /* |
| 7 | 7767 * Advance to the match in window "wp" line "lnum" or past it. |
| 7768 */ | |
| 7769 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7770 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7771 { |
| 1326 | 7772 matchitem_T *cur; /* points to the match list */ |
| 7773 match_T *shl; /* points to search_hl or a match */ | |
| 7774 int shl_flag; /* flag to indicate whether search_hl | |
| 7775 has been processed or not */ | |
| 5979 | 7776 int pos_inprogress; /* marks that position match search is |
| 7777 in progress */ | |
| 7 | 7778 int n; |
| 7779 | |
| 7780 /* | |
| 7781 * When using a multi-line pattern, start searching at the top | |
| 7782 * of the window or just after a closed fold. | |
| 1326 | 7783 * Do this both for search_hl and the match list. |
| 7 | 7784 */ |
| 1326 | 7785 cur = wp->w_match_head; |
| 7786 shl_flag = FALSE; | |
| 7787 while (cur != NULL || shl_flag == FALSE) | |
| 7788 { | |
| 7789 if (shl_flag == FALSE) | |
| 7790 { | |
| 7791 shl = &search_hl; | |
| 7792 shl_flag = TRUE; | |
| 7793 } | |
| 7794 else | |
| 7795 shl = &cur->hl; | |
| 7 | 7796 if (shl->rm.regprog != NULL |
| 7797 && shl->lnum == 0 | |
| 7798 && re_multiline(shl->rm.regprog)) | |
| 7799 { | |
| 7800 if (shl->first_lnum == 0) | |
| 7801 { | |
| 7802 # ifdef FEAT_FOLDING | |
| 7803 for (shl->first_lnum = lnum; | |
| 7804 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7805 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7806 NULL, NULL, TRUE, NULL)) | |
| 7807 break; | |
| 7808 # else | |
| 7809 shl->first_lnum = wp->w_topline; | |
| 7810 # endif | |
| 7811 } | |
| 5979 | 7812 if (cur != NULL) |
| 7813 cur->pos.cur = 0; | |
| 7814 pos_inprogress = TRUE; | |
| 7 | 7815 n = 0; |
| 5979 | 7816 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7817 || (cur != NULL && pos_inprogress))) | |
| 7818 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7819 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
|
7820 shl == &search_hl ? NULL : cur); |
| 5979 | 7821 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7822 ? FALSE : TRUE; | |
| 7 | 7823 if (shl->lnum != 0) |
| 7824 { | |
| 7825 shl->first_lnum = shl->lnum | |
| 7826 + shl->rm.endpos[0].lnum | |
| 7827 - shl->rm.startpos[0].lnum; | |
| 7828 n = shl->rm.endpos[0].col; | |
| 7829 } | |
| 7830 else | |
| 7831 { | |
| 7832 ++shl->first_lnum; | |
| 7833 n = 0; | |
| 7834 } | |
| 7835 } | |
| 7836 } | |
| 1326 | 7837 if (shl != &search_hl && cur != NULL) |
| 7838 cur = cur->next; | |
| 7 | 7839 } |
| 7840 } | |
| 7841 | |
| 7842 /* | |
| 1326 | 7843 * Search for a next 'hlsearch' or match. |
| 7 | 7844 * Uses shl->buf. |
| 7845 * Sets shl->lnum and shl->rm contents. | |
| 7846 * Note: Assumes a previous match is always before "lnum", unless | |
| 7847 * shl->lnum is zero. | |
| 7848 * Careful: Any pointers for buffer lines will become invalid. | |
| 7849 */ | |
| 7850 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7851 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7852 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7853 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
|
7854 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7855 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
|
7856 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7857 { |
| 7858 linenr_T l; | |
| 7859 colnr_T matchcol; | |
| 7860 long nmatched; | |
| 7861 | |
| 7862 if (shl->lnum != 0) | |
| 7863 { | |
| 7864 /* Check for three situations: | |
| 7865 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7866 * 2. If the previous match includes "mincol", use it. | |
| 7867 * 3. Continue after the previous match. | |
| 7868 */ | |
| 7869 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7870 if (lnum > l) | |
| 7871 shl->lnum = 0; | |
| 7872 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7873 return; | |
| 7874 } | |
| 7875 | |
| 7876 /* | |
| 7877 * Repeat searching for a match until one is found that includes "mincol" | |
| 7878 * or none is found in this line. | |
| 7879 */ | |
| 7880 called_emsg = FALSE; | |
| 7881 for (;;) | |
| 7882 { | |
| 1521 | 7883 #ifdef FEAT_RELTIME |
| 7884 /* Stop searching after passing the time limit. */ | |
| 7885 if (profile_passed_limit(&(shl->tm))) | |
| 7886 { | |
| 7887 shl->lnum = 0; /* no match found in time */ | |
| 7888 break; | |
| 7889 } | |
| 7890 #endif | |
| 7 | 7891 /* Three situations: |
| 7892 * 1. No useful previous match: search from start of line. | |
| 7893 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7894 * Break the loop if this is beyond the end of the line. | |
| 7895 * 3. Vi compatible searching: continue at end of previous match. | |
| 7896 */ | |
| 7897 if (shl->lnum == 0) | |
| 7898 matchcol = 0; | |
| 7899 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7900 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7901 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7902 { | |
| 688 | 7903 char_u *ml; |
| 685 | 7904 |
| 7905 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7906 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7907 if (*ml == NUL) |
| 7908 { | |
| 7909 ++matchcol; | |
| 7 | 7910 shl->lnum = 0; |
| 7911 break; | |
| 7912 } | |
| 685 | 7913 #ifdef FEAT_MBYTE |
| 7914 if (has_mbyte) | |
| 7915 matchcol += mb_ptr2len(ml); | |
| 7916 else | |
| 7917 #endif | |
| 7918 ++matchcol; | |
| 7 | 7919 } |
| 7920 else | |
| 7921 matchcol = shl->rm.endpos[0].col; | |
| 7922 | |
| 7923 shl->lnum = lnum; | |
| 5979 | 7924 if (shl->rm.regprog != NULL) |
| 7925 { | |
| 6394 | 7926 /* Remember whether shl->rm is using a copy of the regprog in |
| 7927 * cur->match. */ | |
| 7928 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7929 && shl == &cur->hl | |
| 7930 && 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
|
7931 int timed_out = FALSE; |
| 6394 | 7932 |
| 5979 | 7933 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7934 matchcol, | |
| 1521 | 7935 #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
|
7936 &(shl->tm), &timed_out |
| 1521 | 7937 #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
|
7938 NULL, NULL |
| 5979 | 7939 #endif |
| 7940 ); | |
| 6394 | 7941 /* Copy the regprog, in case it got freed and recompiled. */ |
| 7942 if (regprog_is_copy) | |
| 7943 cur->match.regprog = cur->hl.rm.regprog; | |
| 7944 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
7945 if (called_emsg || got_int || timed_out) |
| 5979 | 7946 { |
| 7947 /* Error while handling regexp: stop using this regexp. */ | |
| 7948 if (shl == &search_hl) | |
| 7949 { | |
| 7950 /* don't free regprog in the match list, it's a copy */ | |
| 7951 vim_regfree(shl->rm.regprog); | |
|
13792
0e9b2971d7c3
patch 8.0.1768: SET_NO_HLSEARCH() used in a wrong way
Christian Brabandt <cb@256bit.org>
parents:
13666
diff
changeset
|
7952 set_no_hlsearch(TRUE); |
| 5979 | 7953 } |
| 7954 shl->rm.regprog = NULL; | |
| 7955 shl->lnum = 0; | |
| 7956 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 7957 message */ | |
| 7958 break; | |
| 7959 } | |
| 7960 } | |
| 7961 else if (cur != NULL) | |
| 7962 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 7963 else |
| 7964 nmatched = 0; | |
| 7 | 7965 if (nmatched == 0) |
| 7966 { | |
| 7967 shl->lnum = 0; /* no match found */ | |
| 7968 break; | |
| 7969 } | |
| 7970 if (shl->rm.startpos[0].lnum > 0 | |
| 7971 || shl->rm.startpos[0].col >= mincol | |
| 7972 || nmatched > 1 | |
| 7973 || shl->rm.endpos[0].col > mincol) | |
| 7974 { | |
| 7975 shl->lnum += shl->rm.startpos[0].lnum; | |
| 7976 break; /* useful match found */ | |
| 7977 } | |
| 7978 } | |
| 7979 } | |
| 7980 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7981 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7982 * 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
|
7983 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7984 */ |
| 5979 | 7985 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7986 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7987 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
|
7988 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7989 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7990 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 7991 { |
| 7992 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7993 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
7994 |
| 5979 | 7995 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 7996 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7997 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7998 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
7999 if (pos->lnum == 0) |
| 5979 | 8000 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8001 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8002 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8003 if (pos->lnum == lnum) |
| 5979 | 8004 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8005 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8006 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8007 /* 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
|
8008 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8009 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
|
8010 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8011 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8012 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8013 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8014 posmatch->pos[found] = tmp; |
| 5979 | 8015 } |
| 8016 } | |
| 8017 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8018 found = i; |
| 5979 | 8019 } |
| 8020 } | |
| 8021 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8022 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8023 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8024 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
|
8025 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8026 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
|
8027 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8028 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8029 shl->lnum = lnum; |
| 5979 | 8030 shl->rm.startpos[0].lnum = 0; |
| 8031 shl->rm.startpos[0].col = start; | |
| 8032 shl->rm.endpos[0].lnum = 0; | |
| 8033 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
|
8034 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8035 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8036 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8037 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8038 return 0; |
| 5979 | 8039 } |
| 5985 | 8040 #endif |
| 5979 | 8041 |
| 7 | 8042 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8043 screen_start_highlight(int attr) |
| 7 | 8044 { |
| 8045 attrentry_T *aep = NULL; | |
| 8046 | |
| 8047 screen_attr = attr; | |
| 8048 if (full_screen | |
| 8049 #ifdef WIN3264 | |
| 8050 && termcap_active | |
| 8051 #endif | |
| 8052 ) | |
| 8053 { | |
| 8054 #ifdef FEAT_GUI | |
| 8055 if (gui.in_use) | |
| 8056 { | |
| 8057 char buf[20]; | |
| 8058 | |
| 681 | 8059 /* The GUI handles this internally. */ |
| 8060 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8061 OUT_STR(buf); |
| 8062 } | |
| 8063 else | |
| 8064 #endif | |
| 8065 { | |
| 8066 if (attr > HL_ALL) /* special HL attr. */ | |
| 8067 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8068 if (IS_CTERM) |
| 7 | 8069 aep = syn_cterm_attr2entry(attr); |
| 8070 else | |
| 8071 aep = syn_term_attr2entry(attr); | |
| 8072 if (aep == NULL) /* did ":syntax clear" */ | |
| 8073 attr = 0; | |
| 8074 else | |
| 8075 attr = aep->ae_attr; | |
| 8076 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8077 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8078 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
|
8079 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
|
8080 #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
|
8081 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
|
8082 ? 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
|
8083 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8084 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8085 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8086 /* If the Normal FG color has BOLD attribute and the new HL |
| 8087 * has a FG color defined, clear BOLD. */ | |
| 8088 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
|
8089 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8090 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
|
8091 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
|
8092 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
|
8093 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
|
8094 || ((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
|
8095 && *T_US != NUL) |
| 7 | 8096 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
|
8097 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8098 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
|
8099 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8100 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
|
8101 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
|
8102 out_str(T_STS); |
| 7 | 8103 |
| 8104 /* | |
| 8105 * Output the color or start string after bold etc., in case the | |
| 8106 * bold etc. override the color setting. | |
| 8107 */ | |
| 8108 if (aep != NULL) | |
| 8109 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8110 #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
|
8111 /* 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
|
8112 * 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
|
8113 * 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
|
8114 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
|
8115 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8116 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
|
8117 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
|
8118 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8119 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8120 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8121 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
|
8122 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8123 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
|
8124 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
|
8125 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8126 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8127 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
|
8128 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8129 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
|
8130 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8131 } |
| 8132 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8133 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8134 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
|
8135 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8136 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
|
8137 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
|
8138 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8139 |
|
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
|
8140 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
|
8141 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8142 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
|
8143 out_str(aep->ae_u.term.start); |
| 7 | 8144 } |
| 8145 } | |
| 8146 } | |
| 8147 } | |
| 8148 } | |
| 8149 | |
| 8150 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8151 screen_stop_highlight(void) |
| 7 | 8152 { |
| 8153 int do_ME = FALSE; /* output T_ME code */ | |
| 8154 | |
| 8155 if (screen_attr != 0 | |
| 8156 #ifdef WIN3264 | |
| 8157 && termcap_active | |
| 8158 #endif | |
| 8159 ) | |
| 8160 { | |
| 8161 #ifdef FEAT_GUI | |
| 8162 if (gui.in_use) | |
| 8163 { | |
| 8164 char buf[20]; | |
| 8165 | |
| 8166 /* use internal GUI code */ | |
| 8167 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8168 OUT_STR(buf); | |
| 8169 } | |
| 8170 else | |
| 8171 #endif | |
| 8172 { | |
| 8173 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8174 { | |
| 8175 attrentry_T *aep; | |
| 8176 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8177 if (IS_CTERM) |
| 7 | 8178 { |
| 8179 /* | |
| 8180 * Assume that t_me restores the original colors! | |
| 8181 */ | |
| 8182 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
|
8183 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8184 #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
|
8185 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
|
8186 ? 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
|
8187 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8188 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8189 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
|
8190 #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
|
8191 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
|
8192 ? 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
|
8193 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8194 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8195 aep->ae_u.cterm.bg_color))) |
| 7 | 8196 do_ME = TRUE; |
| 8197 } | |
| 8198 else | |
| 8199 { | |
| 8200 aep = syn_term_attr2entry(screen_attr); | |
| 8201 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8202 { | |
| 8203 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8204 do_ME = TRUE; | |
| 8205 else | |
| 8206 out_str(aep->ae_u.term.stop); | |
| 8207 } | |
| 8208 } | |
| 8209 if (aep == NULL) /* did ":syntax clear" */ | |
| 8210 screen_attr = 0; | |
| 8211 else | |
| 8212 screen_attr = aep->ae_attr; | |
| 8213 } | |
| 8214 | |
| 8215 /* | |
| 8216 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8217 * same sequence several times. | |
| 8218 */ | |
| 8219 if (screen_attr & HL_STANDOUT) | |
| 8220 { | |
| 8221 if (STRCMP(T_SE, T_ME) == 0) | |
| 8222 do_ME = TRUE; | |
| 8223 else | |
| 8224 out_str(T_SE); | |
| 8225 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8226 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
|
8227 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8228 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
|
8229 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8230 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8231 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
|
8232 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8233 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
|
8234 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8235 { |
| 8236 if (STRCMP(T_UE, T_ME) == 0) | |
| 8237 do_ME = TRUE; | |
| 8238 else | |
| 8239 out_str(T_UE); | |
| 8240 } | |
| 8241 if (screen_attr & HL_ITALIC) | |
| 8242 { | |
| 8243 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8244 do_ME = TRUE; | |
| 8245 else | |
| 8246 out_str(T_CZR); | |
| 8247 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8248 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8249 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8250 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
|
8251 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8252 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8253 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8254 } |
| 7 | 8255 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8256 out_str(T_ME); | |
| 8257 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8258 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8259 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8260 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8261 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
|
8262 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
|
8263 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
|
8264 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
|
8265 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8266 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8267 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8268 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8269 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8270 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8271 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8272 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8273 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
|
8274 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8275 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
|
8276 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8277 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8278 } |
| 7 | 8279 } |
| 8280 } | |
| 8281 } | |
| 8282 screen_attr = 0; | |
| 8283 } | |
| 8284 | |
| 8285 /* | |
| 8286 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8287 * The machine specific code may override this again. | |
| 8288 */ | |
| 8289 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8290 reset_cterm_colors(void) |
| 7 | 8291 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8292 if (IS_CTERM) |
| 7 | 8293 { |
| 8294 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8295 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8296 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
|
8297 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8298 : (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
|
8299 #else |
| 7 | 8300 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
|
8301 #endif |
| 7 | 8302 { |
| 8303 out_str(T_OP); | |
| 8304 screen_attr = -1; | |
| 8305 } | |
| 8306 if (cterm_normal_fg_bold) | |
| 8307 { | |
| 8308 out_str(T_ME); | |
| 8309 screen_attr = -1; | |
| 8310 } | |
| 8311 } | |
| 8312 } | |
| 8313 | |
| 8314 /* | |
| 8315 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8316 * using the attributes from ScreenAttrs["off"]. | |
| 8317 */ | |
| 8318 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8319 screen_char(unsigned off, int row, int col) |
| 7 | 8320 { |
| 8321 int attr; | |
| 8322 | |
| 8323 /* Check for illegal values, just in case (could happen just after | |
| 8324 * resizing). */ | |
| 8325 if (row >= screen_Rows || col >= screen_Columns) | |
| 8326 return; | |
| 8327 | |
| 6602 | 8328 /* Outputting a character in the last cell on the screen may scroll the |
| 8329 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8330 * mark the character invalid (update it when scrolled up). */ | |
| 8331 if (*T_XN == NUL | |
| 8332 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8333 #ifdef FEAT_RIGHTLEFT |
| 8334 /* account for first command-line character in rightleft mode */ | |
| 8335 && !cmdmsg_rl | |
| 8336 #endif | |
| 8337 ) | |
| 8338 { | |
| 8339 ScreenAttrs[off] = (sattr_T)-1; | |
| 8340 return; | |
| 8341 } | |
| 8342 | |
| 8343 /* | |
| 8344 * Stop highlighting first, so it's easier to move the cursor. | |
| 8345 */ | |
| 8346 if (screen_char_attr != 0) | |
| 8347 attr = screen_char_attr; | |
| 8348 else | |
| 8349 attr = ScreenAttrs[off]; | |
| 8350 if (screen_attr != attr) | |
| 8351 screen_stop_highlight(); | |
| 8352 | |
| 8353 windgoto(row, col); | |
| 8354 | |
| 8355 if (screen_attr != attr) | |
| 8356 screen_start_highlight(attr); | |
| 8357 | |
| 8358 #ifdef FEAT_MBYTE | |
| 8359 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8360 { | |
| 8361 char_u buf[MB_MAXBYTES + 1]; | |
| 8362 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8363 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
|
8364 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8365 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
|
8366 # ifdef FEAT_GUI |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8367 && !gui.in_use |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8368 # endif |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8369 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8370 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8371 /* 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
|
8372 * 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
|
8373 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
|
8374 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
|
8375 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8376 /* 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
|
8377 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8378 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
|
8379 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8380 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8381 ++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
|
8382 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8383 /* 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
|
8384 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
|
8385 out_str(buf); |
| 7 | 8386 } |
| 8387 else | |
| 8388 #endif | |
| 8389 { | |
| 8390 #ifdef FEAT_MBYTE | |
| 8391 out_flush_check(); | |
| 8392 #endif | |
| 8393 out_char(ScreenLines[off]); | |
| 8394 #ifdef FEAT_MBYTE | |
| 8395 /* double-byte character in single-width cell */ | |
| 8396 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8397 out_char(ScreenLines2[off]); | |
| 8398 #endif | |
| 8399 } | |
| 8400 | |
| 8401 screen_cur_col++; | |
| 8402 } | |
| 8403 | |
| 8404 #ifdef FEAT_MBYTE | |
| 8405 | |
| 8406 /* | |
| 8407 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8408 * on the screen at position 'row' and 'col'. | |
| 8409 * The attributes of the first byte is used for all. This is required to | |
| 8410 * output the two bytes of a double-byte character with nothing in between. | |
| 8411 */ | |
| 8412 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8413 screen_char_2(unsigned off, int row, int col) |
| 7 | 8414 { |
| 8415 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8416 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8417 return; | |
| 8418 | |
| 8419 /* Outputting the last character on the screen may scrollup the screen. | |
| 8420 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8421 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8422 { | |
| 8423 ScreenAttrs[off] = (sattr_T)-1; | |
| 8424 return; | |
| 8425 } | |
| 8426 | |
| 8427 /* Output the first byte normally (positions the cursor), then write the | |
| 8428 * second byte directly. */ | |
| 8429 screen_char(off, row, col); | |
| 8430 out_char(ScreenLines[off + 1]); | |
| 8431 ++screen_cur_col; | |
| 8432 } | |
| 8433 #endif | |
| 8434 | |
| 8435 /* | |
| 8436 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8437 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8438 */ | |
| 8439 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8440 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8441 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8442 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8443 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8444 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8445 int invert) |
| 7 | 8446 { |
| 8447 int r, c; | |
| 8448 int off; | |
| 1378 | 8449 #ifdef FEAT_MBYTE |
| 8450 int max_off; | |
| 8451 #endif | |
| 7 | 8452 |
| 534 | 8453 /* Can't use ScreenLines unless initialized */ |
| 8454 if (ScreenLines == NULL) | |
| 8455 return; | |
| 8456 | |
| 7 | 8457 if (invert) |
| 8458 screen_char_attr = HL_INVERSE; | |
| 8459 for (r = row; r < row + height; ++r) | |
| 8460 { | |
| 8461 off = LineOffset[r]; | |
| 1378 | 8462 #ifdef FEAT_MBYTE |
| 8463 max_off = off + screen_Columns; | |
| 8464 #endif | |
| 7 | 8465 for (c = col; c < col + width; ++c) |
| 8466 { | |
| 8467 #ifdef FEAT_MBYTE | |
| 1378 | 8468 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8469 { |
| 8470 screen_char_2(off + c, r, c); | |
| 8471 ++c; | |
| 8472 } | |
| 8473 else | |
| 8474 #endif | |
| 8475 { | |
| 8476 screen_char(off + c, r, c); | |
| 8477 #ifdef FEAT_MBYTE | |
| 1378 | 8478 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8479 ++c; |
| 8480 #endif | |
| 8481 } | |
| 8482 } | |
| 8483 } | |
| 8484 screen_char_attr = 0; | |
| 8485 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8486 |
| 7 | 8487 /* |
| 8488 * Redraw the characters for a vertically split window. | |
| 8489 */ | |
| 8490 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8491 redraw_block(int row, int end, win_T *wp) |
| 7 | 8492 { |
| 8493 int col; | |
| 8494 int width; | |
| 8495 | |
| 8496 # ifdef FEAT_CLIPBOARD | |
| 8497 clip_may_clear_selection(row, end - 1); | |
| 8498 # endif | |
| 8499 | |
| 8500 if (wp == NULL) | |
| 8501 { | |
| 8502 col = 0; | |
| 8503 width = Columns; | |
| 8504 } | |
| 8505 else | |
| 8506 { | |
| 8507 col = wp->w_wincol; | |
| 8508 width = wp->w_width; | |
| 8509 } | |
| 8510 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8511 } | |
| 8512 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8513 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8514 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
|
8515 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8516 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8517 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8518 # ifdef FEAT_MBYTE |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8519 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8520 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8521 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8522 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8523 |
| 7 | 8524 /* |
| 8525 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8526 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8527 * Use attributes 'attr'. | |
| 8528 */ | |
| 8529 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8530 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8531 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8532 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8533 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8534 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8535 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8536 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8537 int attr) |
| 7 | 8538 { |
| 8539 int row; | |
| 8540 int col; | |
| 8541 int off; | |
| 8542 int end_off; | |
| 8543 int did_delete; | |
| 8544 int c; | |
| 8545 int norm_term; | |
| 8546 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8547 int force_next = FALSE; | |
| 8548 #endif | |
| 8549 | |
| 8550 if (end_row > screen_Rows) /* safety check */ | |
| 8551 end_row = screen_Rows; | |
| 8552 if (end_col > screen_Columns) /* safety check */ | |
| 8553 end_col = screen_Columns; | |
| 8554 if (ScreenLines == NULL | |
| 8555 || start_row >= end_row | |
| 8556 || start_col >= end_col) /* nothing to do */ | |
| 8557 return; | |
| 8558 | |
| 8559 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8560 norm_term = ( | |
| 8561 #ifdef FEAT_GUI | |
| 8562 !gui.in_use && | |
| 8563 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8564 !IS_CTERM); |
| 7 | 8565 for (row = start_row; row < end_row; ++row) |
| 8566 { | |
| 1668 | 8567 #ifdef FEAT_MBYTE |
| 8568 if (has_mbyte | |
| 8569 # ifdef FEAT_GUI | |
| 8570 && !gui.in_use | |
| 8571 # endif | |
| 8572 ) | |
| 8573 { | |
| 8574 /* When drawing over the right halve of a double-wide char clear | |
| 8575 * out the left halve. When drawing over the left halve of a | |
| 8576 * double wide-char clear out the right halve. Only needed in a | |
| 8577 * terminal. */ | |
| 1685 | 8578 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8579 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8580 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8581 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8582 } |
| 8583 #endif | |
| 7 | 8584 /* |
| 8585 * Try to use delete-line termcap code, when no attributes or in a | |
| 8586 * "normal" terminal, where a bold/italic space is just a | |
| 8587 * space. | |
| 8588 */ | |
| 8589 did_delete = FALSE; | |
| 8590 if (c2 == ' ' | |
| 8591 && end_col == Columns | |
| 8592 && can_clear(T_CE) | |
| 8593 && (attr == 0 | |
| 8594 || (norm_term | |
| 8595 && attr <= HL_ALL | |
| 8596 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8597 { | |
| 8598 /* | |
| 8599 * check if we really need to clear something | |
| 8600 */ | |
| 8601 col = start_col; | |
| 8602 if (c1 != ' ') /* don't clear first char */ | |
| 8603 ++col; | |
| 8604 | |
| 8605 off = LineOffset[row] + col; | |
| 8606 end_off = LineOffset[row] + end_col; | |
| 8607 | |
| 8608 /* skip blanks (used often, keep it fast!) */ | |
| 8609 #ifdef FEAT_MBYTE | |
| 8610 if (enc_utf8) | |
| 8611 while (off < end_off && ScreenLines[off] == ' ' | |
| 8612 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8613 ++off; | |
| 8614 else | |
| 8615 #endif | |
| 8616 while (off < end_off && ScreenLines[off] == ' ' | |
| 8617 && ScreenAttrs[off] == 0) | |
| 8618 ++off; | |
| 8619 if (off < end_off) /* something to be cleared */ | |
| 8620 { | |
| 8621 col = off - LineOffset[row]; | |
| 8622 screen_stop_highlight(); | |
| 8623 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8624 out_str(T_CE); | |
| 8625 screen_start(); /* don't know where cursor is now */ | |
| 8626 col = end_col - col; | |
| 8627 while (col--) /* clear chars in ScreenLines */ | |
| 8628 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8629 space_to_screenline(off, 0); |
| 7 | 8630 ++off; |
| 8631 } | |
| 8632 } | |
| 8633 did_delete = TRUE; /* the chars are cleared now */ | |
| 8634 } | |
| 8635 | |
| 8636 off = LineOffset[row] + start_col; | |
| 8637 c = c1; | |
| 8638 for (col = start_col; col < end_col; ++col) | |
| 8639 { | |
| 8640 if (ScreenLines[off] != c | |
| 8641 #ifdef FEAT_MBYTE | |
| 714 | 8642 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8643 != (c >= 0x80 ? c : 0)) | |
| 7 | 8644 #endif |
| 8645 || ScreenAttrs[off] != attr | |
| 8646 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8647 || force_next | |
| 8648 #endif | |
| 8649 ) | |
| 8650 { | |
| 8651 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8652 /* The bold trick may make a single row of pixels appear in | |
| 8653 * the next character. When a bold character is removed, the | |
| 8654 * next character should be redrawn too. This happens for our | |
| 8655 * own GUI and for some xterms. */ | |
| 8656 if ( | |
| 8657 # ifdef FEAT_GUI | |
| 8658 gui.in_use | |
| 8659 # endif | |
| 8660 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8661 || | |
| 8662 # endif | |
| 8663 # ifdef UNIX | |
| 8664 term_is_xterm | |
| 8665 # endif | |
| 8666 ) | |
| 8667 { | |
| 8668 if (ScreenLines[off] != ' ' | |
| 8669 && (ScreenAttrs[off] > HL_ALL | |
| 8670 || ScreenAttrs[off] & HL_BOLD)) | |
| 8671 force_next = TRUE; | |
| 8672 else | |
| 8673 force_next = FALSE; | |
| 8674 } | |
| 8675 #endif | |
| 8676 ScreenLines[off] = c; | |
| 8677 #ifdef FEAT_MBYTE | |
| 8678 if (enc_utf8) | |
| 8679 { | |
| 8680 if (c >= 0x80) | |
| 8681 { | |
| 8682 ScreenLinesUC[off] = c; | |
| 714 | 8683 ScreenLinesC[0][off] = 0; |
| 7 | 8684 } |
| 8685 else | |
| 8686 ScreenLinesUC[off] = 0; | |
| 8687 } | |
| 8688 #endif | |
| 8689 ScreenAttrs[off] = attr; | |
| 8690 if (!did_delete || c != ' ') | |
| 8691 screen_char(off, row, col); | |
| 8692 } | |
| 8693 ++off; | |
| 8694 if (col == start_col) | |
| 8695 { | |
| 8696 if (did_delete) | |
| 8697 break; | |
| 8698 c = c2; | |
| 8699 } | |
| 8700 } | |
| 8701 if (end_col == Columns) | |
| 8702 LineWraps[row] = FALSE; | |
| 8703 if (row == Rows - 1) /* overwritten the command line */ | |
| 8704 { | |
| 8705 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
|
8706 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
|
8707 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8708 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8709 if (start_col == 0) |
| 8710 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8711 } |
| 8712 } | |
| 8713 } | |
| 8714 | |
| 8715 /* | |
| 8716 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8717 * screen or the command line. | |
| 8718 */ | |
| 8719 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8720 check_for_delay(int check_msg_scroll) |
| 7 | 8721 { |
| 8722 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8723 && !did_wait_return | |
| 8724 && emsg_silent == 0) | |
| 8725 { | |
| 8726 out_flush(); | |
| 8727 ui_delay(1000L, TRUE); | |
| 8728 emsg_on_display = FALSE; | |
| 8729 if (check_msg_scroll) | |
| 8730 msg_scroll = FALSE; | |
| 8731 } | |
| 8732 } | |
| 8733 | |
| 8734 /* | |
| 8735 * screen_valid - allocate screen buffers if size changed | |
| 3263 | 8736 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8737 * Returns TRUE if there is a valid screen to write to. |
| 8738 * Returns FALSE when starting up and screen not initialized yet. | |
| 8739 */ | |
| 8740 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8741 screen_valid(int doclear) |
| 7 | 8742 { |
| 3263 | 8743 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8744 return (ScreenLines != NULL); |
| 8745 } | |
| 8746 | |
| 8747 /* | |
| 8748 * Resize the shell to Rows and Columns. | |
| 8749 * Allocate ScreenLines[] and associated items. | |
| 8750 * | |
| 8751 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8752 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8753 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8754 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8755 * final size of the shell is needed. | |
| 8756 */ | |
| 8757 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8758 screenalloc(int doclear) |
| 7 | 8759 { |
| 8760 int new_row, old_row; | |
| 8761 #ifdef FEAT_GUI | |
| 8762 int old_Rows; | |
| 8763 #endif | |
| 8764 win_T *wp; | |
| 8765 int outofmem = FALSE; | |
| 8766 int len; | |
| 8767 schar_T *new_ScreenLines; | |
| 8768 #ifdef FEAT_MBYTE | |
| 8769 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8770 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8771 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8772 int i; |
| 7 | 8773 #endif |
| 8774 sattr_T *new_ScreenAttrs; | |
| 8775 unsigned *new_LineOffset; | |
| 8776 char_u *new_LineWraps; | |
| 681 | 8777 short *new_TabPageIdxs; |
| 671 | 8778 tabpage_T *tp; |
| 7 | 8779 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8780 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8781 int retry_count = 0; |
| 8782 | |
| 8783 retry: | |
| 7 | 8784 /* |
| 8785 * Allocation of the screen buffers is done only when the size changes and | |
| 8786 * when Rows and Columns have been set and we have started doing full | |
| 8787 * screen stuff. | |
| 8788 */ | |
| 8789 if ((ScreenLines != NULL | |
| 8790 && Rows == screen_Rows | |
| 8791 && Columns == screen_Columns | |
| 8792 #ifdef FEAT_MBYTE | |
| 8793 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8794 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
| 714 | 8795 && p_mco == Screen_mco |
| 7 | 8796 #endif |
| 8797 ) | |
| 8798 || Rows == 0 | |
| 8799 || Columns == 0 | |
| 8800 || (!full_screen && ScreenLines == NULL)) | |
| 8801 return; | |
| 8802 | |
| 8803 /* | |
| 8804 * It's possible that we produce an out-of-memory message below, which | |
| 8805 * will cause this function to be called again. To break the loop, just | |
| 8806 * return here. | |
| 8807 */ | |
| 8808 if (entered) | |
| 8809 return; | |
| 8810 entered = TRUE; | |
| 8811 | |
| 911 | 8812 /* |
| 8813 * Note that the window sizes are updated before reallocating the arrays, | |
| 8814 * thus we must not redraw here! | |
| 8815 */ | |
| 8816 ++RedrawingDisabled; | |
| 8817 | |
| 7 | 8818 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8819 | |
| 8820 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8821 | |
| 8822 /* | |
| 8823 * We're changing the size of the screen. | |
| 8824 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8825 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8826 * lines (unless the screen is going to be cleared). | |
| 8827 * - Free the old arrays. | |
| 8828 * | |
| 8829 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8830 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8831 * size is wrong. | |
| 8832 */ | |
| 671 | 8833 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8834 win_free_lsize(wp); |
| 1946 | 8835 if (aucmd_win != NULL) |
| 8836 win_free_lsize(aucmd_win); | |
| 7 | 8837 |
| 8838 new_ScreenLines = (schar_T *)lalloc((long_u)( | |
| 8839 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8840 #ifdef FEAT_MBYTE | |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8841 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8842 if (enc_utf8) |
| 8843 { | |
| 8844 new_ScreenLinesUC = (u8char_T *)lalloc((long_u)( | |
| 8845 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); | |
| 714 | 8846 for (i = 0; i < p_mco; ++i) |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
8847 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear((long_u)( |
| 7 | 8848 (Rows + 1) * Columns * sizeof(u8char_T)), FALSE); |
| 8849 } | |
| 8850 if (enc_dbcs == DBCS_JPNU) | |
| 8851 new_ScreenLines2 = (schar_T *)lalloc((long_u)( | |
| 8852 (Rows + 1) * Columns * sizeof(schar_T)), FALSE); | |
| 8853 #endif | |
| 8854 new_ScreenAttrs = (sattr_T *)lalloc((long_u)( | |
| 8855 (Rows + 1) * Columns * sizeof(sattr_T)), FALSE); | |
| 8856 new_LineOffset = (unsigned *)lalloc((long_u)( | |
| 8857 Rows * sizeof(unsigned)), FALSE); | |
| 8858 new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); | |
| 681 | 8859 new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); |
| 7 | 8860 |
| 677 | 8861 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8862 { |
| 8863 if (win_alloc_lines(wp) == FAIL) | |
| 8864 { | |
| 8865 outofmem = TRUE; | |
| 1819 | 8866 goto give_up; |
| 8867 } | |
| 8868 } | |
| 1946 | 8869 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8870 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8871 outofmem = TRUE; |
| 1819 | 8872 give_up: |
| 7 | 8873 |
| 714 | 8874 #ifdef FEAT_MBYTE |
| 8875 for (i = 0; i < p_mco; ++i) | |
| 8876 if (new_ScreenLinesC[i] == NULL) | |
| 8877 break; | |
| 8878 #endif | |
| 7 | 8879 if (new_ScreenLines == NULL |
| 8880 #ifdef FEAT_MBYTE | |
| 714 | 8881 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8882 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8883 #endif | |
| 8884 || new_ScreenAttrs == NULL | |
| 8885 || new_LineOffset == NULL | |
| 8886 || new_LineWraps == NULL | |
| 671 | 8887 || new_TabPageIdxs == NULL |
| 7 | 8888 || outofmem) |
| 8889 { | |
| 944 | 8890 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8891 { |
| 8892 /* guess the size */ | |
| 8893 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8894 | |
| 8895 /* Remember we did this to avoid getting outofmem messages over | |
| 8896 * and over again. */ | |
| 944 | 8897 done_outofmem_msg = TRUE; |
| 534 | 8898 } |
|
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_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8900 #ifdef FEAT_MBYTE |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8901 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 8902 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
|
8903 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
|
8904 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8905 #endif |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8906 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8907 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8908 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8909 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 8910 } |
| 8911 else | |
| 8912 { | |
| 944 | 8913 done_outofmem_msg = FALSE; |
| 534 | 8914 |
| 7 | 8915 for (new_row = 0; new_row < Rows; ++new_row) |
| 8916 { | |
| 8917 new_LineOffset[new_row] = new_row * Columns; | |
| 8918 new_LineWraps[new_row] = FALSE; | |
| 8919 | |
| 8920 /* | |
| 8921 * If the screen is not going to be cleared, copy as much as | |
| 8922 * possible from the old screen to the new one and clear the rest | |
| 8923 * (used when resizing the window at the "--more--" prompt or when | |
| 8924 * executing an external command, for the GUI). | |
| 8925 */ | |
| 3263 | 8926 if (!doclear) |
| 7 | 8927 { |
| 8928 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8929 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8930 #ifdef FEAT_MBYTE | |
| 8931 if (enc_utf8) | |
| 8932 { | |
| 8933 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8934 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8935 for (i = 0; i < p_mco; ++i) |
| 8936 (void)vim_memset(new_ScreenLinesC[i] | |
| 8937 + new_row * Columns, | |
| 7 | 8938 0, (size_t)Columns * sizeof(u8char_T)); |
| 8939 } | |
| 8940 if (enc_dbcs == DBCS_JPNU) | |
| 8941 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8942 0, (size_t)Columns * sizeof(schar_T)); | |
| 8943 #endif | |
| 8944 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8945 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8946 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8947 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8948 { |
| 8949 if (screen_Columns < Columns) | |
| 8950 len = screen_Columns; | |
| 8951 else | |
| 8952 len = Columns; | |
| 26 | 8953 #ifdef FEAT_MBYTE |
| 571 | 8954 /* When switching to utf-8 don't copy characters, they |
| 714 | 8955 * may be invalid now. Also when p_mco changes. */ |
| 8956 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8957 && p_mco == Screen_mco) | |
| 26 | 8958 #endif |
| 8959 mch_memmove(new_ScreenLines + new_LineOffset[new_row], | |
| 8960 ScreenLines + LineOffset[old_row], | |
| 8961 (size_t)len * sizeof(schar_T)); | |
| 7 | 8962 #ifdef FEAT_MBYTE |
| 714 | 8963 if (enc_utf8 && ScreenLinesUC != NULL |
| 8964 && p_mco == Screen_mco) | |
| 7 | 8965 { |
| 8966 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 8967 ScreenLinesUC + LineOffset[old_row], | |
| 8968 (size_t)len * sizeof(u8char_T)); | |
| 714 | 8969 for (i = 0; i < p_mco; ++i) |
| 8970 mch_memmove(new_ScreenLinesC[i] | |
| 8971 + new_LineOffset[new_row], | |
| 8972 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 8973 (size_t)len * sizeof(u8char_T)); |
| 8974 } | |
| 8975 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 8976 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 8977 ScreenLines2 + LineOffset[old_row], | |
| 8978 (size_t)len * sizeof(schar_T)); | |
| 8979 #endif | |
| 8980 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 8981 ScreenAttrs + LineOffset[old_row], | |
| 8982 (size_t)len * sizeof(sattr_T)); | |
| 8983 } | |
| 8984 } | |
| 8985 } | |
| 8986 /* Use the last line of the screen for the current line. */ | |
| 8987 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 8988 } | |
| 8989 | |
| 356 | 8990 free_screenlines(); |
| 8991 | |
| 7 | 8992 ScreenLines = new_ScreenLines; |
| 8993 #ifdef FEAT_MBYTE | |
| 8994 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 8995 for (i = 0; i < p_mco; ++i) |
| 8996 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 8997 Screen_mco = p_mco; | |
| 7 | 8998 ScreenLines2 = new_ScreenLines2; |
| 8999 #endif | |
| 9000 ScreenAttrs = new_ScreenAttrs; | |
| 9001 LineOffset = new_LineOffset; | |
| 9002 LineWraps = new_LineWraps; | |
| 671 | 9003 TabPageIdxs = new_TabPageIdxs; |
| 7 | 9004 |
| 9005 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9006 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9007 #ifdef FEAT_GUI | |
| 9008 old_Rows = screen_Rows; | |
| 9009 #endif | |
| 9010 screen_Rows = Rows; | |
| 9011 screen_Columns = Columns; | |
| 9012 | |
| 9013 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9014 if (doclear) |
| 7 | 9015 screenclear2(); |
| 9016 | |
| 9017 #ifdef FEAT_GUI | |
| 9018 else if (gui.in_use | |
| 9019 && !gui.starting | |
| 9020 && ScreenLines != NULL | |
| 9021 && old_Rows != Rows) | |
| 9022 { | |
| 9023 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9024 /* | |
| 9025 * Adjust the position of the cursor, for when executing an external | |
| 9026 * command. | |
| 9027 */ | |
| 9028 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9029 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9030 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9031 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9032 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9033 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9034 } | |
| 9035 #endif | |
| 9036 | |
| 9037 entered = FALSE; | |
| 911 | 9038 --RedrawingDisabled; |
| 766 | 9039 |
| 1824 | 9040 /* |
| 9041 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9042 * in case applying autocommands always changes Rows or Columns. | |
| 9043 */ | |
| 9044 if (starting == 0 && ++retry_count <= 3) | |
| 9045 { | |
| 766 | 9046 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9047 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9048 * jump back to check if we need to allocate the screen again. */ | |
| 9049 goto retry; | |
| 9050 } | |
| 7 | 9051 } |
| 9052 | |
| 9053 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9054 free_screenlines(void) |
| 356 | 9055 { |
| 9056 #ifdef FEAT_MBYTE | |
| 714 | 9057 int i; |
| 9058 | |
| 356 | 9059 vim_free(ScreenLinesUC); |
| 714 | 9060 for (i = 0; i < Screen_mco; ++i) |
| 9061 vim_free(ScreenLinesC[i]); | |
| 356 | 9062 vim_free(ScreenLines2); |
| 9063 #endif | |
| 714 | 9064 vim_free(ScreenLines); |
| 356 | 9065 vim_free(ScreenAttrs); |
| 9066 vim_free(LineOffset); | |
| 9067 vim_free(LineWraps); | |
| 671 | 9068 vim_free(TabPageIdxs); |
| 356 | 9069 } |
| 9070 | |
| 9071 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9072 screenclear(void) |
| 7 | 9073 { |
| 9074 check_for_delay(FALSE); | |
| 9075 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9076 screenclear2(); /* clear the screen */ | |
| 9077 } | |
| 9078 | |
| 9079 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9080 screenclear2(void) |
| 7 | 9081 { |
| 9082 int i; | |
| 9083 | |
| 9084 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9085 #ifdef FEAT_GUI | |
| 9086 || (gui.in_use && gui.starting) | |
| 9087 #endif | |
| 9088 ) | |
| 9089 return; | |
| 9090 | |
| 9091 #ifdef FEAT_GUI | |
| 9092 if (!gui.in_use) | |
| 9093 #endif | |
| 9094 screen_attr = -1; /* force setting the Normal colors */ | |
| 9095 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9096 | |
| 9097 #ifdef FEAT_CLIPBOARD | |
| 9098 /* disable selection without redrawing it */ | |
| 9099 clip_scroll_selection(9999); | |
| 9100 #endif | |
| 9101 | |
| 9102 /* blank out ScreenLines */ | |
| 9103 for (i = 0; i < Rows; ++i) | |
| 9104 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9105 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9106 LineWraps[i] = FALSE; |
| 9107 } | |
| 9108 | |
| 9109 if (can_clear(T_CL)) | |
| 9110 { | |
| 9111 out_str(T_CL); /* clear the display */ | |
| 9112 clear_cmdline = FALSE; | |
| 644 | 9113 mode_displayed = FALSE; |
| 7 | 9114 } |
| 9115 else | |
| 9116 { | |
| 9117 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9118 for (i = 0; i < Rows; ++i) | |
| 9119 lineinvalid(LineOffset[i], (int)Columns); | |
| 9120 clear_cmdline = TRUE; | |
| 9121 } | |
| 9122 | |
| 9123 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9124 | |
| 9125 win_rest_invalid(firstwin); | |
| 9126 redraw_cmdline = TRUE; | |
| 673 | 9127 redraw_tabline = TRUE; |
| 7 | 9128 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9129 must_redraw = NOT_VALID; | |
| 9130 compute_cmdrow(); | |
| 9131 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9132 msg_col = 0; | |
| 9133 screen_start(); /* don't know where cursor is now */ | |
| 9134 msg_scrolled = 0; /* can't scroll back */ | |
| 9135 msg_didany = FALSE; | |
| 9136 msg_didout = FALSE; | |
| 9137 } | |
| 9138 | |
| 9139 /* | |
| 9140 * Clear one line in ScreenLines. | |
| 9141 */ | |
| 9142 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9143 lineclear(unsigned off, int width, int attr) |
| 7 | 9144 { |
| 9145 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9146 #ifdef FEAT_MBYTE | |
| 9147 if (enc_utf8) | |
| 9148 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9149 (size_t)width * sizeof(u8char_T)); | |
| 9150 #endif | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9151 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9152 } |
| 9153 | |
| 9154 /* | |
| 9155 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9156 * invalid value. | |
| 9157 */ | |
| 9158 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9159 lineinvalid(unsigned off, int width) |
| 7 | 9160 { |
| 9161 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9162 } | |
| 9163 | |
| 9164 /* | |
| 9165 * Copy part of a Screenline for vertically split window "wp". | |
| 9166 */ | |
| 9167 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9168 linecopy(int to, int from, win_T *wp) |
| 7 | 9169 { |
| 9170 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9171 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9172 | |
| 9173 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9174 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
|
9175 #ifdef FEAT_MBYTE |
| 7 | 9176 if (enc_utf8) |
| 9177 { | |
| 714 | 9178 int i; |
| 9179 | |
| 7 | 9180 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9181 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9182 for (i = 0; i < p_mco; ++i) |
| 9183 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9184 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9185 } |
| 9186 if (enc_dbcs == DBCS_JPNU) | |
| 9187 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9188 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
|
9189 #endif |
| 7 | 9190 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, |
| 9191 wp->w_width * sizeof(sattr_T)); | |
| 9192 } | |
| 9193 | |
| 9194 /* | |
| 9195 * Return TRUE if clearing with term string "p" would work. | |
| 9196 * It can't work when the string is empty or it won't set the right background. | |
| 9197 */ | |
| 9198 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9199 can_clear(char_u *p) |
| 7 | 9200 { |
| 9201 return (*p != NUL && (t_colors <= 1 | |
| 9202 #ifdef FEAT_GUI | |
| 9203 || gui.in_use | |
| 9204 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9205 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9206 || (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
|
9207 || (!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
|
9208 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9209 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9210 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9211 || *T_UT != NUL)); |
| 7 | 9212 } |
| 9213 | |
| 9214 /* | |
| 9215 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9216 * something directly to the screen (shell commands) or a terminal control | |
| 9217 * code. | |
| 9218 */ | |
| 9219 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9220 screen_start(void) |
| 7 | 9221 { |
| 9222 screen_cur_row = screen_cur_col = 9999; | |
| 9223 } | |
| 9224 | |
| 9225 /* | |
| 9226 * Move the cursor to position "row","col" in the screen. | |
| 9227 * This tries to find the most efficient way to move, minimizing the number of | |
| 9228 * characters sent to the terminal. | |
| 9229 */ | |
| 9230 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9231 windgoto(int row, int col) |
| 7 | 9232 { |
| 205 | 9233 sattr_T *p; |
| 7 | 9234 int i; |
| 9235 int plan; | |
| 9236 int cost; | |
| 9237 int wouldbe_col; | |
| 9238 int noinvcurs; | |
| 9239 char_u *bs; | |
| 9240 int goto_cost; | |
| 9241 int attr; | |
| 9242 | |
| 1213 | 9243 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9244 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9245 | |
| 9246 #define PLAN_LE 1 | |
| 9247 #define PLAN_CR 2 | |
| 9248 #define PLAN_NL 3 | |
| 9249 #define PLAN_WRITE 4 | |
| 9250 /* Can't use ScreenLines unless initialized */ | |
| 9251 if (ScreenLines == NULL) | |
| 9252 return; | |
| 9253 | |
| 9254 if (col != screen_cur_col || row != screen_cur_row) | |
| 9255 { | |
| 9256 /* Check for valid position. */ | |
| 9257 if (row < 0) /* window without text lines? */ | |
| 9258 row = 0; | |
| 9259 if (row >= screen_Rows) | |
| 9260 row = screen_Rows - 1; | |
| 9261 if (col >= screen_Columns) | |
| 9262 col = screen_Columns - 1; | |
| 9263 | |
| 9264 /* check if no cursor movement is allowed in highlight mode */ | |
| 9265 if (screen_attr && *T_MS == NUL) | |
| 9266 noinvcurs = HIGHL_COST; | |
| 9267 else | |
| 9268 noinvcurs = 0; | |
| 9269 goto_cost = GOTO_COST + noinvcurs; | |
| 9270 | |
| 9271 /* | |
| 9272 * Plan how to do the positioning: | |
| 9273 * 1. Use CR to move it to column 0, same row. | |
| 9274 * 2. Use T_LE to move it a few columns to the left. | |
| 9275 * 3. Use NL to move a few lines down, column 0. | |
| 9276 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9277 * | |
| 9278 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9279 * position is unknown then (some terminals wrap, some don't ) | |
| 9280 * | |
| 1213 | 9281 * First check if the highlighting attributes allow us to write |
| 7 | 9282 * characters to move the cursor to the right. |
| 9283 */ | |
| 9284 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9285 { | |
| 9286 /* | |
| 9287 * If the cursor is in the same row, bigger col, we can use CR | |
| 9288 * or T_LE. | |
| 9289 */ | |
| 9290 bs = NULL; /* init for GCC */ | |
| 9291 attr = screen_attr; | |
| 9292 if (row == screen_cur_row && col < screen_cur_col) | |
| 9293 { | |
| 9294 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9295 if (*T_LE) | |
| 9296 bs = T_LE; /* "cursor left" */ | |
| 9297 else | |
| 9298 bs = T_BC; /* "backspace character (old) */ | |
| 9299 if (*bs) | |
| 9300 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9301 else | |
| 9302 cost = 999; | |
| 9303 if (col + 1 < cost) /* using CR is less characters */ | |
| 9304 { | |
| 9305 plan = PLAN_CR; | |
| 9306 wouldbe_col = 0; | |
| 9307 cost = 1; /* CR is just one character */ | |
| 9308 } | |
| 9309 else | |
| 9310 { | |
| 9311 plan = PLAN_LE; | |
| 9312 wouldbe_col = col; | |
| 9313 } | |
| 9314 if (noinvcurs) /* will stop highlighting */ | |
| 9315 { | |
| 9316 cost += noinvcurs; | |
| 9317 attr = 0; | |
| 9318 } | |
| 9319 } | |
| 9320 | |
| 9321 /* | |
| 9322 * If the cursor is above where we want to be, we can use CR LF. | |
| 9323 */ | |
| 9324 else if (row > screen_cur_row) | |
| 9325 { | |
| 9326 plan = PLAN_NL; | |
| 9327 wouldbe_col = 0; | |
| 9328 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9329 if (noinvcurs) /* will stop highlighting */ | |
| 9330 { | |
| 9331 cost += noinvcurs; | |
| 9332 attr = 0; | |
| 9333 } | |
| 9334 } | |
| 9335 | |
| 9336 /* | |
| 9337 * If the cursor is in the same row, smaller col, just use write. | |
| 9338 */ | |
| 9339 else | |
| 9340 { | |
| 9341 plan = PLAN_WRITE; | |
| 9342 wouldbe_col = screen_cur_col; | |
| 9343 cost = 0; | |
| 9344 } | |
| 9345 | |
| 9346 /* | |
| 9347 * Check if any characters that need to be written have the | |
| 9348 * correct attributes. Also avoid UTF-8 characters. | |
| 9349 */ | |
| 9350 i = col - wouldbe_col; | |
| 9351 if (i > 0) | |
| 9352 cost += i; | |
| 9353 if (cost < goto_cost && i > 0) | |
| 9354 { | |
| 9355 /* | |
| 9356 * Check if the attributes are correct without additionally | |
| 9357 * stopping highlighting. | |
| 9358 */ | |
| 9359 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9360 while (i && *p++ == attr) | |
| 9361 --i; | |
| 9362 if (i != 0) | |
| 9363 { | |
| 9364 /* | |
| 9365 * Try if it works when highlighting is stopped here. | |
| 9366 */ | |
| 9367 if (*--p == 0) | |
| 9368 { | |
| 9369 cost += noinvcurs; | |
| 9370 while (i && *p++ == 0) | |
| 9371 --i; | |
| 9372 } | |
| 9373 if (i != 0) | |
| 9374 cost = 999; /* different attributes, don't do it */ | |
| 9375 } | |
| 9376 #ifdef FEAT_MBYTE | |
| 9377 if (enc_utf8) | |
| 9378 { | |
| 9379 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9380 for (i = wouldbe_col; i < col; ++i) | |
| 9381 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9382 { | |
| 9383 cost = 999; | |
| 9384 break; | |
| 9385 } | |
| 9386 } | |
| 9387 #endif | |
| 9388 } | |
| 9389 | |
| 9390 /* | |
| 9391 * We can do it without term_windgoto()! | |
| 9392 */ | |
| 9393 if (cost < goto_cost) | |
| 9394 { | |
| 9395 if (plan == PLAN_LE) | |
| 9396 { | |
| 9397 if (noinvcurs) | |
| 9398 screen_stop_highlight(); | |
| 9399 while (screen_cur_col > col) | |
| 9400 { | |
| 9401 out_str(bs); | |
| 9402 --screen_cur_col; | |
| 9403 } | |
| 9404 } | |
| 9405 else if (plan == PLAN_CR) | |
| 9406 { | |
| 9407 if (noinvcurs) | |
| 9408 screen_stop_highlight(); | |
| 9409 out_char('\r'); | |
| 9410 screen_cur_col = 0; | |
| 9411 } | |
| 9412 else if (plan == PLAN_NL) | |
| 9413 { | |
| 9414 if (noinvcurs) | |
| 9415 screen_stop_highlight(); | |
| 9416 while (screen_cur_row < row) | |
| 9417 { | |
| 9418 out_char('\n'); | |
| 9419 ++screen_cur_row; | |
| 9420 } | |
| 9421 screen_cur_col = 0; | |
| 9422 } | |
| 9423 | |
| 9424 i = col - screen_cur_col; | |
| 9425 if (i > 0) | |
| 9426 { | |
| 9427 /* | |
| 9428 * Use cursor-right if it's one character only. Avoids | |
| 9429 * removing a line of pixels from the last bold char, when | |
| 9430 * using the bold trick in the GUI. | |
| 9431 */ | |
| 9432 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9433 { | |
| 9434 while (i-- > 0) | |
| 9435 out_char(*T_ND); | |
| 9436 } | |
| 9437 else | |
| 9438 { | |
| 9439 int off; | |
| 9440 | |
| 9441 off = LineOffset[row] + screen_cur_col; | |
| 9442 while (i-- > 0) | |
| 9443 { | |
| 9444 if (ScreenAttrs[off] != screen_attr) | |
| 9445 screen_stop_highlight(); | |
| 9446 #ifdef FEAT_MBYTE | |
| 9447 out_flush_check(); | |
| 9448 #endif | |
| 9449 out_char(ScreenLines[off]); | |
| 9450 #ifdef FEAT_MBYTE | |
| 9451 if (enc_dbcs == DBCS_JPNU | |
| 9452 && ScreenLines[off] == 0x8e) | |
| 9453 out_char(ScreenLines2[off]); | |
| 9454 #endif | |
| 9455 ++off; | |
| 9456 } | |
| 9457 } | |
| 9458 } | |
| 9459 } | |
| 9460 } | |
| 9461 else | |
| 9462 cost = 999; | |
| 9463 | |
| 9464 if (cost >= goto_cost) | |
| 9465 { | |
| 9466 if (noinvcurs) | |
| 9467 screen_stop_highlight(); | |
| 5995 | 9468 if (row == screen_cur_row && (col > screen_cur_col) |
| 9469 && *T_CRI != NUL) | |
| 7 | 9470 term_cursor_right(col - screen_cur_col); |
| 9471 else | |
| 9472 term_windgoto(row, col); | |
| 9473 } | |
| 9474 screen_cur_row = row; | |
| 9475 screen_cur_col = col; | |
| 9476 } | |
| 9477 } | |
| 9478 | |
| 9479 /* | |
| 9480 * Set cursor to its position in the current window. | |
| 9481 */ | |
| 9482 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9483 setcursor(void) |
| 7 | 9484 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9485 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
|
9486 } |
|
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 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9489 * 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
|
9490 * 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
|
9491 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9492 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9493 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
|
9494 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9495 if (force || redrawing()) |
| 7 | 9496 { |
| 9497 validate_cursor(); | |
| 9498 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
|
9499 curwin->w_wincol + ( |
| 7 | 9500 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9501 /* With 'rightleft' set and the cursor on a double-wide |
| 9502 * 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
|
9503 curwin->w_p_rl ? ((int)curwin->w_width - curwin->w_wcol - ( |
| 7 | 9504 # ifdef FEAT_MBYTE |
| 1545 | 9505 (has_mbyte |
| 9506 && (*mb_ptr2cells)(ml_get_cursor()) == 2 | |
| 9507 && vim_isprintc(gchar_cursor())) ? 2 : | |
| 7 | 9508 # endif |
| 9509 1)) : | |
| 9510 #endif | |
| 9511 curwin->w_wcol)); | |
| 9512 } | |
| 9513 } | |
| 9514 | |
| 9515 | |
| 9516 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9517 * 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
|
9518 * 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
|
9519 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9520 * scrolling. |
| 9521 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9522 */ | |
| 9523 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9524 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9525 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9526 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9527 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9528 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9529 int mayclear) |
| 7 | 9530 { |
| 9531 int did_delete; | |
| 9532 int nextrow; | |
| 9533 int lastrow; | |
| 9534 int retval; | |
| 9535 | |
| 9536 if (invalid) | |
| 9537 wp->w_lines_valid = 0; | |
| 9538 | |
| 9539 if (wp->w_height < 5) | |
| 9540 return FAIL; | |
| 9541 | |
| 9542 if (line_count > wp->w_height - row) | |
| 9543 line_count = wp->w_height - row; | |
| 9544 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9545 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9546 if (retval != MAYBE) |
| 9547 return retval; | |
| 9548 | |
| 9549 /* | |
| 9550 * If there is a next window or a status line, we first try to delete the | |
| 9551 * lines at the bottom to avoid messing what is after the window. | |
| 9552 * If this fails and there are following windows, don't do anything to avoid | |
| 9553 * messing up those windows, better just redraw. | |
| 9554 */ | |
| 9555 did_delete = FALSE; | |
| 9556 if (wp->w_next != NULL || wp->w_status_height) | |
| 9557 { | |
| 9558 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
|
9559 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9560 did_delete = TRUE; |
| 9561 else if (wp->w_next) | |
| 9562 return FAIL; | |
| 9563 } | |
| 9564 /* | |
| 9565 * if no lines deleted, blank the lines that will end up below the window | |
| 9566 */ | |
| 9567 if (!did_delete) | |
| 9568 { | |
| 9569 wp->w_redr_status = TRUE; | |
| 9570 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
|
9571 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9572 lastrow = nextrow + line_count; |
| 9573 if (lastrow > Rows) | |
| 9574 lastrow = Rows; | |
| 9575 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
|
9576 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9577 ' ', ' ', 0); |
| 9578 } | |
| 9579 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9580 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9581 == FAIL) |
| 9582 { | |
| 9583 /* deletion will have messed up other windows */ | |
| 9584 if (did_delete) | |
| 9585 { | |
| 9586 wp->w_redr_status = TRUE; | |
| 9587 win_rest_invalid(W_NEXT(wp)); | |
| 9588 } | |
| 9589 return FAIL; | |
| 9590 } | |
| 9591 | |
| 9592 return OK; | |
| 9593 } | |
| 9594 | |
| 9595 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9596 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9597 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9598 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9599 * scrolling | |
| 9600 * Return OK for success, FAIL if the lines are not deleted. | |
| 9601 */ | |
| 9602 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9603 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9604 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9605 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9606 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9607 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9608 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9609 int clear_attr) /* for clearing lines */ |
| 7 | 9610 { |
| 9611 int retval; | |
| 9612 | |
| 9613 if (invalid) | |
| 9614 wp->w_lines_valid = 0; | |
| 9615 | |
| 9616 if (line_count > wp->w_height - row) | |
| 9617 line_count = wp->w_height - row; | |
| 9618 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9619 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9620 if (retval != MAYBE) |
| 9621 return retval; | |
| 9622 | |
| 9623 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
|
9624 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9625 return FAIL; |
| 9626 | |
| 9627 /* | |
| 9628 * If there are windows or status lines below, try to put them at the | |
| 9629 * correct place. If we can't do that, they have to be redrawn. | |
| 9630 */ | |
| 9631 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9632 { | |
| 9633 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
|
9634 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9635 { |
| 9636 wp->w_redr_status = TRUE; | |
| 9637 win_rest_invalid(wp->w_next); | |
| 9638 } | |
| 9639 } | |
| 9640 /* | |
| 9641 * If this is the last window and there is no status line, redraw the | |
| 9642 * command line later. | |
| 9643 */ | |
| 9644 else | |
| 9645 redraw_cmdline = TRUE; | |
| 9646 return OK; | |
| 9647 } | |
| 9648 | |
| 9649 /* | |
| 9650 * Common code for win_ins_lines() and win_del_lines(). | |
| 9651 * Returns OK or FAIL when the work has been done. | |
| 9652 * Returns MAYBE when not finished yet. | |
| 9653 */ | |
| 9654 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9655 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9656 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9657 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9658 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9659 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9660 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9661 int clear_attr) |
| 7 | 9662 { |
| 9663 int retval; | |
| 9664 | |
| 9665 if (!redrawing() || line_count <= 0) | |
| 9666 return FAIL; | |
| 9667 | |
|
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
|
9668 /* 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
|
9669 * 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
|
9670 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
|
9671 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
|
9672 |
| 7 | 9673 /* 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
|
9674 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9675 { |
|
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
|
9676 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
|
9677 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9678 return FAIL; |
| 9679 } | |
| 9680 | |
| 9681 /* | |
| 9682 * Delete all remaining lines | |
| 9683 */ | |
| 9684 if (row + line_count >= wp->w_height) | |
| 9685 { | |
| 9686 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
|
9687 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9688 ' ', ' ', 0); |
| 9689 return OK; | |
| 9690 } | |
| 9691 | |
| 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 * When scrolling, the message on the command line should be cleared, |
| 7 | 9694 * 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
|
9695 * Don't do this when avoiding to insert lines. |
| 7 | 9696 */ |
|
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
|
9697 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
|
9698 clear_cmdline = TRUE; |
| 7 | 9699 |
| 9700 /* | |
| 9701 * If the terminal can set a scroll region, use that. | |
| 9702 * Always do this in a vertically split window. This will redraw from | |
| 9703 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9704 * win_line(). | |
| 9705 * 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
|
9706 * 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
|
9707 * scroll-up . |
| 7 | 9708 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9709 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
|
9710 { |
| 7 | 9711 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9712 scroll_region_set(wp, row); | |
| 9713 if (del) | |
| 9714 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
|
9715 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9716 else |
| 9717 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
|
9718 wp->w_height - row, clear_attr, wp); |
| 7 | 9719 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9720 scroll_region_reset(); | |
| 9721 return retval; | |
| 9722 } | |
| 9723 | |
| 9724 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9725 return FAIL; | |
| 9726 | |
| 9727 return MAYBE; | |
| 9728 } | |
| 9729 | |
| 9730 /* | |
| 9731 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9732 */ | |
| 9733 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9734 win_rest_invalid(win_T *wp) |
| 7 | 9735 { |
| 9736 while (wp != NULL) | |
| 9737 { | |
| 9738 redraw_win_later(wp, NOT_VALID); | |
| 9739 wp->w_redr_status = TRUE; | |
| 9740 wp = wp->w_next; | |
| 9741 } | |
| 9742 redraw_cmdline = TRUE; | |
| 9743 } | |
| 9744 | |
| 9745 /* | |
| 9746 * The rest of the routines in this file perform screen manipulations. The | |
| 9747 * given operation is performed physically on the screen. The corresponding | |
| 9748 * change is also made to the internal screen image. In this way, the editor | |
| 9749 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9750 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9751 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9752 * screen changes, and in the meantime, everything still works. | |
| 9753 */ | |
| 9754 | |
| 9755 /* | |
| 9756 * types for inserting or deleting lines | |
| 9757 */ | |
| 9758 #define USE_T_CAL 1 | |
| 9759 #define USE_T_CDL 2 | |
| 9760 #define USE_T_AL 3 | |
| 9761 #define USE_T_CE 4 | |
| 9762 #define USE_T_DL 5 | |
| 9763 #define USE_T_SR 6 | |
| 9764 #define USE_NL 7 | |
| 9765 #define USE_T_CD 8 | |
| 9766 #define USE_REDRAW 9 | |
| 9767 | |
| 9768 /* | |
| 9769 * insert lines on the screen and update ScreenLines[] | |
| 9770 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9771 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9772 * 'row' and 'end' are relative to the start of the region. | |
| 9773 * | |
| 9774 * return FAIL for failure, OK for success. | |
| 9775 */ | |
| 446 | 9776 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9777 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9778 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9779 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9780 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9781 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9782 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9783 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9784 { |
| 9785 int i; | |
| 9786 int j; | |
| 9787 unsigned temp; | |
| 9788 int cursor_row; | |
| 9789 int type; | |
| 9790 int result_empty; | |
| 9791 int can_ce = can_clear(T_CE); | |
| 9792 | |
| 9793 /* | |
| 9794 * FAIL if | |
| 9795 * - there is no valid screen | |
| 9796 * - the screen has to be redrawn completely | |
| 9797 * - the line count is less than one | |
| 9798 * - 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
|
9799 * - redrawing for a callback and there is a modeless selection |
| 7 | 9800 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9801 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
|
9802 #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
|
9803 || (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
|
9804 && 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
|
9805 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9806 ) |
| 7 | 9807 return FAIL; |
| 9808 | |
| 9809 /* | |
| 9810 * There are seven ways to insert lines: | |
| 9811 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9812 * characters from ScreenLines[]. | |
| 9813 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9814 * the insert is just empty lines | |
| 9815 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9816 * present or line_count > 1. It looks better if we do all the inserts | |
| 9817 * at once. | |
| 9818 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9819 * insert is just empty lines and T_CE is not present or line_count > | |
| 9820 * 1. | |
| 9821 * 4. Use T_AL (insert line) if it exists. | |
| 9822 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9823 * just empty lines. | |
| 9824 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9825 * just empty lines. | |
| 9826 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9827 * the 'da' flag is not set or we have clear line capability. | |
| 9828 * 8. redraw the characters from ScreenLines[]. | |
| 9829 * | |
| 9830 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9831 * the scrollbar for the window. It does have insert line, use that if it | |
| 9832 * exists. | |
| 9833 */ | |
| 9834 result_empty = (row + line_count >= end); | |
| 9835 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9836 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
|
9837 else if (can_clear(T_CD) && result_empty) |
| 7 | 9838 type = USE_T_CD; |
| 9839 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9840 type = USE_T_CAL; | |
| 9841 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9842 type = USE_T_CDL; | |
| 9843 else if (*T_AL != NUL) | |
| 9844 type = USE_T_AL; | |
| 9845 else if (can_ce && result_empty) | |
| 9846 type = USE_T_CE; | |
| 9847 else if (*T_DL != NUL && result_empty) | |
| 9848 type = USE_T_DL; | |
| 9849 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9850 type = USE_T_SR; | |
| 9851 else | |
| 9852 return FAIL; | |
| 9853 | |
| 9854 /* | |
| 9855 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9856 * care of t_db if necessary. | |
| 9857 */ | |
| 9858 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9859 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
|
9860 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9861 |
| 9862 /* | |
| 9863 * If text is retained below the screen, first clear or delete as many | |
| 9864 * lines at the bottom of the window as are about to be inserted so that | |
| 9865 * the deleted lines won't later surface during a screen_del_lines. | |
| 9866 */ | |
| 9867 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
|
9868 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9869 |
| 9870 #ifdef FEAT_CLIPBOARD | |
| 9871 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9872 * 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
|
9873 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9874 clip_clear_selection(&clip_star); |
| 7 | 9875 else |
| 9876 clip_scroll_selection(-line_count); | |
| 9877 #endif | |
| 9878 | |
| 9879 #ifdef FEAT_GUI | |
| 9880 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9881 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9882 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9883 #endif |
| 9884 | |
| 9885 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 9886 cursor_row = row; | |
| 9887 else | |
| 9888 cursor_row = row + off; | |
| 9889 | |
| 9890 /* | |
| 9891 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9892 * Clear the inserted lines in ScreenLines[]. | |
| 9893 */ | |
| 9894 row += off; | |
| 9895 end += off; | |
| 9896 for (i = 0; i < line_count; ++i) | |
| 9897 { | |
| 9898 if (wp != NULL && wp->w_width != Columns) | |
| 9899 { | |
| 9900 /* need to copy part of a line */ | |
| 9901 j = end - 1 - i; | |
| 9902 while ((j -= line_count) >= row) | |
| 9903 linecopy(j + line_count, j, wp); | |
| 9904 j += line_count; | |
| 9905 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
|
9906 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
|
9907 clear_attr); |
| 7 | 9908 else |
| 9909 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9910 LineWraps[j] = FALSE; | |
| 9911 } | |
| 9912 else | |
| 9913 { | |
| 9914 j = end - 1 - i; | |
| 9915 temp = LineOffset[j]; | |
| 9916 while ((j -= line_count) >= row) | |
| 9917 { | |
| 9918 LineOffset[j + line_count] = LineOffset[j]; | |
| 9919 LineWraps[j + line_count] = LineWraps[j]; | |
| 9920 } | |
| 9921 LineOffset[j + line_count] = temp; | |
| 9922 LineWraps[j + line_count] = FALSE; | |
| 9923 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
|
9924 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9925 else |
| 9926 lineinvalid(temp, (int)Columns); | |
| 9927 } | |
| 9928 } | |
| 9929 | |
| 9930 screen_stop_highlight(); | |
| 9931 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
|
9932 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
|
9933 screen_start_highlight(clear_attr); |
| 7 | 9934 |
| 9935 /* redraw the characters */ | |
| 9936 if (type == USE_REDRAW) | |
| 9937 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
|
9938 else if (type == USE_T_CAL) |
| 7 | 9939 { |
| 9940 term_append_lines(line_count); | |
| 9941 screen_start(); /* don't know where cursor is now */ | |
| 9942 } | |
| 9943 else | |
| 9944 { | |
| 9945 for (i = 0; i < line_count; i++) | |
| 9946 { | |
| 9947 if (type == USE_T_AL) | |
| 9948 { | |
| 9949 if (i && cursor_row != 0) | |
| 9950 windgoto(cursor_row, 0); | |
| 9951 out_str(T_AL); | |
| 9952 } | |
| 9953 else /* type == USE_T_SR */ | |
| 9954 out_str(T_SR); | |
| 9955 screen_start(); /* don't know where cursor is now */ | |
| 9956 } | |
| 9957 } | |
| 9958 | |
| 9959 /* | |
| 9960 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9961 * have been scrolled down into the region. | |
| 9962 */ | |
| 9963 if (type == USE_T_SR && *T_DA) | |
| 9964 { | |
| 9965 for (i = 0; i < line_count; ++i) | |
| 9966 { | |
| 9967 windgoto(off + i, 0); | |
| 9968 out_str(T_CE); | |
| 9969 screen_start(); /* don't know where cursor is now */ | |
| 9970 } | |
| 9971 } | |
| 9972 | |
| 9973 #ifdef FEAT_GUI | |
| 9974 gui_can_update_cursor(); | |
| 9975 if (gui.in_use) | |
| 9976 out_flush(); /* always flush after a scroll */ | |
| 9977 #endif | |
| 9978 return OK; | |
| 9979 } | |
| 9980 | |
| 9981 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9982 * 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
|
9983 * "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
|
9984 * 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
|
9985 * "row" and "end" are relative to the start of the region. |
| 7 | 9986 * |
| 9987 * Return OK for success, FAIL if the lines are not deleted. | |
| 9988 */ | |
| 9989 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9990 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9991 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9992 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9993 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9994 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9995 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
|
9996 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
|
9997 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 9998 { |
| 9999 int j; | |
| 10000 int i; | |
| 10001 unsigned temp; | |
| 10002 int cursor_row; | |
| 10003 int cursor_end; | |
| 10004 int result_empty; /* result is empty until end of region */ | |
| 10005 int can_delete; /* deleting line codes can be used */ | |
| 10006 int type; | |
| 10007 | |
| 10008 /* | |
| 10009 * FAIL if | |
| 10010 * - there is no valid screen | |
| 10011 * - the screen has to be redrawn completely | |
| 10012 * - the line count is less than one | |
| 10013 * - 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
|
10014 * - redrawing for a callback and there is a modeless selection |
| 7 | 10015 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10016 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
|
10017 || (!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
|
10018 #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
|
10019 || (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
|
10020 && 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
|
10021 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10022 ) |
| 7 | 10023 return FAIL; |
| 10024 | |
| 10025 /* | |
| 10026 * Check if the rest of the current region will become empty. | |
| 10027 */ | |
| 10028 result_empty = row + line_count >= end; | |
| 10029 | |
| 10030 /* | |
| 10031 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10032 * available. | |
| 10033 */ | |
| 10034 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10035 | |
| 10036 /* | |
| 10037 * There are six ways to delete lines: | |
| 10038 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10039 * characters from ScreenLines[]. | |
| 10040 * 1. Use T_CD if it exists and the result is empty. | |
| 10041 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10042 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10043 * none of the other ways work. | |
| 10044 * 4. Use T_CE (erase line) if the result is empty. | |
| 10045 * 5. Use T_DL (delete line) if it exists. | |
| 10046 * 6. redraw the characters from ScreenLines[]. | |
| 10047 */ | |
| 10048 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10049 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
|
10050 else if (can_clear(T_CD) && result_empty) |
| 7 | 10051 type = USE_T_CD; |
| 10052 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10053 /* | |
| 10054 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10055 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10056 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10057 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10058 * the trick... | |
| 10059 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10060 * (Olaf Seibert) | |
| 10061 */ | |
| 10062 else if (row == 0 && T_DB == empty_option | |
| 10063 && (line_count == 1 || *T_CDL == NUL)) | |
| 10064 #else | |
| 10065 else if (row == 0 && ( | |
| 10066 #ifndef AMIGA | |
| 10067 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10068 * up, so use delete-line command */ | |
| 10069 line_count == 1 || | |
| 10070 #endif | |
| 10071 *T_CDL == NUL)) | |
| 10072 #endif | |
| 10073 type = USE_NL; | |
| 10074 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10075 type = USE_T_CDL; | |
| 10076 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
|
10077 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10078 type = USE_T_CE; |
| 10079 else if (*T_DL != NUL && can_delete) | |
| 10080 type = USE_T_DL; | |
| 10081 else if (*T_CDL != NUL && can_delete) | |
| 10082 type = USE_T_CDL; | |
| 10083 else | |
| 10084 return FAIL; | |
| 10085 | |
| 10086 #ifdef FEAT_CLIPBOARD | |
| 10087 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10088 * 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
|
10089 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10090 clip_clear_selection(&clip_star); |
| 7 | 10091 else |
| 10092 clip_scroll_selection(line_count); | |
| 10093 #endif | |
| 10094 | |
| 10095 #ifdef FEAT_GUI | |
| 10096 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10097 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10098 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
|
10099 && gui.cursor_row < end + off); |
| 7 | 10100 #endif |
| 10101 | |
| 10102 if (*T_CCS != NUL) /* cursor relative to region */ | |
| 10103 { | |
| 10104 cursor_row = row; | |
| 10105 cursor_end = end; | |
| 10106 } | |
| 10107 else | |
| 10108 { | |
| 10109 cursor_row = row + off; | |
| 10110 cursor_end = end + off; | |
| 10111 } | |
| 10112 | |
| 10113 /* | |
| 10114 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10115 * Clear the inserted lines in ScreenLines[]. | |
| 10116 */ | |
| 10117 row += off; | |
| 10118 end += off; | |
| 10119 for (i = 0; i < line_count; ++i) | |
| 10120 { | |
| 10121 if (wp != NULL && wp->w_width != Columns) | |
| 10122 { | |
| 10123 /* need to copy part of a line */ | |
| 10124 j = row + i; | |
| 10125 while ((j += line_count) <= end - 1) | |
| 10126 linecopy(j - line_count, j, wp); | |
| 10127 j -= line_count; | |
| 10128 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
|
10129 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
|
10130 clear_attr); |
| 7 | 10131 else |
| 10132 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10133 LineWraps[j] = FALSE; | |
| 10134 } | |
| 10135 else | |
| 10136 { | |
| 10137 /* whole width, moving the line pointers is faster */ | |
| 10138 j = row + i; | |
| 10139 temp = LineOffset[j]; | |
| 10140 while ((j += line_count) <= end - 1) | |
| 10141 { | |
| 10142 LineOffset[j - line_count] = LineOffset[j]; | |
| 10143 LineWraps[j - line_count] = LineWraps[j]; | |
| 10144 } | |
| 10145 LineOffset[j - line_count] = temp; | |
| 10146 LineWraps[j - line_count] = FALSE; | |
| 10147 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
|
10148 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10149 else |
| 10150 lineinvalid(temp, (int)Columns); | |
| 10151 } | |
| 10152 } | |
| 10153 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10154 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
|
10155 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10156 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
|
10157 screen_start_highlight(clear_attr); |
| 7 | 10158 |
| 10159 /* redraw the characters */ | |
| 10160 if (type == USE_REDRAW) | |
| 10161 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
|
10162 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10163 { |
| 10164 windgoto(cursor_row, 0); | |
| 10165 out_str(T_CD); | |
| 10166 screen_start(); /* don't know where cursor is now */ | |
| 10167 } | |
| 10168 else if (type == USE_T_CDL) | |
| 10169 { | |
| 10170 windgoto(cursor_row, 0); | |
| 10171 term_delete_lines(line_count); | |
| 10172 screen_start(); /* don't know where cursor is now */ | |
| 10173 } | |
| 10174 /* | |
| 10175 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10176 * the whole screen (scroll region) up by outputting newlines on the | |
| 10177 * last line. | |
| 10178 */ | |
| 10179 else if (type == USE_NL) | |
| 10180 { | |
| 10181 windgoto(cursor_end - 1, 0); | |
| 10182 for (i = line_count; --i >= 0; ) | |
| 10183 out_char('\n'); /* cursor will remain on same line */ | |
| 10184 } | |
| 10185 else | |
| 10186 { | |
| 10187 for (i = line_count; --i >= 0; ) | |
| 10188 { | |
| 10189 if (type == USE_T_DL) | |
| 10190 { | |
| 10191 windgoto(cursor_row, 0); | |
| 10192 out_str(T_DL); /* delete a line */ | |
| 10193 } | |
| 10194 else /* type == USE_T_CE */ | |
| 10195 { | |
| 10196 windgoto(cursor_row + i, 0); | |
| 10197 out_str(T_CE); /* erase a line */ | |
| 10198 } | |
| 10199 screen_start(); /* don't know where cursor is now */ | |
| 10200 } | |
| 10201 } | |
| 10202 | |
| 10203 /* | |
| 10204 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10205 * scrolled up at the bottom of the region. | |
| 10206 */ | |
| 10207 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10208 { | |
| 10209 for (i = line_count; i > 0; --i) | |
| 10210 { | |
| 10211 windgoto(cursor_end - i, 0); | |
| 10212 out_str(T_CE); /* erase a line */ | |
| 10213 screen_start(); /* don't know where cursor is now */ | |
| 10214 } | |
| 10215 } | |
| 10216 | |
| 10217 #ifdef FEAT_GUI | |
| 10218 gui_can_update_cursor(); | |
| 10219 if (gui.in_use) | |
| 10220 out_flush(); /* always flush after a scroll */ | |
| 10221 #endif | |
| 10222 | |
| 10223 return OK; | |
| 10224 } | |
| 10225 | |
| 10226 /* | |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10227 * Show the current mode and ruler. |
| 7 | 10228 * |
| 10229 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10230 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10231 * cleared only if a mode is shown. | |
| 10232 * Return the length of the message (0 if no message). | |
| 10233 */ | |
| 10234 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10235 showmode(void) |
| 7 | 10236 { |
| 10237 int need_clear; | |
| 10238 int length = 0; | |
| 10239 int do_mode; | |
| 10240 int attr; | |
| 10241 int nwr_save; | |
| 10242 #ifdef FEAT_INS_EXPAND | |
| 10243 int sub_attr; | |
| 10244 #endif | |
| 10245 | |
| 642 | 10246 do_mode = ((p_smd && msg_silent == 0) |
| 10247 && ((State & INSERT) | |
| 10248 || restart_edit | |
| 5735 | 10249 || VIsual_active)); |
| 7 | 10250 if (do_mode || Recording) |
| 10251 { | |
| 10252 /* | |
| 10253 * Don't show mode right now, when not redrawing or inside a mapping. | |
| 10254 * Call char_avail() only when we are going to show something, because | |
| 10255 * it takes a bit of time. | |
| 10256 */ | |
| 10257 if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0) | |
| 10258 { | |
| 10259 redraw_cmdline = TRUE; /* show mode later */ | |
| 10260 return 0; | |
| 10261 } | |
| 10262 | |
| 10263 nwr_save = need_wait_return; | |
| 10264 | |
| 10265 /* wait a bit before overwriting an important message */ | |
| 10266 check_for_delay(FALSE); | |
| 10267 | |
| 10268 /* if the cmdline is more than one line high, erase top lines */ | |
| 10269 need_clear = clear_cmdline; | |
| 10270 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10271 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10272 | |
| 10273 /* Position on the last line in the window, column 0 */ | |
| 10274 msg_pos_mode(); | |
| 10275 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10276 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10277 if (do_mode) |
| 10278 { | |
| 10279 MSG_PUTS_ATTR("--", attr); | |
| 10280 #if defined(FEAT_XIM) | |
| 2520 | 10281 if ( |
| 10282 # ifdef FEAT_GUI_GTK | |
| 10283 preedit_get_status() | |
| 1668 | 10284 # else |
| 10285 im_get_status() | |
| 2520 | 10286 # endif |
| 1668 | 10287 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10288 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
| 7 | 10289 MSG_PUTS_ATTR(" IM", attr); |
| 10290 # else | |
| 10291 MSG_PUTS_ATTR(" XIM", attr); | |
| 10292 # endif | |
| 10293 #endif | |
| 10294 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10295 if (gui.in_use) | |
| 10296 { | |
| 10297 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10298 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10299 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10300 if (enc_utf8) |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10301 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
|
10302 else |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10303 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
|
10304 } |
| 7 | 10305 } |
| 10306 #endif | |
| 10307 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10308 /* CTRL-X in Insert mode */ |
| 10309 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10310 { |
| 10311 /* These messages can get long, avoid a wrap in a narrow | |
| 10312 * window. Prefer showing edit_submode_extra. */ | |
| 10313 length = (Rows - msg_row) * Columns - 3; | |
| 10314 if (edit_submode_extra != NULL) | |
| 10315 length -= vim_strsize(edit_submode_extra); | |
| 10316 if (length > 0) | |
| 10317 { | |
| 10318 if (edit_submode_pre != NULL) | |
| 10319 length -= vim_strsize(edit_submode_pre); | |
| 10320 if (length - vim_strsize(edit_submode) > 0) | |
| 10321 { | |
| 10322 if (edit_submode_pre != NULL) | |
| 10323 msg_puts_attr(edit_submode_pre, attr); | |
| 10324 msg_puts_attr(edit_submode, attr); | |
| 10325 } | |
| 10326 if (edit_submode_extra != NULL) | |
| 10327 { | |
| 10328 MSG_PUTS_ATTR(" ", attr); /* add a space in between */ | |
| 10329 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
|
10330 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10331 else |
| 10332 sub_attr = attr; | |
| 10333 msg_puts_attr(edit_submode_extra, sub_attr); | |
| 10334 } | |
| 10335 } | |
| 10336 } | |
| 10337 else | |
| 10338 #endif | |
| 10339 { | |
| 10340 #ifdef FEAT_VREPLACE | |
| 10341 if (State & VREPLACE_FLAG) | |
| 10342 MSG_PUTS_ATTR(_(" VREPLACE"), attr); | |
| 10343 else | |
| 10344 #endif | |
| 10345 if (State & REPLACE_FLAG) | |
| 10346 MSG_PUTS_ATTR(_(" REPLACE"), attr); | |
| 10347 else if (State & INSERT) | |
| 10348 { | |
| 10349 #ifdef FEAT_RIGHTLEFT | |
| 10350 if (p_ri) | |
| 10351 MSG_PUTS_ATTR(_(" REVERSE"), attr); | |
| 10352 #endif | |
| 10353 MSG_PUTS_ATTR(_(" INSERT"), attr); | |
| 10354 } | |
| 10355 else if (restart_edit == 'I') | |
| 10356 MSG_PUTS_ATTR(_(" (insert)"), attr); | |
| 10357 else if (restart_edit == 'R') | |
| 10358 MSG_PUTS_ATTR(_(" (replace)"), attr); | |
| 10359 else if (restart_edit == 'V') | |
| 10360 MSG_PUTS_ATTR(_(" (vreplace)"), attr); | |
| 10361 #ifdef FEAT_RIGHTLEFT | |
| 10362 if (p_hkmap) | |
| 10363 MSG_PUTS_ATTR(_(" Hebrew"), attr); | |
| 10364 # ifdef FEAT_FKMAP | |
| 10365 if (p_fkmap) | |
| 10366 MSG_PUTS_ATTR(farsi_text_5, attr); | |
| 10367 # endif | |
| 10368 #endif | |
| 10369 #ifdef FEAT_KEYMAP | |
| 10370 if (State & LANGMAP) | |
| 10371 { | |
| 10372 # ifdef FEAT_ARABIC | |
| 10373 if (curwin->w_p_arab) | |
| 10374 MSG_PUTS_ATTR(_(" Arabic"), attr); | |
| 10375 else | |
| 10376 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10377 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
|
10378 NameBuff, MAXPATHL)) |
|
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10379 MSG_PUTS_ATTR(NameBuff, attr); |
| 7 | 10380 } |
| 10381 #endif | |
| 10382 if ((State & INSERT) && p_paste) | |
| 10383 MSG_PUTS_ATTR(_(" (paste)"), attr); | |
| 10384 | |
| 10385 if (VIsual_active) | |
| 10386 { | |
| 10387 char *p; | |
| 10388 | |
| 10389 /* Don't concatenate separate words to avoid translation | |
| 10390 * problems. */ | |
| 10391 switch ((VIsual_select ? 4 : 0) | |
| 10392 + (VIsual_mode == Ctrl_V) * 2 | |
| 10393 + (VIsual_mode == 'V')) | |
| 10394 { | |
| 10395 case 0: p = N_(" VISUAL"); break; | |
| 10396 case 1: p = N_(" VISUAL LINE"); break; | |
| 10397 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10398 case 4: p = N_(" SELECT"); break; | |
| 10399 case 5: p = N_(" SELECT LINE"); break; | |
| 10400 default: p = N_(" SELECT BLOCK"); break; | |
| 10401 } | |
| 10402 MSG_PUTS_ATTR(_(p), attr); | |
| 10403 } | |
| 10404 MSG_PUTS_ATTR(" --", attr); | |
| 10405 } | |
| 644 | 10406 |
| 7 | 10407 need_clear = TRUE; |
| 10408 } | |
| 10409 if (Recording | |
| 10410 #ifdef FEAT_INS_EXPAND | |
| 10411 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10412 #endif | |
| 10413 ) | |
| 10414 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10415 recording_mode(attr); |
| 7 | 10416 need_clear = TRUE; |
| 10417 } | |
| 644 | 10418 |
| 10419 mode_displayed = TRUE; | |
| 7 | 10420 if (need_clear || clear_cmdline) |
| 10421 msg_clr_eos(); | |
| 10422 msg_didout = FALSE; /* overwrite this message */ | |
| 10423 length = msg_col; | |
| 10424 msg_col = 0; | |
| 10425 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10426 } | |
| 10427 else if (clear_cmdline && msg_silent == 0) | |
| 10428 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10429 msg_clr_cmdline(); | |
| 10430 | |
| 10431 #ifdef FEAT_CMDL_INFO | |
| 10432 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10433 if (VIsual_active) | |
| 10434 clear_showcmd(); | |
| 10435 | |
| 10436 /* If the last window has no status line, the ruler is after the mode | |
| 10437 * 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
|
10438 if (redrawing() && lastwin->w_status_height == 0) |
| 7 | 10439 win_redr_ruler(lastwin, TRUE); |
| 10440 #endif | |
| 10441 redraw_cmdline = FALSE; | |
| 10442 clear_cmdline = FALSE; | |
| 10443 | |
| 10444 return length; | |
| 10445 } | |
| 10446 | |
| 10447 /* | |
| 10448 * Position for a mode message. | |
| 10449 */ | |
| 10450 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10451 msg_pos_mode(void) |
| 7 | 10452 { |
| 10453 msg_col = 0; | |
| 10454 msg_row = Rows - 1; | |
| 10455 } | |
| 10456 | |
| 10457 /* | |
| 10458 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10459 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10460 * Caller should check "mode_displayed". |
| 7 | 10461 */ |
| 10462 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10463 unshowmode(int force) |
| 7 | 10464 { |
| 10465 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10466 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10467 */ |
| 10468 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10469 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10470 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10471 clearmode(); |
|
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 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10474 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10475 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10476 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10477 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10478 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10479 { |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10480 msg_pos_mode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10481 if (Recording) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10482 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
|
10483 msg_clr_eos(); |
| 7 | 10484 } |
| 10485 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10486 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10487 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10488 { |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10489 MSG_PUTS_ATTR(_("recording"), attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10490 if (!shortmess(SHM_RECORDING)) |
|
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 char_u s[4]; |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10493 sprintf((char *)s, " @%c", Recording); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10494 MSG_PUTS_ATTR(s, attr); |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10495 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10496 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10497 |
| 667 | 10498 /* |
| 10499 * Draw the tab pages line at the top of the Vim window. | |
| 10500 */ | |
| 10501 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10502 draw_tabline(void) |
| 667 | 10503 { |
| 10504 int tabcount = 0; | |
| 10505 tabpage_T *tp; | |
| 10506 int tabwidth; | |
| 10507 int col = 0; | |
| 673 | 10508 int scol = 0; |
| 667 | 10509 int attr; |
| 10510 win_T *wp; | |
| 671 | 10511 win_T *cwp; |
| 10512 int wincount; | |
| 10513 int modified; | |
| 667 | 10514 int c; |
| 10515 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10516 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
|
10517 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
|
10518 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10519 char_u *p; |
| 677 | 10520 int room; |
| 10521 int use_sep_chars = (t_colors < 8 | |
| 10522 #ifdef FEAT_GUI | |
| 10523 && !gui.in_use | |
| 10524 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10525 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10526 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10527 #endif |
| 677 | 10528 ); |
| 673 | 10529 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10530 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10531 return; |
| 673 | 10532 redraw_tabline = FALSE; |
| 667 | 10533 |
| 685 | 10534 #ifdef FEAT_GUI_TABLINE |
| 798 | 10535 /* Take care of a GUI tabline. */ |
| 685 | 10536 if (gui_use_tabline()) |
| 10537 { | |
| 10538 gui_update_tabline(); | |
| 10539 return; | |
| 10540 } | |
| 10541 #endif | |
| 10542 | |
| 10543 if (tabline_height() < 1) | |
| 667 | 10544 return; |
| 10545 | |
| 677 | 10546 #if defined(FEAT_STL_OPT) |
| 681 | 10547 |
| 10548 /* Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. */ | |
| 10549 for (scol = 0; scol < Columns; ++scol) | |
| 10550 TabPageIdxs[scol] = 0; | |
| 10551 | |
| 677 | 10552 /* Use the 'tabline' option if it's set. */ |
| 10553 if (*p_tal != NUL) | |
| 10554 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10555 int saved_did_emsg = did_emsg; |
| 680 | 10556 |
| 10557 /* Check for an error. If there is one we would loop in redrawing the | |
| 10558 * 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
|
10559 did_emsg = FALSE; |
| 677 | 10560 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10561 if (did_emsg) |
| 680 | 10562 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10563 (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
|
10564 did_emsg |= saved_did_emsg; |
| 680 | 10565 } |
| 10566 else | |
| 10567 #endif | |
| 10568 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10569 FOR_ALL_TABPAGES(tp) |
| 680 | 10570 ++tabcount; |
| 10571 | |
| 10572 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10573 if (tabwidth < 6) | |
| 10574 tabwidth = 6; | |
| 10575 | |
| 10576 attr = attr_nosel; | |
| 10577 tabcount = 0; | |
| 681 | 10578 scol = 0; |
| 699 | 10579 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10580 tp = tp->tp_next) | |
| 680 | 10581 { |
| 10582 scol = col; | |
| 10583 | |
| 10584 if (tp->tp_topframe == topframe) | |
| 10585 attr = attr_sel; | |
| 10586 if (use_sep_chars && col > 0) | |
| 10587 screen_putchar('|', 0, col++, attr); | |
| 10588 | |
| 10589 if (tp->tp_topframe != topframe) | |
| 10590 attr = attr_nosel; | |
| 10591 | |
| 10592 screen_putchar(' ', 0, col++, attr); | |
| 10593 | |
| 10594 if (tp == curtab) | |
| 10595 { | |
| 10596 cwp = curwin; | |
| 10597 wp = firstwin; | |
| 10598 } | |
| 10599 else | |
| 10600 { | |
| 10601 cwp = tp->tp_curwin; | |
| 10602 wp = tp->tp_firstwin; | |
| 10603 } | |
| 10604 | |
| 10605 modified = FALSE; | |
| 10606 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10607 if (bufIsChanged(wp->w_buffer)) | |
| 10608 modified = TRUE; | |
| 10609 if (modified || wincount > 1) | |
| 10610 { | |
| 10611 if (wincount > 1) | |
| 10612 { | |
| 10613 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10614 len = (int)STRLEN(NameBuff); |
| 699 | 10615 if (col + len >= Columns - 3) |
| 10616 break; | |
| 680 | 10617 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10618 #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
|
10619 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10620 #else |
| 6106 | 10621 attr |
| 680 | 10622 #endif |
| 10623 ); | |
| 10624 col += len; | |
| 10625 } | |
| 10626 if (modified) | |
| 10627 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10628 screen_putchar(' ', 0, col++, attr); | |
| 10629 } | |
| 10630 | |
| 10631 room = scol - col + tabwidth - 1; | |
| 10632 if (room > 0) | |
| 10633 { | |
| 685 | 10634 /* Get buffer name in NameBuff[] */ |
| 10635 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10636 shorten_dir(NameBuff); |
| 680 | 10637 len = vim_strsize(NameBuff); |
| 10638 p = NameBuff; | |
| 677 | 10639 #ifdef FEAT_MBYTE |
| 680 | 10640 if (has_mbyte) |
| 10641 while (len > room) | |
| 10642 { | |
| 10643 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10644 MB_PTR_ADV(p); |
| 680 | 10645 } |
| 10646 else | |
| 10647 #endif | |
| 10648 if (len > room) | |
| 677 | 10649 { |
| 680 | 10650 p += len - room; |
| 10651 len = room; | |
| 677 | 10652 } |
| 699 | 10653 if (len > Columns - col - 1) |
| 10654 len = Columns - col - 1; | |
| 680 | 10655 |
| 835 | 10656 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10657 col += len; |
| 10658 } | |
| 10659 screen_putchar(' ', 0, col++, attr); | |
| 10660 | |
| 10661 /* Store the tab page number in TabPageIdxs[], so that | |
| 10662 * jump_to_mouse() knows where each one is. */ | |
| 10663 ++tabcount; | |
| 10664 while (scol < col) | |
| 10665 TabPageIdxs[scol++] = tabcount; | |
| 10666 } | |
| 10667 | |
| 10668 if (use_sep_chars) | |
| 10669 c = '_'; | |
| 10670 else | |
| 10671 c = ' '; | |
| 10672 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10673 |
| 10674 /* Put an "X" for closing the current tab if there are several. */ | |
| 10675 if (first_tabpage->tp_next != NULL) | |
| 10676 { | |
| 10677 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10678 TabPageIdxs[Columns - 1] = -999; | |
| 10679 } | |
| 10680 } | |
| 834 | 10681 |
| 10682 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10683 * set. */ | |
| 10684 redraw_tabline = FALSE; | |
| 667 | 10685 } |
| 685 | 10686 |
| 10687 /* | |
| 10688 * Get buffer name for "buf" into NameBuff[]. | |
| 10689 * Takes care of special buffer names and translates special characters. | |
| 10690 */ | |
| 10691 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10692 get_trans_bufname(buf_T *buf) |
| 685 | 10693 { |
| 10694 if (buf_spname(buf) != NULL) | |
| 3839 | 10695 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10696 else |
| 10697 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10698 trans_characters(NameBuff, MAXPATHL); | |
| 10699 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10700 |
| 7 | 10701 /* |
| 10702 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10703 */ | |
| 10704 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
|
10705 fillchar_status(int *attr, win_T *wp) |
| 7 | 10706 { |
| 10707 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
|
10708 |
|
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
|
10709 #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
|
10710 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
|
10711 { |
|
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
|
10712 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
|
10713 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10714 *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
|
10715 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
|
10716 } |
|
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
|
10717 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10718 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10719 *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
|
10720 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
|
10721 } |
|
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
|
10722 } |
|
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
|
10723 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
|
10724 #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
|
10725 if (wp == curwin) |
| 7 | 10726 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10727 *attr = HL_ATTR(HLF_S); |
| 7 | 10728 fill = fill_stl; |
| 10729 } | |
| 10730 else | |
| 10731 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10732 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10733 fill = fill_stlnc; |
| 10734 } | |
| 10735 /* Use fill when there is highlighting, and highlighting of current | |
| 10736 * window differs, or the fillchars differ, or this is not the | |
| 10737 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10738 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
|
10739 || wp != curwin || ONE_WINDOW) |
| 7 | 10740 || (fill_stl != fill_stlnc))) |
| 10741 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
|
10742 if (wp == curwin) |
| 7 | 10743 return '^'; |
| 10744 return '='; | |
| 10745 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10746 |
| 7 | 10747 /* |
| 10748 * Get the character to use in a separator between vertically split windows. | |
| 10749 * Get its attributes in "*attr". | |
| 10750 */ | |
| 10751 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10752 fillchar_vsep(int *attr) |
| 7 | 10753 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10754 *attr = HL_ATTR(HLF_C); |
| 7 | 10755 if (*attr == 0 && fill_vert == ' ') |
| 10756 return '|'; | |
| 10757 else | |
| 10758 return fill_vert; | |
| 10759 } | |
| 10760 | |
| 10761 /* | |
| 10762 * Return TRUE if redrawing should currently be done. | |
| 10763 */ | |
| 10764 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10765 redrawing(void) |
| 7 | 10766 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10767 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10768 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
|
10769 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10770 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10771 #endif |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10772 return (!RedrawingDisabled |
| 7 | 10773 && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 10774 } | |
| 10775 | |
| 10776 /* | |
| 10777 * Return TRUE if printing messages should currently be done. | |
| 10778 */ | |
| 10779 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10780 messaging(void) |
| 7 | 10781 { |
| 10782 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10783 } | |
| 10784 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10785 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10786 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10787 * 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
|
10788 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10789 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10790 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
|
10791 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10792 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10793 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
|
10794 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
|
10795 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10796 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10797 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
|
10798 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
|
10799 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
|
10800 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10801 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
|
10802 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
|
10803 ++item_count; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10804 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
|
10805 (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
|
10806 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10807 /* 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
|
10808 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
|
10809 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
|
10810 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10811 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
|
10812 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
|
10813 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10814 if (col > 1) |
|
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 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
|
10817 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
|
10818 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10819 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10820 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10821 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
|
10822 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
|
10823 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
|
10824 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10825 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10826 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
|
10827 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
|
10828 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10829 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
|
10830 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10831 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10832 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
|
10833 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
|
10834 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10835 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10836 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
|
10837 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10838 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
|
10839 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10840 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10841 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
|
10842 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10843 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
|
10844 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10845 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10846 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
|
10847 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10848 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
|
10849 (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
|
10850 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10851 #endif |
| 7 | 10852 /* |
| 10853 * Show current status info in ruler and various other places | |
| 10854 * If always is FALSE, only show ruler if position has changed. | |
| 10855 */ | |
| 10856 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10857 showruler(int always) |
| 7 | 10858 { |
| 10859 if (!always && !redrawing()) | |
| 10860 return; | |
| 574 | 10861 #ifdef FEAT_INS_EXPAND |
| 10862 if (pum_visible()) | |
| 10863 { | |
| 10864 /* Don't redraw right now, do it later. */ | |
| 10865 curwin->w_redr_status = TRUE; | |
| 10866 return; | |
| 10867 } | |
| 10868 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10869 #if defined(FEAT_STL_OPT) |
| 40 | 10870 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 680 | 10871 { |
| 1983 | 10872 redraw_custom_statusline(curwin); |
| 680 | 10873 } |
| 7 | 10874 else |
| 10875 #endif | |
| 10876 #ifdef FEAT_CMDL_INFO | |
| 10877 win_redr_ruler(curwin, always); | |
| 10878 #endif | |
| 10879 | |
| 10880 #ifdef FEAT_TITLE | |
| 10881 if (need_maketitle | |
| 10882 # ifdef FEAT_STL_OPT | |
| 10883 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10884 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10885 # endif | |
| 10886 ) | |
| 10887 maketitle(); | |
| 10888 #endif | |
| 1588 | 10889 /* Redraw the tab pages line if needed. */ |
| 10890 if (redraw_tabline) | |
| 10891 draw_tabline(); | |
| 7 | 10892 } |
| 10893 | |
| 10894 #ifdef FEAT_CMDL_INFO | |
| 10895 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10896 win_redr_ruler(win_T *wp, int always) |
| 7 | 10897 { |
| 1869 | 10898 #define RULER_BUF_LEN 70 |
| 10899 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10900 int row; |
| 10901 int fillchar; | |
| 10902 int attr; | |
| 10903 int empty_line = FALSE; | |
| 10904 colnr_T virtcol; | |
| 10905 int i; | |
| 1869 | 10906 size_t len; |
| 7 | 10907 int o; |
| 10908 int this_ru_col; | |
| 10909 int off = 0; | |
| 10910 int width = Columns; | |
| 10911 | |
| 10912 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10913 if (!p_ru) | |
| 10914 return; | |
| 10915 | |
| 10916 /* | |
| 10917 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10918 * after deleting lines, before cursor.lnum is corrected. | |
| 10919 */ | |
| 10920 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10921 return; | |
| 10922 | |
| 10923 #ifdef FEAT_INS_EXPAND | |
| 10924 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10925 * the (long) mode message. */ | |
| 10926 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10927 if (edit_submode != NULL) | |
| 10928 return; | |
| 540 | 10929 /* Don't draw the ruler when the popup menu is visible, it may overlap. */ |
| 10930 if (pum_visible()) | |
| 10931 return; | |
| 7 | 10932 #endif |
| 10933 | |
| 10934 #ifdef FEAT_STL_OPT | |
| 10935 if (*p_ruf) | |
| 10936 { | |
| 680 | 10937 int save_called_emsg = called_emsg; |
| 10938 | |
| 10939 called_emsg = FALSE; | |
| 7 | 10940 win_redr_custom(wp, TRUE); |
| 680 | 10941 if (called_emsg) |
| 10942 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10943 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10944 called_emsg |= save_called_emsg; |
| 7 | 10945 return; |
| 10946 } | |
| 10947 #endif | |
| 10948 | |
| 10949 /* | |
| 10950 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10951 */ | |
| 10952 if (!(State & INSERT) | |
| 10953 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10954 empty_line = TRUE; | |
| 10955 | |
| 10956 /* | |
| 10957 * Only draw the ruler when something changed. | |
| 10958 */ | |
| 10959 validate_virtcol_win(wp); | |
| 10960 if ( redraw_cmdline | |
| 10961 || always | |
| 10962 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 10963 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 10964 || wp->w_virtcol != wp->w_ru_virtcol | |
| 10965 #ifdef FEAT_VIRTUALEDIT | |
| 10966 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 10967 #endif | |
| 10968 || wp->w_topline != wp->w_ru_topline | |
| 10969 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 10970 #ifdef FEAT_DIFF | |
| 10971 || wp->w_topfill != wp->w_ru_topfill | |
| 10972 #endif | |
| 10973 || empty_line != wp->w_ru_empty) | |
| 10974 { | |
| 10975 cursor_off(); | |
| 10976 if (wp->w_status_height) | |
| 10977 { | |
| 10978 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
|
10979 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
|
10980 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
|
10981 width = wp->w_width; |
| 7 | 10982 } |
| 10983 else | |
| 10984 { | |
| 10985 row = Rows - 1; | |
| 10986 fillchar = ' '; | |
| 10987 attr = 0; | |
| 10988 width = Columns; | |
| 10989 off = 0; | |
| 10990 } | |
| 10991 | |
| 10992 /* In list mode virtcol needs to be recomputed */ | |
| 10993 virtcol = wp->w_virtcol; | |
| 10994 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 10995 { | |
| 10996 wp->w_p_list = FALSE; | |
| 10997 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 10998 wp->w_p_list = TRUE; | |
| 10999 } | |
| 11000 | |
| 11001 /* | |
| 11002 * Some sprintfs return the length, some return a pointer. | |
| 11003 * To avoid portability problems we use strlen() here. | |
| 11004 */ | |
| 1869 | 11005 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11006 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11007 ? 0L | |
| 11008 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11009 len = STRLEN(buffer); |
| 11010 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11011 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11012 (int)virtcol + 1); | |
| 11013 | |
| 11014 /* | |
| 11015 * Add a "50%" if there is room for it. | |
| 11016 * On the last line, don't print in the last column (scrolls the | |
| 11017 * screen up on some terminals). | |
| 11018 */ | |
| 11019 i = (int)STRLEN(buffer); | |
| 1869 | 11020 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11021 o = i + vim_strsize(buffer + i + 1); |
| 11022 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11023 ++o; | |
| 11024 this_ru_col = ru_col - (Columns - width); | |
| 11025 if (this_ru_col < 0) | |
| 11026 this_ru_col = 0; | |
| 11027 /* Never use more than half the window/screen width, leave the other | |
| 11028 * 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
|
11029 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
|
11030 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
|
11031 if (this_ru_col + o < width) |
| 7 | 11032 { |
| 6466 | 11033 /* 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
|
11034 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11035 { |
| 11036 #ifdef FEAT_MBYTE | |
| 11037 if (has_mbyte) | |
| 11038 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11039 else | |
| 11040 #endif | |
| 11041 buffer[i++] = fillchar; | |
| 11042 ++o; | |
| 11043 } | |
| 1869 | 11044 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11045 } |
| 11046 /* Truncate at window boundary. */ | |
| 11047 #ifdef FEAT_MBYTE | |
| 11048 if (has_mbyte) | |
| 11049 { | |
| 11050 o = 0; | |
| 474 | 11051 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11052 { |
| 11053 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
|
11054 if (this_ru_col + o > width) |
| 7 | 11055 { |
| 11056 buffer[i] = NUL; | |
| 11057 break; | |
| 11058 } | |
| 11059 } | |
| 11060 } | |
| 11061 else | |
| 11062 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11063 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
|
11064 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
|
11065 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11066 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11067 i = redraw_cmdline; |
| 11068 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
|
11069 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
|
11070 (int)(off + width), |
| 7 | 11071 fillchar, fillchar, attr); |
| 11072 /* don't redraw the cmdline because of showing the ruler */ | |
| 11073 redraw_cmdline = i; | |
| 11074 wp->w_ru_cursor = wp->w_cursor; | |
| 11075 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11076 wp->w_ru_empty = empty_line; | |
| 11077 wp->w_ru_topline = wp->w_topline; | |
| 11078 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11079 #ifdef FEAT_DIFF | |
| 11080 wp->w_ru_topfill = wp->w_topfill; | |
| 11081 #endif | |
| 11082 } | |
| 11083 } | |
| 11084 #endif | |
| 13 | 11085 |
| 11086 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11087 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11088 * 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
|
11089 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11090 * Otherwise it depends on 'numberwidth' and the line count. |
| 11091 */ | |
| 11092 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11093 number_width(win_T *wp) |
| 13 | 11094 { |
| 11095 int n; | |
| 11096 linenr_T lnum; | |
| 11097 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11098 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
|
11099 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11100 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11101 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11102 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11103 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
|
11104 |
| 6679 | 11105 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11106 return wp->w_nrwidth_width; |
| 11107 wp->w_nrwidth_line_count = lnum; | |
| 11108 | |
| 11109 n = 0; | |
| 11110 do | |
| 11111 { | |
| 856 | 11112 lnum /= 10; |
| 11113 ++n; | |
| 13 | 11114 } while (lnum > 0); |
| 11115 | |
| 11116 /* 'numberwidth' gives the minimal width plus one */ | |
| 11117 if (n < wp->w_p_nuw - 1) | |
| 11118 n = wp->w_p_nuw - 1; | |
| 11119 | |
| 11120 wp->w_nrwidth_width = n; | |
| 6679 | 11121 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11122 return n; |
| 11123 } | |
| 11124 #endif | |
| 3986 | 11125 |
| 11126 /* | |
| 11127 * Return the current cursor column. This is the actual position on the | |
| 11128 * screen. First column is 0. | |
| 11129 */ | |
| 11130 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11131 screen_screencol(void) |
| 3986 | 11132 { |
| 11133 return screen_cur_col; | |
| 11134 } | |
| 11135 | |
| 11136 /* | |
| 11137 * Return the current cursor row. This is the actual position on the screen. | |
| 11138 * First row is 0. | |
| 11139 */ | |
| 11140 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11141 screen_screenrow(void) |
| 3986 | 11142 { |
| 11143 return screen_cur_row; | |
| 11144 } |