Mercurial > vim
annotate src/screen.c @ 16817:069ee8dc8c8d v8.1.1410
patch 8.1.1410: popup_move() is not implemented yet
commit https://github.com/vim/vim/commit/60cdb3004abe683e5e8851fa6c5d67b337df4443
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon May 27 21:54:10 2019 +0200
patch 8.1.1410: popup_move() is not implemented yet
Problem: Popup_move() is not implemented yet.
Solution: Implement it. (Yasuhiro Matsumoto, closes https://github.com/vim/vim/issues/4441) Improve the
positioning and resizing.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 27 May 2019 22:00:07 +0200 |
| parents | 4cfad94161f4 |
| children | ce04ebdf26b8 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9992
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * screen.c: code for displaying on the screen | |
| 12 * | |
| 13 * Output to the screen (console, terminal emulator or GUI window) is minimized | |
| 14 * by remembering what is already on the screen, and only updating the parts | |
| 15 * that changed. | |
| 16 * | |
| 17 * ScreenLines[off] Contains a copy of the whole screen, as it is currently | |
| 18 * displayed (excluding text written by external commands). | |
| 19 * ScreenAttrs[off] Contains the associated attributes. | |
| 20 * LineOffset[row] Contains the offset into ScreenLines*[] and ScreenAttrs[] | |
| 21 * for each line. | |
| 22 * LineWraps[row] Flag for each line whether it wraps to the next line. | |
| 23 * | |
| 24 * For double-byte characters, two consecutive bytes in ScreenLines[] can form | |
| 25 * one character which occupies two display cells. | |
| 26 * For UTF-8 a multi-byte character is converted to Unicode and stored in | |
| 27 * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
28 * character without composing chars ScreenLinesUC[] will be 0 and |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
29 * ScreenLinesC[][] is not used. When the character occupies two display |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
30 * cells the next byte in ScreenLines[] is 0. |
| 714 | 31 * ScreenLinesC[][] contain up to 'maxcombine' composing characters |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
32 * (drawn on top of the first character). There is 0 after the last one used. |
| 7 | 33 * ScreenLines2[] is only used for euc-jp to store the second byte if the |
| 34 * first byte is 0x8e (single-width character). | |
| 35 * | |
| 36 * The screen_*() functions write to the screen and handle updating | |
| 37 * ScreenLines[]. | |
| 38 * | |
| 39 * update_screen() is the function that updates all windows and status lines. | |
| 40 * It is called form the main loop when must_redraw is non-zero. It may be | |
| 1213 | 41 * called from other places when an immediate screen update is needed. |
| 7 | 42 * |
| 43 * The part of the buffer that is displayed in a window is set with: | |
| 44 * - w_topline (first buffer line in window) | |
| 5946 | 45 * - w_topfill (filler lines above the first line) |
| 7 | 46 * - w_leftcol (leftmost window cell in window), |
| 47 * - w_skipcol (skipped window cells of first line) | |
| 48 * | |
| 49 * Commands that only move the cursor around in a window, do not need to take | |
| 50 * action to update the display. The main loop will check if w_topline is | |
| 51 * valid and update it (scroll the window) when needed. | |
| 52 * | |
| 53 * Commands that scroll a window change w_topline and must call | |
| 54 * check_cursor() to move the cursor into the visible part of the window, and | |
| 55 * call redraw_later(VALID) to have the window displayed by update_screen() | |
| 56 * later. | |
| 57 * | |
| 58 * Commands that change text in the buffer must call changed_bytes() or | |
| 59 * changed_lines() to mark the area that changed and will require updating | |
| 60 * later. The main loop will call update_screen(), which will update each | |
| 61 * window that shows the changed buffer. This assumes text above the change | |
| 62 * can remain displayed as it is. Text after the change may need updating for | |
| 63 * scrolling, folding and syntax highlighting. | |
| 64 * | |
| 65 * Commands that change how a window is displayed (e.g., setting 'list') or | |
| 66 * invalidate the contents of a window in another way (e.g., change fold | |
| 67 * settings), must call redraw_later(NOT_VALID) to have the whole window | |
| 68 * redisplayed by update_screen() later. | |
| 69 * | |
| 70 * Commands that change how a buffer is displayed (e.g., setting 'tabstop') | |
| 71 * must call redraw_curbuf_later(NOT_VALID) to have all the windows for the | |
| 72 * buffer redisplayed by update_screen() later. | |
| 73 * | |
| 743 | 74 * Commands that change highlighting and possibly cause a scroll too must call |
| 75 * redraw_later(SOME_VALID) to update the whole window but still use scrolling | |
| 76 * to avoid redrawing everything. But the length of displayed lines must not | |
| 77 * change, use NOT_VALID then. | |
| 78 * | |
| 7 | 79 * Commands that move the window position must call redraw_later(NOT_VALID). |
| 80 * TODO: should minimize redrawing by scrolling when possible. | |
| 81 * | |
| 82 * Commands that change everything (e.g., resizing the screen) must call | |
| 83 * redraw_all_later(NOT_VALID) or redraw_all_later(CLEAR). | |
| 84 * | |
| 85 * Things that are handled indirectly: | |
| 86 * - When messages scroll the screen up, msg_scrolled will be set and | |
| 87 * update_screen() called to redraw. | |
| 88 */ | |
| 89 | |
| 90 #include "vim.h" | |
| 91 | |
| 3586 | 92 #define MB_FILLER_CHAR '<' /* character used when a double-width character |
| 93 * doesn't fit. */ | |
| 94 | |
| 7 | 95 /* |
| 96 * The attributes that are actually active for writing to the screen. | |
| 97 */ | |
| 98 static int screen_attr = 0; | |
| 99 | |
| 100 /* | |
| 101 * Positioning the cursor is reduced by remembering the last position. | |
| 102 * Mostly used by windgoto() and screen_char(). | |
| 103 */ | |
| 104 static int screen_cur_row, screen_cur_col; /* last known cursor position */ | |
| 105 | |
| 106 #ifdef FEAT_SEARCH_EXTRA | |
| 107 static match_T search_hl; /* used for 'hlsearch' highlight matching */ | |
| 108 #endif | |
| 109 | |
| 110 #ifdef FEAT_FOLDING | |
| 111 static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */ | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
112 static int compute_foldcolumn(win_T *wp, int col); |
| 7 | 113 #endif |
| 114 | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
115 /* 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
|
116 * loop. */ |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
117 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
|
118 |
| 7 | 119 /* |
| 120 * Buffer for one screen line (characters and attributes). | |
| 121 */ | |
| 122 static schar_T *current_ScreenLine; | |
| 123 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
124 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
125 static void update_popups(void); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
126 #endif |
|
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); |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
128 static void win_redr_status(win_T *wp, int ignore_pum); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
129 static void win_draw_end(win_T *wp, int c1, int c2, int draw_margin, int row, int endrow, hlf_T hl); |
| 7 | 130 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
131 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
|
132 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
|
133 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
|
134 #endif |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
135 static int win_line(win_T *, linenr_T, int, int, int nochange, int number_only); |
|
7805
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_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
|
150 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
|
151 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
|
152 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
|
153 static void lineinvalid(unsigned off, int width); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
154 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
|
155 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
|
156 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
157 static void recording_mode(int attr); |
|
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
|
158 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
|
159 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
|
160 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
161 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
|
162 #endif |
| 7 | 163 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
164 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 165 #endif |
| 166 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
167 static void win_redr_ruler(win_T *wp, int always, int ignore_pum); |
| 7 | 168 #endif |
| 169 | |
| 170 /* Ugly global: overrule attribute used by screen_char() */ | |
| 171 static int screen_char_attr = 0; | |
| 172 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
173 #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
|
174 /* 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
|
175 # 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
|
176 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
177 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
178 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
179 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
180 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
181 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
182 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
183 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
184 // flags for screen_line() |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
185 #define SLF_RIGHTLEFT 1 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
186 #define SLF_POPUP 2 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
187 |
| 7 | 188 /* |
| 189 * Redraw the current window later, with update_screen(type). | |
| 190 * Set must_redraw only if not already set to a higher value. | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
191 * E.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. |
| 7 | 192 */ |
| 193 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
194 redraw_later(int type) |
| 7 | 195 { |
| 196 redraw_win_later(curwin, type); | |
| 197 } | |
| 198 | |
| 199 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
200 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
201 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
202 int type) |
| 7 | 203 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
204 if (!exiting && wp->w_redr_type < type) |
| 7 | 205 { |
| 206 wp->w_redr_type = type; | |
| 207 if (type >= NOT_VALID) | |
| 208 wp->w_lines_valid = 0; | |
| 209 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 210 must_redraw = type; | |
| 211 } | |
| 212 } | |
| 213 | |
| 214 /* | |
| 215 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 216 * after executing a shell command that messes up the screen. | |
| 217 */ | |
| 218 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
219 redraw_later_clear(void) |
| 7 | 220 { |
| 221 redraw_all_later(CLEAR); | |
| 826 | 222 #ifdef FEAT_GUI |
| 223 if (gui.in_use) | |
| 224 /* Use a code that will reset gui.highlight_mask in | |
| 225 * gui_stop_highlight(). */ | |
| 226 screen_attr = HL_ALL + 1; | |
| 227 else | |
| 228 #endif | |
| 229 /* Use attributes that is very unlikely to appear in text. */ | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
230 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 231 } |
| 232 | |
| 233 /* | |
| 234 * Mark all windows to be redrawn later. | |
| 235 */ | |
| 236 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
237 redraw_all_later(int type) |
| 7 | 238 { |
| 239 win_T *wp; | |
| 240 | |
| 241 FOR_ALL_WINDOWS(wp) | |
| 242 redraw_win_later(wp, type); | |
|
15384
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
243 // This may be needed when switching tabs. |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
244 if (must_redraw < type) |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
245 must_redraw = type; |
| 7 | 246 } |
| 247 | |
| 248 /* | |
| 301 | 249 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 250 */ |
| 251 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
252 redraw_curbuf_later(int type) |
| 7 | 253 { |
| 254 redraw_buf_later(curbuf, type); | |
| 255 } | |
| 256 | |
| 257 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
258 redraw_buf_later(buf_T *buf, int type) |
| 7 | 259 { |
| 260 win_T *wp; | |
| 261 | |
| 262 FOR_ALL_WINDOWS(wp) | |
| 263 { | |
| 264 if (wp->w_buffer == buf) | |
| 265 redraw_win_later(wp, type); | |
| 266 } | |
| 267 } | |
| 268 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
269 #if defined(FEAT_SIGNS) || defined(PROTO) |
|
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 |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
271 redraw_buf_line_later(buf_T *buf, linenr_T lnum) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
272 { |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
273 win_T *wp; |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
274 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
275 FOR_ALL_WINDOWS(wp) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
276 if (wp->w_buffer == buf && lnum >= wp->w_topline |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
277 && lnum < wp->w_botline) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
278 redrawWinline(wp, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
279 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
280 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
281 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
282 #if defined(FEAT_JOB_CHANNEL) || defined(PROTO) |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
283 void |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
284 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
|
285 { |
|
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 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
|
287 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
288 #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
|
289 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
|
290 /* 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
|
291 * 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
|
292 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
293 #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
|
294 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
|
295 { |
|
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
|
296 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
|
297 { |
|
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
|
298 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
|
299 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
|
300 } |
|
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
|
301 } |
|
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
|
302 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
303 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
304 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
305 #if defined(FEAT_TERMRESPONSE) || defined(PROTO) |
| 7 | 306 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 * 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
|
308 * 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
|
309 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
311 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
312 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
313 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 int rows; |
| 6959 | 315 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
318 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
319 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
320 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
321 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 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
|
323 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 redraw_later(type); |
| 6959 | 326 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
|
327 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
328 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
329 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 330 rows = screen_Rows - cmdline_row; |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16778
diff
changeset
|
331 screenline = (schar_T *)lalloc(rows * cols * sizeof(schar_T), FALSE); |
|
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16778
diff
changeset
|
332 screenattr = (sattr_T *)lalloc(rows * cols * sizeof(sattr_T), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 screenlineUC = (u8char_T *)lalloc( |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16778
diff
changeset
|
338 rows * cols * sizeof(u8char_T), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
342 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 screenlineC[i] = (u8char_T *)lalloc( |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16778
diff
changeset
|
344 rows * cols * sizeof(u8char_T), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 ret = 2; |
|
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 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 { |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16778
diff
changeset
|
351 screenline2 = (schar_T *)lalloc(rows * cols * sizeof(schar_T), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 /* 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
|
359 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 { |
| 6959 | 361 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
362 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 363 (size_t)cols * sizeof(schar_T)); |
| 364 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 366 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
367 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 { |
| 6959 | 369 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 371 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 for (i = 0; i < p_mco; ++i) |
| 6959 | 373 mch_memmove(screenlineC[i] + r * cols, |
| 374 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 375 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 378 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 380 (size_t)cols * sizeof(schar_T)); |
|
5090
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 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
383 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
387 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
388 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 /* 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
|
391 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
392 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
393 mch_memmove(current_ScreenLine, |
| 6959 | 394 screenline + r * cols, |
| 395 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
396 mch_memmove(ScreenAttrs + off, |
| 6959 | 397 screenattr + r * cols, |
| 398 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
400 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
401 mch_memmove(ScreenLinesUC + off, |
| 6959 | 402 screenlineUC + r * cols, |
| 403 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
405 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 406 screenlineC[i] + r * cols, |
| 407 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
408 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
409 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
410 mch_memmove(ScreenLines2 + off, |
| 6959 | 411 screenline2 + r * cols, |
| 412 (size_t)cols * sizeof(schar_T)); | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
413 screen_line(cmdline_row + r, 0, cols, cols, 0); |
|
5090
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 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
428 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
429 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
430 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
431 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
432 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
433 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
434 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
435 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
436 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
437 #endif |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
438 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
439 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
440 * 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
|
441 * 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
|
442 * 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
|
443 * 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
|
444 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
445 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
446 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
447 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
|
448 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
449 ++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
|
450 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
451 if (State == HITRETURN || State == ASKMORE) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
452 ; // do nothing |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
453 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
|
454 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
455 // Don't redraw when in prompt_for_number(). |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
456 if (cmdline_row > 0) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
457 { |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
458 // Redrawing only works when the screen didn't scroll. Don't clear |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
459 // wildmenu entries. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
460 if (msg_scrolled == 0 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
461 #ifdef FEAT_WILDMENU |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
462 && wild_menu_showing == 0 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
463 #endif |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
464 && call_update_screen) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
465 update_screen(0); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
466 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
467 // Redraw in the same position, so that the user can continue |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
468 // editing the command. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
469 redrawcmdline_ex(FALSE); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
470 } |
|
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
|
471 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
472 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
|
473 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
474 // keep the command line if possible |
|
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
|
475 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
476 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
477 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
478 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
479 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
480 if (gui.in_use && !gui_mch_is_blink_off()) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
481 // Don't update the cursor when it is blinking and off to avoid |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
482 // flicker. |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
483 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
484 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
485 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
486 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
|
487 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
488 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
489 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
490 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
491 /* |
| 7 | 492 * Changed something in the current window, at buffer line "lnum", that |
| 493 * requires that line and possibly other lines to be redrawn. | |
| 494 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 495 * Used to remove the "$" from a change command. | |
| 496 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 497 * may become invalid and the whole window will have to be redrawn. | |
| 498 */ | |
| 499 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
500 redrawWinline( |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
501 win_T *wp, |
|
15400
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
502 linenr_T lnum) |
|
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
503 { |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
504 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
505 wp->w_redraw_top = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
506 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
507 wp->w_redraw_bot = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
508 redraw_win_later(wp, VALID); |
| 7 | 509 } |
| 510 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
511 void |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
512 reset_updating_screen(int may_resize_shell UNUSED) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
513 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
514 updating_screen = FALSE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
515 #ifdef FEAT_GUI |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
516 if (may_resize_shell) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
517 gui_may_resize_shell(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
518 #endif |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
519 #ifdef FEAT_TERMINAL |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
520 term_check_channel_closed_recently(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
521 #endif |
|
14428
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
522 |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
523 #ifdef HAVE_DROP_FILE |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
524 // If handle_drop() was called while updating_screen was TRUE need to |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
525 // handle the drop now. |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
526 handle_any_postponed_drop(); |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
527 #endif |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
528 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
529 |
| 7 | 530 /* |
|
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
|
531 * Update all windows that are editing the current buffer. |
| 7 | 532 */ |
| 533 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
534 update_curbuf(int type) |
| 7 | 535 { |
| 536 redraw_curbuf_later(type); | |
| 537 update_screen(type); | |
| 538 } | |
| 539 | |
| 540 /* | |
| 541 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 542 * 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
|
543 * 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
|
544 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
545 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
|
546 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
|
547 { |
|
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
|
548 int type = type_arg; |
| 7 | 549 win_T *wp; |
| 550 static int did_intro = FALSE; | |
| 551 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 552 int did_one; | |
| 553 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
554 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
555 int did_undraw = FALSE; |
|
16405
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
556 int gui_cursor_col = 0; |
|
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
557 int gui_cursor_row = 0; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
558 #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
|
559 int no_update = FALSE; |
| 7 | 560 |
| 2008 | 561 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 562 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
|
563 return FAIL; |
| 7 | 564 |
|
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
|
565 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
|
566 { |
|
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
|
567 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
|
568 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
|
569 } |
|
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
|
570 |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
571 #ifdef FEAT_EVAL |
|
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
572 { |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
573 buf_T *buf; |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
574 |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
575 // Before updating the screen, notify any listeners of changed text. |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
576 FOR_ALL_BUFFERS(buf) |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
577 invoke_listeners(buf); |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
578 } |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
579 #endif |
|
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
580 |
| 7 | 581 if (must_redraw) |
| 582 { | |
| 583 if (type < must_redraw) /* use maximal type */ | |
| 584 type = must_redraw; | |
| 1331 | 585 |
| 586 /* must_redraw is reset here, so that when we run into some weird | |
| 587 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 588 * scrolling), or update_topline() in win_update() will cause a | |
| 589 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 590 must_redraw = 0; |
| 591 } | |
| 592 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
593 /* 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
|
594 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
|
595 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
596 && !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
|
597 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
598 ) |
| 7 | 599 type = NOT_VALID; |
| 600 | |
| 2008 | 601 /* Postpone the redrawing when it's not needed and when being called |
| 602 * recursively. */ | |
| 603 if (!redrawing() || updating_screen) | |
| 7 | 604 { |
| 605 redraw_later(type); /* remember type for next time */ | |
| 606 must_redraw = type; | |
| 607 if (type > INVERTED_ALL) | |
| 608 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
|
609 return FAIL; |
| 7 | 610 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
611 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
612 // TODO: avoid redrawing everything when there is a popup window. |
|
16809
5ff14f96f1c9
patch 8.1.1406: popup_hide() and popup_show() not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16796
diff
changeset
|
613 if (popup_any_visible()) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
614 type = NOT_VALID; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
615 #endif |
| 7 | 616 |
| 617 updating_screen = TRUE; | |
| 618 #ifdef FEAT_SYN_HL | |
| 619 ++display_tick; /* let syntax code know we're in a next round of | |
| 620 * display updating */ | |
| 621 #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
|
622 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
|
623 ++no_win_do_lines_ins; |
| 7 | 624 |
| 625 /* | |
| 626 * if the screen was scrolled up when displaying a message, scroll it down | |
| 627 */ | |
| 628 if (msg_scrolled) | |
| 629 { | |
| 630 clear_cmdline = TRUE; | |
| 631 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 632 type = CLEAR; | |
| 633 else if (type != CLEAR) | |
| 634 { | |
| 635 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
|
636 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
|
637 == FAIL) |
| 7 | 638 type = CLEAR; |
| 639 FOR_ALL_WINDOWS(wp) | |
| 640 { | |
| 641 if (W_WINROW(wp) < msg_scrolled) | |
| 642 { | |
| 643 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 644 && wp->w_redr_type < REDRAW_TOP | |
| 645 && wp->w_lines_valid > 0 | |
| 646 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 647 { | |
| 648 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 649 wp->w_redr_type = REDRAW_TOP; | |
| 650 } | |
| 651 else | |
| 652 { | |
| 653 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
|
654 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
|
655 <= msg_scrolled) |
| 7 | 656 wp->w_redr_status = TRUE; |
| 657 } | |
| 658 } | |
| 659 } | |
|
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
|
660 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
|
661 redraw_cmdline = TRUE; |
| 673 | 662 redraw_tabline = TRUE; |
| 7 | 663 } |
| 664 msg_scrolled = 0; | |
| 665 need_wait_return = FALSE; | |
| 666 } | |
| 667 | |
| 668 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 669 compute_cmdrow(); | |
| 670 | |
| 671 /* Check for changed highlighting */ | |
| 672 if (need_highlight_changed) | |
| 673 highlight_changed(); | |
| 674 | |
| 675 if (type == CLEAR) /* first clear screen */ | |
| 676 { | |
| 677 screenclear(); /* will reset clear_cmdline */ | |
| 678 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
|
679 /* 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
|
680 must_redraw = 0; |
| 7 | 681 } |
| 682 | |
| 683 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 684 check_for_delay(FALSE); | |
| 685 | |
| 13 | 686 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
687 /* 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
|
688 * changes. */ |
| 13 | 689 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
690 && 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
|
691 ? number_width(curwin) : 0)) |
| 13 | 692 curwin->w_redr_type = NOT_VALID; |
| 693 #endif | |
| 694 | |
| 7 | 695 /* |
| 696 * Only start redrawing if there is really something to do. | |
| 697 */ | |
| 698 if (type == INVERTED) | |
| 699 update_curswant(); | |
| 700 if (curwin->w_redr_type < type | |
| 701 && !((type == VALID | |
| 702 && curwin->w_lines[0].wl_valid | |
| 703 #ifdef FEAT_DIFF | |
| 704 && curwin->w_topfill == curwin->w_old_topfill | |
| 705 && curwin->w_botfill == curwin->w_old_botfill | |
| 706 #endif | |
| 707 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 708 || (type == INVERTED | |
| 1043 | 709 && VIsual_active |
| 7 | 710 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 711 && curwin->w_old_visual_mode == VIsual_mode | |
| 712 && (curwin->w_valid & VALID_VIRTCOL) | |
| 713 && curwin->w_old_curswant == curwin->w_curswant) | |
| 714 )) | |
| 715 curwin->w_redr_type = type; | |
| 716 | |
| 849 | 717 /* Redraw the tab pages line if needed. */ |
| 718 if (redraw_tabline || type >= NOT_VALID) | |
| 719 draw_tabline(); | |
| 720 | |
| 7 | 721 #ifdef FEAT_SYN_HL |
| 722 /* | |
| 723 * Correct stored syntax highlighting info for changes in each displayed | |
| 724 * buffer. Each buffer must only be done once. | |
| 725 */ | |
| 726 FOR_ALL_WINDOWS(wp) | |
| 727 { | |
| 728 if (wp->w_buffer->b_mod_set) | |
| 729 { | |
| 730 win_T *wwp; | |
| 731 | |
| 732 /* Check if we already did this buffer. */ | |
| 733 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 734 if (wwp->w_buffer == wp->w_buffer) | |
| 735 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
736 if (wwp == wp && syntax_present(wp)) |
| 7 | 737 syn_stack_apply_changes(wp->w_buffer); |
| 738 } | |
| 739 } | |
| 740 #endif | |
| 741 | |
| 742 /* | |
| 743 * Go from top to bottom through the windows, redrawing the ones that need | |
| 744 * it. | |
| 745 */ | |
| 746 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 747 did_one = FALSE; | |
| 748 #endif | |
| 749 #ifdef FEAT_SEARCH_EXTRA | |
| 750 search_hl.rm.regprog = NULL; | |
| 751 #endif | |
| 752 FOR_ALL_WINDOWS(wp) | |
| 753 { | |
| 754 if (wp->w_redr_type != 0) | |
| 755 { | |
| 756 cursor_off(); | |
| 757 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 758 if (!did_one) | |
| 759 { | |
| 760 did_one = TRUE; | |
| 761 # ifdef FEAT_SEARCH_EXTRA | |
| 762 start_search_hl(); | |
| 763 # endif | |
| 764 # ifdef FEAT_CLIPBOARD | |
| 765 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 766 if (clip_star.available && clip_isautosel_star()) |
| 767 clip_update_selection(&clip_star); | |
| 768 if (clip_plus.available && clip_isautosel_plus()) | |
| 769 clip_update_selection(&clip_plus); | |
| 7 | 770 # endif |
| 771 #ifdef FEAT_GUI | |
| 772 /* Remove the cursor before starting to do anything, because | |
| 773 * scrolling may make it difficult to redraw the text under | |
| 774 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
775 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
|
776 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
777 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
778 gui_cursor_row = gui.cursor_row; |
| 7 | 779 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
780 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
781 } |
| 7 | 782 #endif |
| 783 } | |
| 784 #endif | |
| 785 win_update(wp); | |
| 786 } | |
| 787 | |
| 788 /* redraw status line after the window to minimize cursor movement */ | |
| 789 if (wp->w_redr_status) | |
| 790 { | |
| 791 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
792 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 793 } |
| 794 } | |
| 795 #if defined(FEAT_SEARCH_EXTRA) | |
| 796 end_search_hl(); | |
| 797 #endif | |
| 4107 | 798 #ifdef FEAT_INS_EXPAND |
| 799 /* May need to redraw the popup menu. */ | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
800 pum_may_redraw(); |
| 4107 | 801 #endif |
| 7 | 802 |
| 803 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 804 * 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
|
805 FOR_ALL_WINDOWS(wp) |
| 7 | 806 wp->w_buffer->b_mod_set = FALSE; |
| 807 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
808 reset_updating_screen(TRUE); |
| 7 | 809 |
| 810 /* Clear or redraw the command line. Done last, because scrolling may | |
| 811 * mess up the command line. */ | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
812 if (clear_cmdline || redraw_cmdline || redraw_mode) |
| 7 | 813 showmode(); |
| 814 | |
|
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
|
815 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
|
816 --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
|
817 |
| 7 | 818 /* 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
|
819 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
820 maybe_intro_message(); |
| 7 | 821 did_intro = TRUE; |
| 822 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
823 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
824 // Display popup windows on top of the others. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
825 update_popups(); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
826 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
827 |
| 7 | 828 #ifdef FEAT_GUI |
| 829 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 830 * done. */ | |
| 831 if (gui.in_use) | |
| 832 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
833 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
|
834 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
835 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
836 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
|
837 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
838 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
839 /* 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
|
840 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
841 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
842 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
843 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 844 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
845 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
846 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
847 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
848 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
849 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
850 out_flush(); |
| 7 | 851 gui_update_scrollbars(FALSE); |
| 852 } | |
| 853 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
854 return OK; |
| 7 | 855 } |
| 856 | |
|
15947
4aaf68cbed32
patch 8.1.0979: compiler warning for unused functions
Bram Moolenaar <Bram@vim.org>
parents:
15939
diff
changeset
|
857 #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_GUI) |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 * 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
|
860 * 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
|
861 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 /* 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
|
869 * 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
|
870 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 } |
|
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 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 * 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
|
880 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 { |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
884 if (redraw_cmdline || redraw_mode) |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
887 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
891 reset_updating_screen(TRUE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
892 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
893 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
894 /* 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
|
895 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
896 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
897 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
898 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
|
899 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
900 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
901 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
902 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
903 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
904 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
905 #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
|
906 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
907 * 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
|
908 * 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
|
909 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
910 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
911 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
|
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 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
|
914 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
915 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
|
916 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
|
917 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
|
918 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
|
919 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
|
920 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
|
921 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
|
922 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
923 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
924 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
|
925 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
926 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
|
927 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
|
928 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
929 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
930 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
931 * 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
|
932 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
933 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
934 conceal_check_cursor_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
|
935 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
936 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
|
937 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
938 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
|
939 /* 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
|
940 * 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
|
941 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
|
942 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
943 } |
| 7 | 944 #endif |
| 945 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
946 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 947 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
948 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 949 { |
| 950 win_T *wp; | |
| 951 int doit = FALSE; | |
| 952 | |
| 953 # ifdef FEAT_FOLDING | |
| 954 win_foldinfo.fi_level = 0; | |
| 955 # endif | |
| 956 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
957 // update/delete a specific sign |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
958 redraw_buf_line_later(buf, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
959 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
960 // check if it resulted in the need to redraw a window |
| 7 | 961 FOR_ALL_WINDOWS(wp) |
| 962 if (wp->w_redr_type != 0) | |
| 963 doit = TRUE; | |
| 964 | |
| 3250 | 965 /* 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
|
966 * 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
|
967 */ |
| 3250 | 968 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
|
969 || 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
|
970 || msg_scrolled |
| 3250 | 971 #ifdef FEAT_GUI |
| 972 || gui.starting | |
| 973 #endif | |
| 974 || starting) | |
| 7 | 975 return; |
| 976 | |
| 977 /* update all windows that need updating */ | |
| 978 update_prepare(); | |
| 979 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
980 FOR_ALL_WINDOWS(wp) |
| 7 | 981 { |
| 982 if (wp->w_redr_type != 0) | |
| 983 win_update(wp); | |
| 984 if (wp->w_redr_status) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
985 win_redr_status(wp, FALSE); |
| 7 | 986 } |
| 987 | |
| 988 update_finish(); | |
| 989 } | |
| 990 #endif | |
| 991 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
992 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
993 static void |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
994 update_popups(void) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
995 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
996 win_T *wp; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
997 win_T *lowest_wp; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
998 int lowest_zindex; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
999 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1000 // Reset all the VALID_POPUP flags. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1001 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
16813
4cfad94161f4
patch 8.1.1408: PFL_HIDDEN conflicts with system header file
Bram Moolenaar <Bram@vim.org>
parents:
16811
diff
changeset
|
1002 wp->w_popup_flags &= ~POPF_REDRAWN; |
|
16796
5f98d80d116a
patch 8.1.1400: using global pointer for tab-local popups is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
16788
diff
changeset
|
1003 for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next) |
|
16813
4cfad94161f4
patch 8.1.1408: PFL_HIDDEN conflicts with system header file
Bram Moolenaar <Bram@vim.org>
parents:
16811
diff
changeset
|
1004 wp->w_popup_flags &= ~POPF_REDRAWN; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1005 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1006 // TODO: don't redraw every popup every time. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1007 for (;;) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1008 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1009 // Find the window with the lowest zindex that hasn't been updated yet, |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1010 // so that the window with a higher zindex is drawn later, thus goes on |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1011 // top. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1012 lowest_zindex = INT_MAX; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1013 lowest_wp = NULL; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1014 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
16813
4cfad94161f4
patch 8.1.1408: PFL_HIDDEN conflicts with system header file
Bram Moolenaar <Bram@vim.org>
parents:
16811
diff
changeset
|
1015 if ((wp->w_popup_flags & (POPF_REDRAWN|POPF_HIDDEN)) == 0 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1016 && wp->w_zindex < lowest_zindex) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1017 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1018 lowest_zindex = wp->w_zindex; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1019 lowest_wp = wp; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1020 } |
|
16796
5f98d80d116a
patch 8.1.1400: using global pointer for tab-local popups is clumsy
Bram Moolenaar <Bram@vim.org>
parents:
16788
diff
changeset
|
1021 for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next) |
|
16813
4cfad94161f4
patch 8.1.1408: PFL_HIDDEN conflicts with system header file
Bram Moolenaar <Bram@vim.org>
parents:
16811
diff
changeset
|
1022 if ((wp->w_popup_flags & (POPF_REDRAWN|POPF_HIDDEN)) == 0 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1023 && wp->w_zindex < lowest_zindex) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1024 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1025 lowest_zindex = wp->w_zindex; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1026 lowest_wp = wp; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1027 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1028 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1029 if (lowest_wp == NULL) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1030 break; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1031 win_update(lowest_wp); |
|
16813
4cfad94161f4
patch 8.1.1408: PFL_HIDDEN conflicts with system header file
Bram Moolenaar <Bram@vim.org>
parents:
16811
diff
changeset
|
1032 lowest_wp->w_popup_flags |= POPF_REDRAWN; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1033 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1034 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1035 #endif |
| 7 | 1036 |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1037 /* |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1038 * Get 'wincolor' attribute for window "wp". If not set and "wp" is a popup |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1039 * window then get the "Pmenu" highlight attribute. |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1040 */ |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1041 static int |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1042 get_wcr_attr(win_T *wp) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1043 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1044 int wcr_attr = 0; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1045 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1046 if (*wp->w_p_wcr != NUL) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1047 wcr_attr = syn_name2attr(wp->w_p_wcr); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1048 #ifdef FEAT_TEXT_PROP |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1049 if (bt_popup(wp->w_buffer) && wcr_attr == 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1050 wcr_attr = HL_ATTR(HLF_PNI); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1051 #endif |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1052 return wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1053 } |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1054 |
| 7 | 1055 #if defined(FEAT_GUI) || defined(PROTO) |
| 1056 /* | |
| 1057 * Update a single window, its status line and maybe the command line msg. | |
| 1058 * Used for the GUI scrollbar. | |
| 1059 */ | |
| 1060 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1061 updateWindow(win_T *wp) |
| 7 | 1062 { |
| 2008 | 1063 /* return if already busy updating */ |
| 1064 if (updating_screen) | |
| 1065 return; | |
| 1066 | |
| 7 | 1067 update_prepare(); |
| 1068 | |
| 1069 #ifdef FEAT_CLIPBOARD | |
| 1070 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1071 if (clip_star.available && clip_isautosel_star()) |
| 1072 clip_update_selection(&clip_star); | |
| 1073 if (clip_plus.available && clip_isautosel_plus()) | |
| 1074 clip_update_selection(&clip_plus); | |
| 7 | 1075 #endif |
| 670 | 1076 |
| 7 | 1077 win_update(wp); |
| 670 | 1078 |
| 1079 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1080 if (redraw_tabline) |
| 677 | 1081 draw_tabline(); |
| 670 | 1082 |
| 7 | 1083 if (wp->w_redr_status |
| 1084 # ifdef FEAT_CMDL_INFO | |
| 1085 || p_ru | |
| 1086 # endif | |
| 1087 # ifdef FEAT_STL_OPT | |
| 40 | 1088 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1089 # endif |
| 1090 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1091 win_redr_status(wp, FALSE); |
| 7 | 1092 |
| 1093 update_finish(); | |
| 1094 } | |
| 1095 #endif | |
| 1096 | |
| 1097 /* | |
| 1098 * Update a single window. | |
| 1099 * | |
| 1100 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1101 * screen or scrolling lines). | |
| 1102 * | |
| 1103 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1104 * implies the one below it. | |
| 1105 * NOT_VALID redraw the whole window | |
| 743 | 1106 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1107 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1108 * INVERTED redraw the changed part of the Visual area | |
| 1109 * INVERTED_ALL redraw the whole Visual area | |
| 1110 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1111 * 2. update lines at the top when scrolled down | |
| 1112 * 3. redraw changed text: | |
| 301 | 1113 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1114 * b_mod_top and b_mod_bot. |
| 1115 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1116 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1117 * - continue redrawing when syntax status is invalid. | |
| 1118 * 4. if scrolled up, update lines at the bottom. | |
| 1119 * This results in three areas that may need updating: | |
| 1120 * top: from first row to top_end (when scrolled down) | |
| 1121 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1122 * bot: from bot_start to last row (when scrolled up) | |
| 1123 */ | |
| 1124 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1125 win_update(win_T *wp) |
| 7 | 1126 { |
| 1127 buf_T *buf = wp->w_buffer; | |
| 1128 int type; | |
| 1129 int top_end = 0; /* Below last row of the top area that needs | |
| 1130 updating. 0 when no top area updating. */ | |
| 1131 int mid_start = 999;/* first row of the mid area that needs | |
| 1132 updating. 999 when no mid area updating. */ | |
| 1133 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1134 updating. 0 when no mid area updating. */ | |
| 1135 int bot_start = 999;/* first row of the bot area that needs | |
| 1136 updating. 999 when no bot area updating */ | |
| 1137 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1138 w_topline got smaller a bit */ | |
| 1139 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1140 matchitem_T *cur; /* points to the match list */ |
| 7 | 1141 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1142 #endif | |
| 1143 | |
| 1144 int row; /* current window row to display */ | |
| 1145 linenr_T lnum; /* current buffer lnum to display */ | |
| 1146 int idx; /* current index in w_lines[] */ | |
| 1147 int srow; /* starting row of the current line */ | |
| 1148 | |
| 1149 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1150 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1151 int i; | |
| 1152 long j; | |
| 1153 static int recursive = FALSE; /* being called recursively */ | |
| 1154 int old_botline = wp->w_botline; | |
| 1155 #ifdef FEAT_FOLDING | |
| 1156 long fold_count; | |
| 1157 #endif | |
| 1158 #ifdef FEAT_SYN_HL | |
| 1159 /* remember what happened to the previous line, to know if | |
| 1160 * check_visual_highlight() can be used */ | |
| 1161 #define DID_NONE 1 /* didn't update a line */ | |
| 1162 #define DID_LINE 2 /* updated a normal line */ | |
| 1163 #define DID_FOLD 3 /* updated a folded line */ | |
| 1164 int did_update = DID_NONE; | |
| 1165 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1166 #endif | |
| 1167 linenr_T mod_top = 0; | |
| 1168 linenr_T mod_bot = 0; | |
| 1169 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1170 int save_got_int; | |
| 1171 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1172 #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
|
1173 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
|
1174 #endif |
| 7 | 1175 |
| 1176 type = wp->w_redr_type; | |
| 1177 | |
| 1178 if (type == NOT_VALID) | |
| 1179 { | |
| 1180 wp->w_redr_status = TRUE; | |
| 1181 wp->w_lines_valid = 0; | |
| 1182 } | |
| 1183 | |
| 1184 /* 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
|
1185 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1186 { |
| 1187 wp->w_redr_type = 0; | |
| 1188 return; | |
| 1189 } | |
| 1190 | |
| 1191 /* Window is zero-width: Only need to draw the separator. */ | |
| 1192 if (wp->w_width == 0) | |
| 1193 { | |
| 1194 /* draw the vertical separator right of this window */ | |
| 1195 draw_vsep_win(wp, 0); | |
| 1196 wp->w_redr_type = 0; | |
| 1197 return; | |
| 1198 } | |
| 1199 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1200 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1201 // 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
|
1202 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
|
1203 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1204 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
|
1205 # 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
|
1206 /* 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
|
1207 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
|
1208 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
|
1209 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1210 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
|
1211 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1212 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1213 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1214 |
| 7 | 1215 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1216 init_search_hl(wp); |
| 7 | 1217 #endif |
| 1218 | |
| 13 | 1219 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1220 /* 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
|
1221 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1222 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1223 if (wp->w_nrwidth != i) |
| 13 | 1224 { |
| 1225 type = NOT_VALID; | |
| 677 | 1226 wp->w_nrwidth = i; |
| 13 | 1227 } |
| 1228 else | |
| 1229 #endif | |
| 1230 | |
| 7 | 1231 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1232 { | |
| 1233 /* | |
| 1234 * When there are both inserted/deleted lines and specific lines to be | |
| 1235 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1236 * everything (only happens when redrawing is off for while). | |
| 1237 */ | |
| 1238 type = NOT_VALID; | |
| 1239 } | |
| 1240 else | |
| 1241 { | |
| 1242 /* | |
| 1243 * Set mod_top to the first line that needs displaying because of | |
| 1244 * changes. Set mod_bot to the first line after the changes. | |
| 1245 */ | |
| 1246 mod_top = wp->w_redraw_top; | |
| 1247 if (wp->w_redraw_bot != 0) | |
| 1248 mod_bot = wp->w_redraw_bot + 1; | |
| 1249 else | |
| 1250 mod_bot = 0; | |
| 1251 if (buf->b_mod_set) | |
| 1252 { | |
| 1253 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1254 { | |
| 1255 mod_top = buf->b_mod_top; | |
| 1256 #ifdef FEAT_SYN_HL | |
| 1257 /* Need to redraw lines above the change that may be included | |
| 1258 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1259 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1260 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1261 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1262 if (mod_top < 1) |
| 1263 mod_top = 1; | |
| 1264 } | |
| 1265 #endif | |
| 1266 } | |
| 1267 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1268 mod_bot = buf->b_mod_bot; | |
| 1269 | |
| 1270 #ifdef FEAT_SEARCH_EXTRA | |
| 1271 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1272 * change in one line may make the Search highlighting in a | |
| 1273 * previous line invalid. Simple solution: redraw all visible | |
| 1274 * lines above the change. | |
| 1326 | 1275 * Same for a match pattern. |
| 7 | 1276 */ |
| 699 | 1277 if (search_hl.rm.regprog != NULL |
| 1278 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1279 top_to_mod = TRUE; |
| 699 | 1280 else |
| 1326 | 1281 { |
| 1282 cur = wp->w_match_head; | |
| 1283 while (cur != NULL) | |
| 1284 { | |
| 1285 if (cur->match.regprog != NULL | |
| 1286 && re_multiline(cur->match.regprog)) | |
| 699 | 1287 { |
| 1288 top_to_mod = TRUE; | |
| 1289 break; | |
| 1290 } | |
| 1326 | 1291 cur = cur->next; |
| 1292 } | |
| 1293 } | |
| 7 | 1294 #endif |
| 1295 } | |
| 1296 #ifdef FEAT_FOLDING | |
| 1297 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1298 { | |
| 1299 linenr_T lnumt, lnumb; | |
| 1300 | |
| 1301 /* | |
| 1302 * A change in a line can cause lines above it to become folded or | |
| 1303 * unfolded. Find the top most buffer line that may be affected. | |
| 1304 * If the line was previously folded and displayed, get the first | |
| 1305 * line of that fold. If the line is folded now, get the first | |
| 1306 * folded line. Use the minimum of these two. | |
| 1307 */ | |
| 1308 | |
| 1309 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1310 * the line below it. If there is no valid entry, use w_topline. | |
| 1311 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1312 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1313 lnumt = wp->w_topline; | |
| 1314 lnumb = MAXLNUM; | |
| 1315 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1316 if (wp->w_lines[i].wl_valid) | |
| 1317 { | |
| 1318 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1319 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1320 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1321 { | |
| 1322 lnumb = wp->w_lines[i].wl_lnum; | |
| 1323 /* When there is a fold column it might need updating | |
| 1324 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1325 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1326 ++lnumb; |
| 1327 } | |
| 1328 } | |
| 1329 | |
| 1330 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1331 if (mod_top > lnumt) | |
| 1332 mod_top = lnumt; | |
| 1333 | |
| 1334 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1335 --mod_bot; | |
| 1336 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1337 ++mod_bot; | |
| 1338 if (mod_bot < lnumb) | |
| 1339 mod_bot = lnumb; | |
| 1340 } | |
| 1341 #endif | |
| 1342 | |
| 1343 /* When a change starts above w_topline and the end is below | |
| 1344 * w_topline, start redrawing at w_topline. | |
| 36 | 1345 * If the end of the change is above w_topline: do like no change was |
| 1346 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1347 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1348 { | |
| 1349 if (mod_bot > wp->w_topline) | |
| 1350 mod_top = wp->w_topline; | |
| 1351 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1352 else if (syntax_present(wp)) |
| 7 | 1353 top_end = 1; |
| 1354 #endif | |
| 1355 } | |
| 36 | 1356 |
| 1357 /* When line numbers are displayed need to redraw all lines below | |
| 1358 * inserted/deleted lines. */ | |
| 1359 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1360 mod_bot = MAXLNUM; | |
| 7 | 1361 } |
|
15715
52930462eec4
patch 8.1.0865: when 'listchars' only contains "nbsp:X" it does not work
Bram Moolenaar <Bram@vim.org>
parents:
15683
diff
changeset
|
1362 wp->w_redraw_top = 0; // reset for next time |
|
52930462eec4
patch 8.1.0865: when 'listchars' only contains "nbsp:X" it does not work
Bram Moolenaar <Bram@vim.org>
parents:
15683
diff
changeset
|
1363 wp->w_redraw_bot = 0; |
| 7 | 1364 |
| 1365 /* | |
| 1366 * When only displaying the lines at the top, set top_end. Used when | |
| 1367 * window has scrolled down for msg_scrolled. | |
| 1368 */ | |
| 1369 if (type == REDRAW_TOP) | |
| 1370 { | |
| 1371 j = 0; | |
| 1372 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1373 { | |
| 1374 j += wp->w_lines[i].wl_size; | |
| 1375 if (j >= wp->w_upd_rows) | |
| 1376 { | |
| 1377 top_end = j; | |
| 1378 break; | |
| 1379 } | |
| 1380 } | |
| 1381 if (top_end == 0) | |
| 1382 /* not found (cannot happen?): redraw everything */ | |
| 1383 type = NOT_VALID; | |
| 1384 else | |
| 1385 /* top area defined, the rest is VALID */ | |
| 1386 type = VALID; | |
| 1387 } | |
| 1388 | |
| 1378 | 1389 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1390 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1391 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1392 * called. */ | |
| 1393 if (screen_cleared) | |
| 1394 screen_cleared = MAYBE; | |
| 1395 | |
| 7 | 1396 /* |
| 1397 * If there are no changes on the screen that require a complete redraw, | |
| 1398 * handle three cases: | |
| 1399 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1400 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1401 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1402 * w_lines[] that needs updating. | |
| 1403 */ | |
| 743 | 1404 if ((type == VALID || type == SOME_VALID |
| 1405 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1406 #ifdef FEAT_DIFF |
| 1407 && !wp->w_botfill && !wp->w_old_botfill | |
| 1408 #endif | |
| 1409 ) | |
| 1410 { | |
| 1411 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1412 { | |
| 1413 /* | |
| 1414 * w_topline is the first changed line, the scrolling will be done | |
| 1415 * further down. | |
| 1416 */ | |
| 1417 } | |
| 1418 else if (wp->w_lines[0].wl_valid | |
| 1419 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1420 #ifdef FEAT_DIFF | |
| 1421 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1422 && wp->w_topfill > wp->w_old_topfill) | |
| 1423 #endif | |
| 1424 )) | |
| 1425 { | |
| 1426 /* | |
| 1427 * New topline is above old topline: May scroll down. | |
| 1428 */ | |
| 1429 #ifdef FEAT_FOLDING | |
| 1430 if (hasAnyFolding(wp)) | |
| 1431 { | |
| 1432 linenr_T ln; | |
| 1433 | |
| 1434 /* count the number of lines we are off, counting a sequence | |
| 1435 * of folded lines as one */ | |
| 1436 j = 0; | |
| 1437 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1438 { | |
| 1439 ++j; | |
| 1440 if (j >= wp->w_height - 2) | |
| 1441 break; | |
| 1442 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1443 } | |
| 1444 } | |
| 1445 else | |
| 1446 #endif | |
| 1447 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1448 if (j < wp->w_height - 2) /* not too far off */ | |
| 1449 { | |
| 1450 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1451 #ifdef FEAT_DIFF | |
| 1452 /* insert extra lines for previously invisible filler lines */ | |
| 1453 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1454 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1455 - wp->w_old_topfill; | |
| 1456 #endif | |
| 1457 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1458 { | |
| 1459 /* | |
| 1460 * Try to insert the correct number of lines. | |
| 1461 * If not the last window, delete the lines at the bottom. | |
| 1462 * win_ins_lines may fail when the terminal can't do it. | |
| 1463 */ | |
| 1464 if (i > 0) | |
| 1465 check_for_delay(FALSE); | |
| 1466 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1467 { | |
| 1468 if (wp->w_lines_valid != 0) | |
| 1469 { | |
| 1470 /* Need to update rows that are new, stop at the | |
| 1471 * first one that scrolled down. */ | |
| 1472 top_end = i; | |
| 1473 scrolled_down = TRUE; | |
| 1474 | |
| 1475 /* Move the entries that were scrolled, disable | |
| 1476 * the entries for the lines to be redrawn. */ | |
| 1477 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1478 wp->w_lines_valid = wp->w_height; | |
| 1479 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1480 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1481 while (idx >= 0) | |
| 1482 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1483 } | |
| 1484 } | |
| 1485 else | |
| 1486 mid_start = 0; /* redraw all lines */ | |
| 1487 } | |
| 1488 else | |
| 1489 mid_start = 0; /* redraw all lines */ | |
| 1490 } | |
| 1491 else | |
| 1492 mid_start = 0; /* redraw all lines */ | |
| 1493 } | |
| 1494 else | |
| 1495 { | |
| 1496 /* | |
| 1497 * New topline is at or below old topline: May scroll up. | |
| 1498 * When topline didn't change, find first entry in w_lines[] that | |
| 1499 * needs updating. | |
| 1500 */ | |
| 1501 | |
| 1502 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1503 j = -1; | |
| 1504 row = 0; | |
| 1505 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1506 { | |
| 1507 if (wp->w_lines[i].wl_valid | |
| 1508 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1509 { | |
| 1510 j = i; | |
| 1511 break; | |
| 1512 } | |
| 1513 row += wp->w_lines[i].wl_size; | |
| 1514 } | |
| 1515 if (j == -1) | |
| 1516 { | |
| 1517 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1518 * lines */ | |
| 1519 mid_start = 0; | |
| 1520 } | |
| 1521 else | |
| 1522 { | |
| 1523 /* | |
| 1524 * Try to delete the correct number of lines. | |
| 1525 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1526 */ | |
| 1527 #ifdef FEAT_DIFF | |
| 1528 /* If the topline didn't change, delete old filler lines, | |
| 1529 * otherwise delete filler lines of the new topline... */ | |
| 1530 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1531 row += wp->w_old_topfill; | |
| 1532 else | |
| 1533 row += diff_check_fill(wp, wp->w_topline); | |
| 1534 /* ... but don't delete new filler lines. */ | |
| 1535 row -= wp->w_topfill; | |
| 1536 #endif | |
| 1537 if (row > 0) | |
| 1538 { | |
| 1539 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
|
1540 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
|
1541 == OK) |
| 7 | 1542 bot_start = wp->w_height - row; |
| 1543 else | |
| 1544 mid_start = 0; /* redraw all lines */ | |
| 1545 } | |
| 1546 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1547 { | |
| 1548 /* | |
| 1549 * Skip the lines (below the deleted lines) that are still | |
| 1550 * valid and don't need redrawing. Copy their info | |
| 1551 * upwards, to compensate for the deleted lines. Set | |
| 1552 * bot_start to the first row that needs redrawing. | |
| 1553 */ | |
| 1554 bot_start = 0; | |
| 1555 idx = 0; | |
| 1556 for (;;) | |
| 1557 { | |
| 1558 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1559 /* stop at line that didn't fit, unless it is still | |
| 1560 * valid (no lines deleted) */ | |
| 1561 if (row > 0 && bot_start + row | |
| 1562 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1563 { | |
| 1564 wp->w_lines_valid = idx + 1; | |
| 1565 break; | |
| 1566 } | |
| 1567 bot_start += wp->w_lines[idx++].wl_size; | |
| 1568 | |
| 1569 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1570 if (++j >= wp->w_lines_valid) | |
| 1571 { | |
| 1572 wp->w_lines_valid = idx; | |
| 1573 break; | |
| 1574 } | |
| 1575 } | |
| 1576 #ifdef FEAT_DIFF | |
| 1577 /* Correct the first entry for filler lines at the top | |
| 1578 * when it won't get updated below. */ | |
| 1579 if (wp->w_p_diff && bot_start > 0) | |
| 1580 wp->w_lines[0].wl_size = | |
| 1581 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1582 + wp->w_topfill; | |
| 1583 #endif | |
| 1584 } | |
| 1585 } | |
| 1586 } | |
| 1587 | |
| 1588 /* When starting redraw in the first line, redraw all lines. When | |
| 1589 * there is only one window it's probably faster to clear the screen | |
| 1590 * first. */ | |
| 1591 if (mid_start == 0) | |
| 1592 { | |
| 1593 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1594 if (ONE_WINDOW) |
| 981 | 1595 { |
| 1331 | 1596 /* Clear the screen when it was not done by win_del_lines() or |
| 1597 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1598 * then. */ | |
| 1599 if (screen_cleared != TRUE) | |
| 1600 screenclear(); | |
| 981 | 1601 /* The screen was cleared, redraw the tab pages line. */ |
| 1602 if (redraw_tabline) | |
| 1603 draw_tabline(); | |
| 1604 } | |
| 7 | 1605 } |
| 1331 | 1606 |
| 1607 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1608 * cleared (only happens for the first window) or when screenclear() | |
| 1609 * was called directly above, "must_redraw" will have been set to | |
| 1610 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1611 if (screen_cleared == TRUE) | |
| 1612 must_redraw = 0; | |
| 7 | 1613 } |
| 1614 else | |
| 1615 { | |
| 1616 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1617 mid_start = 0; | |
| 1618 mid_end = wp->w_height; | |
| 1619 } | |
| 1620 | |
| 743 | 1621 if (type == SOME_VALID) |
| 1622 { | |
| 1623 /* SOME_VALID: redraw all lines. */ | |
| 1624 mid_start = 0; | |
| 1625 mid_end = wp->w_height; | |
| 1626 type = NOT_VALID; | |
| 1627 } | |
| 1628 | |
| 7 | 1629 /* check if we are updating or removing the inverted part */ |
| 1630 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1631 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1632 { | |
| 1633 linenr_T from, to; | |
| 1634 | |
| 1635 if (VIsual_active) | |
| 1636 { | |
| 1637 if (VIsual_active | |
| 1638 && (VIsual_mode != wp->w_old_visual_mode | |
| 1639 || type == INVERTED_ALL)) | |
| 1640 { | |
| 1641 /* | |
| 1642 * If the type of Visual selection changed, redraw the whole | |
| 1643 * selection. Also when the ownership of the X selection is | |
| 1644 * gained or lost. | |
| 1645 */ | |
| 1646 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1647 { | |
| 1648 from = curwin->w_cursor.lnum; | |
| 1649 to = VIsual.lnum; | |
| 1650 } | |
| 1651 else | |
| 1652 { | |
| 1653 from = VIsual.lnum; | |
| 1654 to = curwin->w_cursor.lnum; | |
| 1655 } | |
| 1656 /* redraw more when the cursor moved as well */ | |
| 1657 if (wp->w_old_cursor_lnum < from) | |
| 1658 from = wp->w_old_cursor_lnum; | |
| 1659 if (wp->w_old_cursor_lnum > to) | |
| 1660 to = wp->w_old_cursor_lnum; | |
| 1661 if (wp->w_old_visual_lnum < from) | |
| 1662 from = wp->w_old_visual_lnum; | |
| 1663 if (wp->w_old_visual_lnum > to) | |
| 1664 to = wp->w_old_visual_lnum; | |
| 1665 } | |
| 1666 else | |
| 1667 { | |
| 1668 /* | |
| 1669 * Find the line numbers that need to be updated: The lines | |
| 1670 * between the old cursor position and the current cursor | |
| 1671 * position. Also check if the Visual position changed. | |
| 1672 */ | |
| 1673 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1674 { | |
| 1675 from = curwin->w_cursor.lnum; | |
| 1676 to = wp->w_old_cursor_lnum; | |
| 1677 } | |
| 1678 else | |
| 1679 { | |
| 1680 from = wp->w_old_cursor_lnum; | |
| 1681 to = curwin->w_cursor.lnum; | |
| 1682 if (from == 0) /* Visual mode just started */ | |
| 1683 from = to; | |
| 1684 } | |
| 1685 | |
| 422 | 1686 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1687 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1688 { |
| 1689 if (wp->w_old_visual_lnum < from | |
| 1690 && wp->w_old_visual_lnum != 0) | |
| 1691 from = wp->w_old_visual_lnum; | |
| 1692 if (wp->w_old_visual_lnum > to) | |
| 1693 to = wp->w_old_visual_lnum; | |
| 1694 if (VIsual.lnum < from) | |
| 1695 from = VIsual.lnum; | |
| 1696 if (VIsual.lnum > to) | |
| 1697 to = VIsual.lnum; | |
| 1698 } | |
| 1699 } | |
| 1700 | |
| 1701 /* | |
| 1702 * If in block mode and changed column or curwin->w_curswant: | |
| 1703 * update all lines. | |
| 1704 * First compute the actual start and end column. | |
| 1705 */ | |
| 1706 if (VIsual_mode == Ctrl_V) | |
| 1707 { | |
| 6266 | 1708 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1709 #if defined(FEAT_LINEBREAK) |
| 6266 | 1710 int save_ve_flags = ve_flags; |
| 1711 | |
| 1712 if (curwin->w_p_lbr) | |
| 1713 ve_flags = VE_ALL; | |
| 1714 #endif | |
| 7 | 1715 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1716 #if defined(FEAT_LINEBREAK) |
| 6266 | 1717 ve_flags = save_ve_flags; |
| 1718 #endif | |
| 7 | 1719 ++toc; |
| 1720 if (curwin->w_curswant == MAXCOL) | |
| 1721 toc = MAXCOL; | |
| 1722 | |
| 1723 if (fromc != wp->w_old_cursor_fcol | |
| 1724 || toc != wp->w_old_cursor_lcol) | |
| 1725 { | |
| 1726 if (from > VIsual.lnum) | |
| 1727 from = VIsual.lnum; | |
| 1728 if (to < VIsual.lnum) | |
| 1729 to = VIsual.lnum; | |
| 1730 } | |
| 1731 wp->w_old_cursor_fcol = fromc; | |
| 1732 wp->w_old_cursor_lcol = toc; | |
| 1733 } | |
| 1734 } | |
| 1735 else | |
| 1736 { | |
| 1737 /* Use the line numbers of the old Visual area. */ | |
| 1738 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1739 { | |
| 1740 from = wp->w_old_cursor_lnum; | |
| 1741 to = wp->w_old_visual_lnum; | |
| 1742 } | |
| 1743 else | |
| 1744 { | |
| 1745 from = wp->w_old_visual_lnum; | |
| 1746 to = wp->w_old_cursor_lnum; | |
| 1747 } | |
| 1748 } | |
| 1749 | |
| 1750 /* | |
| 1751 * There is no need to update lines above the top of the window. | |
| 1752 */ | |
| 1753 if (from < wp->w_topline) | |
| 1754 from = wp->w_topline; | |
| 1755 | |
| 1756 /* | |
| 1757 * If we know the value of w_botline, use it to restrict the update to | |
| 1758 * the lines that are visible in the window. | |
| 1759 */ | |
| 1760 if (wp->w_valid & VALID_BOTLINE) | |
| 1761 { | |
| 1762 if (from >= wp->w_botline) | |
| 1763 from = wp->w_botline - 1; | |
| 1764 if (to >= wp->w_botline) | |
| 1765 to = wp->w_botline - 1; | |
| 1766 } | |
| 1767 | |
| 1768 /* | |
| 1769 * Find the minimal part to be updated. | |
| 1770 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1771 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1772 * top_end; need to redraw from top_end to the "to" line. | |
| 1773 * A middle mouse click with a Visual selection may change the text | |
| 1774 * above the Visual area and reset wl_valid, do count these for | |
| 1775 * mid_end (in srow). | |
| 1776 */ | |
| 1777 if (mid_start > 0) | |
| 1778 { | |
| 1779 lnum = wp->w_topline; | |
| 1780 idx = 0; | |
| 1781 srow = 0; | |
| 1782 if (scrolled_down) | |
| 1783 mid_start = top_end; | |
| 1784 else | |
| 1785 mid_start = 0; | |
| 1786 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1787 { | |
| 1788 if (wp->w_lines[idx].wl_valid) | |
| 1789 mid_start += wp->w_lines[idx].wl_size; | |
| 1790 else if (!scrolled_down) | |
| 1791 srow += wp->w_lines[idx].wl_size; | |
| 1792 ++idx; | |
| 1793 # ifdef FEAT_FOLDING | |
| 1794 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1795 lnum = wp->w_lines[idx].wl_lnum; | |
| 1796 else | |
| 1797 # endif | |
| 1798 ++lnum; | |
| 1799 } | |
| 1800 srow += mid_start; | |
| 1801 mid_end = wp->w_height; | |
| 1802 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1803 { | |
| 1804 if (wp->w_lines[idx].wl_valid | |
| 1805 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1806 { | |
| 1807 /* Only update until first row of this line */ | |
| 1808 mid_end = srow; | |
| 1809 break; | |
| 1810 } | |
| 1811 srow += wp->w_lines[idx].wl_size; | |
| 1812 } | |
| 1813 } | |
| 1814 } | |
| 1815 | |
| 1816 if (VIsual_active && buf == curwin->w_buffer) | |
| 1817 { | |
| 1818 wp->w_old_visual_mode = VIsual_mode; | |
| 1819 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1820 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1821 wp->w_old_visual_col = VIsual.col; |
| 7 | 1822 wp->w_old_curswant = curwin->w_curswant; |
| 1823 } | |
| 1824 else | |
| 1825 { | |
| 1826 wp->w_old_visual_mode = 0; | |
| 1827 wp->w_old_cursor_lnum = 0; | |
| 1828 wp->w_old_visual_lnum = 0; | |
| 422 | 1829 wp->w_old_visual_col = 0; |
| 7 | 1830 } |
| 1831 | |
| 1832 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1833 /* reset got_int, otherwise regexp won't work */ | |
| 1834 save_got_int = got_int; | |
| 1835 got_int = 0; | |
| 1836 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1837 #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
|
1838 /* 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
|
1839 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
|
1840 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
|
1841 #endif |
| 7 | 1842 #ifdef FEAT_FOLDING |
| 1843 win_foldinfo.fi_level = 0; | |
| 1844 #endif | |
| 1845 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1846 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1847 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1848 * 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
|
1849 * 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
|
1850 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1851 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
|
1852 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
|
1853 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1854 |
| 7 | 1855 /* |
| 1856 * Update all the window rows. | |
| 1857 */ | |
| 1858 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1859 row = 0; | |
| 1860 srow = 0; | |
| 1861 lnum = wp->w_topline; /* first line shown in window */ | |
| 1862 for (;;) | |
| 1863 { | |
| 1864 /* stop updating when reached the end of the window (check for _past_ | |
| 1865 * the end of the window is at the end of the loop) */ | |
| 1866 if (row == wp->w_height) | |
| 1867 { | |
| 1868 didline = TRUE; | |
| 1869 break; | |
| 1870 } | |
| 1871 | |
| 1872 /* stop updating when hit the end of the file */ | |
| 1873 if (lnum > buf->b_ml.ml_line_count) | |
| 1874 { | |
| 1875 eof = TRUE; | |
| 1876 break; | |
| 1877 } | |
| 1878 | |
| 1879 /* Remember the starting row of the line that is going to be dealt | |
| 1880 * with. It is used further down when the line doesn't fit. */ | |
| 1881 srow = row; | |
| 1882 | |
| 1883 /* | |
| 1884 * Update a line when it is in an area that needs updating, when it | |
| 1885 * has changes or w_lines[idx] is invalid. | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
1886 * "bot_start" may be halfway a wrapped line after using |
| 7 | 1887 * win_del_lines(), check if the current line includes it. |
| 1888 * When syntax folding is being used, the saved syntax states will | |
| 1889 * already have been updated, we can't see where the syntax state is | |
| 1890 * the same again, just update until the end of the window. | |
| 1891 */ | |
| 1892 if (row < top_end | |
| 1893 || (row >= mid_start && row < mid_end) | |
| 1894 #ifdef FEAT_SEARCH_EXTRA | |
| 1895 || top_to_mod | |
| 1896 #endif | |
| 1897 || idx >= wp->w_lines_valid | |
| 1898 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1899 || (mod_top != 0 | |
| 1900 && (lnum == mod_top | |
| 1901 || (lnum >= mod_top | |
| 1902 && (lnum < mod_bot | |
| 1903 #ifdef FEAT_SYN_HL | |
| 1904 || did_update == DID_FOLD | |
| 1905 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1906 && syntax_present(wp) |
| 7 | 1907 && ( |
| 1908 # ifdef FEAT_FOLDING | |
| 1909 (foldmethodIsSyntax(wp) | |
| 1910 && hasAnyFolding(wp)) || | |
| 1911 # endif | |
| 1912 syntax_check_changed(lnum))) | |
| 1913 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1914 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1915 /* match in fixed position might need redraw |
| 1916 * if lines were inserted or deleted */ | |
| 1917 || (wp->w_match_head != NULL | |
| 1918 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1919 #endif |
| 7 | 1920 ))))) |
| 1921 { | |
| 1922 #ifdef FEAT_SEARCH_EXTRA | |
| 1923 if (lnum == mod_top) | |
| 1924 top_to_mod = FALSE; | |
| 1925 #endif | |
| 1926 | |
| 1927 /* | |
| 1928 * When at start of changed lines: May scroll following lines | |
| 1929 * up or down to minimize redrawing. | |
| 1930 * Don't do this when the change continues until the end. | |
| 3318 | 1931 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1932 */ |
| 1933 if (lnum == mod_top | |
| 1934 && mod_bot != MAXLNUM | |
| 3318 | 1935 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1936 { |
| 1937 int old_rows = 0; | |
| 1938 int new_rows = 0; | |
| 1939 int xtra_rows; | |
| 1940 linenr_T l; | |
| 1941 | |
| 1942 /* Count the old number of window rows, using w_lines[], which | |
| 1943 * should still contain the sizes for the lines as they are | |
| 1944 * currently displayed. */ | |
| 1945 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1946 { | |
| 1947 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1948 * lines are part of the changed area. */ | |
| 1949 if (wp->w_lines[i].wl_valid | |
| 1950 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1951 break; | |
| 1952 old_rows += wp->w_lines[i].wl_size; | |
| 1953 #ifdef FEAT_FOLDING | |
| 1954 if (wp->w_lines[i].wl_valid | |
| 1955 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1956 { | |
| 1957 /* Must have found the last valid entry above mod_bot. | |
| 1958 * Add following invalid entries. */ | |
| 1959 ++i; | |
| 1960 while (i < wp->w_lines_valid | |
| 1961 && !wp->w_lines[i].wl_valid) | |
| 1962 old_rows += wp->w_lines[i++].wl_size; | |
| 1963 break; | |
| 1964 } | |
| 1965 #endif | |
| 1966 } | |
| 1967 | |
| 1968 if (i >= wp->w_lines_valid) | |
| 1969 { | |
| 1970 /* We can't find a valid line below the changed lines, | |
| 1971 * need to redraw until the end of the window. | |
| 1972 * Inserting/deleting lines has no use. */ | |
| 1973 bot_start = 0; | |
| 1974 } | |
| 1975 else | |
| 1976 { | |
| 1977 /* Able to count old number of rows: Count new window | |
| 1978 * rows, and may insert/delete lines */ | |
| 1979 j = idx; | |
| 1980 for (l = lnum; l < mod_bot; ++l) | |
| 1981 { | |
| 1982 #ifdef FEAT_FOLDING | |
| 1983 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1984 ++new_rows; | |
| 1985 else | |
| 1986 #endif | |
| 1987 #ifdef FEAT_DIFF | |
| 1988 if (l == wp->w_topline) | |
| 1989 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1990 + wp->w_topfill; | |
| 1991 else | |
| 1992 #endif | |
| 1993 new_rows += plines_win(wp, l, TRUE); | |
| 1994 ++j; | |
| 1995 if (new_rows > wp->w_height - row - 2) | |
| 1996 { | |
| 1997 /* it's getting too much, must redraw the rest */ | |
| 1998 new_rows = 9999; | |
| 1999 break; | |
| 2000 } | |
| 2001 } | |
| 2002 xtra_rows = new_rows - old_rows; | |
| 2003 if (xtra_rows < 0) | |
| 2004 { | |
| 2005 /* May scroll text up. If there is not enough | |
| 2006 * remaining text or scrolling fails, must redraw the | |
| 2007 * rest. If scrolling works, must redraw the text | |
| 2008 * below the scrolled text. */ | |
| 2009 if (row - xtra_rows >= wp->w_height - 2) | |
| 2010 mod_bot = MAXLNUM; | |
| 2011 else | |
| 2012 { | |
| 2013 check_for_delay(FALSE); | |
| 2014 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
|
2015 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 2016 mod_bot = MAXLNUM; |
| 2017 else | |
| 2018 bot_start = wp->w_height + xtra_rows; | |
| 2019 } | |
| 2020 } | |
| 2021 else if (xtra_rows > 0) | |
| 2022 { | |
| 2023 /* May scroll text down. If there is not enough | |
| 2024 * remaining text of scrolling fails, must redraw the | |
| 2025 * rest. */ | |
| 2026 if (row + xtra_rows >= wp->w_height - 2) | |
| 2027 mod_bot = MAXLNUM; | |
| 2028 else | |
| 2029 { | |
| 2030 check_for_delay(FALSE); | |
| 2031 if (win_ins_lines(wp, row + old_rows, | |
| 2032 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2033 mod_bot = MAXLNUM; | |
| 2034 else if (top_end > row + old_rows) | |
| 2035 /* Scrolled the part at the top that requires | |
| 2036 * updating down. */ | |
| 2037 top_end += xtra_rows; | |
| 2038 } | |
| 2039 } | |
| 2040 | |
| 2041 /* When not updating the rest, may need to move w_lines[] | |
| 2042 * entries. */ | |
| 2043 if (mod_bot != MAXLNUM && i != j) | |
| 2044 { | |
| 2045 if (j < i) | |
| 2046 { | |
| 2047 int x = row + new_rows; | |
| 2048 | |
| 2049 /* move entries in w_lines[] upwards */ | |
| 2050 for (;;) | |
| 2051 { | |
| 2052 /* stop at last valid entry in w_lines[] */ | |
| 2053 if (i >= wp->w_lines_valid) | |
| 2054 { | |
| 2055 wp->w_lines_valid = j; | |
| 2056 break; | |
| 2057 } | |
| 2058 wp->w_lines[j] = wp->w_lines[i]; | |
| 2059 /* stop at a line that won't fit */ | |
| 2060 if (x + (int)wp->w_lines[j].wl_size | |
| 2061 > wp->w_height) | |
| 2062 { | |
| 2063 wp->w_lines_valid = j + 1; | |
| 2064 break; | |
| 2065 } | |
| 2066 x += wp->w_lines[j++].wl_size; | |
| 2067 ++i; | |
| 2068 } | |
| 2069 if (bot_start > x) | |
| 2070 bot_start = x; | |
| 2071 } | |
| 2072 else /* j > i */ | |
| 2073 { | |
| 2074 /* move entries in w_lines[] downwards */ | |
| 2075 j -= i; | |
| 2076 wp->w_lines_valid += j; | |
| 2077 if (wp->w_lines_valid > wp->w_height) | |
| 2078 wp->w_lines_valid = wp->w_height; | |
| 2079 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2080 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2081 | |
| 2082 /* The w_lines[] entries for inserted lines are | |
| 2083 * now invalid, but wl_size may be used above. | |
| 2084 * Reset to zero. */ | |
| 2085 while (i >= idx) | |
| 2086 { | |
| 2087 wp->w_lines[i].wl_size = 0; | |
| 2088 wp->w_lines[i--].wl_valid = FALSE; | |
| 2089 } | |
| 2090 } | |
| 2091 } | |
| 2092 } | |
| 2093 } | |
| 2094 | |
| 2095 #ifdef FEAT_FOLDING | |
| 2096 /* | |
| 2097 * When lines are folded, display one line for all of them. | |
| 2098 * Otherwise, display normally (can be several display lines when | |
| 2099 * 'wrap' is on). | |
| 2100 */ | |
| 2101 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2102 if (fold_count != 0) | |
| 2103 { | |
| 2104 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2105 ++row; | |
| 2106 --fold_count; | |
| 2107 wp->w_lines[idx].wl_folded = TRUE; | |
| 2108 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2109 # ifdef FEAT_SYN_HL | |
| 2110 did_update = DID_FOLD; | |
| 2111 # endif | |
| 2112 } | |
| 2113 else | |
| 2114 #endif | |
| 2115 if (idx < wp->w_lines_valid | |
| 2116 && wp->w_lines[idx].wl_valid | |
| 2117 && wp->w_lines[idx].wl_lnum == lnum | |
| 2118 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2119 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2120 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2121 #ifdef FEAT_DIFF | |
| 2122 && diff_check_fill(wp, lnum) == 0 | |
| 2123 #endif | |
| 2124 ) | |
| 2125 { | |
| 2126 /* This line is not going to fit. Don't draw anything here, | |
| 2127 * will draw "@ " lines below. */ | |
| 2128 row = wp->w_height + 1; | |
| 2129 } | |
| 2130 else | |
| 2131 { | |
| 2132 #ifdef FEAT_SEARCH_EXTRA | |
| 2133 prepare_search_hl(wp, lnum); | |
| 2134 #endif | |
| 2135 #ifdef FEAT_SYN_HL | |
| 2136 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2137 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
|
2138 && syntax_present(wp)) |
| 7 | 2139 syntax_end_parsing(syntax_last_parsed + 1); |
| 2140 #endif | |
| 2141 | |
| 2142 /* | |
| 2143 * Display one line. | |
| 2144 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2145 row = win_line(wp, lnum, srow, wp->w_height, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2146 mod_top == 0, FALSE); |
| 7 | 2147 |
| 2148 #ifdef FEAT_FOLDING | |
| 2149 wp->w_lines[idx].wl_folded = FALSE; | |
| 2150 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2151 #endif | |
| 2152 #ifdef FEAT_SYN_HL | |
| 2153 did_update = DID_LINE; | |
| 2154 syntax_last_parsed = lnum; | |
| 2155 #endif | |
| 2156 } | |
| 2157 | |
| 2158 wp->w_lines[idx].wl_lnum = lnum; | |
| 2159 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
|
2160 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2161 /* 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
|
2162 * 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
|
2163 * 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
|
2164 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2165 { |
| 2166 /* we may need the size of that too long line later on */ | |
| 3318 | 2167 if (dollar_vcol == -1) |
| 7 | 2168 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2169 ++idx; | |
| 2170 break; | |
| 2171 } | |
| 3318 | 2172 if (dollar_vcol == -1) |
| 7 | 2173 wp->w_lines[idx].wl_size = row - srow; |
| 2174 ++idx; | |
| 2175 #ifdef FEAT_FOLDING | |
| 2176 lnum += fold_count + 1; | |
| 2177 #else | |
| 2178 ++lnum; | |
| 2179 #endif | |
| 2180 } | |
| 2181 else | |
| 2182 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2183 if (wp->w_p_rnu) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2184 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2185 #ifdef FEAT_FOLDING |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2186 // 'relativenumber' set: The text doesn't need to be drawn, but |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2187 // the number column nearly always does. |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2188 fold_count = foldedCount(wp, lnum, &win_foldinfo); |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2189 if (fold_count != 0) |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2190 fold_line(wp, fold_count, &win_foldinfo, lnum, row); |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2191 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2192 #endif |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
2193 (void)win_line(wp, lnum, srow, wp->w_height, TRUE, TRUE); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2194 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2195 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2196 // This line does not need to be drawn, advance to the next one. |
| 7 | 2197 row += wp->w_lines[idx++].wl_size; |
| 2198 if (row > wp->w_height) /* past end of screen */ | |
| 2199 break; | |
| 2200 #ifdef FEAT_FOLDING | |
| 2201 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2202 #else | |
| 2203 ++lnum; | |
| 2204 #endif | |
| 2205 #ifdef FEAT_SYN_HL | |
| 2206 did_update = DID_NONE; | |
| 2207 #endif | |
| 2208 } | |
| 2209 | |
| 2210 if (lnum > buf->b_ml.ml_line_count) | |
| 2211 { | |
| 2212 eof = TRUE; | |
| 2213 break; | |
| 2214 } | |
| 2215 } | |
| 2216 /* | |
| 2217 * End of loop over all window lines. | |
| 2218 */ | |
| 2219 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2220 #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
|
2221 /* 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
|
2222 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
|
2223 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2224 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
|
2225 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2226 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
|
2227 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
|
2228 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
|
2229 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
|
2230 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
|
2231 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2232 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
|
2233 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2234 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
|
2235 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2236 #endif |
| 7 | 2237 |
| 2238 if (idx > wp->w_lines_valid) | |
| 2239 wp->w_lines_valid = idx; | |
| 2240 | |
| 2241 #ifdef FEAT_SYN_HL | |
| 2242 /* | |
| 2243 * Let the syntax stuff know we stop parsing here. | |
| 2244 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2245 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2246 syntax_end_parsing(syntax_last_parsed + 1); |
| 2247 #endif | |
| 2248 | |
| 2249 /* | |
| 2250 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2251 * line we were working on, then the line didn't fit. | |
| 2252 */ | |
| 2253 wp->w_empty_rows = 0; | |
| 2254 #ifdef FEAT_DIFF | |
| 2255 wp->w_filler_rows = 0; | |
| 2256 #endif | |
| 2257 if (!eof && !didline) | |
| 2258 { | |
| 2259 if (lnum == wp->w_topline) | |
| 2260 { | |
| 2261 /* | |
| 2262 * Single line that does not fit! | |
| 2263 * Don't overwrite it, it can be edited. | |
| 2264 */ | |
| 2265 wp->w_botline = lnum + 1; | |
| 2266 } | |
| 2267 #ifdef FEAT_DIFF | |
| 2268 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2269 { | |
| 2270 /* Window ends in filler lines. */ | |
| 2271 wp->w_botline = lnum; | |
| 2272 wp->w_filler_rows = wp->w_height - srow; | |
| 2273 } | |
| 2274 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2275 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
|
2276 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2277 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
|
2278 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2279 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2280 * 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
|
2281 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2282 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
|
2283 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2284 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
|
2285 (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
|
2286 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2287 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2288 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2289 } |
| 7 | 2290 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2291 { | |
| 2292 /* | |
| 2293 * Last line isn't finished: Display "@@@" at the end. | |
| 2294 */ | |
| 2295 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2296 W_WINROW(wp) + wp->w_height, | |
| 2297 (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
|
2298 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2299 set_empty_rows(wp, srow); |
| 2300 wp->w_botline = lnum; | |
| 2301 } | |
| 2302 else | |
| 2303 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2304 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2305 wp->w_botline = lnum; |
| 2306 } | |
| 2307 } | |
| 2308 else | |
| 2309 { | |
| 2310 draw_vsep_win(wp, row); | |
| 2311 if (eof) /* we hit the end of the file */ | |
| 2312 { | |
| 2313 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2314 #ifdef FEAT_DIFF | |
| 2315 j = diff_check_fill(wp, wp->w_botline); | |
| 2316 if (j > 0 && !wp->w_botfill) | |
| 2317 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2318 // Display filler lines at the end of the file. |
| 7 | 2319 if (char2cells(fill_diff) > 1) |
| 2320 i = '-'; | |
| 2321 else | |
| 2322 i = fill_diff; | |
| 2323 if (row + j > wp->w_height) | |
| 2324 j = wp->w_height - row; | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2325 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2326 row += j; |
| 2327 } | |
| 2328 #endif | |
| 2329 } | |
| 3318 | 2330 else if (dollar_vcol == -1) |
| 7 | 2331 wp->w_botline = lnum; |
| 2332 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2333 // Make sure the rest of the screen is blank |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2334 // put '~'s on rows that aren't part of the file. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2335 win_draw_end(wp, '~', ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2336 } |
| 2337 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2338 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2339 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2340 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2341 |
| 7 | 2342 /* Reset the type of redrawing required, the window has been updated. */ |
| 2343 wp->w_redr_type = 0; | |
| 2344 #ifdef FEAT_DIFF | |
| 2345 wp->w_old_topfill = wp->w_topfill; | |
| 2346 wp->w_old_botfill = wp->w_botfill; | |
| 2347 #endif | |
| 2348 | |
| 3318 | 2349 if (dollar_vcol == -1) |
| 7 | 2350 { |
| 2351 /* | |
| 2352 * There is a trick with w_botline. If we invalidate it on each | |
| 2353 * change that might modify it, this will cause a lot of expensive | |
| 2354 * calls to plines() in update_topline() each time. Therefore the | |
| 2355 * value of w_botline is often approximated, and this value is used to | |
| 2356 * compute the value of w_topline. If the value of w_botline was | |
| 2357 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2358 * the visible part of the text). If it's not, we need to redraw | |
| 2359 * again. Mostly this just means scrolling up a few lines, so it | |
| 2360 * doesn't look too bad. Only do this for the current window (where | |
| 2361 * changes are relevant). | |
| 2362 */ | |
| 2363 wp->w_valid |= VALID_BOTLINE; | |
| 2364 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2365 { | |
| 2366 recursive = TRUE; | |
| 2367 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2368 update_topline(); /* may invalidate w_botline again */ | |
| 2369 if (must_redraw != 0) | |
| 2370 { | |
| 2371 /* Don't update for changes in buffer again. */ | |
| 2372 i = curbuf->b_mod_set; | |
| 2373 curbuf->b_mod_set = FALSE; | |
| 2374 win_update(curwin); | |
| 2375 must_redraw = 0; | |
| 2376 curbuf->b_mod_set = i; | |
| 2377 } | |
| 2378 recursive = FALSE; | |
| 2379 } | |
| 2380 } | |
| 2381 | |
| 2382 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2383 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2384 if (!got_int) | |
| 2385 got_int = save_got_int; | |
| 2386 #endif | |
| 2387 } | |
| 2388 | |
| 2389 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2390 * Call screen_fill() with the columns adjusted for 'rightleft' if needed. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2391 * Return the new offset. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2392 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2393 static int |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2394 screen_fill_end( |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2395 win_T *wp, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2396 int c1, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2397 int c2, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2398 int off, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2399 int width, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2400 int row, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2401 int endrow, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2402 int attr) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2403 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2404 int nn = off + width; |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2405 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2406 if (nn > wp->w_width) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2407 nn = wp->w_width; |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2408 #ifdef FEAT_RIGHTLEFT |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2409 if (wp->w_p_rl) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2410 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2411 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2412 W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - off, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2413 c1, c2, attr); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2414 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2415 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2416 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2417 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2418 wp->w_wincol + off, (int)wp->w_wincol + nn, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2419 c1, c2, attr); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2420 return nn; |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2421 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2422 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2423 /* |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2424 * Clear lines near the end the window and mark the unused lines with "c1". |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2425 * use "c2" as the filler character. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2426 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2427 */ |
| 2428 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2429 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2430 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2431 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2432 int c2, |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2433 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2434 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2435 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2436 hlf_T hl) |
| 7 | 2437 { |
| 2438 int n = 0; | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2439 int attr = HL_ATTR(hl); |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2440 int wcr_attr = get_wcr_attr(wp); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2441 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2442 attr = hl_combine_attr(wcr_attr, attr); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2443 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2444 if (draw_margin) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2445 { |
| 6553 | 2446 #ifdef FEAT_FOLDING |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2447 int fdc = compute_foldcolumn(wp, 0); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2448 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2449 if (fdc > 0) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2450 // draw the fold column |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2451 n = screen_fill_end(wp, ' ', ' ', n, fdc, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2452 row, endrow, hl_combine_attr(wcr_attr, HL_ATTR(HLF_FC))); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2453 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2454 #ifdef FEAT_SIGNS |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2455 if (signcolumn_on(wp)) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2456 // draw the sign column |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2457 n = screen_fill_end(wp, ' ', ' ', n, 2, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2458 row, endrow, hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC))); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2459 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2460 if ((wp->w_p_nu || wp->w_p_rnu) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2461 && vim_strchr(p_cpo, CPO_NUMCOL) == NULL) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2462 // draw the number column |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2463 n = screen_fill_end(wp, ' ', ' ', n, number_width(wp) + 1, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2464 row, endrow, hl_combine_attr(wcr_attr, HL_ATTR(HLF_N))); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2465 } |
| 7 | 2466 |
| 2467 #ifdef FEAT_RIGHTLEFT | |
| 2468 if (wp->w_p_rl) | |
| 2469 { | |
| 2470 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2471 wp->w_wincol, W_ENDCOL(wp) - 1 - n, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2472 c2, c2, attr); |
| 7 | 2473 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2474 W_ENDCOL(wp) - 1 - n, W_ENDCOL(wp) - n, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2475 c1, c2, attr); |
| 7 | 2476 } |
| 2477 else | |
| 2478 #endif | |
| 2479 { | |
| 2480 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2481 wp->w_wincol + n, (int)W_ENDCOL(wp), |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2482 c1, c2, attr); |
| 7 | 2483 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2484 |
| 7 | 2485 set_empty_rows(wp, row); |
| 2486 } | |
| 2487 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2488 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2489 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2490 * 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
|
2491 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2492 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2493 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
|
2494 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2495 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2496 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2497 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2498 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2499 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2500 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 #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
|
2502 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2503 * 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
|
2504 * 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
|
2505 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 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
|
2508 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2509 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
|
2510 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2511 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2512 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2513 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2514 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
|
2515 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2518 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2519 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2520 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
|
2521 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
|
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 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2525 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
|
2526 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2528 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2529 idx = off + col; |
|
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 /* 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
|
2532 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
|
2533 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 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
|
2535 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
|
2536 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
|
2537 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2538 - (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
|
2539 # endif |
|
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 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2542 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2543 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2544 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2545 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
|
2546 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
|
2547 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2548 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2550 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2553 else |
|
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 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 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
|
2557 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2558 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2559 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
|
2560 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
|
2561 int firstbyte = *p; |
|
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 /* 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
|
2564 * 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
|
2565 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
|
2566 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2567 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2568 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2569 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
|
2570 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
|
2571 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2573 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2574 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
|
2575 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2576 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2578 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2579 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2580 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
|
2581 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2582 ScreenLines[idx] = firstbyte; |
|
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 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2585 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2586 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2587 /* Non-BMP character: display as ? or fullwidth ?. */ |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
2588 ScreenLinesUC[idx] = u8c; |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2589 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
|
2590 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2591 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
|
2592 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
|
2593 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2594 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2595 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2596 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2597 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
|
2598 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2599 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
|
2600 /* 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
|
2601 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
|
2602 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
|
2603 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2604 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
|
2605 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2606 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2607 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2608 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2609 } |
|
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 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2612 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
|
2613 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2614 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
|
2615 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
|
2616 if (len > 0) |
|
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 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2619 if (wp->w_p_rl) |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2620 mch_memmove(current_ScreenLine, text, len); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2621 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2622 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2623 mch_memmove(current_ScreenLine + col, text, len); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2624 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2625 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2626 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2627 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2628 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2629 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2630 |
| 7 | 2631 #ifdef FEAT_FOLDING |
| 2632 /* | |
| 6553 | 2633 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2634 * space is available for window "wp", minus "col". | |
| 2635 */ | |
| 2636 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2637 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2638 { |
| 2639 int fdc = wp->w_p_fdc; | |
| 2640 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
|
2641 int wwidth = wp->w_width; |
| 6553 | 2642 |
| 2643 if (fdc > wwidth - (col + wmw)) | |
| 2644 fdc = wwidth - (col + wmw); | |
| 2645 return fdc; | |
| 2646 } | |
| 2647 | |
| 2648 /* | |
| 7 | 2649 * Display one folded line. |
| 2650 */ | |
| 2651 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2652 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2653 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2654 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2655 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2656 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2657 int row) |
| 7 | 2658 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2659 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2660 pos_T *top, *bot; |
| 2661 linenr_T lnume = lnum + fold_count - 1; | |
| 2662 int len; | |
| 29 | 2663 char_u *text; |
| 7 | 2664 int fdc; |
| 2665 int col; | |
| 2666 int txtcol; | |
| 2667 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2668 int ri; |
| 7 | 2669 |
| 2670 /* Build the fold line: | |
| 2671 * 1. Add the cmdwin_type for the command-line window | |
| 2672 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2673 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2674 * 4. Compose the text |
| 2675 * 5. Add the text | |
| 2676 * 6. set highlighting for the Visual area an other text | |
| 2677 */ | |
| 2678 col = 0; | |
| 2679 | |
| 2680 /* | |
| 2681 * 1. Add the cmdwin_type for the command-line window | |
| 2682 * Ignores 'rightleft', this window is never right-left. | |
| 2683 */ | |
| 2684 #ifdef FEAT_CMDWIN | |
| 2685 if (cmdwin_type != 0 && wp == curwin) | |
| 2686 { | |
| 2687 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
|
2688 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2689 if (enc_utf8) |
| 2690 ScreenLinesUC[off] = 0; | |
| 2691 ++col; | |
| 2692 } | |
| 2693 #endif | |
| 2694 | |
| 2695 /* | |
| 2696 * 2. Add the 'foldcolumn' | |
| 6553 | 2697 * Reduce the width when there is not enough space. |
| 7 | 2698 */ |
| 6553 | 2699 fdc = compute_foldcolumn(wp, col); |
| 7 | 2700 if (fdc > 0) |
| 2701 { | |
| 2702 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2703 #ifdef FEAT_RIGHTLEFT | |
| 2704 if (wp->w_p_rl) | |
| 2705 { | |
| 2706 int i; | |
| 2707 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2708 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
|
2709 HL_ATTR(HLF_FC)); |
| 7 | 2710 /* reverse the fold column */ |
| 2711 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
|
2712 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2713 } |
| 2714 else | |
| 2715 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2716 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2717 col += fdc; |
| 2718 } | |
| 2719 | |
| 2720 #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
|
2721 # 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
|
2722 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2723 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
|
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 + (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
|
2726 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2727 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
|
2728 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
|
2729 } while (0) |
| 7 | 2730 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2731 # 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
|
2732 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2733 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
|
2734 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
|
2735 } while (0) |
| 7 | 2736 #endif |
| 2737 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2738 /* 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
|
2739 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2740 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2741 |
| 2742 #ifdef FEAT_SIGNS | |
| 2743 /* 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
|
2744 if (signcolumn_on(wp)) |
| 7 | 2745 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2746 len = wp->w_width - col; |
| 7 | 2747 if (len > 0) |
| 2748 { | |
| 2749 if (len > 2) | |
| 2750 len = 2; | |
| 2751 # ifdef FEAT_RIGHTLEFT | |
| 2752 if (wp->w_p_rl) | |
| 2753 /* the line number isn't reversed */ | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2754 copy_text_attr(off + wp->w_width - len - col, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2755 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2756 else |
| 2757 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2758 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2759 col += len; |
| 2760 } | |
| 2761 } | |
| 2762 #endif | |
| 2763 | |
| 2764 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2765 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2766 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2767 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2768 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2769 len = wp->w_width - col; |
| 7 | 2770 if (len > 0) |
| 2771 { | |
| 13 | 2772 int w = number_width(wp); |
| 5905 | 2773 long num; |
| 2774 char *fmt = "%*ld "; | |
| 13 | 2775 |
| 2776 if (len > w + 1) | |
| 2777 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2778 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2779 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
|
2780 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2781 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2782 else |
| 4065 | 2783 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2784 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2785 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
|
2786 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
|
2787 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2788 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2789 * line number */ |
| 4065 | 2790 num = lnum; |
| 2791 fmt = "%-*ld "; | |
| 2792 } | |
| 2793 } | |
| 2794 | |
| 2795 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2796 #ifdef FEAT_RIGHTLEFT |
| 2797 if (wp->w_p_rl) | |
| 2798 /* 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
|
2799 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
|
2800 HL_ATTR(HLF_FL)); |
| 7 | 2801 else |
| 2802 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2803 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2804 col += len; |
| 2805 } | |
| 2806 } | |
| 2807 | |
| 2808 /* | |
| 2809 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2810 */ | |
| 29 | 2811 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2812 |
| 2813 txtcol = col; /* remember where text starts */ | |
| 2814 | |
| 2815 /* | |
| 2816 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2817 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2818 * in columns number-col - window-width. | |
| 2819 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2820 col = text_to_screenline(wp, text, col); |
| 7 | 2821 |
| 2822 /* Fill the rest of the line with the fold filler */ | |
| 2823 #ifdef FEAT_RIGHTLEFT | |
| 2824 if (wp->w_p_rl) | |
| 2825 col -= txtcol; | |
| 2826 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2827 while (col < wp->w_width |
| 7 | 2828 #ifdef FEAT_RIGHTLEFT |
| 2829 - (wp->w_p_rl ? txtcol : 0) | |
| 2830 #endif | |
| 2831 ) | |
| 2832 { | |
| 2833 if (enc_utf8) | |
| 2834 { | |
| 2835 if (fill_fold >= 0x80) | |
| 2836 { | |
| 2837 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2838 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
|
2839 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2840 } |
| 2841 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2842 { |
| 7 | 2843 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2844 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2845 } |
|
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
|
2846 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
|
2847 } |
|
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
|
2848 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
|
2849 ScreenLines[off + col++] = fill_fold; |
| 7 | 2850 } |
| 2851 | |
| 2852 if (text != buf) | |
| 2853 vim_free(text); | |
| 2854 | |
| 2855 /* | |
| 2856 * 6. set highlighting for the Visual area an other text. | |
| 2857 * If all folded lines are in the Visual area, highlight the line. | |
| 2858 */ | |
| 2859 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2860 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2861 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2862 { |
| 2863 /* Visual is after curwin->w_cursor */ | |
| 2864 top = &curwin->w_cursor; | |
| 2865 bot = &VIsual; | |
| 2866 } | |
| 2867 else | |
| 2868 { | |
| 2869 /* Visual is before curwin->w_cursor */ | |
| 2870 top = &VIsual; | |
| 2871 bot = &curwin->w_cursor; | |
| 2872 } | |
| 2873 if (lnum >= top->lnum | |
| 2874 && lnume <= bot->lnum | |
| 2875 && (VIsual_mode != 'v' | |
| 2876 || ((lnum > top->lnum | |
| 2877 || (lnum == top->lnum | |
| 2878 && top->col == 0)) | |
| 2879 && (lnume < bot->lnum | |
| 2880 || (lnume == bot->lnum | |
| 2881 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2882 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2883 { |
| 2884 if (VIsual_mode == Ctrl_V) | |
| 2885 { | |
| 2886 /* 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
|
2887 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2888 { |
| 3040 | 2889 if (wp->w_old_cursor_lcol != MAXCOL |
| 2890 && 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
|
2891 < (colnr_T)wp->w_width) |
| 7 | 2892 len = wp->w_old_cursor_lcol; |
| 2893 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2894 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
|
2895 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2896 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2897 } |
| 2898 } | |
| 2899 else | |
| 216 | 2900 { |
| 7 | 2901 /* 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
|
2902 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2903 } |
| 7 | 2904 } |
| 2905 } | |
| 2906 | |
| 743 | 2907 #ifdef FEAT_SYN_HL |
| 6685 | 2908 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2909 if (wp->w_p_cc_cols) | |
| 2910 { | |
| 2911 int i = 0; | |
| 2912 int j = wp->w_p_cc_cols[i]; | |
| 2913 int old_txtcol = txtcol; | |
| 2914 | |
| 2915 while (j > -1) | |
| 2916 { | |
| 2917 txtcol += j; | |
| 2918 if (wp->w_p_wrap) | |
| 2919 txtcol -= wp->w_skipcol; | |
| 2920 else | |
| 2921 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
|
2922 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2923 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
|
2924 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2925 txtcol = old_txtcol; |
| 2926 j = wp->w_p_cc_cols[++i]; | |
| 2927 } | |
| 2928 } | |
| 2929 | |
| 743 | 2930 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2931 if (wp->w_p_cuc) |
| 2932 { | |
| 2933 txtcol += wp->w_virtcol; | |
| 2934 if (wp->w_p_wrap) | |
| 2935 txtcol -= wp->w_skipcol; | |
| 2936 else | |
| 2937 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
|
2938 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2939 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
|
2940 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2941 } |
| 743 | 2942 #endif |
| 7 | 2943 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2944 screen_line(row + W_WINROW(wp), wp->w_wincol, (int)wp->w_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
2945 (int)wp->w_width, 0); |
| 7 | 2946 |
| 2947 /* | |
| 2948 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2949 * updated (saves a call to plines() later). | |
| 2950 */ | |
| 2951 if (wp == curwin | |
| 2952 && lnum <= curwin->w_cursor.lnum | |
| 2953 && lnume >= curwin->w_cursor.lnum) | |
| 2954 { | |
| 2955 curwin->w_cline_row = row; | |
| 2956 curwin->w_cline_height = 1; | |
| 2957 curwin->w_cline_folded = TRUE; | |
| 2958 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2959 } | |
| 2960 } | |
| 2961 | |
| 2962 /* | |
| 2963 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2964 */ | |
| 2965 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2966 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2967 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2968 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2969 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2970 int attr) |
| 7 | 2971 { |
| 216 | 2972 int i; |
| 2973 | |
| 7 | 2974 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2975 if (enc_utf8) | |
| 2976 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 2977 for (i = 0; i < len; ++i) |
| 2978 ScreenAttrs[off + i] = attr; | |
| 7 | 2979 } |
| 2980 | |
| 2981 /* | |
| 2982 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2983 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2984 */ |
| 2985 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2986 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2987 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2988 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2989 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2990 linenr_T lnum) /* current line number */ |
| 7 | 2991 { |
| 2992 int i = 0; | |
| 2993 int level; | |
| 2994 int first_level; | |
| 519 | 2995 int empty; |
| 6553 | 2996 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2997 |
| 2998 /* Init to all spaces. */ | |
| 6929 | 2999 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 3000 |
| 3001 level = win_foldinfo.fi_level; | |
| 3002 if (level > 0) | |
| 3003 { | |
| 519 | 3004 /* If there is only one column put more info in it. */ |
| 6553 | 3005 empty = (fdc == 1) ? 0 : 1; |
| 519 | 3006 |
| 7 | 3007 /* If the column is too narrow, we start at the lowest level that |
| 3008 * fits and use numbers to indicated the depth. */ | |
| 6553 | 3009 first_level = level - fdc - closed + 1 + empty; |
| 7 | 3010 if (first_level < 1) |
| 3011 first_level = 1; | |
| 3012 | |
| 6553 | 3013 for (i = 0; i + empty < fdc; ++i) |
| 7 | 3014 { |
| 3015 if (win_foldinfo.fi_lnum == lnum | |
| 3016 && first_level + i >= win_foldinfo.fi_low_level) | |
| 3017 p[i] = '-'; | |
| 3018 else if (first_level == 1) | |
| 3019 p[i] = '|'; | |
| 3020 else if (first_level + i <= 9) | |
| 3021 p[i] = '0' + first_level + i; | |
| 3022 else | |
| 3023 p[i] = '>'; | |
| 3024 if (first_level + i == level) | |
| 3025 break; | |
| 3026 } | |
| 3027 } | |
| 3028 if (closed) | |
| 6553 | 3029 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3030 } |
| 3031 #endif /* FEAT_FOLDING */ | |
| 3032 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3033 #ifdef FEAT_TEXT_PROP |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3034 static textprop_T *current_text_props = NULL; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3035 static buf_T *current_buf = NULL; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3036 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3037 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3038 text_prop_compare(const void *s1, const void *s2) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3039 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3040 int idx1, idx2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3041 proptype_T *pt1, *pt2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3042 colnr_T col1, col2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3043 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3044 idx1 = *(int *)s1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3045 idx2 = *(int *)s2; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3046 pt1 = text_prop_type_by_id(current_buf, current_text_props[idx1].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3047 pt2 = text_prop_type_by_id(current_buf, current_text_props[idx2].tp_type); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3048 if (pt1 == pt2) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3049 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3050 if (pt1 == NULL) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3051 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3052 if (pt2 == NULL) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3053 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3054 if (pt1->pt_priority != pt2->pt_priority) |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3055 return pt1->pt_priority > pt2->pt_priority ? 1 : -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3056 col1 = current_text_props[idx1].tp_col; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3057 col2 = current_text_props[idx2].tp_col; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3058 return col1 == col2 ? 0 : col1 > col2 ? 1 : -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3059 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3060 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3061 |
| 7 | 3062 /* |
| 3063 * Display line "lnum" of window 'wp' on the screen. | |
| 3064 * Start at row "startrow", stop when "endrow" is reached. | |
| 3065 * wp->w_virtcol needs to be valid. | |
| 3066 * | |
| 3067 * Return the number of last row the line occupies. | |
| 3068 */ | |
| 3069 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3070 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3071 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3072 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3073 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3074 int endrow, |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3075 int nochange UNUSED, // not updating for changed text |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3076 int number_only) // only update the number column |
| 7 | 3077 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3078 int col = 0; /* visual column on screen */ |
| 7 | 3079 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3080 int c = 0; /* init for GCC */ | |
| 3081 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3082 #ifdef FEAT_LINEBREAK |
| 3083 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3084 #endif | |
| 7 | 3085 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3086 char_u *line; /* current line */ | |
| 3087 char_u *ptr; /* current position in "line" */ | |
| 3088 int row; /* row in the window, excl w_winrow */ | |
| 3089 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3090 | |
| 3091 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3092 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3093 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3094 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3095 int c_extra = NUL; /* extra chars, all the same */ |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3096 int c_final = NUL; /* final char, mandatory if set */ |
| 7 | 3097 int extra_attr = 0; /* attributes when n_extra != 0 */ |
| 3098 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3099 displaying lcs_eol at end-of-line */ | |
| 3100 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3101 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3102 | |
| 3103 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3104 int saved_n_extra = 0; | |
| 3105 char_u *saved_p_extra = NULL; | |
| 3106 int saved_c_extra = 0; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3107 int saved_c_final = 0; |
| 7 | 3108 int saved_char_attr = 0; |
| 3109 | |
| 3110 int n_attr = 0; /* chars with special attr */ | |
| 3111 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3112 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3113 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3114 | |
| 3115 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3116 | |
| 3117 int fromcol, tocol; /* start/end of inverting */ | |
| 3118 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3119 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3120 pos_T *top, *bot; | |
| 1813 | 3121 int lnum_in_visual_area = FALSE; |
| 7 | 3122 pos_T pos; |
| 3123 long v; | |
| 3124 | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3125 int char_attr = 0; // attributes for next character |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3126 int attr_pri = FALSE; // char_attr has priority |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3127 int area_highlighting = FALSE; // Visual or incsearch highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3128 // in this line |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3129 int vi_attr = 0; // attributes for Visual and incsearch |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3130 // highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3131 int wcr_attr = 0; // attributes from 'wincolor' |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3132 int win_attr = 0; // background for whole window, except |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3133 // margins and "~" lines. |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3134 int area_attr = 0; // attributes desired by highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3135 int search_attr = 0; // attributes desired by 'hlsearch' |
| 7 | 3136 #ifdef FEAT_SYN_HL |
| 743 | 3137 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3138 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3139 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3140 int save_did_emsg; | |
| 1437 | 3141 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
|
3142 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3143 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3144 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3145 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3146 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3147 int text_prop_next = 0; // next text property to use |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3148 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3149 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3150 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3151 proptype_T *text_prop_type = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3152 int text_prop_attr = 0; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
3153 int text_prop_combine = FALSE; |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3154 #endif |
| 743 | 3155 #ifdef FEAT_SPELL |
| 221 | 3156 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3157 # define SPWORDLEN 150 |
| 3158 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3159 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3160 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3161 starts */ |
| 221 | 3162 int spell_attr = 0; /* attributes desired by spelling */ |
| 3163 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3164 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3165 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3166 * there are no spell errors */ |
| 386 | 3167 static int cap_col = -1; /* column to check for Cap word */ |
| 3168 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3169 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3170 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3171 int extra_check = 0; // has extra highlighting |
| 7 | 3172 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3173 int mb_l = 1; /* multi-byte byte length */ | |
| 3174 int mb_c = 0; /* decoded multi-byte character */ | |
| 3175 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3176 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3177 #ifdef FEAT_DIFF |
| 3178 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3179 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3180 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3181 int change_start = MAXCOL; /* first col of changed area */ |
| 3182 int change_end = -1; /* last col of changed area */ | |
| 3183 #endif | |
| 3184 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3185 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3186 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
|
3187 chars */ |
| 7 | 3188 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3189 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3190 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3191 # define LINE_ATTR |
| 1536 | 3192 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3193 #endif |
| 3194 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3195 matchitem_T *cur; /* points to the match list */ |
| 3196 match_T *shl; /* points to search_hl or a match */ | |
| 3197 int shl_flag; /* flag to indicate whether search_hl | |
| 3198 has been processed or not */ | |
| 5979 | 3199 int pos_inprogress; /* marks that position match search is |
| 3200 in progress */ | |
| 1326 | 3201 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3202 equals startcol of search_hl or one | |
| 3203 of the matches */ | |
| 7 | 3204 #endif |
| 3205 #ifdef FEAT_ARABIC | |
| 3206 int prev_c = 0; /* previous Arabic character */ | |
| 3207 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3208 #endif | |
| 910 | 3209 #if defined(LINE_ATTR) |
| 867 | 3210 int did_line_attr = 0; |
| 3211 #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
|
3212 #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
|
3213 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3214 #endif |
| 7 | 3215 |
| 3216 /* draw_state: items that are drawn in sequence: */ | |
| 3217 #define WL_START 0 /* nothing done yet */ | |
| 3218 #ifdef FEAT_CMDWIN | |
| 3219 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3220 #else | |
| 3221 # define WL_CMDLINE WL_START | |
| 3222 #endif | |
| 3223 #ifdef FEAT_FOLDING | |
| 3224 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3225 #else | |
| 3226 # define WL_FOLD WL_CMDLINE | |
| 3227 #endif | |
| 3228 #ifdef FEAT_SIGNS | |
| 3229 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3230 #else | |
| 3231 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3232 #endif | |
| 3233 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3234 #ifdef FEAT_LINEBREAK |
| 3235 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3236 #else | |
| 3237 # define WL_BRI WL_NR | |
| 3238 #endif | |
| 7 | 3239 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3240 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3241 #else |
| 5995 | 3242 # define WL_SBR WL_BRI |
| 7 | 3243 #endif |
| 3244 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3245 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3246 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3247 int feedback_col = 0; |
| 3248 int feedback_old_attr = -1; | |
| 3249 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3250 int screen_line_flags = 0; |
| 7 | 3251 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3252 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3253 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
|
3254 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
|
3255 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
|
3256 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
|
3257 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3258 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
|
3259 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3260 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
|
3261 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3262 int match_conc = 0; /* cchar for match functions */ |
| 6520 | 3263 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3264 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3265 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3266 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3267 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3268 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3269 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3270 col -= boguscols; \ |
| 6520 | 3271 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3272 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3273 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3274 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3275 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3276 #endif |
| 7 | 3277 |
| 3278 if (startrow > endrow) /* past the end already! */ | |
| 3279 return startrow; | |
| 3280 | |
| 3281 row = startrow; | |
| 3282 screen_row = row + W_WINROW(wp); | |
| 3283 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3284 if (!number_only) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3285 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3286 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3287 * To speed up the loop below, set extra_check when there is linebreak, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3288 * trailing white space and/or syntax processing to be done. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3289 */ |
| 7 | 3290 #ifdef FEAT_LINEBREAK |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3291 extra_check = wp->w_p_lbr; |
| 7 | 3292 #endif |
| 3293 #ifdef FEAT_SYN_HL | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3294 if (syntax_present(wp) && !wp->w_s->b_syn_error |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
3295 # ifdef SYN_TIME_LIMIT |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3296 && !wp->w_s->b_syn_slow |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3297 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3298 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3299 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3300 /* Prepare for syntax highlighting in this line. When there is an |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3301 * error, stop syntax highlighting. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3302 save_did_emsg = did_emsg; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3303 did_emsg = FALSE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3304 syntax_start(wp, lnum); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3305 if (did_emsg) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3306 wp->w_s->b_syn_error = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3307 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3308 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3309 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
|
3310 #ifdef SYN_TIME_LIMIT |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3311 if (!wp->w_s->b_syn_slow) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3312 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3313 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3314 has_syntax = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3315 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3316 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3317 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3318 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3319 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3320 /* Check for columns to display for 'colorcolumn'. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3321 color_cols = wp->w_p_cc_cols; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3322 if (color_cols != NULL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3323 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3324 #endif |
| 3325 | |
|
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
|
3326 #ifdef FEAT_TERMINAL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3327 if (term_show_buffer(wp->w_buffer)) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3328 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3329 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3330 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3331 win_attr = term_get_attr(wp->w_buffer, lnum, -1); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3332 } |
|
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
|
3333 #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
|
3334 |
| 743 | 3335 #ifdef FEAT_SPELL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3336 if (wp->w_p_spell |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3337 && *wp->w_s->b_p_spl != NUL |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3338 && wp->w_s->b_langp.ga_len > 0 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3339 && *(char **)(wp->w_s->b_langp.ga_data) != NULL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3340 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3341 /* Prepare for spell checking. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3342 has_spell = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3343 extra_check = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3344 |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3345 /* Get the start of the next line, so that words that wrap to the |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3346 * next line are found too: "et<line-break>al.". |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3347 * Trick: skip a few chars for C/shell/Vim comments */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3348 nextline[SPWORDLEN] = NUL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3349 if (lnum < wp->w_buffer->b_ml.ml_line_count) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3350 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3351 line = ml_get_buf(wp->w_buffer, lnum + 1, FALSE); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3352 spell_cat_line(nextline + SPWORDLEN, line, SPWORDLEN); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3353 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3354 |
|
14875
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3355 /* When a word wrapped from the previous line the start of the |
|
081f30c50300
patch 8.1.0449: when 'rnu' is set folded lines are not displayed correctly
Christian Brabandt <cb@256bit.org>
parents:
14862
diff
changeset
|
3356 * current line is valid. */ |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3357 if (lnum == checked_lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3358 cur_checked_col = checked_col; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3359 checked_lnum = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3360 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3361 /* When there was a sentence end in the previous line may require a |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3362 * word starting with capital in this line. In line 1 always check |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3363 * the first word. */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3364 if (lnum != capcol_lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3365 cap_col = -1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3366 if (lnum == 1) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3367 cap_col = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3368 capcol_lnum = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3369 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3370 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3371 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3372 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3373 * handle visual active in this window |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3374 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3375 fromcol = -10; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3376 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3377 if (VIsual_active && wp->w_buffer == curwin->w_buffer) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3378 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3379 /* Visual is after curwin->w_cursor */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3380 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3381 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3382 top = &curwin->w_cursor; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3383 bot = &VIsual; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3384 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3385 else /* Visual is before curwin->w_cursor */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3386 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3387 top = &VIsual; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3388 bot = &curwin->w_cursor; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3389 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3390 lnum_in_visual_area = (lnum >= top->lnum && lnum <= bot->lnum); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3391 if (VIsual_mode == Ctrl_V) /* block mode */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3392 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3393 if (lnum_in_visual_area) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3394 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3395 fromcol = wp->w_old_cursor_fcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3396 tocol = wp->w_old_cursor_lcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3397 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3398 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3399 else /* non-block mode */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3400 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3401 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3402 fromcol = 0; |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3403 else if (lnum == top->lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3404 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3405 if (VIsual_mode == 'V') /* linewise */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3406 fromcol = 0; |
| 7 | 3407 else |
| 3408 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3409 getvvcol(wp, top, (colnr_T *)&fromcol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3410 if (gchar_pos(top) == NUL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3411 tocol = fromcol + 1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3412 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3413 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3414 if (VIsual_mode != 'V' && lnum == bot->lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3415 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3416 if (*p_sel == 'e' && bot->col == 0 && bot->coladd == 0) |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3417 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3418 fromcol = -10; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3419 tocol = MAXCOL; |
| 7 | 3420 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3421 else if (bot->col == MAXCOL) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3422 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3423 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3424 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3425 pos = *bot; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3426 if (*p_sel == 'e') |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3427 getvvcol(wp, &pos, (colnr_T *)&tocol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3428 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3429 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3430 getvvcol(wp, &pos, NULL, NULL, (colnr_T *)&tocol); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3431 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3432 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3433 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3434 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3435 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3436 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3437 /* Check if the character under the cursor should not be inverted */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3438 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
|
3439 #ifdef FEAT_GUI |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3440 && !gui.in_use |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3441 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3442 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3443 noinvcur = TRUE; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3444 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3445 /* if inverting in this line set area_highlighting */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3446 if (fromcol >= 0) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3447 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3448 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3449 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3450 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3451 if ((clip_star.available && !clip_star.owned |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3452 && clip_isautosel_star()) |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3453 || (clip_plus.available && !clip_plus.owned |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3454 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3455 vi_attr = HL_ATTR(HLF_VNC); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3456 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3457 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3458 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3459 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3460 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3461 * handle 'incsearch' and ":s///c" highlighting |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3462 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3463 else if (highlight_match |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3464 && wp == curwin |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3465 && lnum >= curwin->w_cursor.lnum |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3466 && lnum <= curwin->w_cursor.lnum + search_match_lines) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3467 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3468 if (lnum == curwin->w_cursor.lnum) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3469 getvcol(curwin, &(curwin->w_cursor), |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
3470 (colnr_T *)&fromcol, NULL, NULL); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3471 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3472 fromcol = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3473 if (lnum == curwin->w_cursor.lnum + search_match_lines) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3474 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3475 pos.lnum = lnum; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3476 pos.col = search_match_endcol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3477 getvcol(curwin, &pos, (colnr_T *)&tocol, NULL, NULL); |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3478 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3479 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3480 tocol = MAXCOL; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3481 /* do at least one character; happens when past end of line */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3482 if (fromcol == tocol) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3483 tocol = fromcol + 1; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3484 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3485 vi_attr = HL_ATTR(HLF_I); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3486 } |
| 7 | 3487 } |
| 3488 | |
| 3489 #ifdef FEAT_DIFF | |
| 3490 filler_lines = diff_check(wp, lnum); | |
| 3491 if (filler_lines < 0) | |
| 3492 { | |
| 3493 if (filler_lines == -1) | |
| 3494 { | |
| 3495 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3496 diff_hlf = HLF_ADD; /* added line */ | |
| 3497 else if (change_start == 0) | |
| 3498 diff_hlf = HLF_TXD; /* changed text */ | |
| 3499 else | |
| 3500 diff_hlf = HLF_CHD; /* changed line */ | |
| 3501 } | |
| 3502 else | |
| 3503 diff_hlf = HLF_ADD; /* added line */ | |
| 3504 filler_lines = 0; | |
| 3505 area_highlighting = TRUE; | |
| 3506 } | |
| 3507 if (lnum == wp->w_topline) | |
| 3508 filler_lines = wp->w_topfill; | |
| 3509 filler_todo = filler_lines; | |
| 3510 #endif | |
| 3511 | |
| 3512 #ifdef LINE_ATTR | |
| 3513 # ifdef FEAT_SIGNS | |
| 3514 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3515 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3516 if (v != 0) | |
| 3517 line_attr = sign_get_attr((int)v, TRUE); | |
| 3518 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3519 # if defined(FEAT_QUICKFIX) |
| 7 | 3520 /* Highlight the current line in the quickfix window. */ |
| 644 | 3521 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
|
3522 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3523 # endif |
| 3524 if (line_attr != 0) | |
| 3525 area_highlighting = TRUE; | |
| 3526 #endif | |
| 3527 | |
| 3528 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3529 ptr = line; | |
| 3530 | |
| 743 | 3531 #ifdef FEAT_SPELL |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3532 if (has_spell && !number_only) |
| 348 | 3533 { |
| 386 | 3534 /* For checking first word with a capital skip white space. */ |
| 3535 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
|
3536 cap_col = getwhitecols(line); |
| 386 | 3537 |
| 348 | 3538 /* To be able to spell-check over line boundaries copy the end of the |
| 3539 * current line into nextline[]. Above the start of the next line was | |
| 3540 * copied to nextline[SPWORDLEN]. */ | |
| 3541 if (nextline[SPWORDLEN] == NUL) | |
| 3542 { | |
| 3543 /* No next line or it is empty. */ | |
| 3544 nextlinecol = MAXCOL; | |
| 3545 nextline_idx = 0; | |
| 3546 } | |
| 3547 else | |
| 3548 { | |
| 835 | 3549 v = (long)STRLEN(line); |
| 348 | 3550 if (v < SPWORDLEN) |
| 3551 { | |
| 3552 /* Short line, use it completely and append the start of the | |
| 3553 * next line. */ | |
| 3554 nextlinecol = 0; | |
| 3555 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3556 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3557 nextline_idx = v + 1; |
| 3558 } | |
| 3559 else | |
| 3560 { | |
| 3561 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3562 nextlinecol = v - SPWORDLEN; | |
| 3563 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3564 nextline_idx = SPWORDLEN + 1; | |
| 3565 } | |
| 3566 } | |
| 3567 } | |
| 3568 #endif | |
| 3569 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3570 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3571 { |
|
15715
52930462eec4
patch 8.1.0865: when 'listchars' only contains "nbsp:X" it does not work
Bram Moolenaar <Bram@vim.org>
parents:
15683
diff
changeset
|
3572 if (lcs_space || lcs_trail || lcs_nbsp) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3573 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3574 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3575 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3576 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3577 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
|
3578 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
|
3579 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3580 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3581 } |
| 7 | 3582 } |
| 3583 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3584 wcr_attr = get_wcr_attr(wp); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3585 if (wcr_attr != 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3586 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3587 win_attr = wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3588 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3589 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3590 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3591 if (bt_popup(wp->w_buffer)) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3592 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3593 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3594 |
| 7 | 3595 /* |
| 3596 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3597 * first character to be displayed. | |
| 3598 */ | |
| 3599 if (wp->w_p_wrap) | |
| 3600 v = wp->w_skipcol; | |
| 3601 else | |
| 3602 v = wp->w_leftcol; | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3603 if (v > 0 && !number_only) |
| 7 | 3604 { |
| 3605 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3606 |
| 7 | 3607 while (vcol < v && *ptr != NUL) |
| 3608 { | |
| 5995 | 3609 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3610 vcol += c; |
| 3611 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3612 MB_PTR_ADV(ptr); |
| 7 | 3613 } |
| 3614 | |
| 1984 | 3615 /* When: |
| 3616 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3617 * - 'colorcolumn' is set, or |
| 1984 | 3618 * - 'virtualedit' is set, or |
| 3619 * - the visual mode is active, | |
| 3620 * the end of the line may be before the start of the displayed part. | |
| 3621 */ | |
| 3622 if (vcol < v && ( | |
| 5735 | 3623 #ifdef FEAT_SYN_HL |
| 3624 wp->w_p_cuc || draw_color_col || | |
| 3625 #endif | |
| 3626 virtual_active() || | |
| 3627 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3628 vcol = v; |
| 3629 | |
| 3630 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3631 * that character but skip the first few screen characters. */ | |
| 3632 if (vcol > v) | |
| 3633 { | |
| 3634 vcol -= c; | |
| 3635 ptr = prev_ptr; | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3636 /* 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
|
3637 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3638 if (( (*mb_ptr2cells)(ptr) >= c || *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
|
3639 n_skip = v - vcol; |
| 7 | 3640 } |
| 3641 | |
| 3642 /* | |
| 3643 * Adjust for when the inverted text is before the screen, | |
| 3644 * and when the start of the inverted text is before the screen. | |
| 3645 */ | |
| 3646 if (tocol <= vcol) | |
| 3647 fromcol = 0; | |
| 3648 else if (fromcol >= 0 && fromcol < vcol) | |
| 3649 fromcol = vcol; | |
| 3650 | |
| 3651 #ifdef FEAT_LINEBREAK | |
| 3652 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3653 if (wp->w_p_wrap) | |
| 3654 need_showbreak = TRUE; | |
| 3655 #endif | |
| 743 | 3656 #ifdef FEAT_SPELL |
| 499 | 3657 /* When spell checking a word we need to figure out the start of the |
| 3658 * word and if it's badly spelled or not. */ | |
| 3659 if (has_spell) | |
| 3660 { | |
| 3661 int len; | |
| 1536 | 3662 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3663 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3664 |
| 3665 pos = wp->w_cursor; | |
| 3666 wp->w_cursor.lnum = lnum; | |
| 1536 | 3667 wp->w_cursor.col = linecol; |
| 534 | 3668 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3669 |
| 3670 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3671 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3672 ptr = line + linecol; | |
| 3673 | |
| 530 | 3674 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3675 { |
| 3676 /* no bad word found at line start, don't check until end of a | |
| 3677 * word */ | |
| 534 | 3678 spell_hlf = HLF_COUNT; |
| 3572 | 3679 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3680 } |
| 3681 else | |
| 534 | 3682 { |
| 499 | 3683 /* bad word found, use attributes until end of word */ |
| 3684 word_end = wp->w_cursor.col + len + 1; | |
| 3685 | |
| 534 | 3686 /* Turn index into actual attributes. */ |
| 3687 if (spell_hlf != HLF_COUNT) | |
| 3688 spell_attr = highlight_attr[spell_hlf]; | |
| 3689 } | |
| 499 | 3690 wp->w_cursor = pos; |
| 501 | 3691 |
| 743 | 3692 # ifdef FEAT_SYN_HL |
| 501 | 3693 /* Need to restart syntax highlighting for this line. */ |
| 3694 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3695 syntax_start(wp, lnum); |
| 743 | 3696 # endif |
| 499 | 3697 } |
| 3698 #endif | |
| 7 | 3699 } |
| 3700 | |
| 3701 /* | |
| 3702 * Correct highlighting for cursor that can't be disabled. | |
| 3703 * Avoids having to check this for each character. | |
| 3704 */ | |
| 3705 if (fromcol >= 0) | |
| 3706 { | |
| 3707 if (noinvcur) | |
| 3708 { | |
| 3709 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3710 { | |
| 3711 /* highlighting starts at cursor, let it start just after the | |
| 3712 * cursor */ | |
| 3713 fromcol_prev = fromcol; | |
| 3714 fromcol = -1; | |
| 3715 } | |
| 3716 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3717 /* restart highlighting after the cursor */ | |
| 3718 fromcol_prev = wp->w_virtcol; | |
| 3719 } | |
| 3720 if (fromcol >= tocol) | |
| 3721 fromcol = -1; | |
| 3722 } | |
| 3723 | |
| 3724 #ifdef FEAT_SEARCH_EXTRA | |
| 3725 /* | |
| 1326 | 3726 * Handle highlighting the last used search pattern and matches. |
| 3727 * Do this for both search_hl and the match list. | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3728 * Not in a popup window. |
| 7 | 3729 */ |
| 1326 | 3730 cur = wp->w_match_head; |
| 3731 shl_flag = FALSE; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3732 while ((cur != NULL || shl_flag == FALSE) && !number_only |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3733 && !(screen_line_flags & SLF_POPUP)) |
| 1326 | 3734 { |
| 3735 if (shl_flag == FALSE) | |
| 3736 { | |
| 3737 shl = &search_hl; | |
| 3738 shl_flag = TRUE; | |
| 3739 } | |
| 3740 else | |
| 3741 shl = &cur->hl; | |
| 36 | 3742 shl->startcol = MAXCOL; |
| 3743 shl->endcol = MAXCOL; | |
| 7 | 3744 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3745 shl->is_addpos = FALSE; |
| 5979 | 3746 v = (long)(ptr - line); |
| 3747 if (cur != NULL) | |
| 3748 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3749 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
|
3750 shl == &search_hl ? NULL : cur); |
| 5979 | 3751 |
| 3752 /* Need to get the line again, a multi-line regexp may have made it | |
| 3753 * invalid. */ | |
| 3754 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3755 ptr = line + v; | |
| 3756 | |
| 3757 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3758 { | |
| 3759 if (shl->lnum == lnum) | |
| 3760 shl->startcol = shl->rm.startpos[0].col; | |
| 3761 else | |
| 3762 shl->startcol = 0; | |
| 3763 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3764 - shl->rm.startpos[0].lnum) | |
| 3765 shl->endcol = shl->rm.endpos[0].col; | |
| 3766 else | |
| 3767 shl->endcol = MAXCOL; | |
| 3768 /* Highlight one character for an empty match. */ | |
| 3769 if (shl->startcol == shl->endcol) | |
| 3770 { | |
| 3771 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3772 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3773 else |
| 5979 | 3774 ++shl->endcol; |
| 3775 } | |
| 3776 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3777 { | |
| 3778 shl->attr_cur = shl->attr; | |
| 3779 search_attr = shl->attr; | |
| 3780 } | |
| 3781 area_highlighting = TRUE; | |
| 7 | 3782 } |
| 1326 | 3783 if (shl != &search_hl && cur != NULL) |
| 3784 cur = cur->next; | |
| 7 | 3785 } |
| 3786 #endif | |
| 3787 | |
| 743 | 3788 #ifdef FEAT_SYN_HL |
|
15991
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3789 // Cursor line highlighting for 'cursorline' in the current window. |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3790 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3791 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3792 // Do not show the cursor line when Visual mode is active, because it's |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3793 // not clear what is selected then. Do update w_last_cursorline. |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3794 if (!(wp == curwin && VIsual_active)) |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3795 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3796 line_attr = HL_ATTR(HLF_CUL); |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3797 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3798 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
3799 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 3800 } |
| 3801 #endif | |
| 3802 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3803 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3804 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3805 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3806 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3807 text_prop_count = get_text_props(wp->w_buffer, lnum, |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3808 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3809 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3810 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3811 // Make a copy of the properties, so that they are properly |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3812 // aligned. |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3813 text_props = (textprop_T *)alloc( |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3814 text_prop_count * sizeof(textprop_T)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3815 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3816 mch_memmove(text_props, prop_start, |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3817 text_prop_count * sizeof(textprop_T)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3818 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3819 // Allocate an array for the indexes. |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3820 text_prop_idxs = (int *)alloc(text_prop_count * sizeof(int)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3821 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3822 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3823 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3824 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3825 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3826 |
| 504 | 3827 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3828 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3829 |
| 7 | 3830 #ifdef FEAT_RIGHTLEFT |
| 3831 if (wp->w_p_rl) | |
| 3832 { | |
| 3833 /* Rightleft window: process the text in the normal direction, but put | |
| 3834 * it in current_ScreenLine[] from right to left. Start at the | |
| 3835 * 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
|
3836 col = wp->w_width - 1; |
| 7 | 3837 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3838 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 3839 } |
| 3840 #endif | |
| 3841 | |
| 3842 /* | |
| 3843 * Repeat for the whole displayed line. | |
| 3844 */ | |
| 3845 for (;;) | |
| 3846 { | |
| 6947 | 3847 #ifdef FEAT_CONCEAL |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
3848 int has_match_conc = 0; // match wants to conceal |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
3849 int did_decrement_ptr = FALSE; |
| 6947 | 3850 #endif |
| 7 | 3851 /* Skip this quickly when working on the text. */ |
| 3852 if (draw_state != WL_LINE) | |
| 3853 { | |
| 3854 #ifdef FEAT_CMDWIN | |
| 3855 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3856 { | |
| 3857 draw_state = WL_CMDLINE; | |
| 3858 if (cmdwin_type != 0 && wp == curwin) | |
| 3859 { | |
| 3860 /* Draw the cmdline character. */ | |
| 3861 n_extra = 1; | |
| 1340 | 3862 c_extra = cmdwin_type; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3863 c_final = NUL; |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3864 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_AT)); |
| 7 | 3865 } |
| 3866 } | |
| 3867 #endif | |
| 3868 | |
| 3869 #ifdef FEAT_FOLDING | |
| 3870 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3871 { | |
| 6553 | 3872 int fdc = compute_foldcolumn(wp, 0); |
| 3873 | |
| 7 | 3874 draw_state = WL_FOLD; |
| 6553 | 3875 if (fdc > 0) |
| 7 | 3876 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3877 /* 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
|
3878 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3879 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3880 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3881 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3882 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3883 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3884 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
|
3885 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3886 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3887 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3888 c_extra = NUL; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3889 c_final = NUL; |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3890 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_FC)); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3891 } |
| 7 | 3892 } |
| 3893 } | |
| 3894 #endif | |
| 3895 | |
| 3896 #ifdef FEAT_SIGNS | |
| 3897 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3898 { | |
| 3899 draw_state = WL_SIGN; | |
| 3900 /* Show the sign column when there are any signs in this | |
| 3901 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3902 if (signcolumn_on(wp)) |
| 7 | 3903 { |
| 2661 | 3904 int text_sign; |
| 7 | 3905 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3906 int icon_sign; |
| 7 | 3907 # endif |
| 3908 | |
| 3909 /* Draw two cells with the sign value or blank. */ | |
| 3910 c_extra = ' '; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3911 c_final = NUL; |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3912 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC)); |
| 7 | 3913 n_extra = 2; |
| 3914 | |
| 5921 | 3915 if (row == startrow |
| 3916 #ifdef FEAT_DIFF | |
| 3917 + filler_lines && filler_todo <= 0 | |
| 3918 #endif | |
| 3919 ) | |
| 7 | 3920 { |
| 3921 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3922 SIGN_TEXT); | |
| 3923 # ifdef FEAT_SIGN_ICONS | |
| 3924 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3925 SIGN_ICON); | |
| 3926 if (gui.in_use && icon_sign != 0) | |
| 3927 { | |
| 3928 /* Use the image in this position. */ | |
| 3929 c_extra = SIGN_BYTE; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3930 c_final = NUL; |
| 7 | 3931 # ifdef FEAT_NETBEANS_INTG |
| 3932 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3933 { |
| 7 | 3934 c_extra = MULTISIGN_BYTE; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3935 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3936 } |
| 7 | 3937 # endif |
| 3938 char_attr = icon_sign; | |
| 3939 } | |
| 3940 else | |
| 3941 # endif | |
| 3942 if (text_sign != 0) | |
| 3943 { | |
| 3944 p_extra = sign_get_text(text_sign); | |
| 3945 if (p_extra != NULL) | |
| 3946 { | |
| 3947 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3948 c_final = NUL; |
| 835 | 3949 n_extra = (int)STRLEN(p_extra); |
| 7 | 3950 } |
| 3951 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3952 } | |
| 3953 } | |
| 3954 } | |
| 3955 } | |
| 3956 #endif | |
| 3957 | |
| 3958 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3959 { | |
| 3960 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3961 /* 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
|
3962 * 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
|
3963 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3964 && (row == startrow |
| 3965 #ifdef FEAT_DIFF | |
| 3966 + filler_lines | |
| 3967 #endif | |
| 3968 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3969 { | |
| 3970 /* Draw the line number (empty space after wrapping). */ | |
| 3971 if (row == startrow | |
| 3972 #ifdef FEAT_DIFF | |
| 3973 + filler_lines | |
| 3974 #endif | |
| 3975 ) | |
| 3976 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3977 long num; |
| 4065 | 3978 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3979 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3980 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
|
3981 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3982 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3983 else |
| 4065 | 3984 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3985 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3986 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
|
3987 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3988 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3989 /* 'number' + 'relativenumber' */ |
| 4065 | 3990 num = lnum; |
| 3991 fmt = "%-*ld "; | |
| 3992 } | |
| 3993 } | |
| 3994 | |
| 3995 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3996 number_width(wp), num); |
| 7 | 3997 if (wp->w_skipcol > 0) |
| 3998 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3999 *p_extra = '-'; | |
| 4000 #ifdef FEAT_RIGHTLEFT | |
| 4001 if (wp->w_p_rl) /* reverse line numbers */ | |
|
16137
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4002 { |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4003 char_u *p1, *p2; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4004 int t; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4005 |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4006 // like rl_mirror(), but keep the space at the end |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4007 p2 = skiptowhite(extra) - 1; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4008 for (p1 = extra; p1 < p2; ++p1, --p2) |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4009 { |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4010 t = *p1; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4011 *p1 = *p2; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4012 *p2 = t; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4013 } |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4014 } |
| 7 | 4015 #endif |
| 4016 p_extra = extra; | |
| 4017 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4018 c_final = NUL; |
| 7 | 4019 } |
| 4020 else | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4021 { |
| 7 | 4022 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4023 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4024 } |
| 13 | 4025 n_extra = number_width(wp) + 1; |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4026 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_N)); |
| 743 | 4027 #ifdef FEAT_SYN_HL |
| 4028 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 4029 * the current line differently. |
| 4030 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 4031 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4032 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 4033 && lnum == wp->w_cursor.lnum) |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4034 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); |
| 743 | 4035 #endif |
| 7 | 4036 } |
| 4037 } | |
| 4038 | |
| 5995 | 4039 #ifdef FEAT_LINEBREAK |
| 4040 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4041 && n_extra == 0 && *p_sbr != NUL) | |
| 4042 /* draw indent after showbreak value */ | |
| 4043 draw_state = WL_BRI; | |
| 4044 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4045 /* After the showbreak, draw the breakindent */ | |
| 4046 draw_state = WL_BRI - 1; | |
| 4047 | |
| 4048 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4049 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4050 { | |
| 4051 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4052 /* 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
|
4053 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
|
4054 && (row != startrow || need_showbreak) |
| 5995 | 4055 # ifdef FEAT_DIFF |
| 4056 && filler_lines == 0 | |
| 6834 | 4057 # endif |
| 5995 | 4058 ) |
| 4059 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4060 char_attr = 0; |
| 6834 | 4061 # ifdef FEAT_DIFF |
| 5995 | 4062 if (diff_hlf != (hlf_T)0) |
| 6106 | 4063 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4064 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4065 # ifdef FEAT_SYN_HL |
| 6106 | 4066 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4067 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
|
4068 HL_ATTR(HLF_CUL)); |
| 6834 | 4069 # endif |
| 6106 | 4070 } |
| 6834 | 4071 # endif |
| 6028 | 4072 p_extra = NULL; |
| 5995 | 4073 c_extra = ' '; |
| 4074 n_extra = get_breakindent_win(wp, | |
| 4075 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4076 /* Correct end of highlighted area for 'breakindent', | |
| 4077 * required when 'linebreak' is also set. */ | |
| 4078 if (tocol == vcol) | |
| 4079 tocol += n_extra; | |
| 4080 } | |
| 4081 } | |
| 4082 #endif | |
| 4083 | |
| 7 | 4084 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4085 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4086 { | |
| 4087 draw_state = WL_SBR; | |
| 4088 # ifdef FEAT_DIFF | |
| 4089 if (filler_todo > 0) | |
| 4090 { | |
| 4091 /* Draw "deleted" diff line(s). */ | |
| 4092 if (char2cells(fill_diff) > 1) | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4093 { |
| 7 | 4094 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4095 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4096 } |
| 7 | 4097 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4098 { |
| 7 | 4099 c_extra = fill_diff; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4100 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4101 } |
| 7 | 4102 # ifdef FEAT_RIGHTLEFT |
| 4103 if (wp->w_p_rl) | |
| 4104 n_extra = col + 1; | |
| 4105 else | |
| 4106 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4107 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
|
4108 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4109 } |
| 4110 # endif | |
| 4111 # ifdef FEAT_LINEBREAK | |
| 4112 if (*p_sbr != NUL && need_showbreak) | |
| 4113 { | |
| 4114 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4115 p_extra = p_sbr; | |
| 4116 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4117 c_final = NUL; |
| 7 | 4118 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
|
4119 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4120 need_showbreak = FALSE; |
| 6503 | 4121 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4122 /* Correct end of highlighted area for 'showbreak', |
| 4123 * required when 'linebreak' is also set. */ | |
| 4124 if (tocol == vcol) | |
| 4125 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4126 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4127 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4128 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4129 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
|
4130 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4131 #endif |
| 7 | 4132 } |
| 4133 # endif | |
| 4134 } | |
| 4135 #endif | |
| 4136 | |
| 4137 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4138 { | |
| 4139 draw_state = WL_LINE; | |
| 4140 if (saved_n_extra) | |
| 4141 { | |
| 4142 /* Continue item from end of wrapped line. */ | |
| 4143 n_extra = saved_n_extra; | |
| 4144 c_extra = saved_c_extra; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4145 c_final = saved_c_final; |
| 7 | 4146 p_extra = saved_p_extra; |
| 4147 char_attr = saved_char_attr; | |
| 4148 } | |
| 4149 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4150 char_attr = win_attr; |
| 7 | 4151 } |
| 4152 } | |
| 4153 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4154 // When still displaying '$' of change command, stop at cursor. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4155 // When only displaying the (relative) line number and that's done, |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4156 // stop here. |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4157 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4158 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4159 #ifdef FEAT_DIFF |
| 4160 && filler_todo <= 0 | |
| 4161 #endif | |
| 4162 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4163 || (number_only && draw_state > WL_NR)) |
| 7 | 4164 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4165 screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4166 screen_line_flags); |
| 819 | 4167 /* Pretend we have finished updating the window. Except when |
| 4168 * 'cursorcolumn' is set. */ | |
| 4169 #ifdef FEAT_SYN_HL | |
| 4170 if (wp->w_p_cuc) | |
| 4171 row = wp->w_cline_row + wp->w_cline_height; | |
| 4172 else | |
| 4173 #endif | |
| 4174 row = wp->w_height; | |
| 7 | 4175 break; |
| 4176 } | |
| 4177 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4178 if (draw_state == WL_LINE && (area_highlighting |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4179 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4180 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4181 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4182 )) |
| 7 | 4183 { |
| 4184 /* handle Visual or match highlighting in this line */ | |
| 4185 if (vcol == fromcol | |
| 4186 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4187 && (*mb_ptr2cells)(ptr) > 1) | |
| 4188 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4189 && vcol_prev < vcol /* not at margin */ |
| 7 | 4190 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4191 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4192 else if (area_attr != 0 |
| 4193 && (vcol == tocol | |
| 4194 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4195 area_attr = 0; /* stop highlighting */ | |
| 4196 | |
| 4197 #ifdef FEAT_SEARCH_EXTRA | |
| 4198 if (!n_extra) | |
| 4199 { | |
| 4200 /* | |
| 4201 * Check for start/end of search pattern match. | |
| 4202 * After end, check for start/end of next match. | |
| 4203 * When another match, have to check for start again. | |
| 4204 * Watch out for matching an empty string! | |
| 1326 | 4205 * Do this for 'search_hl' and the match list (ordered by |
| 4206 * priority). | |
| 7 | 4207 */ |
| 36 | 4208 v = (long)(ptr - line); |
| 1326 | 4209 cur = wp->w_match_head; |
| 4210 shl_flag = FALSE; | |
| 4211 while (cur != NULL || shl_flag == FALSE) | |
| 4212 { | |
| 4213 if (shl_flag == FALSE | |
| 4214 && ((cur != NULL | |
| 4215 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4216 || cur == NULL)) | |
| 4217 { | |
| 4218 shl = &search_hl; | |
| 4219 shl_flag = TRUE; | |
| 4220 } | |
| 4221 else | |
| 4222 shl = &cur->hl; | |
| 5979 | 4223 if (cur != NULL) |
| 4224 cur->pos.cur = 0; | |
| 4225 pos_inprogress = TRUE; | |
| 4226 while (shl->rm.regprog != NULL | |
| 4227 || (cur != NULL && pos_inprogress)) | |
| 7 | 4228 { |
| 36 | 4229 if (shl->startcol != MAXCOL |
| 4230 && v >= (long)shl->startcol | |
| 4231 && v < (long)shl->endcol) | |
| 7 | 4232 { |
| 6430 | 4233 int tmp_col = v + MB_PTR2LEN(ptr); |
| 4234 | |
| 4235 if (shl->endcol < tmp_col) | |
| 4236 shl->endcol = tmp_col; | |
| 7 | 4237 shl->attr_cur = shl->attr; |
| 6947 | 4238 #ifdef FEAT_CONCEAL |
|
16154
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4239 // Match with the "Conceal" group results in hiding |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4240 // the match. |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4241 if (cur != NULL |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4242 && shl != &search_hl |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4243 && syn_name2id((char_u *)"Conceal") |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4244 == cur->hlg_id) |
| 6947 | 4245 { |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4246 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4247 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4248 match_conc = cur->conceal_char; |
| 4249 } | |
| 4250 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4251 has_match_conc = match_conc = 0; |
| 6947 | 4252 #endif |
| 7 | 4253 } |
| 6430 | 4254 else if (v == (long)shl->endcol) |
| 7 | 4255 { |
| 4256 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4257 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
|
4258 shl == &search_hl ? NULL : cur); |
| 5979 | 4259 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4260 ? FALSE : TRUE; |
| 7 | 4261 |
| 4262 /* Need to get the line again, a multi-line regexp | |
| 4263 * may have made it invalid. */ | |
| 4264 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4265 ptr = line + v; | |
| 4266 | |
| 4267 if (shl->lnum == lnum) | |
| 4268 { | |
| 36 | 4269 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4270 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4271 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4272 else |
| 36 | 4273 shl->endcol = MAXCOL; |
| 4274 | |
| 4275 if (shl->startcol == shl->endcol) | |
| 7 | 4276 { |
| 4277 /* highlight empty match, try again after | |
| 4278 * it */ | |
| 4279 if (has_mbyte) | |
| 474 | 4280 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4281 + shl->endcol); |
| 7 | 4282 else |
| 36 | 4283 ++shl->endcol; |
| 7 | 4284 } |
| 4285 | |
| 4286 /* Loop to check if the match starts at the | |
| 4287 * current position */ | |
| 4288 continue; | |
| 4289 } | |
| 4290 } | |
| 4291 break; | |
| 4292 } | |
| 1326 | 4293 if (shl != &search_hl && cur != NULL) |
| 4294 cur = cur->next; | |
| 4295 } | |
| 4296 | |
| 4297 /* Use attributes from match with highest priority among | |
| 4298 * 'search_hl' and the match list. */ | |
| 4299 search_attr = search_hl.attr_cur; | |
| 4300 cur = wp->w_match_head; | |
| 4301 shl_flag = FALSE; | |
| 4302 while (cur != NULL || shl_flag == FALSE) | |
| 4303 { | |
| 4304 if (shl_flag == FALSE | |
| 4305 && ((cur != NULL | |
| 4306 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4307 || cur == NULL)) | |
| 699 | 4308 { |
| 1326 | 4309 shl = &search_hl; |
| 4310 shl_flag = TRUE; | |
| 699 | 4311 } |
| 1326 | 4312 else |
| 4313 shl = &cur->hl; | |
| 4314 if (shl->attr_cur != 0) | |
| 4315 search_attr = shl->attr_cur; | |
| 4316 if (shl != &search_hl && cur != NULL) | |
| 4317 cur = cur->next; | |
| 4318 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4319 /* 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
|
4320 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
|
4321 || (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
|
4322 search_attr = 0; |
| 7 | 4323 } |
| 4324 #endif | |
| 4325 | |
| 4326 #ifdef FEAT_DIFF | |
| 674 | 4327 if (diff_hlf != (hlf_T)0) |
| 7 | 4328 { |
| 1295 | 4329 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4330 && n_extra == 0) | |
| 7 | 4331 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4332 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4333 && n_extra == 0) | |
| 7 | 4334 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
|
4335 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4336 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
|
4337 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4338 } |
| 4339 #endif | |
| 4340 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4341 #ifdef FEAT_TEXT_PROP |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4342 if (text_props != NULL) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4343 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4344 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4345 int bcol = (int)(ptr - line); |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4346 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4347 // Check if any active property ends. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4348 for (pi = 0; pi < text_props_active; ++pi) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4349 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4350 int tpi = text_prop_idxs[pi]; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4351 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4352 if (bcol >= text_props[tpi].tp_col - 1 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4353 + text_props[tpi].tp_len) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4354 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4355 if (pi + 1 < text_props_active) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4356 mch_memmove(text_prop_idxs + pi, |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4357 text_prop_idxs + pi + 1, |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4358 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4359 * (text_props_active - (pi + 1))); |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4360 --text_props_active; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4361 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4362 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4363 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4364 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4365 // Add any text property that starts in this column. |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4366 while (text_prop_next < text_prop_count |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4367 && bcol >= text_props[text_prop_next].tp_col - 1) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4368 text_prop_idxs[text_props_active++] = text_prop_next++; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4369 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4370 text_prop_attr = 0; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4371 text_prop_combine = FALSE; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4372 if (text_props_active > 0) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4373 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4374 // Sort the properties on priority and/or starting last. |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4375 // Then combine the attributes, highest priority last. |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4376 current_text_props = text_props; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4377 current_buf = wp->w_buffer; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4378 qsort((void *)text_prop_idxs, (size_t)text_props_active, |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4379 sizeof(int), text_prop_compare); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4380 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4381 for (pi = 0; pi < text_props_active; ++pi) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4382 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4383 int tpi = text_prop_idxs[pi]; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4384 proptype_T *pt = text_prop_type_by_id( |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4385 wp->w_buffer, text_props[tpi].tp_type); |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4386 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4387 if (pt != NULL) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4388 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4389 int pt_attr = syn_id2attr(pt->pt_hl_id); |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4390 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4391 text_prop_type = pt; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4392 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4393 hl_combine_attr(text_prop_attr, pt_attr); |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4394 text_prop_combine = pt->pt_flags & PT_FLAG_COMBINE; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4395 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4396 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4397 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4398 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4399 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4400 |
| 674 | 4401 /* Decide which of the highlight attributes to use. */ |
| 4402 attr_pri = TRUE; | |
| 6717 | 4403 #ifdef LINE_ATTR |
| 674 | 4404 if (area_attr != 0) |
| 6717 | 4405 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4406 else if (search_attr != 0) |
| 6717 | 4407 char_attr = hl_combine_attr(line_attr, search_attr); |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4408 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4409 else if (text_prop_type != NULL) |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4410 { |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4411 char_attr = hl_combine_attr( |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4412 line_attr != 0 ? line_attr : win_attr, text_prop_attr); |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4413 } |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4414 # endif |
| 674 | 4415 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4416 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4417 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4418 // Use line_attr when not in the Visual or 'incsearch' area |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4419 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4420 char_attr = line_attr; |
| 6717 | 4421 #else |
| 4422 if (area_attr != 0) | |
| 4423 char_attr = area_attr; | |
| 4424 else if (search_attr != 0) | |
| 4425 char_attr = search_attr; | |
| 674 | 4426 #endif |
| 4427 else | |
| 4428 { | |
| 4429 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4430 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4431 if (text_prop_type != NULL) |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4432 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4433 if (text_prop_combine) |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4434 char_attr = hl_combine_attr( |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4435 syntax_attr, text_prop_attr); |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4436 else |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4437 char_attr = hl_combine_attr( |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4438 win_attr, text_prop_attr); |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4439 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4440 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4441 #endif |
| 674 | 4442 #ifdef FEAT_SYN_HL |
| 4443 if (has_syntax) | |
| 4444 char_attr = syntax_attr; | |
| 4445 else | |
| 4446 #endif | |
| 4447 char_attr = 0; | |
| 4448 } | |
| 7 | 4449 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4450 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4451 char_attr = win_attr; |
| 7 | 4452 |
| 4453 /* | |
| 4454 * Get the next character to put on the screen. | |
| 4455 */ | |
| 4456 /* | |
| 1340 | 4457 * The "p_extra" points to the extra stuff that is inserted to |
| 4458 * represent special characters (non-printable stuff) and other | |
| 4459 * things. When all characters are the same, c_extra is used. | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4460 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4461 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4462 * "p_extra[n_extra]". | |
| 7 | 4463 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4464 */ | |
| 4465 if (n_extra > 0) | |
| 4466 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4467 if (c_extra != NUL || (n_extra == 1 && c_final != NUL)) |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4468 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4469 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4470 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
|
4471 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4472 { |
| 4473 mb_utf8 = TRUE; | |
| 714 | 4474 u8cc[0] = 0; |
| 819 | 4475 c = 0xc0; |
| 7 | 4476 } |
| 4477 else | |
| 4478 mb_utf8 = FALSE; | |
| 4479 } | |
| 4480 else | |
| 4481 { | |
| 4482 c = *p_extra; | |
| 4483 if (has_mbyte) | |
| 4484 { | |
| 4485 mb_c = c; | |
| 4486 if (enc_utf8) | |
| 4487 { | |
| 4488 /* If the UTF-8 character is more than one byte: | |
| 4489 * 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
|
4490 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4491 mb_utf8 = FALSE; |
| 4492 if (mb_l > n_extra) | |
| 4493 mb_l = 1; | |
| 4494 else if (mb_l > 1) | |
| 4495 { | |
| 714 | 4496 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4497 mb_utf8 = TRUE; |
| 819 | 4498 c = 0xc0; |
| 7 | 4499 } |
| 4500 } | |
| 4501 else | |
| 4502 { | |
| 4503 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4504 mb_l = MB_BYTE2LEN(c); | |
| 4505 if (mb_l >= n_extra) | |
| 4506 mb_l = 1; | |
| 4507 else if (mb_l > 1) | |
| 4508 mb_c = (c << 8) + p_extra[1]; | |
| 4509 } | |
| 504 | 4510 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4511 mb_l = 1; | |
| 4512 | |
| 7 | 4513 /* If a double-width char doesn't fit display a '>' in the |
| 4514 * last column. */ | |
| 504 | 4515 if (( |
| 7 | 4516 # ifdef FEAT_RIGHTLEFT |
| 4517 wp->w_p_rl ? (col <= 0) : | |
| 4518 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4519 (col >= wp->w_width - 1)) |
| 7 | 4520 && (*mb_char2cells)(mb_c) == 2) |
| 4521 { | |
| 4522 c = '>'; | |
| 4523 mb_c = c; | |
| 4524 mb_l = 1; | |
| 4525 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
|
4526 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4527 /* put the pointer back to output the double-width |
| 4528 * character at the start of the next line. */ | |
| 4529 ++n_extra; | |
| 4530 --p_extra; | |
| 4531 } | |
| 4532 else | |
| 4533 { | |
| 4534 n_extra -= mb_l - 1; | |
| 4535 p_extra += mb_l - 1; | |
| 4536 } | |
| 4537 } | |
| 4538 ++p_extra; | |
| 4539 } | |
| 4540 --n_extra; | |
| 4541 } | |
| 4542 else | |
| 4543 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4544 #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
|
4545 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4546 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4547 |
| 6026 | 4548 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
|
4549 VIM_CLEAR(p_extra_free); |
| 7 | 4550 /* |
| 4551 * Get a character from the line itself. | |
| 4552 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4553 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4554 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4555 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4556 #endif |
| 7 | 4557 if (has_mbyte) |
| 4558 { | |
| 4559 mb_c = c; | |
| 4560 if (enc_utf8) | |
| 4561 { | |
| 4562 /* If the UTF-8 character is more than one byte: Decode it | |
| 4563 * 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
|
4564 mb_l = utfc_ptr2len(ptr); |
| 7 | 4565 mb_utf8 = FALSE; |
| 4566 if (mb_l > 1) | |
| 4567 { | |
| 714 | 4568 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4569 /* Overlong encoded ASCII or ASCII with composing char |
| 4570 * is displayed normally, except a NUL. */ | |
| 4571 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
|
4572 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4573 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4574 #ifdef FEAT_LINEBREAK |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4575 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4576 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4577 } |
| 7 | 4578 mb_utf8 = TRUE; |
| 507 | 4579 |
| 4580 /* At start of the line we can have a composing char. | |
| 4581 * Draw it as a space with a composing char. */ | |
| 4582 if (utf_iscomposing(mb_c)) | |
| 4583 { | |
| 1326 | 4584 int i; |
| 4585 | |
| 714 | 4586 for (i = Screen_mco - 1; i > 0; --i) |
| 4587 u8cc[i] = u8cc[i - 1]; | |
| 4588 u8cc[0] = mb_c; | |
| 507 | 4589 mb_c = ' '; |
| 4590 } | |
| 7 | 4591 } |
| 4592 | |
| 4593 if ((mb_l == 1 && c >= 0x80) | |
| 4594 || (mb_l >= 1 && mb_c == 0) | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4595 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4596 { |
| 4597 /* | |
| 4598 * Illegal UTF-8 byte: display as <xx>. | |
| 4599 * Non-BMP character : display as ? or fullwidth ?. | |
| 4600 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4601 transchar_hex(extra, mb_c); |
| 714 | 4602 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4603 if (wp->w_p_rl) /* reverse */ |
|
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4604 rl_mirror(extra); |
| 714 | 4605 # endif |
| 7 | 4606 p_extra = extra; |
| 4607 c = *p_extra; | |
| 4608 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4609 mb_utf8 = (c >= 0x80); | |
| 4610 n_extra = (int)STRLEN(p_extra); | |
| 4611 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4612 c_final = NUL; |
| 7 | 4613 if (area_attr == 0 && search_attr == 0) |
| 4614 { | |
| 4615 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
|
4616 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4617 saved_attr2 = char_attr; /* save current attr */ |
| 4618 } | |
| 4619 } | |
| 4620 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4621 mb_l = 1; | |
| 4622 #ifdef FEAT_ARABIC | |
| 4623 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4624 { | |
| 4625 /* Do Arabic shaping. */ | |
| 714 | 4626 int pc, pc1, nc; |
| 4627 int pcc[MAX_MCO]; | |
| 7 | 4628 |
| 4629 /* The idea of what is the previous and next | |
| 4630 * character depends on 'rightleft'. */ | |
| 4631 if (wp->w_p_rl) | |
| 4632 { | |
| 4633 pc = prev_c; | |
| 4634 pc1 = prev_c1; | |
| 4635 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4636 prev_c1 = u8cc[0]; |
| 7 | 4637 } |
| 4638 else | |
| 4639 { | |
| 714 | 4640 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4641 nc = prev_c; |
| 714 | 4642 pc1 = pcc[0]; |
| 7 | 4643 } |
| 4644 prev_c = mb_c; | |
| 4645 | |
| 714 | 4646 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4647 } |
| 4648 else | |
| 4649 prev_c = mb_c; | |
| 4650 #endif | |
| 4651 } | |
| 4652 else /* enc_dbcs */ | |
| 4653 { | |
| 4654 mb_l = MB_BYTE2LEN(c); | |
| 4655 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4656 mb_l = 1; | |
| 4657 else if (mb_l > 1) | |
| 4658 { | |
| 4659 /* We assume a second byte below 32 is illegal. | |
| 4660 * Hopefully this is OK for all double-byte encodings! | |
| 4661 */ | |
| 4662 if (ptr[1] >= 32) | |
| 4663 mb_c = (c << 8) + ptr[1]; | |
| 4664 else | |
| 4665 { | |
| 4666 if (ptr[1] == NUL) | |
| 4667 { | |
| 4668 /* head byte at end of line */ | |
| 4669 mb_l = 1; | |
| 4670 transchar_nonprint(extra, c); | |
| 4671 } | |
| 4672 else | |
| 4673 { | |
| 4674 /* illegal tail byte */ | |
| 4675 mb_l = 2; | |
| 4676 STRCPY(extra, "XX"); | |
| 4677 } | |
| 4678 p_extra = extra; | |
| 4679 n_extra = (int)STRLEN(extra) - 1; | |
| 4680 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4681 c_final = NUL; |
| 7 | 4682 c = *p_extra++; |
| 4683 if (area_attr == 0 && search_attr == 0) | |
| 4684 { | |
| 4685 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
|
4686 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4687 saved_attr2 = char_attr; /* save current attr */ |
| 4688 } | |
| 4689 mb_c = c; | |
| 4690 } | |
| 4691 } | |
| 4692 } | |
| 4693 /* If a double-width char doesn't fit display a '>' in the | |
| 4694 * last column; the character is displayed at the start of the | |
| 4695 * next line. */ | |
| 4696 if (( | |
| 4697 # ifdef FEAT_RIGHTLEFT | |
| 4698 wp->w_p_rl ? (col <= 0) : | |
| 4699 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4700 (col >= wp->w_width - 1)) |
| 7 | 4701 && (*mb_char2cells)(mb_c) == 2) |
| 4702 { | |
| 4703 c = '>'; | |
| 4704 mb_c = c; | |
| 4705 mb_utf8 = FALSE; | |
| 4706 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
|
4707 multi_attr = HL_ATTR(HLF_AT); |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4708 // Put pointer back so that the character will be |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4709 // displayed at the start of the next line. |
| 7 | 4710 --ptr; |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4711 #ifdef FEAT_CONCEAL |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4712 did_decrement_ptr = TRUE; |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4713 #endif |
| 7 | 4714 } |
| 4715 else if (*ptr != NUL) | |
| 4716 ptr += mb_l - 1; | |
| 4717 | |
| 4718 /* 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
|
4719 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4720 * 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
|
4721 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4722 { |
| 4723 n_extra = 1; | |
| 3586 | 4724 c_extra = MB_FILLER_CHAR; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4725 c_final = NUL; |
| 7 | 4726 c = ' '; |
| 4727 if (area_attr == 0 && search_attr == 0) | |
| 4728 { | |
| 4729 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
|
4730 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4731 saved_attr2 = char_attr; /* save current attr */ |
| 4732 } | |
| 4733 mb_c = c; | |
| 4734 mb_utf8 = FALSE; | |
| 4735 mb_l = 1; | |
| 4736 } | |
| 4737 | |
| 4738 } | |
| 4739 ++ptr; | |
| 4740 | |
| 4741 if (extra_check) | |
| 4742 { | |
| 743 | 4743 #ifdef FEAT_SPELL |
| 221 | 4744 int can_spell = TRUE; |
| 743 | 4745 #endif |
| 4746 | |
|
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
|
4747 #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
|
4748 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
|
4749 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4750 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
|
4751 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4752 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
|
4753 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
|
4754 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
|
4755 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
|
4756 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4757 #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
|
4758 |
| 743 | 4759 #ifdef FEAT_SYN_HL |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4760 // Get syntax attribute, unless still at the start of the line |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4761 // (double-wide char that doesn't fit). |
| 221 | 4762 v = (long)(ptr - line); |
| 4763 if (has_syntax && v > 0) | |
| 7 | 4764 { |
| 4765 /* Get the syntax attribute for the character. If there | |
| 4766 * is an error, disable syntax highlighting. */ | |
| 4767 save_did_emsg = did_emsg; | |
| 4768 did_emsg = FALSE; | |
| 4769 | |
| 221 | 4770 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4771 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4772 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4773 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4774 NULL, FALSE); |
| 7 | 4775 |
| 4776 if (did_emsg) | |
| 482 | 4777 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4778 wp->w_s->b_syn_error = TRUE; |
| 482 | 4779 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4780 syntax_attr = 0; |
| 482 | 4781 } |
| 7 | 4782 else |
| 4783 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4784 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4785 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4786 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4787 syntax_attr = hl_combine_attr(win_attr, syntax_attr); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4788 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4789 #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
|
4790 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
|
4791 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4792 #endif |
| 7 | 4793 |
| 4794 /* Need to get the line again, a multi-line regexp may | |
| 4795 * have made it invalid. */ | |
| 4796 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4797 ptr = line + v; | |
| 4798 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4799 # ifdef FEAT_TEXT_PROP |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4800 // Text properties overrule syntax highlighting or combine. |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4801 if (text_prop_attr == 0 || text_prop_combine) |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4802 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4803 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4804 int comb_attr = syntax_attr; |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4805 # ifdef FEAT_TEXT_PROP |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4806 comb_attr = hl_combine_attr(text_prop_attr, comb_attr); |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4807 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4808 if (!attr_pri) |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4809 char_attr = comb_attr; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4810 else |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4811 char_attr = hl_combine_attr(comb_attr, char_attr); |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4812 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4813 # 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
|
4814 /* 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
|
4815 * 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
|
4816 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
|
4817 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
|
4818 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
|
4819 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
|
4820 # endif |
| 7 | 4821 } |
| 743 | 4822 #endif |
| 4823 | |
| 4824 #ifdef FEAT_SPELL | |
| 301 | 4825 /* Check spelling (unless at the end of the line). |
| 319 | 4826 * Only do this when there is no syntax highlighting, the |
| 4827 * @Spell cluster is not used or the current syntax item | |
| 4828 * contains the @Spell cluster. */ | |
| 348 | 4829 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4830 { |
| 230 | 4831 spell_attr = 0; |
| 743 | 4832 if (c != 0 && ( |
| 4833 # ifdef FEAT_SYN_HL | |
| 4834 !has_syntax || | |
| 4835 # endif | |
| 4836 can_spell)) | |
| 221 | 4837 { |
| 348 | 4838 char_u *prev_ptr, *p; |
| 4839 int len; | |
| 534 | 4840 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 4841 if (has_mbyte) |
| 4842 { | |
| 4843 prev_ptr = ptr - mb_l; | |
| 4844 v -= mb_l - 1; | |
| 4845 } | |
| 4846 else | |
| 4847 prev_ptr = ptr - 1; | |
| 348 | 4848 |
| 4849 /* Use nextline[] if possible, it has the start of the | |
| 4850 * next line concatenated. */ | |
| 4851 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4852 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4853 else | |
| 4854 p = prev_ptr; | |
| 835 | 4855 cap_col -= (int)(prev_ptr - line); |
| 625 | 4856 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4857 nochange); | |
| 348 | 4858 word_end = v + len; |
| 301 | 4859 |
| 4860 /* In Insert mode only highlight a word that | |
| 4861 * doesn't touch the cursor. */ | |
| 534 | 4862 if (spell_hlf != HLF_COUNT |
| 301 | 4863 && (State & INSERT) != 0 |
| 4864 && wp->w_cursor.lnum == lnum | |
| 4865 && wp->w_cursor.col >= | |
| 4866 (colnr_T)(prev_ptr - line) | |
| 4867 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4868 { |
| 534 | 4869 spell_hlf = HLF_COUNT; |
| 301 | 4870 spell_redraw_lnum = lnum; |
| 221 | 4871 } |
| 348 | 4872 |
| 534 | 4873 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4874 && (p - nextline) + len > nextline_idx) |
| 4875 { | |
| 4876 /* Remember that the good word continues at the | |
| 4877 * start of the next line. */ | |
| 4878 checked_lnum = lnum + 1; | |
| 835 | 4879 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4880 } |
| 386 | 4881 |
| 534 | 4882 /* Turn index into actual attributes. */ |
| 4883 if (spell_hlf != HLF_COUNT) | |
| 4884 spell_attr = highlight_attr[spell_hlf]; | |
| 4885 | |
| 386 | 4886 if (cap_col > 0) |
| 4887 { | |
| 4888 if (p != prev_ptr | |
| 4889 && (p - nextline) + cap_col >= nextline_idx) | |
| 4890 { | |
| 4891 /* Remember that the word in the next line | |
| 4892 * must start with a capital. */ | |
| 4893 capcol_lnum = lnum + 1; | |
| 835 | 4894 cap_col = (int)((p - nextline) + cap_col |
| 4895 - nextline_idx); | |
| 386 | 4896 } |
| 4897 else | |
| 4898 /* Compute the actual column. */ | |
| 835 | 4899 cap_col += (int)(prev_ptr - line); |
| 386 | 4900 } |
| 221 | 4901 } |
| 4902 } | |
| 4903 if (spell_attr != 0) | |
| 348 | 4904 { |
| 674 | 4905 if (!attr_pri) |
| 348 | 4906 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4907 else | |
| 4908 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4909 } | |
| 7 | 4910 #endif |
| 4911 #ifdef FEAT_LINEBREAK | |
| 4912 /* | |
| 221 | 4913 * Found last space before word: check for line break. |
| 7 | 4914 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4915 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
|
4916 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4917 { |
| 6693 | 4918 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4919 char_u *p = ptr - (mb_off + 1); |
| 6681 | 4920 |
| 5995 | 4921 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4922 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4923 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4924 if (c == TAB && n_extra + col > wp->w_width) |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4925 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
4926 n_extra = tabstop_padding(vcol, wp->w_buffer->b_p_ts, |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4927 wp->w_buffer->b_p_vts_array) - 1; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4928 # else |
| 6371 | 4929 n_extra = (int)wp->w_buffer->b_p_ts |
| 4930 - vcol % (int)wp->w_buffer->b_p_ts - 1; | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
4931 # endif |
| 6371 | 4932 |
| 6693 | 4933 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4934 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4935 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4936 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4937 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4938 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4939 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4940 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4941 #endif |
| 6026 | 4942 if (!wp->w_p_list) |
| 4943 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4944 } |
| 7 | 4945 } |
| 4946 #endif | |
| 4947 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4948 // 'list': Change char 160 to lcs_nbsp and space to lcs_space. |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4949 // But not when the character is followed by a composing |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4950 // character (use mb_l to check that). |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4951 if (wp->w_p_list |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4952 && ((((c == 160 && mb_l == 1) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4953 || (mb_utf8 |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4954 && ((mb_c == 160 && mb_l == 2) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4955 || (mb_c == 0x202f && mb_l == 3)))) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4956 && lcs_nbsp) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4957 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4958 && mb_l == 1 |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4959 && lcs_space |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4960 && ptr - line <= trailcol))) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4961 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4962 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4963 if (area_attr == 0 && search_attr == 0) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4964 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4965 n_attr = 1; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4966 extra_attr = HL_ATTR(HLF_8); |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4967 saved_attr2 = char_attr; /* save current attr */ |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4968 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4969 mb_c = c; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4970 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
|
4971 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4972 mb_utf8 = TRUE; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4973 u8cc[0] = 0; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4974 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4975 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4976 else |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4977 mb_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4978 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4979 |
| 7 | 4980 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4981 { | |
| 4982 c = lcs_trail; | |
| 674 | 4983 if (!attr_pri) |
| 7 | 4984 { |
| 4985 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
|
4986 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4987 saved_attr2 = char_attr; /* save current attr */ |
| 4988 } | |
| 4989 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
|
4990 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4991 { |
| 4992 mb_utf8 = TRUE; | |
| 714 | 4993 u8cc[0] = 0; |
| 819 | 4994 c = 0xc0; |
| 7 | 4995 } |
| 4996 else | |
| 4997 mb_utf8 = FALSE; | |
| 4998 } | |
| 4999 } | |
| 5000 | |
| 5001 /* | |
| 5002 * Handling of non-printable characters. | |
| 5003 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
5004 if (!vim_isprintc(c)) |
| 7 | 5005 { |
| 5006 /* | |
| 5007 * when getting a character from the file, we may have to | |
| 5008 * turn it into something else on the way to putting it | |
| 5009 * into "ScreenLines". | |
| 5010 */ | |
| 5011 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 5012 { | |
| 6026 | 5013 int tab_len = 0; |
| 6503 | 5014 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 5015 #ifdef FEAT_LINEBREAK | |
| 5016 /* only adjust the tab_len, when at the first column | |
| 5017 * after the showbreak value was drawn */ | |
| 5018 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 5019 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 5020 #endif | |
| 7 | 5021 /* tab amount depends on current column */ |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5022 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5023 tab_len = tabstop_padding(vcol_adjusted, |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5024 wp->w_buffer->b_p_ts, |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5025 wp->w_buffer->b_p_vts_array) - 1; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5026 #else |
| 6026 | 5027 tab_len = (int)wp->w_buffer->b_p_ts |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5028 - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5029 #endif |
| 6503 | 5030 |
| 6026 | 5031 #ifdef FEAT_LINEBREAK |
| 6100 | 5032 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 5033 #endif |
| 5034 /* tab amount depends on current column */ | |
| 5035 n_extra = tab_len; | |
| 5036 #ifdef FEAT_LINEBREAK | |
| 5037 else | |
| 5038 { | |
| 5039 char_u *p; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5040 int len; |
| 6026 | 5041 int i; |
| 5042 int saved_nextra = n_extra; | |
| 5043 | |
| 6172 | 5044 #ifdef FEAT_CONCEAL |
| 6627 | 5045 if (vcol_off > 0) |
| 6172 | 5046 /* there are characters to conceal */ |
| 5047 tab_len += vcol_off; | |
| 6520 | 5048 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 5049 */ | |
| 5050 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 5051 && n_extra > tab_len) | |
| 5052 tab_len += n_extra - tab_len; | |
| 5053 #endif | |
| 5054 | |
| 6026 | 5055 /* if n_extra > 0, it gives the number of chars, to |
| 5056 * use for a tab, else we need to calculate the width | |
| 5057 * for a tab */ | |
| 5058 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 5059 if (n_extra > 0) | |
| 5060 len += n_extra - tab_len; | |
| 5061 c = lcs_tab1; | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
5062 p = alloc(len + 1); |
| 6026 | 5063 vim_memset(p, ' ', len); |
| 5064 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5065 vim_free(p_extra_free); |
| 6026 | 5066 p_extra_free = p; |
| 5067 for (i = 0; i < tab_len; i++) | |
| 5068 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5069 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5070 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5071 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5072 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5073 } |
| 6026 | 5074 mb_char2bytes(lcs_tab2, p); |
| 5075 p += mb_char2len(lcs_tab2); | |
| 5076 n_extra += mb_char2len(lcs_tab2) | |
| 5077 - (saved_nextra > 0 ? 1 : 0); | |
| 5078 } | |
| 5079 p_extra = p_extra_free; | |
| 6172 | 5080 #ifdef FEAT_CONCEAL |
| 5081 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 5082 * macro below, so need to adjust for that here */ | |
| 6627 | 5083 if (vcol_off > 0) |
| 6172 | 5084 n_extra -= vcol_off; |
| 5085 #endif | |
| 6026 | 5086 } |
| 5087 #endif | |
| 3984 | 5088 #ifdef FEAT_CONCEAL |
| 6627 | 5089 { |
| 5090 int vc_saved = vcol_off; | |
| 5091 | |
| 5092 /* Tab alignment should be identical regardless of | |
| 5093 * 'conceallevel' value. So tab compensates of all | |
| 5094 * previous concealed characters, and thus resets | |
| 5095 * vcol_off and boguscols accumulated so far in the | |
| 5096 * line. Note that the tab can be longer than | |
| 5097 * 'tabstop' when there are concealed characters. */ | |
| 5098 FIX_FOR_BOGUSCOLS; | |
| 5099 | |
| 5100 /* Make sure, the highlighting for the tab char will be | |
| 5101 * correctly set further below (effectively reverts the | |
| 5102 * FIX_FOR_BOGSUCOLS macro */ | |
| 5103 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 5104 && lcs_tab1) |
| 6627 | 5105 tab_len += vc_saved; |
| 5106 } | |
| 3984 | 5107 #endif |
| 7 | 5108 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 5109 if (wp->w_p_list) | |
| 5110 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5111 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5112 #ifdef FEAT_LINEBREAK |
| 5113 if (wp->w_p_lbr) | |
| 5114 c_extra = NUL; /* using p_extra from above */ | |
| 5115 else | |
| 5116 #endif | |
| 5117 c_extra = lcs_tab2; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5118 c_final = lcs_tab3; |
| 6026 | 5119 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
|
5120 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5121 saved_attr2 = char_attr; /* save current attr */ |
| 5122 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
|
5123 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5124 { |
| 5125 mb_utf8 = TRUE; | |
| 714 | 5126 u8cc[0] = 0; |
| 819 | 5127 c = 0xc0; |
| 7 | 5128 } |
| 5129 } | |
| 5130 else | |
| 5131 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5132 c_final = NUL; |
| 7 | 5133 c_extra = ' '; |
| 5134 c = ' '; | |
| 5135 } | |
| 5136 } | |
| 36 | 5137 else if (c == NUL |
| 6799 | 5138 && (wp->w_p_list |
| 36 | 5139 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5140 && tocol > vcol | |
| 5141 && VIsual_mode != Ctrl_V | |
| 5142 && ( | |
| 5143 # ifdef FEAT_RIGHTLEFT | |
| 5144 wp->w_p_rl ? (col >= 0) : | |
| 5145 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5146 (col < wp->w_width)) |
| 36 | 5147 && !(noinvcur |
| 1850 | 5148 && lnum == wp->w_cursor.lnum |
| 36 | 5149 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5150 && lcs_eol_one > 0) |
| 7 | 5151 { |
| 36 | 5152 /* Display a '$' after the line or highlight an extra |
| 5153 * character if the line break is included. */ | |
| 7 | 5154 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5155 /* For a diff line the highlighting continues after the | |
| 5156 * "$". */ | |
| 5157 if ( | |
| 5158 # ifdef FEAT_DIFF | |
| 534 | 5159 diff_hlf == (hlf_T)0 |
| 7 | 5160 # ifdef LINE_ATTR |
| 5161 && | |
| 5162 # endif | |
| 5163 # endif | |
| 5164 # ifdef LINE_ATTR | |
| 5165 line_attr == 0 | |
| 5166 # endif | |
| 5167 ) | |
| 5168 #endif | |
| 5169 { | |
| 5170 /* In virtualedit, visual selections may extend | |
| 5171 * beyond end of line. */ | |
| 5172 if (area_highlighting && virtual_active() | |
| 5173 && tocol != MAXCOL && vcol < tocol) | |
| 5174 n_extra = 0; | |
| 5175 else | |
| 5176 { | |
| 5177 p_extra = at_end_str; | |
| 5178 n_extra = 1; | |
| 5179 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5180 c_final = NUL; |
| 7 | 5181 } |
| 5182 } | |
| 6799 | 5183 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5184 c = lcs_eol; |
| 5185 else | |
| 5186 c = ' '; | |
| 7 | 5187 lcs_eol_one = -1; |
| 5188 --ptr; /* put it back at the NUL */ | |
| 674 | 5189 if (!attr_pri) |
| 7 | 5190 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5191 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5192 n_attr = 1; |
| 5193 } | |
| 5194 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
|
5195 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5196 { |
| 5197 mb_utf8 = TRUE; | |
| 714 | 5198 u8cc[0] = 0; |
| 819 | 5199 c = 0xc0; |
| 7 | 5200 } |
| 5201 else | |
| 5202 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5203 } | |
| 5204 else if (c != NUL) | |
| 5205 { | |
| 5206 p_extra = transchar(c); | |
| 6064 | 5207 if (n_extra == 0) |
| 5208 n_extra = byte2cells(c) - 1; | |
| 7 | 5209 #ifdef FEAT_RIGHTLEFT |
| 5210 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5211 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5212 #endif | |
| 5213 c_extra = NUL; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5214 c_final = NUL; |
| 6026 | 5215 #ifdef FEAT_LINEBREAK |
| 5216 if (wp->w_p_lbr) | |
| 5217 { | |
| 5218 char_u *p; | |
| 5219 | |
| 5220 c = *p_extra; | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
5221 p = alloc(n_extra + 1); |
| 6026 | 5222 vim_memset(p, ' ', n_extra); |
| 5223 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5224 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5225 vim_free(p_extra_free); |
| 6026 | 5226 p_extra_free = p_extra = p; |
| 5227 } | |
| 5228 else | |
| 5229 #endif | |
| 5230 { | |
| 5231 n_extra = byte2cells(c) - 1; | |
| 5232 c = *p_extra++; | |
| 5233 } | |
| 674 | 5234 if (!attr_pri) |
| 7 | 5235 { |
| 5236 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
|
5237 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5238 saved_attr2 = char_attr; /* save current attr */ |
| 5239 } | |
| 5240 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5241 } | |
| 5242 else if (VIsual_active | |
| 5243 && (VIsual_mode == Ctrl_V | |
| 5244 || VIsual_mode == 'v') | |
| 5245 && virtual_active() | |
| 5246 && tocol != MAXCOL | |
| 5247 && vcol < tocol | |
| 5248 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5249 #ifdef FEAT_RIGHTLEFT |
| 7 | 5250 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5251 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5252 (col < wp->w_width))) |
| 7 | 5253 { |
| 5254 c = ' '; | |
| 5255 --ptr; /* put it back at the NUL */ | |
| 5256 } | |
| 910 | 5257 #if defined(LINE_ATTR) |
| 7 | 5258 else if (( |
| 5259 # ifdef FEAT_DIFF | |
| 910 | 5260 diff_hlf != (hlf_T)0 || |
| 7 | 5261 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5262 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5263 win_attr != 0 || |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5264 # endif |
| 7 | 5265 line_attr != 0 |
| 5266 ) && ( | |
| 5267 # ifdef FEAT_RIGHTLEFT | |
| 5268 wp->w_p_rl ? (col >= 0) : | |
| 5269 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5270 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5271 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5272 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5273 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5274 < wp->w_width))) |
| 7 | 5275 { |
| 5276 /* Highlight until the right side of the window */ | |
| 5277 c = ' '; | |
| 5278 --ptr; /* put it back at the NUL */ | |
| 867 | 5279 |
| 5280 /* Remember we do the char for line highlighting. */ | |
| 5281 ++did_line_attr; | |
| 5282 | |
| 5283 /* 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
|
5284 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
|
5285 && (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
|
5286 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5287 char_attr = line_attr; |
| 7 | 5288 # ifdef FEAT_DIFF |
| 5289 if (diff_hlf == HLF_TXD) | |
| 5290 { | |
| 5291 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5292 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5293 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5294 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5295 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5296 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
|
5297 HL_ATTR(HLF_CUL)); |
| 6106 | 5298 } |
| 7 | 5299 } |
| 5300 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5301 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5302 if (win_attr != 0) |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5303 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5304 char_attr = win_attr; |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5305 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
|
5306 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
|
5307 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
|
5308 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5309 # endif |
| 7 | 5310 } |
| 5311 #endif | |
| 5312 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5313 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5314 #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
|
5315 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
|
5316 && (wp != curwin || lnum != wp->w_cursor.lnum || |
|
16154
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
5317 conceal_cursor_line(wp)) |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
5318 && ((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
|
5319 && !(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
|
5320 && 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
|
5321 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5322 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5323 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5324 && (syn_get_sub_char() != NUL || match_conc |
| 5325 || 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
|
5326 && 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
|
5327 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5328 /* 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
|
5329 * character. */ |
| 6947 | 5330 if (match_conc) |
| 5331 c = match_conc; | |
| 5332 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
|
5333 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5334 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5335 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5336 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5337 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5338 |
|
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
|
5339 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5340 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5341 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5342 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5343 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5344 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
|
5345 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5346 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5347 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5348 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5349 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5350 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5351 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5352 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5353 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5354 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5355 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5356 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5357 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5358 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5359 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5360 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5361 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5362 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5363 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5364 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5365 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5366 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5367 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
|
5368 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
|
5369 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5370 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5371 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5372 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5373 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5374 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5375 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
|
5376 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5377 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5378 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5379 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
|
5380 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5381 } |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5382 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5383 if (n_skip > 0 && did_decrement_ptr) |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5384 // not showing the '>', put pointer back to avoid getting stuck |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5385 ++ptr; |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5386 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5387 #endif // FEAT_CONCEAL |
| 7 | 5388 } |
| 5389 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5390 #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
|
5391 /* 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
|
5392 * 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
|
5393 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
|
5394 && 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
|
5395 && 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
|
5396 && (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
|
5397 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5398 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5399 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
|
5400 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
|
5401 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5402 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5403 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
|
5404 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
|
5405 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
|
5406 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5407 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5408 |
| 7 | 5409 /* Don't override visual selection highlighting. */ |
| 5410 if (n_attr > 0 | |
| 5411 && draw_state == WL_LINE | |
| 674 | 5412 && !attr_pri) |
| 7 | 5413 char_attr = extra_attr; |
| 5414 | |
| 42 | 5415 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5416 /* XIM don't send preedit_start and preedit_end, but they send |
| 5417 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5418 * 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
|
5419 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
|
5420 && xic != NULL |
| 1850 | 5421 && lnum == wp->w_cursor.lnum |
| 7 | 5422 && (State & INSERT) |
| 5423 && !p_imdisable | |
| 5424 && im_is_preediting() | |
| 5425 && draw_state == WL_LINE) | |
| 5426 { | |
| 5427 colnr_T tcol; | |
| 5428 | |
| 5429 if (preedit_end_col == MAXCOL) | |
| 1850 | 5430 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5431 else |
| 5432 tcol = preedit_end_col; | |
| 5433 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5434 { | |
| 5435 if (feedback_old_attr < 0) | |
| 5436 { | |
| 5437 feedback_col = 0; | |
| 5438 feedback_old_attr = char_attr; | |
| 5439 } | |
| 5440 char_attr = im_get_feedback_attr(feedback_col); | |
| 5441 if (char_attr < 0) | |
| 5442 char_attr = feedback_old_attr; | |
| 5443 feedback_col++; | |
| 5444 } | |
| 5445 else if (feedback_old_attr >= 0) | |
| 5446 { | |
| 5447 char_attr = feedback_old_attr; | |
| 5448 feedback_old_attr = -1; | |
| 5449 feedback_col = 0; | |
| 5450 } | |
| 5451 } | |
| 5452 #endif | |
| 5453 /* | |
| 5454 * Handle the case where we are in column 0 but not on the first | |
| 5455 * character of the line and the user wants us to show us a | |
| 5456 * special character (via 'listchars' option "precedes:<char>". | |
| 5457 */ | |
| 5458 if (lcs_prec_todo != NUL | |
| 6276 | 5459 && wp->w_p_list |
| 7 | 5460 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5461 #ifdef FEAT_DIFF | |
| 5462 && filler_todo <= 0 | |
| 5463 #endif | |
| 5464 && draw_state > WL_NR | |
| 5465 && c != NUL) | |
| 5466 { | |
| 5467 c = lcs_prec; | |
| 5468 lcs_prec_todo = NUL; | |
| 3586 | 5469 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5470 { | |
| 5471 /* Double-width character being overwritten by the "precedes" | |
| 5472 * character, need to fill up half the character. */ | |
| 5473 c_extra = MB_FILLER_CHAR; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5474 c_final = NUL; |
| 3586 | 5475 n_extra = 1; |
| 5476 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
|
5477 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5478 } |
| 7 | 5479 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
|
5480 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5481 { |
| 5482 mb_utf8 = TRUE; | |
| 714 | 5483 u8cc[0] = 0; |
| 819 | 5484 c = 0xc0; |
| 7 | 5485 } |
| 5486 else | |
| 5487 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5488 if (!attr_pri) |
| 7 | 5489 { |
| 5490 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
|
5491 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5492 n_attr3 = 1; |
| 5493 } | |
| 5494 } | |
| 5495 | |
| 5496 /* | |
| 867 | 5497 * At end of the text line or just after the last character. |
| 7 | 5498 */ |
| 867 | 5499 if (c == NUL |
| 910 | 5500 #if defined(LINE_ATTR) |
| 867 | 5501 || did_line_attr == 1 |
| 5502 #endif | |
| 5503 ) | |
| 5504 { | |
| 5505 #ifdef FEAT_SEARCH_EXTRA | |
| 5506 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5507 |
| 5508 /* we're not really at that column when skipping some text */ | |
| 1439 | 5509 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5510 ++prevcol; |
| 867 | 5511 #endif |
| 5512 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5513 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5514 * highlight match at end of line. If it's beyond the last |
| 5515 * char on the screen, just overwrite that one (tricky!) Not | |
| 5516 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5517 #ifdef FEAT_SEARCH_EXTRA |
| 5518 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5519 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5520 prevcol_hl_flag = TRUE; |
| 5521 else | |
| 5522 { | |
| 5523 cur = wp->w_match_head; | |
| 5524 while (cur != NULL) | |
| 5525 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5526 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5527 { |
| 5528 prevcol_hl_flag = TRUE; | |
| 5529 break; | |
| 5530 } | |
| 5531 cur = cur->next; | |
| 5532 } | |
| 5533 } | |
| 5534 #endif | |
| 7 | 5535 if (lcs_eol == lcs_eol_one |
| 1850 | 5536 && ((area_attr != 0 && vcol == fromcol |
| 5537 && (VIsual_mode != Ctrl_V | |
| 5538 || lnum == VIsual.lnum | |
| 5539 || lnum == curwin->w_cursor.lnum) | |
| 5540 && c == NUL) | |
| 7 | 5541 #ifdef FEAT_SEARCH_EXTRA |
| 5542 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5543 || (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
|
5544 # 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
|
5545 && !(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
|
5546 && !(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
|
5547 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5548 # 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
|
5549 && 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
|
5550 # endif |
| 910 | 5551 # if defined(LINE_ATTR) |
| 867 | 5552 && did_line_attr <= 1 |
| 5553 # endif | |
| 5554 ) | |
| 7 | 5555 #endif |
| 5556 )) | |
| 5557 { | |
| 5558 int n = 0; | |
| 5559 | |
| 5560 #ifdef FEAT_RIGHTLEFT | |
| 5561 if (wp->w_p_rl) | |
| 5562 { | |
| 5563 if (col < 0) | |
| 5564 n = 1; | |
| 5565 } | |
| 5566 else | |
| 5567 #endif | |
| 5568 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5569 if (col >= wp->w_width) |
| 7 | 5570 n = -1; |
| 5571 } | |
| 5572 if (n != 0) | |
| 5573 { | |
| 5574 /* At the window boundary, highlight the last character | |
| 5575 * instead (better than nothing). */ | |
| 5576 off += n; | |
| 5577 col += n; | |
| 5578 } | |
| 5579 else | |
| 5580 { | |
| 5581 /* Add a blank character to highlight. */ | |
| 5582 ScreenLines[off] = ' '; | |
| 5583 if (enc_utf8) | |
| 5584 ScreenLinesUC[off] = 0; | |
| 5585 } | |
| 5586 #ifdef FEAT_SEARCH_EXTRA | |
| 5587 if (area_attr == 0) | |
| 5588 { | |
| 1326 | 5589 /* Use attributes from match with highest priority among |
| 5590 * 'search_hl' and the match list. */ | |
| 5591 char_attr = search_hl.attr; | |
| 5592 cur = wp->w_match_head; | |
| 5593 shl_flag = FALSE; | |
| 5594 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5595 { |
| 1326 | 5596 if (shl_flag == FALSE |
| 5597 && ((cur != NULL | |
| 5598 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5599 || cur == NULL)) | |
| 699 | 5600 { |
| 1326 | 5601 shl = &search_hl; |
| 5602 shl_flag = TRUE; | |
| 699 | 5603 } |
| 1326 | 5604 else |
| 5605 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5606 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
|
5607 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5608 char_attr = shl->attr; |
| 5609 if (shl != &search_hl && cur != NULL) | |
| 5610 cur = cur->next; | |
| 699 | 5611 } |
| 7 | 5612 } |
| 5613 #endif | |
| 5614 ScreenAttrs[off] = char_attr; | |
| 5615 #ifdef FEAT_RIGHTLEFT | |
| 5616 if (wp->w_p_rl) | |
| 1437 | 5617 { |
| 7 | 5618 --col; |
| 1437 | 5619 --off; |
| 5620 } | |
| 7 | 5621 else |
| 5622 #endif | |
| 1437 | 5623 { |
| 7 | 5624 ++col; |
| 1437 | 5625 ++off; |
| 5626 } | |
| 743 | 5627 ++vcol; |
| 1437 | 5628 #ifdef FEAT_SYN_HL |
| 5629 eol_hl_off = 1; | |
| 5630 #endif | |
| 743 | 5631 } |
| 867 | 5632 } |
| 5633 | |
| 5634 /* | |
| 5635 * At end of the text line. | |
| 5636 */ | |
| 5637 if (c == NUL) | |
| 5638 { | |
| 743 | 5639 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5640 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5641 if (wp->w_p_wrap) |
| 5642 v = wp->w_skipcol; | |
| 5643 else | |
| 5644 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5645 |
| 820 | 5646 /* check if line ends before left margin */ |
| 5647 if (vcol < v + col - win_col_off(wp)) | |
| 5648 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
|
5649 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5650 // Get rid of the boguscols now, we want to draw until the right |
|
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5651 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5652 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5653 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5654 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5655 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5656 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5657 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
|
5658 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5659 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5660 && (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
|
5661 && (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
|
5662 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
|
5663 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5664 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5665 || win_attr != 0) |
| 743 | 5666 # ifdef FEAT_RIGHTLEFT |
| 5667 && !wp->w_p_rl | |
| 5668 # endif | |
| 5669 ) | |
| 5670 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5671 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5672 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5673 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5674 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5675 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5676 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5677 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5678 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
|
5679 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5680 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5681 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5682 while (col < wp->w_width) |
| 743 | 5683 { |
| 5684 ScreenLines[off] = ' '; | |
| 5685 if (enc_utf8) | |
| 5686 ScreenLinesUC[off] = 0; | |
| 5687 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5688 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5689 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
|
5690 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5691 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5692 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
|
5693 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
|
5694 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
|
5695 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5696 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5697 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5698 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5699 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5700 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5701 |
| 743 | 5702 ++vcol; |
| 5703 } | |
| 5704 } | |
| 5705 #endif | |
| 7 | 5706 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5707 screen_line(screen_row, wp->w_wincol, col, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5708 (int)wp->w_width, screen_line_flags); |
| 7 | 5709 row++; |
| 5710 | |
| 5711 /* | |
| 5712 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5713 * updated (saves a call to plines() later). | |
| 5714 */ | |
| 5715 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5716 { | |
| 5717 curwin->w_cline_row = startrow; | |
| 5718 curwin->w_cline_height = row - startrow; | |
| 5719 #ifdef FEAT_FOLDING | |
| 5720 curwin->w_cline_folded = FALSE; | |
| 5721 #endif | |
| 5722 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5723 } | |
| 5724 | |
| 5725 break; | |
| 5726 } | |
| 5727 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5728 // Show "extends" character from 'listchars' if beyond the line end and |
|
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5729 // 'list' is set. |
|
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5730 if (lcs_ext != NUL |
|
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5731 && wp->w_p_list |
| 7 | 5732 && !wp->w_p_wrap |
| 5733 #ifdef FEAT_DIFF | |
| 5734 && filler_todo <= 0 | |
| 5735 #endif | |
| 5736 && ( | |
| 5737 #ifdef FEAT_RIGHTLEFT | |
| 5738 wp->w_p_rl ? col == 0 : | |
| 5739 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5740 col == wp->w_width - 1) |
| 7 | 5741 && (*ptr != NUL |
| 1555 | 5742 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5743 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5744 { | |
| 5745 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
|
5746 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5747 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
|
5748 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5749 { |
| 5750 mb_utf8 = TRUE; | |
| 714 | 5751 u8cc[0] = 0; |
| 819 | 5752 c = 0xc0; |
| 7 | 5753 } |
| 5754 else | |
| 5755 mb_utf8 = FALSE; | |
| 5756 } | |
| 5757 | |
| 743 | 5758 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5759 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5760 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5761 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
|
5762 |
| 743 | 5763 /* 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
|
5764 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5765 * 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
|
5766 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5767 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
|
5768 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
|
5769 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5770 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5771 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
|
5772 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5773 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5774 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
|
5775 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
|
5776 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5777 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
|
5778 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5779 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
|
5780 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
|
5781 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5782 } |
| 743 | 5783 #endif |
| 5784 | |
| 7 | 5785 /* |
| 5786 * Store character to be displayed. | |
| 5787 * Skip characters that are left of the screen for 'nowrap'. | |
| 5788 */ | |
| 5789 vcol_prev = vcol; | |
| 5790 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5791 { | |
| 5792 /* | |
| 5793 * Store the character. | |
| 5794 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5795 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5796 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5797 { | |
| 5798 /* A double-wide character is: put first halve in left cell. */ | |
| 5799 --off; | |
| 5800 --col; | |
| 5801 } | |
| 5802 #endif | |
| 5803 ScreenLines[off] = c; | |
| 5804 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5805 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5806 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5807 ScreenLines[off] = 0x8e; |
| 7 | 5808 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5809 } |
| 7 | 5810 else if (enc_utf8) |
| 5811 { | |
| 5812 if (mb_utf8) | |
| 5813 { | |
| 1326 | 5814 int i; |
| 5815 | |
| 7 | 5816 ScreenLinesUC[off] = mb_c; |
| 819 | 5817 if ((c & 0xff) == 0) |
| 5818 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5819 for (i = 0; i < Screen_mco; ++i) |
| 5820 { | |
| 5821 ScreenLinesC[i][off] = u8cc[i]; | |
| 5822 if (u8cc[i] == 0) | |
| 5823 break; | |
| 5824 } | |
| 7 | 5825 } |
| 5826 else | |
| 5827 ScreenLinesUC[off] = 0; | |
| 5828 } | |
| 5829 if (multi_attr) | |
| 5830 { | |
| 5831 ScreenAttrs[off] = multi_attr; | |
| 5832 multi_attr = 0; | |
| 5833 } | |
| 5834 else | |
| 5835 ScreenAttrs[off] = char_attr; | |
| 5836 | |
| 5837 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5838 { | |
| 5839 /* Need to fill two screen columns. */ | |
| 5840 ++off; | |
| 5841 ++col; | |
| 5842 if (enc_utf8) | |
| 5843 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5844 ScreenLines[off] = 0; | |
| 5845 else | |
| 5846 /* DBCS: Put second byte in the second screen char. */ | |
| 5847 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5848 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5849 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5850 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5851 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5852 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5853 ++vcol; |
| 7 | 5854 /* When "tocol" is halfway a character, set it to the end of |
| 5855 * the character, otherwise highlighting won't stop. */ | |
| 5856 if (tocol == vcol) | |
| 5857 ++tocol; | |
| 5858 #ifdef FEAT_RIGHTLEFT | |
| 5859 if (wp->w_p_rl) | |
| 5860 { | |
| 5861 /* now it's time to backup one cell */ | |
| 5862 --off; | |
| 5863 --col; | |
| 5864 } | |
| 5865 #endif | |
| 5866 } | |
| 5867 #ifdef FEAT_RIGHTLEFT | |
| 5868 if (wp->w_p_rl) | |
| 5869 { | |
| 5870 --off; | |
| 5871 --col; | |
| 5872 } | |
| 5873 else | |
| 5874 #endif | |
| 5875 { | |
| 5876 ++off; | |
| 5877 ++col; | |
| 5878 } | |
| 5879 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5880 #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
|
5881 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
|
5882 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5883 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5884 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5885 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5886 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5887 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5888 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5889 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5890 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5891 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5892 * 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
|
5893 * 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
|
5894 * 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
|
5895 * 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
|
5896 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5897 * 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
|
5898 * 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
|
5899 * 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
|
5900 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5901 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5902 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5903 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5904 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5905 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5906 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5907 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5908 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5909 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5910 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5911 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5912 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5913 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5914 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5915 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5916 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5917 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5918 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5919 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5920 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5921 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5922 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
|
5923 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5924 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5925 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5926 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5927 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5928 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5929 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5930 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5931 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5932 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5933 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5934 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5935 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5936 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5937 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5938 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5939 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5940 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5941 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5942 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5943 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5944 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5945 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5946 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5947 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5948 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5949 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5950 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5951 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5952 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5953 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5954 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5955 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5956 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5957 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5958 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5959 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5960 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5961 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5962 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5963 #endif /* FEAT_CONCEAL */ |
| 7 | 5964 else |
| 5965 --n_skip; | |
| 5966 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5967 /* 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
|
5968 * column. */ |
| 1849 | 5969 if (draw_state > WL_NR |
| 7 | 5970 #ifdef FEAT_DIFF |
| 5971 && filler_todo <= 0 | |
| 5972 #endif | |
| 5973 ) | |
| 5974 ++vcol; | |
| 5975 | |
| 743 | 5976 #ifdef FEAT_SYN_HL |
| 5977 if (vcol_save_attr >= 0) | |
| 5978 char_attr = vcol_save_attr; | |
| 5979 #endif | |
| 5980 | |
| 7 | 5981 /* restore attributes after "predeces" in 'listchars' */ |
| 5982 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5983 char_attr = saved_attr3; | |
| 5984 | |
| 5985 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5986 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5987 char_attr = saved_attr2; | |
| 5988 | |
| 5989 /* | |
| 5990 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5991 * so far. If there is no more to display it is caught above. |
| 7 | 5992 */ |
| 5993 if (( | |
| 5994 #ifdef FEAT_RIGHTLEFT | |
| 5995 wp->w_p_rl ? (col < 0) : | |
| 5996 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5997 (col >= wp->w_width)) |
| 7 | 5998 && (*ptr != NUL |
| 5999 #ifdef FEAT_DIFF | |
| 6000 || filler_todo > 0 | |
| 6001 #endif | |
| 2724 | 6002 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 6003 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 6004 ) | |
| 6005 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6006 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6007 screen_line(screen_row, wp->w_wincol, col - boguscols, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6008 (int)wp->w_width, screen_line_flags); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6009 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6010 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6011 screen_line(screen_row, wp->w_wincol, col, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6012 (int)wp->w_width, screen_line_flags); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6013 #endif |
| 7 | 6014 ++row; |
| 6015 ++screen_row; | |
| 6016 | |
| 6017 /* When not wrapping and finished diff lines, or when displayed | |
| 6018 * '$' and highlighting until last column, break here. */ | |
| 6019 if ((!wp->w_p_wrap | |
| 6020 #ifdef FEAT_DIFF | |
| 6021 && filler_todo <= 0 | |
| 6022 #endif | |
| 6023 ) || lcs_eol_one == -1) | |
| 6024 break; | |
| 6025 | |
| 6026 /* When the window is too narrow draw all "@" lines. */ | |
| 6027 if (draw_state != WL_LINE | |
| 6028 #ifdef FEAT_DIFF | |
| 6029 && filler_todo <= 0 | |
| 6030 #endif | |
| 6031 ) | |
| 6032 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
6033 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 6034 draw_vsep_win(wp, row); |
| 6035 row = endrow; | |
| 6036 } | |
| 6037 | |
| 6038 /* When line got too long for screen break here. */ | |
| 6039 if (row == endrow) | |
| 6040 { | |
| 6041 ++row; | |
| 6042 break; | |
| 6043 } | |
| 6044 | |
| 6045 if (screen_cur_row == screen_row - 1 | |
| 6046 #ifdef FEAT_DIFF | |
| 6047 && filler_todo <= 0 | |
| 6048 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6049 && wp->w_width == Columns) |
| 7 | 6050 { |
| 6051 /* Remember that the line wraps, used for modeless copy. */ | |
| 6052 LineWraps[screen_row - 1] = TRUE; | |
| 6053 | |
| 6054 /* | |
| 6055 * Special trick to make copy/paste of wrapped lines work with | |
| 6056 * xterm/screen: write an extra character beyond the end of | |
| 6057 * the line. This will work with all terminal types | |
| 6058 * (regardless of the xn,am settings). | |
| 6059 * Only do this on a fast tty. | |
| 6060 * Only do this if the cursor is on the current line | |
| 6061 * (something has been written in it). | |
| 6062 * Don't do this for the GUI. | |
| 6063 * Don't do this for double-width characters. | |
| 6064 * Don't do this for a window not at the right screen border. | |
| 6065 */ | |
| 6066 if (p_tf | |
| 6067 #ifdef FEAT_GUI | |
| 6068 && !gui.in_use | |
| 6069 #endif | |
| 6070 && !(has_mbyte | |
| 1378 | 6071 && ((*mb_off2cells)(LineOffset[screen_row], |
| 6072 LineOffset[screen_row] + screen_Columns) | |
| 6073 == 2 | |
| 7 | 6074 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 6075 + (int)Columns - 2, |
| 6076 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6077 == 2))) |
| 7 | 6078 { |
| 6079 /* First make sure we are at the end of the screen line, | |
| 6080 * then output the same character again to let the | |
| 6081 * terminal know about the wrap. If the terminal doesn't | |
| 6082 * 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
|
6083 if (screen_cur_col != wp->w_width) |
| 7 | 6084 screen_char(LineOffset[screen_row - 1] |
| 6085 + (unsigned)Columns - 1, | |
| 6086 screen_row - 1, (int)(Columns - 1)); | |
| 6087 | |
| 6088 /* When there is a multi-byte character, just output a | |
| 6089 * space to keep it simple. */ | |
| 148 | 6090 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 6091 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 6092 out_char(' '); |
| 6093 else | |
| 6094 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 6095 + (Columns - 1)]); | |
| 6096 /* force a redraw of the first char on the next line */ | |
| 6097 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 6098 screen_start(); /* don't know where cursor is now */ | |
| 6099 } | |
| 6100 } | |
| 6101 | |
| 6102 col = 0; | |
| 6103 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6104 #ifdef FEAT_RIGHTLEFT | |
| 6105 if (wp->w_p_rl) | |
| 6106 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6107 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 6108 off += col; |
| 6109 } | |
| 6110 #endif | |
| 6111 | |
| 6112 /* reset the drawing state for the start of a wrapped line */ | |
| 6113 draw_state = WL_START; | |
| 6114 saved_n_extra = n_extra; | |
| 6115 saved_p_extra = p_extra; | |
| 6116 saved_c_extra = c_extra; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
6117 saved_c_final = c_final; |
| 7 | 6118 saved_char_attr = char_attr; |
| 6119 n_extra = 0; | |
| 6120 lcs_prec_todo = lcs_prec; | |
| 6121 #ifdef FEAT_LINEBREAK | |
| 6122 # ifdef FEAT_DIFF | |
| 6123 if (filler_todo <= 0) | |
| 6124 # endif | |
| 6125 need_showbreak = TRUE; | |
| 6126 #endif | |
| 6127 #ifdef FEAT_DIFF | |
| 6128 --filler_todo; | |
| 6129 /* When the filler lines are actually below the last line of the | |
| 6130 * file, don't draw the line itself, break here. */ | |
| 6131 if (filler_todo == 0 && wp->w_botfill) | |
| 6132 break; | |
| 6133 #endif | |
| 6134 } | |
| 6135 | |
| 6136 } /* for every character in the line */ | |
| 6137 | |
| 743 | 6138 #ifdef FEAT_SPELL |
| 386 | 6139 /* After an empty line check first word for capital. */ |
| 6140 if (*skipwhite(line) == NUL) | |
| 6141 { | |
| 6142 capcol_lnum = lnum + 1; | |
| 6143 cap_col = 0; | |
| 6144 } | |
| 6145 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6146 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6147 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6148 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6149 #endif |
| 386 | 6150 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6151 vim_free(p_extra_free); |
| 7 | 6152 return row; |
| 6153 } | |
| 6154 | |
| 714 | 6155 /* |
| 6156 * 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
|
6157 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6158 */ |
| 6159 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6160 comp_char_differs(int off_from, int off_to) |
| 714 | 6161 { |
| 6162 int i; | |
| 6163 | |
| 6164 for (i = 0; i < Screen_mco; ++i) | |
| 6165 { | |
| 6166 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6167 return TRUE; | |
| 6168 if (ScreenLinesC[i][off_from] == 0) | |
| 6169 break; | |
| 6170 } | |
| 6171 return FALSE; | |
| 6172 } | |
| 6173 | |
| 7 | 6174 /* |
| 6175 * Check whether the given character needs redrawing: | |
| 6176 * - the (first byte of the) character is different | |
| 6177 * - the attributes are different | |
| 6178 * - the character is multi-byte and the next byte is different | |
| 1616 | 6179 * - the character is two cells wide and the second cell differs. |
| 7 | 6180 */ |
| 6181 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6182 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6183 { |
| 6184 if (cols > 0 | |
| 6185 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6186 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6187 || (enc_dbcs != 0 | |
| 6188 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6189 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6190 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6191 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6192 != ScreenLines[off_to + 1]))) | |
| 6193 || (enc_utf8 | |
| 6194 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6195 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6196 && comp_char_differs(off_from, off_to)) |
| 3759 | 6197 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6198 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6199 != ScreenLines[off_to + 1]))))) |
| 7 | 6200 return TRUE; |
| 6201 return FALSE; | |
| 6202 } | |
| 6203 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6204 #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
|
6205 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6206 * 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
|
6207 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6208 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6209 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
|
6210 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6211 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
|
6212 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6213 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6214 |
| 7 | 6215 /* |
| 6216 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6217 * have actually changed. Handle insert/delete character. | |
| 6218 * "coloff" gives the first column on the screen for this line. | |
| 6219 * "endcol" gives the columns where valid characters are. | |
| 6220 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6221 * needs to be cleared, negative otherwise. | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6222 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6223 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6224 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6225 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6226 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6227 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6228 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6229 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6230 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6231 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6232 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
|
6233 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6234 int flags UNUSED) |
| 7 | 6235 { |
| 6236 unsigned off_from; | |
| 6237 unsigned off_to; | |
| 1378 | 6238 unsigned max_off_from; |
| 6239 unsigned max_off_to; | |
| 7 | 6240 int col = 0; |
| 6241 int hl; | |
| 6242 int force = FALSE; /* force update rest of the line */ | |
| 6243 int redraw_this /* bool: does character need redraw? */ | |
| 6244 #ifdef FEAT_GUI | |
| 6245 = TRUE /* For GUI when while-loop empty */ | |
| 6246 #endif | |
| 6247 ; | |
| 6248 int redraw_next; /* redraw_this for next character */ | |
| 6249 int clear_next = FALSE; | |
| 6250 int char_cells; /* 1: normal char */ | |
| 6251 /* 2: occupies two display cells */ | |
| 6252 # define CHAR_CELLS char_cells | |
| 6253 | |
| 3413 | 6254 /* Check for illegal row and col, just in case. */ |
| 6255 if (row >= Rows) | |
| 6256 row = Rows - 1; | |
| 6257 if (endcol > Columns) | |
| 6258 endcol = Columns; | |
| 6259 | |
| 7 | 6260 # ifdef FEAT_CLIPBOARD |
| 6261 clip_may_clear_selection(row, row); | |
| 6262 # endif | |
| 6263 | |
| 6264 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6265 off_to = LineOffset[row] + coloff; | |
| 1378 | 6266 max_off_from = off_from + screen_Columns; |
| 6267 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6268 |
| 6269 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6270 if (flags & SLF_RIGHTLEFT) |
| 7 | 6271 { |
| 6272 /* Clear rest first, because it's left of the text. */ | |
| 6273 if (clear_width > 0) | |
| 6274 { | |
| 6275 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6276 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6277 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6278 { |
| 6279 ++off_to; | |
| 6280 ++col; | |
| 6281 } | |
| 6282 if (col <= endcol) | |
| 6283 screen_fill(row, row + 1, col + coloff, | |
| 6284 endcol + coloff + 1, ' ', ' ', 0); | |
| 6285 } | |
| 6286 col = endcol + 1; | |
| 6287 off_to = LineOffset[row] + col + coloff; | |
| 6288 off_from += col; | |
| 6289 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6290 } | |
| 6291 #endif /* FEAT_RIGHTLEFT */ | |
| 6292 | |
| 6293 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6294 | |
| 6295 while (col < endcol) | |
| 6296 { | |
| 6297 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6298 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6299 else |
| 6300 char_cells = 1; | |
| 6301 | |
| 6302 redraw_this = redraw_next; | |
| 6303 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6304 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6305 | |
| 6306 #ifdef FEAT_GUI | |
| 6307 /* If the next character was bold, then redraw the current character to | |
| 6308 * remove any pixels that might have spilt over into us. This only | |
| 6309 * happens in the GUI. | |
| 6310 */ | |
| 6311 if (redraw_next && gui.in_use) | |
| 6312 { | |
| 6313 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6314 if (hl > HL_ALL) |
| 6315 hl = syn_attr2attr(hl); | |
| 6316 if (hl & HL_BOLD) | |
| 7 | 6317 redraw_this = TRUE; |
| 6318 } | |
| 6319 #endif | |
| 6320 | |
| 6321 if (redraw_this) | |
| 6322 { | |
| 6323 /* | |
| 6324 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6325 * Attributes for characters are stored at the position where the | |
| 6326 * cursor is when writing the highlighting code. The | |
| 6327 * start-highlighting code must be written with the cursor on the | |
| 6328 * first highlighted character. The stop-highlighting code must | |
| 6329 * be written with the cursor just after the last highlighted | |
| 6330 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6331 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6332 * to clear the rest of the line, and force redrawing it |
| 6333 * completely. | |
| 6334 */ | |
| 6335 if ( p_wiv | |
| 6336 && !force | |
| 6337 #ifdef FEAT_GUI | |
| 6338 && !gui.in_use | |
| 6339 #endif | |
| 6340 && ScreenAttrs[off_to] != 0 | |
| 6341 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6342 { | |
| 6343 /* | |
| 6344 * Need to remove highlighting attributes here. | |
| 6345 */ | |
| 6346 windgoto(row, col + coloff); | |
| 6347 out_str(T_CE); /* clear rest of this screen line */ | |
| 6348 screen_start(); /* don't know where cursor is now */ | |
| 6349 force = TRUE; /* force redraw of rest of the line */ | |
| 6350 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6351 | |
| 6352 /* | |
| 6353 * If the previous character was highlighted, need to stop | |
| 6354 * highlighting at this character. | |
| 6355 */ | |
| 6356 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6357 { | |
| 6358 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6359 term_windgoto(row, col + coloff); | |
| 6360 screen_stop_highlight(); | |
| 6361 } | |
| 6362 else | |
| 6363 screen_attr = 0; /* highlighting has stopped */ | |
| 6364 } | |
| 6365 if (enc_dbcs != 0) | |
| 6366 { | |
| 6367 /* Check if overwriting a double-byte with a single-byte or | |
| 6368 * the other way around requires another character to be | |
| 6369 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6370 * ScreenLinesUC[] is sufficient. */ | |
| 6371 if (char_cells == 1 | |
| 6372 && col + 1 < endcol | |
| 1378 | 6373 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6374 { |
| 6375 /* Writing a single-cell character over a double-cell | |
| 6376 * character: need to redraw the next cell. */ | |
| 6377 ScreenLines[off_to + 1] = 0; | |
| 6378 redraw_next = TRUE; | |
| 6379 } | |
| 6380 else if (char_cells == 2 | |
| 6381 && col + 2 < endcol | |
| 1378 | 6382 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6383 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6384 { |
| 6385 /* Writing the second half of a double-cell character over | |
| 6386 * a double-cell character: need to redraw the second | |
| 6387 * cell. */ | |
| 6388 ScreenLines[off_to + 2] = 0; | |
| 6389 redraw_next = TRUE; | |
| 6390 } | |
| 6391 | |
| 6392 if (enc_dbcs == DBCS_JPNU) | |
| 6393 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6394 } | |
| 6395 /* When writing a single-width character over a double-width | |
| 6396 * character and at the end of the redrawn text, need to clear out | |
| 6397 * the right halve of the old character. | |
| 6398 * Also required when writing the right halve of a double-width | |
| 6399 * char over the left halve of an existing one. */ | |
| 6400 if (has_mbyte && col + char_cells == endcol | |
| 6401 && ((char_cells == 1 | |
| 1378 | 6402 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6403 || (char_cells == 2 |
| 1378 | 6404 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6405 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6406 clear_next = TRUE; |
| 6407 | |
| 6408 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6409 if (enc_utf8) | |
| 6410 { | |
| 6411 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6412 if (ScreenLinesUC[off_from] != 0) | |
| 6413 { | |
| 714 | 6414 int i; |
| 6415 | |
| 6416 for (i = 0; i < Screen_mco; ++i) | |
| 6417 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6418 } |
| 6419 } | |
| 6420 if (char_cells == 2) | |
| 6421 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6422 | |
| 6423 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6424 /* The bold trick makes a single column of pixels appear in the |
| 6425 * next character. When a bold character is removed, the next | |
| 7 | 6426 * character should be redrawn too. This happens for our own GUI |
| 6427 * and for some xterms. */ | |
| 6428 if ( | |
| 6429 # ifdef FEAT_GUI | |
| 6430 gui.in_use | |
| 6431 # endif | |
| 6432 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6433 || | |
| 6434 # endif | |
| 6435 # ifdef UNIX | |
| 6436 term_is_xterm | |
| 6437 # endif | |
| 6438 ) | |
| 6439 { | |
| 6440 hl = ScreenAttrs[off_to]; | |
| 743 | 6441 if (hl > HL_ALL) |
| 6442 hl = syn_attr2attr(hl); | |
| 6443 if (hl & HL_BOLD) | |
| 7 | 6444 redraw_next = TRUE; |
| 6445 } | |
| 6446 #endif | |
| 6447 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6448 |
| 819 | 6449 /* For simplicity set the attributes of second half of a |
| 6450 * double-wide character equal to the first half. */ | |
| 6451 if (char_cells == 2) | |
| 6452 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6453 | |
| 7 | 6454 if (enc_dbcs != 0 && char_cells == 2) |
| 6455 screen_char_2(off_to, row, col + coloff); | |
| 6456 else | |
| 6457 screen_char(off_to, row, col + coloff); | |
| 6458 } | |
| 6459 else if ( p_wiv | |
| 6460 #ifdef FEAT_GUI | |
| 6461 && !gui.in_use | |
| 6462 #endif | |
| 6463 && col + coloff > 0) | |
| 6464 { | |
| 6465 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6466 { | |
| 6467 /* | |
| 6468 * Don't output stop-highlight when moving the cursor, it will | |
| 6469 * stop the highlighting when it should continue. | |
| 6470 */ | |
| 6471 screen_attr = 0; | |
| 6472 } | |
| 6473 else if (screen_attr != 0) | |
| 6474 screen_stop_highlight(); | |
| 6475 } | |
| 6476 | |
| 6477 off_to += CHAR_CELLS; | |
| 6478 off_from += CHAR_CELLS; | |
| 6479 col += CHAR_CELLS; | |
| 6480 } | |
| 6481 | |
| 6482 if (clear_next) | |
| 6483 { | |
| 6484 /* Clear the second half of a double-wide character of which the left | |
| 6485 * half was overwritten with a single-wide character. */ | |
| 6486 ScreenLines[off_to] = ' '; | |
| 6487 if (enc_utf8) | |
| 6488 ScreenLinesUC[off_to] = 0; | |
| 6489 screen_char(off_to, row, col + coloff); | |
| 6490 } | |
| 6491 | |
| 6492 if (clear_width > 0 | |
| 6493 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6494 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6495 #endif |
| 6496 ) | |
| 6497 { | |
| 6498 #ifdef FEAT_GUI | |
| 6499 int startCol = col; | |
| 6500 #endif | |
| 6501 | |
| 6502 /* blank out the rest of the line */ | |
| 6503 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6504 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6505 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6506 { |
| 6507 ++off_to; | |
| 6508 ++col; | |
| 6509 } | |
| 6510 if (col < clear_width) | |
| 6511 { | |
| 6512 #ifdef FEAT_GUI | |
| 6513 /* | |
| 6514 * In the GUI, clearing the rest of the line may leave pixels | |
| 6515 * behind if the first character cleared was bold. Some bold | |
| 6516 * fonts spill over the left. In this case we redraw the previous | |
| 6517 * character too. If we didn't skip any blanks above, then we | |
| 6518 * only redraw if the character wasn't already redrawn anyway. | |
| 6519 */ | |
| 996 | 6520 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6521 { |
| 6522 hl = ScreenAttrs[off_to]; | |
| 6523 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6524 { |
| 6525 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6526 |
| 996 | 6527 if (enc_utf8) |
| 6528 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6529 * that its width is 2. */ | |
| 6530 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6531 else if (enc_dbcs != 0) | |
| 6532 { | |
| 6533 /* find previous character by counting from first | |
| 6534 * column and get its width. */ | |
| 6535 unsigned off = LineOffset[row]; | |
| 1378 | 6536 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6537 |
| 6538 while (off < off_to) | |
| 6539 { | |
| 1378 | 6540 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6541 off += prev_cells; |
| 6542 } | |
| 6543 } | |
| 6544 | |
| 6545 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6546 screen_char_2(off_to - prev_cells, row, | |
| 6547 col + coloff - prev_cells); | |
| 6548 else | |
| 6549 screen_char(off_to - prev_cells, row, | |
| 6550 col + coloff - prev_cells); | |
| 6551 } | |
| 7 | 6552 } |
| 6553 #endif | |
| 6554 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6555 ' ', ' ', 0); | |
| 6556 off_to += clear_width - col; | |
| 6557 col = clear_width; | |
| 6558 } | |
| 6559 } | |
| 6560 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6561 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6562 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6563 && !(flags & SLF_POPUP) // no separator for popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6564 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6565 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6566 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6567 // For a window that has a right neighbor, draw the separator char |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6568 // right of the window contents. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6569 if (coloff + col < Columns) |
| 7 | 6570 { |
| 6571 int c; | |
| 6572 | |
| 6573 c = fillchar_vsep(&hl); | |
| 6477 | 6574 if (ScreenLines[off_to] != (schar_T)c |
| 714 | 6575 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6576 != (c >= 0x80 ? c : 0)) | |
| 7 | 6577 || ScreenAttrs[off_to] != hl) |
| 6578 { | |
| 6579 ScreenLines[off_to] = c; | |
| 6580 ScreenAttrs[off_to] = hl; | |
| 6581 if (enc_utf8) | |
| 6582 { | |
| 6583 if (c >= 0x80) | |
| 6584 { | |
| 6585 ScreenLinesUC[off_to] = c; | |
| 714 | 6586 ScreenLinesC[0][off_to] = 0; |
| 7 | 6587 } |
| 6588 else | |
| 6589 ScreenLinesUC[off_to] = 0; | |
| 6590 } | |
| 6591 screen_char(off_to, row, col + coloff); | |
| 6592 } | |
| 6593 } | |
| 6594 else | |
| 6595 LineWraps[row] = FALSE; | |
| 6596 } | |
| 6597 } | |
| 6598 | |
| 474 | 6599 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6600 /* |
| 474 | 6601 * Mirror text "str" for right-left displaying. |
| 6602 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6603 */ |
| 474 | 6604 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6605 rl_mirror(char_u *str) |
| 7 | 6606 { |
| 6607 char_u *p1, *p2; | |
| 6608 int t; | |
| 6609 | |
| 6610 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6611 { | |
| 6612 t = *p1; | |
| 6613 *p1 = *p2; | |
| 6614 *p2 = t; | |
| 6615 } | |
| 6616 } | |
| 6617 #endif | |
| 6618 | |
| 6619 /* | |
| 6620 * mark all status lines for redraw; used after first :cd | |
| 6621 */ | |
| 6622 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6623 status_redraw_all(void) |
| 7 | 6624 { |
| 6625 win_T *wp; | |
| 6626 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6627 FOR_ALL_WINDOWS(wp) |
| 7 | 6628 if (wp->w_status_height) |
| 6629 { | |
| 6630 wp->w_redr_status = TRUE; | |
| 6631 redraw_later(VALID); | |
| 6632 } | |
| 6633 } | |
| 6634 | |
| 6635 /* | |
| 6636 * mark all status lines of the current buffer for redraw | |
| 6637 */ | |
| 6638 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6639 status_redraw_curbuf(void) |
| 7 | 6640 { |
| 6641 win_T *wp; | |
| 6642 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6643 FOR_ALL_WINDOWS(wp) |
| 7 | 6644 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6645 { | |
| 6646 wp->w_redr_status = TRUE; | |
| 6647 redraw_later(VALID); | |
| 6648 } | |
| 6649 } | |
| 6650 | |
| 6651 /* | |
| 6652 * Redraw all status lines that need to be redrawn. | |
| 6653 */ | |
| 6654 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6655 redraw_statuslines(void) |
| 7 | 6656 { |
| 6657 win_T *wp; | |
| 6658 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6659 FOR_ALL_WINDOWS(wp) |
| 7 | 6660 if (wp->w_redr_status) |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6661 win_redr_status(wp, FALSE); |
| 673 | 6662 if (redraw_tabline) |
| 677 | 6663 draw_tabline(); |
| 7 | 6664 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6665 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6666 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6667 /* |
| 6668 * Redraw all status lines at the bottom of frame "frp". | |
| 6669 */ | |
| 6670 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6671 win_redraw_last_status(frame_T *frp) |
| 7 | 6672 { |
| 6673 if (frp->fr_layout == FR_LEAF) | |
| 6674 frp->fr_win->w_redr_status = TRUE; | |
| 6675 else if (frp->fr_layout == FR_ROW) | |
| 6676 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6677 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6678 win_redraw_last_status(frp); |
| 6679 } | |
| 6680 else /* frp->fr_layout == FR_COL */ | |
| 6681 { | |
| 6682 frp = frp->fr_child; | |
| 6683 while (frp->fr_next != NULL) | |
| 6684 frp = frp->fr_next; | |
| 6685 win_redraw_last_status(frp); | |
| 6686 } | |
| 6687 } | |
| 6688 #endif | |
| 6689 | |
| 6690 /* | |
| 6691 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6692 */ | |
| 6693 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6694 draw_vsep_win(win_T *wp, int row) |
| 7 | 6695 { |
| 6696 int hl; | |
| 6697 int c; | |
| 6698 | |
| 6699 if (wp->w_vsep_width) | |
| 6700 { | |
| 6701 /* draw the vertical separator right of this window */ | |
| 6702 c = fillchar_vsep(&hl); | |
| 6703 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6704 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6705 c, ' ', hl); | |
| 6706 } | |
| 6707 } | |
| 6708 | |
| 6709 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6710 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6711 |
| 6712 /* | |
| 1378 | 6713 * Get the length of an item as it will be shown in the status line. |
| 7 | 6714 */ |
| 6715 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6716 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6717 { |
| 6718 int len = 0; | |
| 6719 | |
| 6720 #ifdef FEAT_MENU | |
| 6721 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6722 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6723 | |
| 6724 /* Check for menu separators - replace with '|'. */ | |
| 6725 if (emenu && menu_is_separator(s)) | |
| 6726 return 1; | |
| 6727 #endif | |
| 6728 | |
| 6729 while (*s != NUL) | |
| 6730 { | |
| 1685 | 6731 s += skip_status_match_char(xp, s); |
| 42 | 6732 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6733 MB_PTR_ADV(s); |
| 7 | 6734 } |
| 6735 | |
| 6736 return len; | |
| 6737 } | |
| 6738 | |
| 6739 /* | |
| 1685 | 6740 * Return the number of characters that should be skipped in a status match. |
| 277 | 6741 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6742 */ | |
| 6743 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6744 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6745 { |
| 1685 | 6746 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6747 #ifdef FEAT_MENU |
| 6748 || ((xp->xp_context == EXPAND_MENUS | |
| 6749 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6750 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6751 #endif | |
| 1685 | 6752 ) |
| 6753 { | |
| 6754 #ifndef BACKSLASH_IN_FILENAME | |
| 6755 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6756 return 2; | |
| 6757 #endif | |
| 6758 return 1; | |
| 6759 } | |
| 6760 return 0; | |
| 277 | 6761 } |
| 6762 | |
| 6763 /* | |
| 7 | 6764 * Show wildchar matches in the status line. |
| 6765 * Show at least the "match" item. | |
| 6766 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6767 * | |
| 6768 * If inversion is possible we use it. Else '=' characters are used. | |
| 6769 */ | |
| 6770 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6771 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6772 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6773 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6774 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6775 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6776 int showtail) |
| 7 | 6777 { |
| 6778 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6779 int row; | |
| 6780 char_u *buf; | |
| 6781 int len; | |
| 1378 | 6782 int clen; /* length in screen cells */ |
| 7 | 6783 int fillchar; |
| 6784 int attr; | |
| 6785 int i; | |
| 6786 int highlight = TRUE; | |
| 6787 char_u *selstart = NULL; | |
| 6788 int selstart_col = 0; | |
| 6789 char_u *selend = NULL; | |
| 6790 static int first_match = 0; | |
| 6791 int add_left = FALSE; | |
| 6792 char_u *s; | |
| 6793 #ifdef FEAT_MENU | |
| 6794 int emenu; | |
| 6795 #endif | |
| 6796 int l; | |
| 6797 | |
| 6798 if (matches == NULL) /* interrupted completion? */ | |
| 6799 return; | |
| 6800 | |
| 39 | 6801 if (has_mbyte) |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
6802 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 6803 else |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
6804 buf = alloc(Columns + 1); |
| 7 | 6805 if (buf == NULL) |
| 6806 return; | |
| 6807 | |
| 6808 if (match == -1) /* don't show match but original text */ | |
| 6809 { | |
| 6810 match = 0; | |
| 6811 highlight = FALSE; | |
| 6812 } | |
| 6813 /* count 1 for the ending ">" */ | |
| 6814 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6815 if (match == 0) | |
| 6816 first_match = 0; | |
| 6817 else if (match < first_match) | |
| 6818 { | |
| 6819 /* jumping left, as far as we can go */ | |
| 6820 first_match = match; | |
| 6821 add_left = TRUE; | |
| 6822 } | |
| 6823 else | |
| 6824 { | |
| 6825 /* check if match fits on the screen */ | |
| 6826 for (i = first_match; i < match; ++i) | |
| 6827 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6828 if (first_match > 0) | |
| 6829 clen += 2; | |
| 6830 /* jumping right, put match at the left */ | |
| 6831 if ((long)clen > Columns) | |
| 6832 { | |
| 6833 first_match = match; | |
| 6834 /* if showing the last match, we can add some on the left */ | |
| 6835 clen = 2; | |
| 6836 for (i = match; i < num_matches; ++i) | |
| 6837 { | |
| 6838 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6839 if ((long)clen >= Columns) | |
| 6840 break; | |
| 6841 } | |
| 6842 if (i == num_matches) | |
| 6843 add_left = TRUE; | |
| 6844 } | |
| 6845 } | |
| 6846 if (add_left) | |
| 6847 while (first_match > 0) | |
| 6848 { | |
| 6849 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6850 if ((long)clen >= Columns) | |
| 6851 break; | |
| 6852 --first_match; | |
| 6853 } | |
| 6854 | |
|
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
|
6855 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6856 |
| 6857 if (first_match == 0) | |
| 6858 { | |
| 6859 *buf = NUL; | |
| 6860 len = 0; | |
| 6861 } | |
| 6862 else | |
| 6863 { | |
| 6864 STRCPY(buf, "< "); | |
| 6865 len = 2; | |
| 6866 } | |
| 6867 clen = len; | |
| 6868 | |
| 6869 i = first_match; | |
| 6870 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6871 { | |
| 6872 if (i == match) | |
| 6873 { | |
| 6874 selstart = buf + len; | |
| 6875 selstart_col = clen; | |
| 6876 } | |
| 6877 | |
| 6878 s = L_MATCH(i); | |
| 6879 /* Check for menu separators - replace with '|' */ | |
| 6880 #ifdef FEAT_MENU | |
| 6881 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6882 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6883 if (emenu && menu_is_separator(s)) | |
| 6884 { | |
| 6885 STRCPY(buf + len, transchar('|')); | |
| 6886 l = (int)STRLEN(buf + len); | |
| 6887 len += l; | |
| 6888 clen += l; | |
| 6889 } | |
| 6890 else | |
| 6891 #endif | |
| 6892 for ( ; *s != NUL; ++s) | |
| 6893 { | |
| 1685 | 6894 s += skip_status_match_char(xp, s); |
| 7 | 6895 clen += ptr2cells(s); |
| 474 | 6896 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6897 { |
| 6898 STRNCPY(buf + len, s, l); | |
| 6899 s += l - 1; | |
| 6900 len += l; | |
| 6901 } | |
| 6902 else | |
| 6903 { | |
| 6904 STRCPY(buf + len, transchar_byte(*s)); | |
| 6905 len += (int)STRLEN(buf + len); | |
| 6906 } | |
| 6907 } | |
| 6908 if (i == match) | |
| 6909 selend = buf + len; | |
| 6910 | |
| 6911 *(buf + len++) = ' '; | |
| 6912 *(buf + len++) = ' '; | |
| 6913 clen += 2; | |
| 6914 if (++i == num_matches) | |
| 6915 break; | |
| 6916 } | |
| 6917 | |
| 6918 if (i != num_matches) | |
| 6919 { | |
| 6920 *(buf + len++) = '>'; | |
| 6921 ++clen; | |
| 6922 } | |
| 6923 | |
| 6924 buf[len] = NUL; | |
| 6925 | |
| 6926 row = cmdline_row - 1; | |
| 6927 if (row >= 0) | |
| 6928 { | |
| 6929 if (wild_menu_showing == 0) | |
| 6930 { | |
| 6931 if (msg_scrolled > 0) | |
| 6932 { | |
| 6933 /* Put the wildmenu just above the command line. If there is | |
| 6934 * no room, scroll the screen one line up. */ | |
| 6935 if (cmdline_row == Rows - 1) | |
| 6936 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6937 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6938 ++msg_scrolled; |
| 6939 } | |
| 6940 else | |
| 6941 { | |
| 6942 ++cmdline_row; | |
| 6943 ++row; | |
| 6944 } | |
| 6945 wild_menu_showing = WM_SCROLLED; | |
| 6946 } | |
| 6947 else | |
| 6948 { | |
| 6949 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6950 * Set 'winminheight' to zero to avoid that the window is | |
| 6951 * resized. */ | |
| 6952 if (lastwin->w_status_height == 0) | |
| 6953 { | |
| 6954 save_p_ls = p_ls; | |
| 6955 save_p_wmh = p_wmh; | |
| 6956 p_ls = 2; | |
| 6957 p_wmh = 0; | |
| 6958 last_status(FALSE); | |
| 6959 } | |
| 6960 wild_menu_showing = WM_SHOWN; | |
| 6961 } | |
| 6962 } | |
| 6963 | |
| 6964 screen_puts(buf, row, 0, attr); | |
| 6965 if (selstart != NULL && highlight) | |
| 6966 { | |
| 6967 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6968 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6969 } |
| 6970 | |
| 6971 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6972 } | |
| 6973 | |
| 6974 win_redraw_last_status(topframe); | |
| 6975 vim_free(buf); | |
| 6976 } | |
| 6977 #endif | |
| 6978 | |
| 6979 /* | |
| 6980 * Redraw the status line of window wp. | |
| 6981 * | |
| 6982 * If inversion is possible we use it. Else '=' characters are used. | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6983 * If "ignore_pum" is TRUE, also redraw statusline when the popup menu is |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6984 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6985 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6986 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
6987 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 6988 { |
| 6989 int row; | |
| 6990 char_u *p; | |
| 6991 int len; | |
| 6992 int fillchar; | |
| 6993 int attr; | |
| 6994 int this_ru_col; | |
| 1910 | 6995 static int busy = FALSE; |
| 6996 | |
| 6997 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6998 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6999 if (busy) | |
| 7000 return; | |
| 7001 busy = TRUE; | |
| 7 | 7002 |
| 7003 wp->w_redr_status = FALSE; | |
| 7004 if (wp->w_status_height == 0) | |
| 7005 { | |
| 7006 /* no status line, can only be last window */ | |
| 7007 redraw_cmdline = TRUE; | |
| 7008 } | |
| 540 | 7009 else if (!redrawing() |
| 7010 #ifdef FEAT_INS_EXPAND | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7011 // don't update status line when popup menu is visible and may be |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7012 // drawn over it, unless it will be redrawn later |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7013 || (!ignore_pum && pum_visible()) |
| 540 | 7014 #endif |
| 7015 ) | |
| 7 | 7016 { |
| 7017 /* Don't redraw right now, do it later. */ | |
| 7018 wp->w_redr_status = TRUE; | |
| 7019 } | |
| 7020 #ifdef FEAT_STL_OPT | |
| 40 | 7021 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 7022 { |
| 7023 /* redraw custom status line */ | |
| 1983 | 7024 redraw_custom_statusline(wp); |
| 7 | 7025 } |
| 7026 #endif | |
| 7027 else | |
| 7028 { | |
|
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
|
7029 fillchar = fillchar_status(&attr, wp); |
| 7 | 7030 |
| 685 | 7031 get_trans_bufname(wp->w_buffer); |
| 7 | 7032 p = NameBuff; |
| 7033 len = (int)STRLEN(p); | |
| 7034 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7035 if (bt_help(wp->w_buffer) |
| 7 | 7036 #ifdef FEAT_QUICKFIX |
| 7037 || wp->w_p_pvw | |
| 7038 #endif | |
| 7039 || bufIsChanged(wp->w_buffer) | |
| 7040 || wp->w_buffer->b_p_ro) | |
| 7041 *(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
|
7042 if (bt_help(wp->w_buffer)) |
| 7 | 7043 { |
| 809 | 7044 STRCPY(p + len, _("[Help]")); |
| 7 | 7045 len += (int)STRLEN(p + len); |
| 7046 } | |
| 7047 #ifdef FEAT_QUICKFIX | |
| 7048 if (wp->w_p_pvw) | |
| 7049 { | |
| 7050 STRCPY(p + len, _("[Preview]")); | |
| 7051 len += (int)STRLEN(p + len); | |
| 7052 } | |
| 7053 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7054 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
|
7055 #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
|
7056 && !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
|
7057 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7058 ) |
| 7 | 7059 { |
| 7060 STRCPY(p + len, "[+]"); | |
| 7061 len += 3; | |
| 7062 } | |
| 7063 if (wp->w_buffer->b_p_ro) | |
| 7064 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
7065 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
|
7066 len += (int)STRLEN(p + len); |
| 7 | 7067 } |
| 7068 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7069 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
|
7070 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
|
7071 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 7072 if (this_ru_col <= 1) |
| 7073 { | |
| 7074 p = (char_u *)"<"; /* No room for file name! */ | |
| 7075 len = 1; | |
| 7076 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7077 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7078 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7079 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7080 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7081 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7082 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7083 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7084 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7085 * Going from start to end is much faster for DBCS. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7086 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7087 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7088 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7089 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7090 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7091 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7092 p = p + i - 1; |
| 7 | 7093 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7094 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7095 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7096 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7097 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7098 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7099 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7100 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7101 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7102 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7103 } |
| 7 | 7104 |
| 7105 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
|
7106 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
|
7107 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
|
7108 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 7109 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7110 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 7111 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 7112 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
|
7113 - 1 + wp->w_wincol), attr); |
| 7 | 7114 |
| 7115 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
7116 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 7117 #endif |
| 7118 } | |
| 7119 | |
| 7120 /* | |
| 7121 * May need to draw the character below the vertical separator. | |
| 7122 */ | |
| 7123 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7124 { | |
| 7125 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
|
7126 fillchar = fillchar_status(&attr, wp); |
| 7 | 7127 else |
| 7128 fillchar = fillchar_vsep(&attr); | |
| 7129 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7130 attr); | |
| 7131 } | |
| 1910 | 7132 busy = FALSE; |
| 7 | 7133 } |
| 7134 | |
| 680 | 7135 #ifdef FEAT_STL_OPT |
| 7136 /* | |
| 7137 * Redraw the status line according to 'statusline' and take care of any | |
| 7138 * errors encountered. | |
| 7139 */ | |
| 7140 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7141 redraw_custom_statusline(win_T *wp) |
| 680 | 7142 { |
| 1983 | 7143 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7144 int saved_did_emsg = did_emsg; |
| 1983 | 7145 |
| 7146 /* When called recursively return. This can happen when the statusline | |
| 7147 * contains an expression that triggers a redraw. */ | |
| 7148 if (entered) | |
| 7149 return; | |
| 7150 entered = TRUE; | |
| 680 | 7151 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7152 did_emsg = FALSE; |
| 680 | 7153 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7154 if (did_emsg) |
| 1983 | 7155 { |
| 7156 /* When there is an error disable the statusline, otherwise the | |
| 7157 * display is messed up with errors and a redraw triggers the problem | |
| 7158 * again and again. */ | |
| 680 | 7159 set_string_option_direct((char_u *)"statusline", -1, |
| 7160 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7161 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7162 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7163 did_emsg |= saved_did_emsg; |
| 1983 | 7164 entered = FALSE; |
| 680 | 7165 } |
| 7166 #endif | |
| 7167 | |
| 7 | 7168 /* |
| 7169 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7170 * line of the window right of it. If not, then it's a vertical separator. | |
| 7171 * Only call if (wp->w_vsep_width != 0). | |
| 7172 */ | |
| 7173 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7174 stl_connected(win_T *wp) |
| 7 | 7175 { |
| 7176 frame_T *fr; | |
| 7177 | |
| 7178 fr = wp->w_frame; | |
| 7179 while (fr->fr_parent != NULL) | |
| 7180 { | |
| 7181 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7182 { | |
| 7183 if (fr->fr_next != NULL) | |
| 7184 break; | |
| 7185 } | |
| 7186 else | |
| 7187 { | |
| 7188 if (fr->fr_next != NULL) | |
| 7189 return TRUE; | |
| 7190 } | |
| 7191 fr = fr->fr_parent; | |
| 7192 } | |
| 7193 return FALSE; | |
| 7194 } | |
| 7195 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7196 |
| 7 | 7197 /* |
| 7198 * Get the value to show for the language mappings, active 'keymap'. | |
| 7199 */ | |
| 7200 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7201 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7202 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7203 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
|
7204 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
|
7205 int len) /* length of buffer */ |
| 7 | 7206 { |
| 7207 char_u *p; | |
| 7208 | |
| 7209 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7210 return FALSE; | |
| 7211 | |
| 7212 { | |
| 7213 #ifdef FEAT_EVAL | |
| 7214 buf_T *old_curbuf = curbuf; | |
| 7215 win_T *old_curwin = curwin; | |
| 7216 char_u *s; | |
| 7217 | |
| 7218 curbuf = wp->w_buffer; | |
| 7219 curwin = wp; | |
| 7220 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7221 ++emsg_skip; | |
| 714 | 7222 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7223 --emsg_skip; |
| 7224 curbuf = old_curbuf; | |
| 7225 curwin = old_curwin; | |
| 7226 if (p == NULL || *p == NUL) | |
| 7227 #endif | |
| 7228 { | |
| 7229 #ifdef FEAT_KEYMAP | |
| 7230 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7231 p = wp->w_buffer->b_p_keymap; | |
| 7232 else | |
| 7233 #endif | |
| 7234 p = (char_u *)"lang"; | |
| 7235 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7236 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7237 buf[0] = NUL; |
| 7238 #ifdef FEAT_EVAL | |
| 7239 vim_free(s); | |
| 7240 #endif | |
| 7241 } | |
| 7242 return buf[0] != NUL; | |
| 7243 } | |
| 7244 | |
| 7245 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7246 /* | |
| 677 | 7247 * Redraw the status line or ruler of window "wp". |
| 7248 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7249 */ |
| 7250 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7251 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7252 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7253 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7254 { |
| 5539 | 7255 static int entered = FALSE; |
| 7 | 7256 int attr; |
| 7257 int curattr; | |
| 7258 int row; | |
| 7259 int col = 0; | |
| 7260 int maxwidth; | |
| 7261 int width; | |
| 7262 int n; | |
| 7263 int len; | |
| 7264 int fillchar; | |
| 7265 char_u buf[MAXPATHL]; | |
| 1983 | 7266 char_u *stl; |
| 7 | 7267 char_u *p; |
| 681 | 7268 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7269 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7270 int use_sandbox = FALSE; |
| 2693 | 7271 win_T *ewp; |
| 7272 int p_crb_save; | |
| 7 | 7273 |
| 5539 | 7274 /* There is a tiny chance that this gets called recursively: When |
| 7275 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7276 * Avoid trouble by not allowing recursion. */ | |
| 7277 if (entered) | |
| 7278 return; | |
| 7279 entered = TRUE; | |
| 7280 | |
| 7 | 7281 /* setup environment for the task at hand */ |
| 677 | 7282 if (wp == NULL) |
| 7283 { | |
| 7284 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7285 stl = p_tal; |
| 677 | 7286 row = 0; |
| 707 | 7287 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7288 attr = HL_ATTR(HLF_TPF); |
| 677 | 7289 maxwidth = Columns; |
| 7290 # ifdef FEAT_EVAL | |
| 681 | 7291 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7292 # endif |
| 7293 } | |
| 40 | 7294 else |
| 677 | 7295 { |
| 7296 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
|
7297 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
|
7298 maxwidth = wp->w_width; |
| 677 | 7299 |
| 7300 if (draw_ruler) | |
| 7301 { | |
| 1983 | 7302 stl = p_ruf; |
| 677 | 7303 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7304 if (*stl == '%') |
| 7305 { | |
| 7306 if (*++stl == '-') | |
| 7307 stl++; | |
| 7308 if (atoi((char *)stl)) | |
| 7309 while (VIM_ISDIGIT(*stl)) | |
| 7310 stl++; | |
| 7311 if (*stl++ != '(') | |
| 7312 stl = p_ruf; | |
| 677 | 7313 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7314 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
|
7315 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
|
7316 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
|
7317 maxwidth = wp->w_width - col; |
| 677 | 7318 if (!wp->w_status_height) |
| 7319 { | |
| 7320 row = Rows - 1; | |
| 7321 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7322 fillchar = ' '; | |
| 7323 attr = 0; | |
| 7324 } | |
| 7325 | |
| 7326 # ifdef FEAT_EVAL | |
| 681 | 7327 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7328 # endif |
| 7329 } | |
| 7330 else | |
| 7331 { | |
| 7332 if (*wp->w_p_stl != NUL) | |
| 1983 | 7333 stl = wp->w_p_stl; |
| 677 | 7334 else |
| 1983 | 7335 stl = p_stl; |
| 677 | 7336 # ifdef FEAT_EVAL |
| 681 | 7337 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7338 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7339 # endif |
| 7340 } | |
| 7341 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7342 col += wp->w_wincol; |
| 677 | 7343 } |
| 7344 | |
| 7 | 7345 if (maxwidth <= 0) |
| 5539 | 7346 goto theend; |
| 677 | 7347 |
| 2693 | 7348 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7349 * the cursor away and back. */ | |
| 7350 ewp = wp == NULL ? curwin : wp; | |
| 7351 p_crb_save = ewp->w_p_crb; | |
| 7352 ewp->w_p_crb = FALSE; | |
| 7353 | |
| 1983 | 7354 /* Make a copy, because the statusline may include a function call that |
| 7355 * might change the option value and free the memory. */ | |
| 7356 stl = vim_strsave(stl); | |
| 2693 | 7357 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7358 stl, use_sandbox, |
| 681 | 7359 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7360 vim_free(stl); |
| 2693 | 7361 ewp->w_p_crb = p_crb_save; |
| 2661 | 7362 |
| 7363 /* Make all characters printable. */ | |
| 7364 p = transstr(buf); | |
| 7365 if (p != NULL) | |
| 7366 { | |
| 7367 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7368 vim_free(p); | |
| 7369 } | |
| 7370 | |
| 7371 /* fill up with "fillchar" */ | |
| 835 | 7372 len = (int)STRLEN(buf); |
| 1883 | 7373 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7374 { |
| 7375 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7376 ++width; | |
| 7377 } | |
| 7378 buf[len] = NUL; | |
| 7379 | |
| 681 | 7380 /* |
| 7381 * Draw each snippet with the specified highlighting. | |
| 7382 */ | |
| 7 | 7383 curattr = attr; |
| 7384 p = buf; | |
| 681 | 7385 for (n = 0; hltab[n].start != NULL; n++) |
| 7386 { | |
| 7387 len = (int)(hltab[n].start - p); | |
| 7 | 7388 screen_puts_len(p, len, row, col, curattr); |
| 7389 col += vim_strnsize(p, len); | |
| 681 | 7390 p = hltab[n].start; |
| 7391 | |
| 7392 if (hltab[n].userhl == 0) | |
| 7 | 7393 curattr = attr; |
| 681 | 7394 else if (hltab[n].userhl < 0) |
| 7395 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
|
7396 #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
|
7397 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
|
7398 && 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
|
7399 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
|
7400 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
|
7401 && 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
|
7402 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
|
7403 #endif |
| 680 | 7404 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7405 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7406 else |
| 681 | 7407 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7408 } |
| 7409 screen_puts(p, row, col, curattr); | |
| 681 | 7410 |
| 7411 if (wp == NULL) | |
| 7412 { | |
| 7413 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7414 col = 0; | |
| 7415 len = 0; | |
| 7416 p = buf; | |
| 7417 fillchar = 0; | |
| 7418 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7419 { | |
| 7420 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7421 while (col < len) | |
| 7422 TabPageIdxs[col++] = fillchar; | |
| 7423 p = tabtab[n].start; | |
| 7424 fillchar = tabtab[n].userhl; | |
| 7425 } | |
| 7426 while (col < Columns) | |
| 7427 TabPageIdxs[col++] = fillchar; | |
| 7428 } | |
| 5539 | 7429 |
| 7430 theend: | |
| 7431 entered = FALSE; | |
| 7 | 7432 } |
| 7433 | |
| 7434 #endif /* FEAT_STL_OPT */ | |
| 7435 | |
| 7436 /* | |
| 7437 * Output a single character directly to the screen and update ScreenLines. | |
| 7438 */ | |
| 7439 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7440 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7441 { |
| 3549 | 7442 char_u buf[MB_MAXBYTES + 1]; |
| 7443 | |
| 7444 if (has_mbyte) | |
| 7445 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7446 else | |
| 7447 { | |
| 7448 buf[0] = c; | |
| 7449 buf[1] = NUL; | |
| 7450 } | |
| 7 | 7451 screen_puts(buf, row, col, attr); |
| 7452 } | |
| 7453 | |
| 7454 /* | |
| 7455 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7456 * Also return its attribute in *attrp; | |
| 7457 */ | |
| 7458 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7459 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7460 { |
| 7461 unsigned off; | |
| 7462 | |
| 7463 /* safety check */ | |
| 7464 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7465 { | |
| 7466 off = LineOffset[row] + col; | |
| 7467 *attrp = ScreenAttrs[off]; | |
| 7468 bytes[0] = ScreenLines[off]; | |
| 7469 bytes[1] = NUL; | |
| 7470 | |
| 7471 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7472 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7473 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7474 { | |
| 7475 bytes[0] = ScreenLines[off]; | |
| 7476 bytes[1] = ScreenLines2[off]; | |
| 7477 bytes[2] = NUL; | |
| 7478 } | |
| 7479 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7480 { | |
| 7481 bytes[1] = ScreenLines[off + 1]; | |
| 7482 bytes[2] = NUL; | |
| 7483 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7484 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7485 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7486 |
| 714 | 7487 /* |
| 7488 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7489 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7490 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7491 */ |
| 7492 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7493 screen_comp_differs(int off, int *u8cc) |
| 714 | 7494 { |
| 7495 int i; | |
| 7496 | |
| 7497 for (i = 0; i < Screen_mco; ++i) | |
| 7498 { | |
| 7499 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7500 return TRUE; | |
| 7501 if (u8cc[i] == 0) | |
| 7502 break; | |
| 7503 } | |
| 7504 return FALSE; | |
| 7505 } | |
| 7506 | |
| 7 | 7507 /* |
| 7508 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7509 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7510 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7511 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7512 */ | |
| 7513 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7514 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7515 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7516 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7517 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7518 int attr) |
| 7 | 7519 { |
| 7520 screen_puts_len(text, -1, row, col, attr); | |
| 7521 } | |
| 7522 | |
| 7523 /* | |
| 7524 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7525 * a NUL. | |
| 7526 */ | |
| 7527 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7528 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7529 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7530 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7531 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7532 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7533 int attr) |
| 7 | 7534 { |
| 7535 unsigned off; | |
| 7536 char_u *ptr = text; | |
| 5923 | 7537 int len = textlen; |
| 7 | 7538 int c; |
| 1378 | 7539 unsigned max_off; |
| 7 | 7540 int mbyte_blen = 1; |
| 7541 int mbyte_cells = 1; | |
| 7542 int u8c = 0; | |
| 714 | 7543 int u8cc[MAX_MCO]; |
| 7 | 7544 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7545 #ifdef FEAT_ARABIC |
| 7 | 7546 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7547 int pc, nc, nc1; |
| 7548 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7549 #endif |
| 1843 | 7550 int force_redraw_this; |
| 7551 int force_redraw_next = FALSE; | |
| 7552 int need_redraw; | |
| 7 | 7553 |
| 7554 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7555 return; | |
| 1843 | 7556 off = LineOffset[row] + col; |
| 7 | 7557 |
| 1668 | 7558 /* When drawing over the right halve of a double-wide char clear out the |
| 7559 * left halve. Only needed in a terminal. */ | |
| 1685 | 7560 if (has_mbyte && col > 0 && col < screen_Columns |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7561 #ifdef FEAT_GUI |
| 1668 | 7562 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7563 #endif |
| 1668 | 7564 && mb_fix_col(col, row) != col) |
| 1843 | 7565 { |
| 7566 ScreenLines[off - 1] = ' '; | |
| 7567 ScreenAttrs[off - 1] = 0; | |
| 7568 if (enc_utf8) | |
| 7569 { | |
| 7570 ScreenLinesUC[off - 1] = 0; | |
| 7571 ScreenLinesC[0][off - 1] = 0; | |
| 7572 } | |
| 7573 /* redraw the previous cell, make it empty */ | |
| 7574 screen_char(off - 1, row, col - 1); | |
| 7575 /* force the cell at "col" to be redrawn */ | |
| 7576 force_redraw_next = TRUE; | |
| 7577 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7578 |
| 1378 | 7579 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7580 while (col < screen_Columns |
| 7581 && (len < 0 || (int)(ptr - text) < len) | |
| 7582 && *ptr != NUL) | |
| 7 | 7583 { |
| 7584 c = *ptr; | |
| 7585 /* check if this is the first byte of a multibyte */ | |
| 7586 if (has_mbyte) | |
| 7587 { | |
| 7588 if (enc_utf8 && len > 0) | |
| 474 | 7589 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7590 else |
| 474 | 7591 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7592 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7593 mbyte_cells = 1; | |
| 7594 else if (enc_dbcs != 0) | |
| 7595 mbyte_cells = mbyte_blen; | |
| 7596 else /* enc_utf8 */ | |
| 7597 { | |
| 7598 if (len >= 0) | |
| 714 | 7599 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7600 (int)((text + len) - ptr)); |
| 7601 else | |
| 714 | 7602 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7603 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7604 #ifdef FEAT_ARABIC |
| 7 | 7605 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7606 { | |
| 7607 /* Do Arabic shaping. */ | |
| 7608 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7609 { | |
| 7610 /* Past end of string to be displayed. */ | |
| 7611 nc = NUL; | |
| 7612 nc1 = NUL; | |
| 7613 } | |
| 7614 else | |
| 714 | 7615 { |
| 1994 | 7616 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7617 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7618 nc1 = pcc[0]; |
| 7619 } | |
| 7 | 7620 pc = prev_c; |
| 7621 prev_c = u8c; | |
| 714 | 7622 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7623 } |
| 7624 else | |
| 7625 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7626 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7627 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7628 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7629 /* 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
|
7630 * 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
|
7631 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7632 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7633 } |
| 7 | 7634 } |
| 7635 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7636 |
| 1843 | 7637 force_redraw_this = force_redraw_next; |
| 7638 force_redraw_next = FALSE; | |
| 7639 | |
| 7640 need_redraw = ScreenLines[off] != c | |
| 7 | 7641 || (mbyte_cells == 2 |
| 7642 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7643 || (enc_dbcs == DBCS_JPNU | |
| 7644 && c == 0x8e | |
| 7645 && ScreenLines2[off] != ptr[1]) | |
| 7646 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7647 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7648 (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
|
7649 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7650 && screen_comp_differs(off, u8cc)))) |
| 7 | 7651 || ScreenAttrs[off] != attr |
| 1843 | 7652 || exmode_active; |
| 7653 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7654 if (need_redraw || force_redraw_this) |
| 7 | 7655 { |
| 7656 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7657 /* The bold trick makes a single row of pixels appear in the next | |
| 7658 * character. When a bold character is removed, the next | |
| 7659 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7660 * and for some xterms. */ |
| 7661 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7662 # ifdef FEAT_GUI |
| 7663 gui.in_use | |
| 7664 # endif | |
| 7665 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7666 || | |
| 7667 # endif | |
| 7668 # ifdef UNIX | |
| 7669 term_is_xterm | |
| 7670 # endif | |
| 1843 | 7671 )) |
| 7672 { | |
| 7673 int n = ScreenAttrs[off]; | |
| 7674 | |
| 7675 if (n > HL_ALL) | |
| 7676 n = syn_attr2attr(n); | |
| 7677 if (n & HL_BOLD) | |
| 7678 force_redraw_next = TRUE; | |
| 7 | 7679 } |
| 7680 #endif | |
| 7681 /* When at the end of the text and overwriting a two-cell | |
| 7682 * character with a one-cell character, need to clear the next | |
| 7683 * cell. Also when overwriting the left halve of a two-cell char | |
| 7684 * with the right halve of a two-cell char. Do this only once | |
| 7685 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7686 if (clear_next_cell) | |
| 7687 clear_next_cell = FALSE; | |
| 7688 else if (has_mbyte | |
| 7689 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7690 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7691 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7692 || (mbyte_cells == 2 |
| 1378 | 7693 && (*mb_off2cells)(off, max_off) == 1 |
| 7694 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7695 clear_next_cell = TRUE; |
| 7696 | |
| 7697 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7698 * it confuses mb_off2cells(). */ | |
| 7699 if (enc_dbcs | |
| 1378 | 7700 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7701 || (mbyte_cells == 2 |
| 1378 | 7702 && (*mb_off2cells)(off, max_off) == 1 |
| 7703 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7704 ScreenLines[off + mbyte_blen] = 0; |
| 7705 ScreenLines[off] = c; | |
| 7706 ScreenAttrs[off] = attr; | |
| 7707 if (enc_utf8) | |
| 7708 { | |
| 714 | 7709 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7710 ScreenLinesUC[off] = 0; |
| 7711 else | |
| 7712 { | |
| 714 | 7713 int i; |
| 7714 | |
| 7 | 7715 ScreenLinesUC[off] = u8c; |
| 714 | 7716 for (i = 0; i < Screen_mco; ++i) |
| 7717 { | |
| 7718 ScreenLinesC[i][off] = u8cc[i]; | |
| 7719 if (u8cc[i] == 0) | |
| 7720 break; | |
| 7721 } | |
| 7 | 7722 } |
| 7723 if (mbyte_cells == 2) | |
| 7724 { | |
| 7725 ScreenLines[off + 1] = 0; | |
| 7726 ScreenAttrs[off + 1] = attr; | |
| 7727 } | |
| 7728 screen_char(off, row, col); | |
| 7729 } | |
| 7730 else if (mbyte_cells == 2) | |
| 7731 { | |
| 7732 ScreenLines[off + 1] = ptr[1]; | |
| 7733 ScreenAttrs[off + 1] = attr; | |
| 7734 screen_char_2(off, row, col); | |
| 7735 } | |
| 7736 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7737 { | |
| 7738 ScreenLines2[off] = ptr[1]; | |
| 7739 screen_char(off, row, col); | |
| 7740 } | |
| 7741 else | |
| 7742 screen_char(off, row, col); | |
| 7743 } | |
| 7744 if (has_mbyte) | |
| 7745 { | |
| 7746 off += mbyte_cells; | |
| 7747 col += mbyte_cells; | |
| 7748 ptr += mbyte_blen; | |
| 7749 if (clear_next_cell) | |
| 5923 | 7750 { |
| 7751 /* This only happens at the end, display one space next. */ | |
| 7 | 7752 ptr = (char_u *)" "; |
| 5923 | 7753 len = -1; |
| 7754 } | |
| 7 | 7755 } |
| 7756 else | |
| 7757 { | |
| 7758 ++off; | |
| 7759 ++col; | |
| 7760 ++ptr; | |
| 7761 } | |
| 7762 } | |
| 1843 | 7763 |
| 7764 /* If we detected the next character needs to be redrawn, but the text | |
| 7765 * doesn't extend up to there, update the character here. */ | |
| 7766 if (force_redraw_next && col < screen_Columns) | |
| 7767 { | |
| 7768 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7769 screen_char_2(off, row, col); | |
| 7770 else | |
| 7771 screen_char(off, row, col); | |
| 7772 } | |
| 7 | 7773 } |
| 7774 | |
| 7775 #ifdef FEAT_SEARCH_EXTRA | |
| 7776 /* | |
| 1326 | 7777 * Prepare for 'hlsearch' highlighting. |
| 7 | 7778 */ |
| 7779 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7780 start_search_hl(void) |
| 7 | 7781 { |
| 7782 if (p_hls && !no_hlsearch) | |
| 7783 { | |
| 7784 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
|
7785 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7786 # ifdef FEAT_RELTIME |
| 7787 /* Set the time limit to 'redrawtime'. */ | |
| 7788 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7789 # endif | |
| 7 | 7790 } |
| 7791 } | |
| 7792 | |
| 7793 /* | |
| 1326 | 7794 * Clean up for 'hlsearch' highlighting. |
| 7 | 7795 */ |
| 7796 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7797 end_search_hl(void) |
| 7 | 7798 { |
| 7799 if (search_hl.rm.regprog != NULL) | |
| 7800 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7801 vim_regfree(search_hl.rm.regprog); |
| 7 | 7802 search_hl.rm.regprog = NULL; |
| 7803 } | |
| 7804 } | |
| 7805 | |
| 7806 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7807 * 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
|
7808 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7809 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7810 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
|
7811 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7812 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7813 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7814 /* 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
|
7815 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7816 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7817 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7818 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7819 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7820 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7821 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7822 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7823 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
|
7824 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
|
7825 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7826 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7827 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7828 /* 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
|
7829 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
|
7830 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7831 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7832 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7833 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
|
7834 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7835 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7836 /* 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
|
7837 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7838 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7839 /* |
| 7 | 7840 * Advance to the match in window "wp" line "lnum" or past it. |
| 7841 */ | |
| 7842 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7843 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7844 { |
| 1326 | 7845 matchitem_T *cur; /* points to the match list */ |
| 7846 match_T *shl; /* points to search_hl or a match */ | |
| 7847 int shl_flag; /* flag to indicate whether search_hl | |
| 7848 has been processed or not */ | |
| 5979 | 7849 int pos_inprogress; /* marks that position match search is |
| 7850 in progress */ | |
| 7 | 7851 int n; |
| 7852 | |
| 7853 /* | |
| 7854 * When using a multi-line pattern, start searching at the top | |
| 7855 * of the window or just after a closed fold. | |
| 1326 | 7856 * Do this both for search_hl and the match list. |
| 7 | 7857 */ |
| 1326 | 7858 cur = wp->w_match_head; |
| 7859 shl_flag = FALSE; | |
| 7860 while (cur != NULL || shl_flag == FALSE) | |
| 7861 { | |
| 7862 if (shl_flag == FALSE) | |
| 7863 { | |
| 7864 shl = &search_hl; | |
| 7865 shl_flag = TRUE; | |
| 7866 } | |
| 7867 else | |
| 7868 shl = &cur->hl; | |
| 7 | 7869 if (shl->rm.regprog != NULL |
| 7870 && shl->lnum == 0 | |
| 7871 && re_multiline(shl->rm.regprog)) | |
| 7872 { | |
| 7873 if (shl->first_lnum == 0) | |
| 7874 { | |
| 7875 # ifdef FEAT_FOLDING | |
| 7876 for (shl->first_lnum = lnum; | |
| 7877 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7878 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7879 NULL, NULL, TRUE, NULL)) | |
| 7880 break; | |
| 7881 # else | |
| 7882 shl->first_lnum = wp->w_topline; | |
| 7883 # endif | |
| 7884 } | |
| 5979 | 7885 if (cur != NULL) |
| 7886 cur->pos.cur = 0; | |
| 7887 pos_inprogress = TRUE; | |
| 7 | 7888 n = 0; |
| 5979 | 7889 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7890 || (cur != NULL && pos_inprogress))) | |
| 7891 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7892 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
|
7893 shl == &search_hl ? NULL : cur); |
| 5979 | 7894 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7895 ? FALSE : TRUE; | |
| 7 | 7896 if (shl->lnum != 0) |
| 7897 { | |
| 7898 shl->first_lnum = shl->lnum | |
| 7899 + shl->rm.endpos[0].lnum | |
| 7900 - shl->rm.startpos[0].lnum; | |
| 7901 n = shl->rm.endpos[0].col; | |
| 7902 } | |
| 7903 else | |
| 7904 { | |
| 7905 ++shl->first_lnum; | |
| 7906 n = 0; | |
| 7907 } | |
| 7908 } | |
| 7909 } | |
| 1326 | 7910 if (shl != &search_hl && cur != NULL) |
| 7911 cur = cur->next; | |
| 7 | 7912 } |
| 7913 } | |
| 7914 | |
| 7915 /* | |
| 1326 | 7916 * Search for a next 'hlsearch' or match. |
| 7 | 7917 * Uses shl->buf. |
| 7918 * Sets shl->lnum and shl->rm contents. | |
| 7919 * Note: Assumes a previous match is always before "lnum", unless | |
| 7920 * shl->lnum is zero. | |
| 7921 * Careful: Any pointers for buffer lines will become invalid. | |
| 7922 */ | |
| 7923 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7924 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7925 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7926 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
|
7927 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7928 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
|
7929 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7930 { |
| 7931 linenr_T l; | |
| 7932 colnr_T matchcol; | |
| 7933 long nmatched; | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
7934 int save_called_emsg = called_emsg; |
| 7 | 7935 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7936 // for :{range}s/pat only highlight inside the range |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7937 if (lnum < search_first_line || lnum > search_last_line) |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7938 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7939 shl->lnum = 0; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7940 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7941 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7942 |
| 7 | 7943 if (shl->lnum != 0) |
| 7944 { | |
| 7945 /* Check for three situations: | |
| 7946 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7947 * 2. If the previous match includes "mincol", use it. | |
| 7948 * 3. Continue after the previous match. | |
| 7949 */ | |
| 7950 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7951 if (lnum > l) | |
| 7952 shl->lnum = 0; | |
| 7953 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7954 return; | |
| 7955 } | |
| 7956 | |
| 7957 /* | |
| 7958 * Repeat searching for a match until one is found that includes "mincol" | |
| 7959 * or none is found in this line. | |
| 7960 */ | |
| 7961 called_emsg = FALSE; | |
| 7962 for (;;) | |
| 7963 { | |
| 1521 | 7964 #ifdef FEAT_RELTIME |
| 7965 /* Stop searching after passing the time limit. */ | |
| 7966 if (profile_passed_limit(&(shl->tm))) | |
| 7967 { | |
| 7968 shl->lnum = 0; /* no match found in time */ | |
| 7969 break; | |
| 7970 } | |
| 7971 #endif | |
| 7 | 7972 /* Three situations: |
| 7973 * 1. No useful previous match: search from start of line. | |
| 7974 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7975 * Break the loop if this is beyond the end of the line. | |
| 7976 * 3. Vi compatible searching: continue at end of previous match. | |
| 7977 */ | |
| 7978 if (shl->lnum == 0) | |
| 7979 matchcol = 0; | |
| 7980 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7981 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7982 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7983 { | |
| 688 | 7984 char_u *ml; |
| 685 | 7985 |
| 7986 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7987 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7988 if (*ml == NUL) |
| 7989 { | |
| 7990 ++matchcol; | |
| 7 | 7991 shl->lnum = 0; |
| 7992 break; | |
| 7993 } | |
| 685 | 7994 if (has_mbyte) |
| 7995 matchcol += mb_ptr2len(ml); | |
| 7996 else | |
| 7997 ++matchcol; | |
| 7 | 7998 } |
| 7999 else | |
| 8000 matchcol = shl->rm.endpos[0].col; | |
| 8001 | |
| 8002 shl->lnum = lnum; | |
| 5979 | 8003 if (shl->rm.regprog != NULL) |
| 8004 { | |
| 6394 | 8005 /* Remember whether shl->rm is using a copy of the regprog in |
| 8006 * cur->match. */ | |
| 8007 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 8008 && shl == &cur->hl | |
| 8009 && 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
|
8010 int timed_out = FALSE; |
| 6394 | 8011 |
| 5979 | 8012 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 8013 matchcol, | |
| 1521 | 8014 #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
|
8015 &(shl->tm), &timed_out |
| 1521 | 8016 #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
|
8017 NULL, NULL |
| 5979 | 8018 #endif |
| 8019 ); | |
| 6394 | 8020 /* Copy the regprog, in case it got freed and recompiled. */ |
| 8021 if (regprog_is_copy) | |
| 8022 cur->match.regprog = cur->hl.rm.regprog; | |
| 8023 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8024 if (called_emsg || got_int || timed_out) |
| 5979 | 8025 { |
| 8026 /* Error while handling regexp: stop using this regexp. */ | |
| 8027 if (shl == &search_hl) | |
| 8028 { | |
| 8029 /* don't free regprog in the match list, it's a copy */ | |
| 8030 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
|
8031 set_no_hlsearch(TRUE); |
| 5979 | 8032 } |
| 8033 shl->rm.regprog = NULL; | |
| 8034 shl->lnum = 0; | |
| 8035 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 8036 message */ | |
| 8037 break; | |
| 8038 } | |
| 8039 } | |
| 8040 else if (cur != NULL) | |
| 8041 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 8042 else |
| 8043 nmatched = 0; | |
| 7 | 8044 if (nmatched == 0) |
| 8045 { | |
| 8046 shl->lnum = 0; /* no match found */ | |
| 8047 break; | |
| 8048 } | |
| 8049 if (shl->rm.startpos[0].lnum > 0 | |
| 8050 || shl->rm.startpos[0].col >= mincol | |
| 8051 || nmatched > 1 | |
| 8052 || shl->rm.endpos[0].col > mincol) | |
| 8053 { | |
| 8054 shl->lnum += shl->rm.startpos[0].lnum; | |
| 8055 break; /* useful match found */ | |
| 8056 } | |
| 8057 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8058 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8059 // Restore called_emsg for assert_fails(). |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8060 called_emsg = save_called_emsg; |
| 7 | 8061 } |
| 8062 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8063 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8064 * 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
|
8065 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8066 */ |
| 5979 | 8067 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8068 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8069 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
|
8070 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8071 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8072 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 8073 { |
| 8074 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8075 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8076 |
| 5979 | 8077 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 8078 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8079 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8080 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8081 if (pos->lnum == 0) |
| 5979 | 8082 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8083 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8084 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8085 if (pos->lnum == lnum) |
| 5979 | 8086 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8087 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8088 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8089 /* 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
|
8090 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8091 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
|
8092 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8093 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8094 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8095 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8096 posmatch->pos[found] = tmp; |
| 5979 | 8097 } |
| 8098 } | |
| 8099 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8100 found = i; |
| 5979 | 8101 } |
| 8102 } | |
| 8103 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8104 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8105 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8106 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
|
8107 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8108 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
|
8109 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8110 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8111 shl->lnum = lnum; |
| 5979 | 8112 shl->rm.startpos[0].lnum = 0; |
| 8113 shl->rm.startpos[0].col = start; | |
| 8114 shl->rm.endpos[0].lnum = 0; | |
| 8115 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
|
8116 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8117 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8118 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8119 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8120 return 0; |
| 5979 | 8121 } |
| 5985 | 8122 #endif |
| 5979 | 8123 |
| 7 | 8124 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8125 screen_start_highlight(int attr) |
| 7 | 8126 { |
| 8127 attrentry_T *aep = NULL; | |
| 8128 | |
| 8129 screen_attr = attr; | |
| 8130 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
8131 #ifdef MSWIN |
| 7 | 8132 && termcap_active |
| 8133 #endif | |
| 8134 ) | |
| 8135 { | |
| 8136 #ifdef FEAT_GUI | |
| 8137 if (gui.in_use) | |
| 8138 { | |
| 8139 char buf[20]; | |
| 8140 | |
| 681 | 8141 /* The GUI handles this internally. */ |
| 8142 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8143 OUT_STR(buf); |
| 8144 } | |
| 8145 else | |
| 8146 #endif | |
| 8147 { | |
| 8148 if (attr > HL_ALL) /* special HL attr. */ | |
| 8149 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8150 if (IS_CTERM) |
| 7 | 8151 aep = syn_cterm_attr2entry(attr); |
| 8152 else | |
| 8153 aep = syn_term_attr2entry(attr); | |
| 8154 if (aep == NULL) /* did ":syntax clear" */ | |
| 8155 attr = 0; | |
| 8156 else | |
| 8157 attr = aep->ae_attr; | |
| 8158 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8159 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8160 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
|
8161 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
|
8162 #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
|
8163 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
|
8164 ? 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
|
8165 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8166 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8167 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8168 /* If the Normal FG color has BOLD attribute and the new HL |
| 8169 * has a FG color defined, clear BOLD. */ | |
| 8170 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
|
8171 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8172 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
|
8173 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
|
8174 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
|
8175 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
|
8176 || ((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
|
8177 && *T_US != NUL) |
| 7 | 8178 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
|
8179 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8180 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
|
8181 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8182 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
|
8183 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
|
8184 out_str(T_STS); |
| 7 | 8185 |
| 8186 /* | |
| 8187 * Output the color or start string after bold etc., in case the | |
| 8188 * bold etc. override the color setting. | |
| 8189 */ | |
| 8190 if (aep != NULL) | |
| 8191 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8192 #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
|
8193 /* 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
|
8194 * 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
|
8195 * 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
|
8196 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
|
8197 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8198 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
|
8199 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
|
8200 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8201 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8202 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8203 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
|
8204 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8205 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
|
8206 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
|
8207 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8208 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8209 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
|
8210 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8211 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
|
8212 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8213 } |
| 8214 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8215 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8216 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
|
8217 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8218 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
|
8219 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
|
8220 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8221 |
|
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
|
8222 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
|
8223 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8224 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
|
8225 out_str(aep->ae_u.term.start); |
| 7 | 8226 } |
| 8227 } | |
| 8228 } | |
| 8229 } | |
| 8230 } | |
| 8231 | |
| 8232 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8233 screen_stop_highlight(void) |
| 7 | 8234 { |
| 8235 int do_ME = FALSE; /* output T_ME code */ | |
| 8236 | |
| 8237 if (screen_attr != 0 | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
8238 #ifdef MSWIN |
| 7 | 8239 && termcap_active |
| 8240 #endif | |
| 8241 ) | |
| 8242 { | |
| 8243 #ifdef FEAT_GUI | |
| 8244 if (gui.in_use) | |
| 8245 { | |
| 8246 char buf[20]; | |
| 8247 | |
| 8248 /* use internal GUI code */ | |
| 8249 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8250 OUT_STR(buf); | |
| 8251 } | |
| 8252 else | |
| 8253 #endif | |
| 8254 { | |
| 8255 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8256 { | |
| 8257 attrentry_T *aep; | |
| 8258 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8259 if (IS_CTERM) |
| 7 | 8260 { |
| 8261 /* | |
| 8262 * Assume that t_me restores the original colors! | |
| 8263 */ | |
| 8264 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
|
8265 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8266 #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
|
8267 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
|
8268 ? 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
|
8269 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8270 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8271 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
|
8272 #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
|
8273 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
|
8274 ? 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
|
8275 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8276 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8277 aep->ae_u.cterm.bg_color))) |
| 7 | 8278 do_ME = TRUE; |
| 8279 } | |
| 8280 else | |
| 8281 { | |
| 8282 aep = syn_term_attr2entry(screen_attr); | |
| 8283 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8284 { | |
| 8285 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8286 do_ME = TRUE; | |
| 8287 else | |
| 8288 out_str(aep->ae_u.term.stop); | |
| 8289 } | |
| 8290 } | |
| 8291 if (aep == NULL) /* did ":syntax clear" */ | |
| 8292 screen_attr = 0; | |
| 8293 else | |
| 8294 screen_attr = aep->ae_attr; | |
| 8295 } | |
| 8296 | |
| 8297 /* | |
| 8298 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8299 * same sequence several times. | |
| 8300 */ | |
| 8301 if (screen_attr & HL_STANDOUT) | |
| 8302 { | |
| 8303 if (STRCMP(T_SE, T_ME) == 0) | |
| 8304 do_ME = TRUE; | |
| 8305 else | |
| 8306 out_str(T_SE); | |
| 8307 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8308 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
|
8309 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8310 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
|
8311 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8312 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8313 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
|
8314 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8315 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
|
8316 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8317 { |
| 8318 if (STRCMP(T_UE, T_ME) == 0) | |
| 8319 do_ME = TRUE; | |
| 8320 else | |
| 8321 out_str(T_UE); | |
| 8322 } | |
| 8323 if (screen_attr & HL_ITALIC) | |
| 8324 { | |
| 8325 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8326 do_ME = TRUE; | |
| 8327 else | |
| 8328 out_str(T_CZR); | |
| 8329 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8330 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8331 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8332 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
|
8333 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8334 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8335 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8336 } |
| 7 | 8337 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8338 out_str(T_ME); | |
| 8339 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8340 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8341 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8342 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8343 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
|
8344 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
|
8345 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
|
8346 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
|
8347 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8348 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8349 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8350 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8351 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8352 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8353 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8354 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8355 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
|
8356 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8357 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
|
8358 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8359 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8360 } |
| 7 | 8361 } |
| 8362 } | |
| 8363 } | |
| 8364 screen_attr = 0; | |
| 8365 } | |
| 8366 | |
| 8367 /* | |
| 8368 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8369 * The machine specific code may override this again. | |
| 8370 */ | |
| 8371 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8372 reset_cterm_colors(void) |
| 7 | 8373 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8374 if (IS_CTERM) |
| 7 | 8375 { |
| 8376 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8377 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8378 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
|
8379 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8380 : (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
|
8381 #else |
| 7 | 8382 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
|
8383 #endif |
| 7 | 8384 { |
| 8385 out_str(T_OP); | |
| 8386 screen_attr = -1; | |
| 8387 } | |
| 8388 if (cterm_normal_fg_bold) | |
| 8389 { | |
| 8390 out_str(T_ME); | |
| 8391 screen_attr = -1; | |
| 8392 } | |
| 8393 } | |
| 8394 } | |
| 8395 | |
| 8396 /* | |
| 8397 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8398 * using the attributes from ScreenAttrs["off"]. | |
| 8399 */ | |
| 8400 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8401 screen_char(unsigned off, int row, int col) |
| 7 | 8402 { |
| 8403 int attr; | |
| 8404 | |
| 8405 /* Check for illegal values, just in case (could happen just after | |
| 8406 * resizing). */ | |
| 8407 if (row >= screen_Rows || col >= screen_Columns) | |
| 8408 return; | |
| 8409 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8410 #ifdef FEAT_INS_EXPAND |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8411 if (pum_under_menu(row, col)) |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8412 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8413 #endif |
| 6602 | 8414 /* Outputting a character in the last cell on the screen may scroll the |
| 8415 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8416 * mark the character invalid (update it when scrolled up). */ | |
| 8417 if (*T_XN == NUL | |
| 8418 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8419 #ifdef FEAT_RIGHTLEFT |
| 8420 /* account for first command-line character in rightleft mode */ | |
| 8421 && !cmdmsg_rl | |
| 8422 #endif | |
| 8423 ) | |
| 8424 { | |
| 8425 ScreenAttrs[off] = (sattr_T)-1; | |
| 8426 return; | |
| 8427 } | |
| 8428 | |
| 8429 /* | |
| 8430 * Stop highlighting first, so it's easier to move the cursor. | |
| 8431 */ | |
| 8432 if (screen_char_attr != 0) | |
| 8433 attr = screen_char_attr; | |
| 8434 else | |
| 8435 attr = ScreenAttrs[off]; | |
| 8436 if (screen_attr != attr) | |
| 8437 screen_stop_highlight(); | |
| 8438 | |
| 8439 windgoto(row, col); | |
| 8440 | |
| 8441 if (screen_attr != attr) | |
| 8442 screen_start_highlight(attr); | |
| 8443 | |
| 8444 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8445 { | |
| 8446 char_u buf[MB_MAXBYTES + 1]; | |
| 8447 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8448 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
|
8449 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8450 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8451 #ifdef FEAT_GUI |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8452 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8453 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8454 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8455 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8456 /* 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
|
8457 * 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
|
8458 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
|
8459 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
|
8460 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8461 /* 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
|
8462 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8463 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
|
8464 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8465 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8466 ++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
|
8467 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8468 /* 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
|
8469 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
|
8470 out_str(buf); |
| 7 | 8471 } |
| 8472 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8473 { |
| 7 | 8474 out_flush_check(); |
| 8475 out_char(ScreenLines[off]); | |
| 8476 /* double-byte character in single-width cell */ | |
| 8477 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8478 out_char(ScreenLines2[off]); | |
| 8479 } | |
| 8480 | |
| 8481 screen_cur_col++; | |
| 8482 } | |
| 8483 | |
| 8484 /* | |
| 8485 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8486 * on the screen at position 'row' and 'col'. | |
| 8487 * The attributes of the first byte is used for all. This is required to | |
| 8488 * output the two bytes of a double-byte character with nothing in between. | |
| 8489 */ | |
| 8490 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8491 screen_char_2(unsigned off, int row, int col) |
| 7 | 8492 { |
| 8493 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8494 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8495 return; | |
| 8496 | |
| 8497 /* Outputting the last character on the screen may scrollup the screen. | |
| 8498 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8499 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8500 { | |
| 8501 ScreenAttrs[off] = (sattr_T)-1; | |
| 8502 return; | |
| 8503 } | |
| 8504 | |
| 8505 /* Output the first byte normally (positions the cursor), then write the | |
| 8506 * second byte directly. */ | |
| 8507 screen_char(off, row, col); | |
| 8508 out_char(ScreenLines[off + 1]); | |
| 8509 ++screen_cur_col; | |
| 8510 } | |
| 8511 | |
| 8512 /* | |
| 8513 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8514 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8515 */ | |
| 8516 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8517 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8518 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8519 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8520 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8521 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8522 int invert) |
| 7 | 8523 { |
| 8524 int r, c; | |
| 8525 int off; | |
| 1378 | 8526 int max_off; |
| 7 | 8527 |
| 534 | 8528 /* Can't use ScreenLines unless initialized */ |
| 8529 if (ScreenLines == NULL) | |
| 8530 return; | |
| 8531 | |
| 7 | 8532 if (invert) |
| 8533 screen_char_attr = HL_INVERSE; | |
| 8534 for (r = row; r < row + height; ++r) | |
| 8535 { | |
| 8536 off = LineOffset[r]; | |
| 1378 | 8537 max_off = off + screen_Columns; |
| 7 | 8538 for (c = col; c < col + width; ++c) |
| 8539 { | |
| 1378 | 8540 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8541 { |
| 8542 screen_char_2(off + c, r, c); | |
| 8543 ++c; | |
| 8544 } | |
| 8545 else | |
| 8546 { | |
| 8547 screen_char(off + c, r, c); | |
| 1378 | 8548 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8549 ++c; |
| 8550 } | |
| 8551 } | |
| 8552 } | |
| 8553 screen_char_attr = 0; | |
| 8554 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8555 |
| 7 | 8556 /* |
| 8557 * Redraw the characters for a vertically split window. | |
| 8558 */ | |
| 8559 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8560 redraw_block(int row, int end, win_T *wp) |
| 7 | 8561 { |
| 8562 int col; | |
| 8563 int width; | |
| 8564 | |
| 8565 # ifdef FEAT_CLIPBOARD | |
| 8566 clip_may_clear_selection(row, end - 1); | |
| 8567 # endif | |
| 8568 | |
| 8569 if (wp == NULL) | |
| 8570 { | |
| 8571 col = 0; | |
| 8572 width = Columns; | |
| 8573 } | |
| 8574 else | |
| 8575 { | |
| 8576 col = wp->w_wincol; | |
| 8577 width = wp->w_width; | |
| 8578 } | |
| 8579 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8580 } | |
| 8581 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8582 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8583 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
|
8584 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8585 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8586 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8587 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8588 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8589 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8590 |
| 7 | 8591 /* |
| 8592 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8593 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8594 * Use attributes 'attr'. | |
| 8595 */ | |
| 8596 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8597 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8598 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8599 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8600 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8601 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8602 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8603 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8604 int attr) |
| 7 | 8605 { |
| 8606 int row; | |
| 8607 int col; | |
| 8608 int off; | |
| 8609 int end_off; | |
| 8610 int did_delete; | |
| 8611 int c; | |
| 8612 int norm_term; | |
| 8613 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8614 int force_next = FALSE; | |
| 8615 #endif | |
| 8616 | |
| 8617 if (end_row > screen_Rows) /* safety check */ | |
| 8618 end_row = screen_Rows; | |
| 8619 if (end_col > screen_Columns) /* safety check */ | |
| 8620 end_col = screen_Columns; | |
| 8621 if (ScreenLines == NULL | |
| 8622 || start_row >= end_row | |
| 8623 || start_col >= end_col) /* nothing to do */ | |
| 8624 return; | |
| 8625 | |
| 8626 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8627 norm_term = ( | |
| 8628 #ifdef FEAT_GUI | |
| 8629 !gui.in_use && | |
| 8630 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8631 !IS_CTERM); |
| 7 | 8632 for (row = start_row; row < end_row; ++row) |
| 8633 { | |
| 1668 | 8634 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8635 #ifdef FEAT_GUI |
| 1668 | 8636 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8637 #endif |
| 1668 | 8638 ) |
| 8639 { | |
| 8640 /* When drawing over the right halve of a double-wide char clear | |
| 8641 * out the left halve. When drawing over the left halve of a | |
| 8642 * double wide-char clear out the right halve. Only needed in a | |
| 8643 * terminal. */ | |
| 1685 | 8644 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8645 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8646 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8647 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8648 } |
| 7 | 8649 /* |
| 8650 * Try to use delete-line termcap code, when no attributes or in a | |
| 8651 * "normal" terminal, where a bold/italic space is just a | |
| 8652 * space. | |
| 8653 */ | |
| 8654 did_delete = FALSE; | |
| 8655 if (c2 == ' ' | |
| 8656 && end_col == Columns | |
| 8657 && can_clear(T_CE) | |
| 8658 && (attr == 0 | |
| 8659 || (norm_term | |
| 8660 && attr <= HL_ALL | |
| 8661 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8662 { | |
| 8663 /* | |
| 8664 * check if we really need to clear something | |
| 8665 */ | |
| 8666 col = start_col; | |
| 8667 if (c1 != ' ') /* don't clear first char */ | |
| 8668 ++col; | |
| 8669 | |
| 8670 off = LineOffset[row] + col; | |
| 8671 end_off = LineOffset[row] + end_col; | |
| 8672 | |
| 8673 /* skip blanks (used often, keep it fast!) */ | |
| 8674 if (enc_utf8) | |
| 8675 while (off < end_off && ScreenLines[off] == ' ' | |
| 8676 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8677 ++off; | |
| 8678 else | |
| 8679 while (off < end_off && ScreenLines[off] == ' ' | |
| 8680 && ScreenAttrs[off] == 0) | |
| 8681 ++off; | |
| 8682 if (off < end_off) /* something to be cleared */ | |
| 8683 { | |
| 8684 col = off - LineOffset[row]; | |
| 8685 screen_stop_highlight(); | |
| 8686 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8687 out_str(T_CE); | |
| 8688 screen_start(); /* don't know where cursor is now */ | |
| 8689 col = end_col - col; | |
| 8690 while (col--) /* clear chars in ScreenLines */ | |
| 8691 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8692 space_to_screenline(off, 0); |
| 7 | 8693 ++off; |
| 8694 } | |
| 8695 } | |
| 8696 did_delete = TRUE; /* the chars are cleared now */ | |
| 8697 } | |
| 8698 | |
| 8699 off = LineOffset[row] + start_col; | |
| 8700 c = c1; | |
| 8701 for (col = start_col; col < end_col; ++col) | |
| 8702 { | |
| 8703 if (ScreenLines[off] != c | |
| 714 | 8704 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8705 != (c >= 0x80 ? c : 0)) | |
| 7 | 8706 || ScreenAttrs[off] != attr |
| 8707 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8708 || force_next | |
| 8709 #endif | |
| 8710 ) | |
| 8711 { | |
| 8712 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8713 /* The bold trick may make a single row of pixels appear in | |
| 8714 * the next character. When a bold character is removed, the | |
| 8715 * next character should be redrawn too. This happens for our | |
| 8716 * own GUI and for some xterms. */ | |
| 8717 if ( | |
| 8718 # ifdef FEAT_GUI | |
| 8719 gui.in_use | |
| 8720 # endif | |
| 8721 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8722 || | |
| 8723 # endif | |
| 8724 # ifdef UNIX | |
| 8725 term_is_xterm | |
| 8726 # endif | |
| 8727 ) | |
| 8728 { | |
| 8729 if (ScreenLines[off] != ' ' | |
| 8730 && (ScreenAttrs[off] > HL_ALL | |
| 8731 || ScreenAttrs[off] & HL_BOLD)) | |
| 8732 force_next = TRUE; | |
| 8733 else | |
| 8734 force_next = FALSE; | |
| 8735 } | |
| 8736 #endif | |
| 8737 ScreenLines[off] = c; | |
| 8738 if (enc_utf8) | |
| 8739 { | |
| 8740 if (c >= 0x80) | |
| 8741 { | |
| 8742 ScreenLinesUC[off] = c; | |
| 714 | 8743 ScreenLinesC[0][off] = 0; |
| 7 | 8744 } |
| 8745 else | |
| 8746 ScreenLinesUC[off] = 0; | |
| 8747 } | |
| 8748 ScreenAttrs[off] = attr; | |
| 8749 if (!did_delete || c != ' ') | |
| 8750 screen_char(off, row, col); | |
| 8751 } | |
| 8752 ++off; | |
| 8753 if (col == start_col) | |
| 8754 { | |
| 8755 if (did_delete) | |
| 8756 break; | |
| 8757 c = c2; | |
| 8758 } | |
| 8759 } | |
| 8760 if (end_col == Columns) | |
| 8761 LineWraps[row] = FALSE; | |
| 8762 if (row == Rows - 1) /* overwritten the command line */ | |
| 8763 { | |
| 8764 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
|
8765 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
|
8766 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8767 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8768 if (start_col == 0) |
| 8769 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8770 } |
| 8771 } | |
| 8772 } | |
| 8773 | |
| 8774 /* | |
| 8775 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8776 * screen or the command line. | |
| 8777 */ | |
| 8778 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8779 check_for_delay(int check_msg_scroll) |
| 7 | 8780 { |
| 8781 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8782 && !did_wait_return | |
| 8783 && emsg_silent == 0) | |
| 8784 { | |
| 8785 out_flush(); | |
| 8786 ui_delay(1000L, TRUE); | |
| 8787 emsg_on_display = FALSE; | |
| 8788 if (check_msg_scroll) | |
| 8789 msg_scroll = FALSE; | |
| 8790 } | |
| 8791 } | |
| 8792 | |
| 8793 /* | |
|
16320
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8794 * Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8795 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8796 static void |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8797 clear_TabPageIdxs(void) |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8798 { |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8799 int scol; |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8800 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8801 for (scol = 0; scol < Columns; ++scol) |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8802 TabPageIdxs[scol] = 0; |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8803 } |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8804 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8805 /* |
| 7 | 8806 * screen_valid - allocate screen buffers if size changed |
| 3263 | 8807 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8808 * Returns TRUE if there is a valid screen to write to. |
| 8809 * Returns FALSE when starting up and screen not initialized yet. | |
| 8810 */ | |
| 8811 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8812 screen_valid(int doclear) |
| 7 | 8813 { |
| 3263 | 8814 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8815 return (ScreenLines != NULL); |
| 8816 } | |
| 8817 | |
| 8818 /* | |
| 8819 * Resize the shell to Rows and Columns. | |
| 8820 * Allocate ScreenLines[] and associated items. | |
| 8821 * | |
| 8822 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8823 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8824 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8825 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8826 * final size of the shell is needed. | |
| 8827 */ | |
| 8828 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8829 screenalloc(int doclear) |
| 7 | 8830 { |
| 8831 int new_row, old_row; | |
| 8832 #ifdef FEAT_GUI | |
| 8833 int old_Rows; | |
| 8834 #endif | |
| 8835 win_T *wp; | |
| 8836 int outofmem = FALSE; | |
| 8837 int len; | |
| 8838 schar_T *new_ScreenLines; | |
| 8839 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8840 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8841 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8842 int i; |
| 7 | 8843 sattr_T *new_ScreenAttrs; |
| 8844 unsigned *new_LineOffset; | |
| 8845 char_u *new_LineWraps; | |
| 681 | 8846 short *new_TabPageIdxs; |
| 671 | 8847 tabpage_T *tp; |
| 7 | 8848 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8849 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8850 int retry_count = 0; |
| 8851 | |
| 8852 retry: | |
| 7 | 8853 /* |
| 8854 * Allocation of the screen buffers is done only when the size changes and | |
| 8855 * when Rows and Columns have been set and we have started doing full | |
| 8856 * screen stuff. | |
| 8857 */ | |
| 8858 if ((ScreenLines != NULL | |
| 8859 && Rows == screen_Rows | |
| 8860 && Columns == screen_Columns | |
| 8861 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8862 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8863 && p_mco == Screen_mco) |
| 7 | 8864 || Rows == 0 |
| 8865 || Columns == 0 | |
| 8866 || (!full_screen && ScreenLines == NULL)) | |
| 8867 return; | |
| 8868 | |
| 8869 /* | |
| 8870 * It's possible that we produce an out-of-memory message below, which | |
| 8871 * will cause this function to be called again. To break the loop, just | |
| 8872 * return here. | |
| 8873 */ | |
| 8874 if (entered) | |
| 8875 return; | |
| 8876 entered = TRUE; | |
| 8877 | |
| 911 | 8878 /* |
| 8879 * Note that the window sizes are updated before reallocating the arrays, | |
| 8880 * thus we must not redraw here! | |
| 8881 */ | |
| 8882 ++RedrawingDisabled; | |
| 8883 | |
| 7 | 8884 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8885 | |
| 8886 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8887 | |
| 8888 /* | |
| 8889 * We're changing the size of the screen. | |
| 8890 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8891 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8892 * lines (unless the screen is going to be cleared). | |
| 8893 * - Free the old arrays. | |
| 8894 * | |
| 8895 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8896 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8897 * size is wrong. | |
| 8898 */ | |
| 671 | 8899 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8900 win_free_lsize(wp); |
| 1946 | 8901 if (aucmd_win != NULL) |
| 8902 win_free_lsize(aucmd_win); | |
| 7 | 8903 |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8904 new_ScreenLines = (schar_T *)lalloc( |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8905 (Rows + 1) * Columns * sizeof(schar_T), FALSE); |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8906 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8907 if (enc_utf8) |
| 8908 { | |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8909 new_ScreenLinesUC = (u8char_T *)lalloc( |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8910 (Rows + 1) * Columns * sizeof(u8char_T), FALSE); |
| 714 | 8911 for (i = 0; i < p_mco; ++i) |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8912 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear( |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8913 (Rows + 1) * Columns * sizeof(u8char_T), FALSE); |
| 7 | 8914 } |
| 8915 if (enc_dbcs == DBCS_JPNU) | |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8916 new_ScreenLines2 = (schar_T *)lalloc( |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8917 (Rows + 1) * Columns * sizeof(schar_T), FALSE); |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8918 new_ScreenAttrs = (sattr_T *)lalloc( |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8919 (Rows + 1) * Columns * sizeof(sattr_T), FALSE); |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8920 new_LineOffset = (unsigned *)lalloc(Rows * sizeof(unsigned), FALSE); |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8921 new_LineWraps = (char_u *)lalloc(Rows * sizeof(char_u), FALSE); |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8922 new_TabPageIdxs = (short *)lalloc(Columns * sizeof(short), FALSE); |
| 7 | 8923 |
| 677 | 8924 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8925 { |
| 8926 if (win_alloc_lines(wp) == FAIL) | |
| 8927 { | |
| 8928 outofmem = TRUE; | |
| 1819 | 8929 goto give_up; |
| 8930 } | |
| 8931 } | |
| 1946 | 8932 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8933 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8934 outofmem = TRUE; |
| 1819 | 8935 give_up: |
| 7 | 8936 |
| 714 | 8937 for (i = 0; i < p_mco; ++i) |
| 8938 if (new_ScreenLinesC[i] == NULL) | |
| 8939 break; | |
| 7 | 8940 if (new_ScreenLines == NULL |
| 714 | 8941 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8942 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8943 || new_ScreenAttrs == NULL | |
| 8944 || new_LineOffset == NULL | |
| 8945 || new_LineWraps == NULL | |
| 671 | 8946 || new_TabPageIdxs == NULL |
| 7 | 8947 || outofmem) |
| 8948 { | |
| 944 | 8949 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8950 { |
| 8951 /* guess the size */ | |
| 8952 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8953 | |
| 8954 /* Remember we did this to avoid getting outofmem messages over | |
| 8955 * and over again. */ | |
| 944 | 8956 done_outofmem_msg = TRUE; |
| 534 | 8957 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8958 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8959 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 8960 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
|
8961 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
|
8962 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8963 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8964 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8965 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8966 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 8967 } |
| 8968 else | |
| 8969 { | |
| 944 | 8970 done_outofmem_msg = FALSE; |
| 534 | 8971 |
| 7 | 8972 for (new_row = 0; new_row < Rows; ++new_row) |
| 8973 { | |
| 8974 new_LineOffset[new_row] = new_row * Columns; | |
| 8975 new_LineWraps[new_row] = FALSE; | |
| 8976 | |
| 8977 /* | |
| 8978 * If the screen is not going to be cleared, copy as much as | |
| 8979 * possible from the old screen to the new one and clear the rest | |
| 8980 * (used when resizing the window at the "--more--" prompt or when | |
| 8981 * executing an external command, for the GUI). | |
| 8982 */ | |
| 3263 | 8983 if (!doclear) |
| 7 | 8984 { |
| 8985 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8986 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8987 if (enc_utf8) | |
| 8988 { | |
| 8989 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8990 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8991 for (i = 0; i < p_mco; ++i) |
| 8992 (void)vim_memset(new_ScreenLinesC[i] | |
| 8993 + new_row * Columns, | |
| 7 | 8994 0, (size_t)Columns * sizeof(u8char_T)); |
| 8995 } | |
| 8996 if (enc_dbcs == DBCS_JPNU) | |
| 8997 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8998 0, (size_t)Columns * sizeof(schar_T)); | |
| 8999 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 9000 0, (size_t)Columns * sizeof(sattr_T)); | |
| 9001 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 9002 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 9003 { |
| 9004 if (screen_Columns < Columns) | |
| 9005 len = screen_Columns; | |
| 9006 else | |
| 9007 len = Columns; | |
| 571 | 9008 /* When switching to utf-8 don't copy characters, they |
| 714 | 9009 * may be invalid now. Also when p_mco changes. */ |
| 9010 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 9011 && p_mco == Screen_mco) | |
| 26 | 9012 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 9013 ScreenLines + LineOffset[old_row], | |
| 9014 (size_t)len * sizeof(schar_T)); | |
| 714 | 9015 if (enc_utf8 && ScreenLinesUC != NULL |
| 9016 && p_mco == Screen_mco) | |
| 7 | 9017 { |
| 9018 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 9019 ScreenLinesUC + LineOffset[old_row], | |
| 9020 (size_t)len * sizeof(u8char_T)); | |
| 714 | 9021 for (i = 0; i < p_mco; ++i) |
| 9022 mch_memmove(new_ScreenLinesC[i] | |
| 9023 + new_LineOffset[new_row], | |
| 9024 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 9025 (size_t)len * sizeof(u8char_T)); |
| 9026 } | |
| 9027 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 9028 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 9029 ScreenLines2 + LineOffset[old_row], | |
| 9030 (size_t)len * sizeof(schar_T)); | |
| 9031 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 9032 ScreenAttrs + LineOffset[old_row], | |
| 9033 (size_t)len * sizeof(sattr_T)); | |
| 9034 } | |
| 9035 } | |
| 9036 } | |
| 9037 /* Use the last line of the screen for the current line. */ | |
| 9038 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 9039 } | |
| 9040 | |
| 356 | 9041 free_screenlines(); |
| 9042 | |
| 7 | 9043 ScreenLines = new_ScreenLines; |
| 9044 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 9045 for (i = 0; i < p_mco; ++i) |
| 9046 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 9047 Screen_mco = p_mco; | |
| 7 | 9048 ScreenLines2 = new_ScreenLines2; |
| 9049 ScreenAttrs = new_ScreenAttrs; | |
| 9050 LineOffset = new_LineOffset; | |
| 9051 LineWraps = new_LineWraps; | |
| 671 | 9052 TabPageIdxs = new_TabPageIdxs; |
| 7 | 9053 |
| 9054 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9055 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9056 #ifdef FEAT_GUI | |
| 9057 old_Rows = screen_Rows; | |
| 9058 #endif | |
| 9059 screen_Rows = Rows; | |
| 9060 screen_Columns = Columns; | |
| 9061 | |
| 9062 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9063 if (doclear) |
| 7 | 9064 screenclear2(); |
| 9065 #ifdef FEAT_GUI | |
| 9066 else if (gui.in_use | |
| 9067 && !gui.starting | |
| 9068 && ScreenLines != NULL | |
| 9069 && old_Rows != Rows) | |
| 9070 { | |
| 9071 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9072 /* | |
| 9073 * Adjust the position of the cursor, for when executing an external | |
| 9074 * command. | |
| 9075 */ | |
| 9076 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9077 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9078 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9079 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9080 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9081 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9082 } | |
| 9083 #endif | |
|
16320
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
9084 clear_TabPageIdxs(); |
| 7 | 9085 |
| 9086 entered = FALSE; | |
| 911 | 9087 --RedrawingDisabled; |
| 766 | 9088 |
| 1824 | 9089 /* |
| 9090 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9091 * in case applying autocommands always changes Rows or Columns. | |
| 9092 */ | |
| 9093 if (starting == 0 && ++retry_count <= 3) | |
| 9094 { | |
| 766 | 9095 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9096 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9097 * jump back to check if we need to allocate the screen again. */ | |
| 9098 goto retry; | |
| 9099 } | |
| 7 | 9100 } |
| 9101 | |
| 9102 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9103 free_screenlines(void) |
| 356 | 9104 { |
| 714 | 9105 int i; |
| 9106 | |
| 356 | 9107 vim_free(ScreenLinesUC); |
| 714 | 9108 for (i = 0; i < Screen_mco; ++i) |
| 9109 vim_free(ScreenLinesC[i]); | |
| 356 | 9110 vim_free(ScreenLines2); |
| 714 | 9111 vim_free(ScreenLines); |
| 356 | 9112 vim_free(ScreenAttrs); |
| 9113 vim_free(LineOffset); | |
| 9114 vim_free(LineWraps); | |
| 671 | 9115 vim_free(TabPageIdxs); |
| 356 | 9116 } |
| 9117 | |
| 9118 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9119 screenclear(void) |
| 7 | 9120 { |
| 9121 check_for_delay(FALSE); | |
| 9122 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9123 screenclear2(); /* clear the screen */ | |
| 9124 } | |
| 9125 | |
| 9126 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9127 screenclear2(void) |
| 7 | 9128 { |
| 9129 int i; | |
| 9130 | |
| 9131 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9132 #ifdef FEAT_GUI | |
| 9133 || (gui.in_use && gui.starting) | |
| 9134 #endif | |
| 9135 ) | |
| 9136 return; | |
| 9137 | |
| 9138 #ifdef FEAT_GUI | |
| 9139 if (!gui.in_use) | |
| 9140 #endif | |
| 9141 screen_attr = -1; /* force setting the Normal colors */ | |
| 9142 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9143 | |
| 9144 #ifdef FEAT_CLIPBOARD | |
| 9145 /* disable selection without redrawing it */ | |
| 9146 clip_scroll_selection(9999); | |
| 9147 #endif | |
| 9148 | |
| 9149 /* blank out ScreenLines */ | |
| 9150 for (i = 0; i < Rows; ++i) | |
| 9151 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9152 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9153 LineWraps[i] = FALSE; |
| 9154 } | |
| 9155 | |
| 9156 if (can_clear(T_CL)) | |
| 9157 { | |
| 9158 out_str(T_CL); /* clear the display */ | |
| 9159 clear_cmdline = FALSE; | |
| 644 | 9160 mode_displayed = FALSE; |
| 7 | 9161 } |
| 9162 else | |
| 9163 { | |
| 9164 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9165 for (i = 0; i < Rows; ++i) | |
| 9166 lineinvalid(LineOffset[i], (int)Columns); | |
| 9167 clear_cmdline = TRUE; | |
| 9168 } | |
| 9169 | |
| 9170 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9171 | |
| 9172 win_rest_invalid(firstwin); | |
| 9173 redraw_cmdline = TRUE; | |
| 673 | 9174 redraw_tabline = TRUE; |
| 7 | 9175 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9176 must_redraw = NOT_VALID; | |
| 9177 compute_cmdrow(); | |
| 9178 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9179 msg_col = 0; | |
| 9180 screen_start(); /* don't know where cursor is now */ | |
| 9181 msg_scrolled = 0; /* can't scroll back */ | |
| 9182 msg_didany = FALSE; | |
| 9183 msg_didout = FALSE; | |
| 9184 } | |
| 9185 | |
| 9186 /* | |
| 9187 * Clear one line in ScreenLines. | |
| 9188 */ | |
| 9189 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9190 lineclear(unsigned off, int width, int attr) |
| 7 | 9191 { |
| 9192 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9193 if (enc_utf8) | |
| 9194 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9195 (size_t)width * sizeof(u8char_T)); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9196 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9197 } |
| 9198 | |
| 9199 /* | |
| 9200 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9201 * invalid value. | |
| 9202 */ | |
| 9203 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9204 lineinvalid(unsigned off, int width) |
| 7 | 9205 { |
| 9206 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9207 } | |
| 9208 | |
| 9209 /* | |
| 9210 * Copy part of a Screenline for vertically split window "wp". | |
| 9211 */ | |
| 9212 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9213 linecopy(int to, int from, win_T *wp) |
| 7 | 9214 { |
| 9215 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9216 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9217 | |
| 9218 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9219 wp->w_width * sizeof(schar_T)); | |
| 9220 if (enc_utf8) | |
| 9221 { | |
| 714 | 9222 int i; |
| 9223 | |
| 7 | 9224 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9225 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9226 for (i = 0; i < p_mco; ++i) |
| 9227 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9228 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9229 } |
| 9230 if (enc_dbcs == DBCS_JPNU) | |
| 9231 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9232 wp->w_width * sizeof(schar_T)); | |
| 9233 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9234 wp->w_width * sizeof(sattr_T)); | |
| 9235 } | |
| 9236 | |
| 9237 /* | |
| 9238 * Return TRUE if clearing with term string "p" would work. | |
| 9239 * It can't work when the string is empty or it won't set the right background. | |
| 9240 */ | |
| 9241 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9242 can_clear(char_u *p) |
| 7 | 9243 { |
| 9244 return (*p != NUL && (t_colors <= 1 | |
| 9245 #ifdef FEAT_GUI | |
| 9246 || gui.in_use | |
| 9247 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9248 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9249 || (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
|
9250 || (!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
|
9251 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9252 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9253 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9254 || *T_UT != NUL)); |
| 7 | 9255 } |
| 9256 | |
| 9257 /* | |
| 9258 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9259 * something directly to the screen (shell commands) or a terminal control | |
| 9260 * code. | |
| 9261 */ | |
| 9262 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9263 screen_start(void) |
| 7 | 9264 { |
| 9265 screen_cur_row = screen_cur_col = 9999; | |
| 9266 } | |
| 9267 | |
| 9268 /* | |
| 9269 * Move the cursor to position "row","col" in the screen. | |
| 9270 * This tries to find the most efficient way to move, minimizing the number of | |
| 9271 * characters sent to the terminal. | |
| 9272 */ | |
| 9273 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9274 windgoto(int row, int col) |
| 7 | 9275 { |
| 205 | 9276 sattr_T *p; |
| 7 | 9277 int i; |
| 9278 int plan; | |
| 9279 int cost; | |
| 9280 int wouldbe_col; | |
| 9281 int noinvcurs; | |
| 9282 char_u *bs; | |
| 9283 int goto_cost; | |
| 9284 int attr; | |
| 9285 | |
| 1213 | 9286 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9287 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9288 | |
| 9289 #define PLAN_LE 1 | |
| 9290 #define PLAN_CR 2 | |
| 9291 #define PLAN_NL 3 | |
| 9292 #define PLAN_WRITE 4 | |
| 9293 /* Can't use ScreenLines unless initialized */ | |
| 9294 if (ScreenLines == NULL) | |
| 9295 return; | |
| 9296 | |
| 9297 if (col != screen_cur_col || row != screen_cur_row) | |
| 9298 { | |
| 9299 /* Check for valid position. */ | |
| 9300 if (row < 0) /* window without text lines? */ | |
| 9301 row = 0; | |
| 9302 if (row >= screen_Rows) | |
| 9303 row = screen_Rows - 1; | |
| 9304 if (col >= screen_Columns) | |
| 9305 col = screen_Columns - 1; | |
| 9306 | |
| 9307 /* check if no cursor movement is allowed in highlight mode */ | |
| 9308 if (screen_attr && *T_MS == NUL) | |
| 9309 noinvcurs = HIGHL_COST; | |
| 9310 else | |
| 9311 noinvcurs = 0; | |
| 9312 goto_cost = GOTO_COST + noinvcurs; | |
| 9313 | |
| 9314 /* | |
| 9315 * Plan how to do the positioning: | |
| 9316 * 1. Use CR to move it to column 0, same row. | |
| 9317 * 2. Use T_LE to move it a few columns to the left. | |
| 9318 * 3. Use NL to move a few lines down, column 0. | |
| 9319 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9320 * | |
| 9321 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9322 * position is unknown then (some terminals wrap, some don't ) | |
| 9323 * | |
| 1213 | 9324 * First check if the highlighting attributes allow us to write |
| 7 | 9325 * characters to move the cursor to the right. |
| 9326 */ | |
| 9327 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9328 { | |
| 9329 /* | |
| 9330 * If the cursor is in the same row, bigger col, we can use CR | |
| 9331 * or T_LE. | |
| 9332 */ | |
| 9333 bs = NULL; /* init for GCC */ | |
| 9334 attr = screen_attr; | |
| 9335 if (row == screen_cur_row && col < screen_cur_col) | |
| 9336 { | |
| 9337 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9338 if (*T_LE) | |
| 9339 bs = T_LE; /* "cursor left" */ | |
| 9340 else | |
| 9341 bs = T_BC; /* "backspace character (old) */ | |
| 9342 if (*bs) | |
| 9343 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9344 else | |
| 9345 cost = 999; | |
| 9346 if (col + 1 < cost) /* using CR is less characters */ | |
| 9347 { | |
| 9348 plan = PLAN_CR; | |
| 9349 wouldbe_col = 0; | |
| 9350 cost = 1; /* CR is just one character */ | |
| 9351 } | |
| 9352 else | |
| 9353 { | |
| 9354 plan = PLAN_LE; | |
| 9355 wouldbe_col = col; | |
| 9356 } | |
| 9357 if (noinvcurs) /* will stop highlighting */ | |
| 9358 { | |
| 9359 cost += noinvcurs; | |
| 9360 attr = 0; | |
| 9361 } | |
| 9362 } | |
| 9363 | |
| 9364 /* | |
| 9365 * If the cursor is above where we want to be, we can use CR LF. | |
| 9366 */ | |
| 9367 else if (row > screen_cur_row) | |
| 9368 { | |
| 9369 plan = PLAN_NL; | |
| 9370 wouldbe_col = 0; | |
| 9371 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9372 if (noinvcurs) /* will stop highlighting */ | |
| 9373 { | |
| 9374 cost += noinvcurs; | |
| 9375 attr = 0; | |
| 9376 } | |
| 9377 } | |
| 9378 | |
| 9379 /* | |
| 9380 * If the cursor is in the same row, smaller col, just use write. | |
| 9381 */ | |
| 9382 else | |
| 9383 { | |
| 9384 plan = PLAN_WRITE; | |
| 9385 wouldbe_col = screen_cur_col; | |
| 9386 cost = 0; | |
| 9387 } | |
| 9388 | |
| 9389 /* | |
| 9390 * Check if any characters that need to be written have the | |
| 9391 * correct attributes. Also avoid UTF-8 characters. | |
| 9392 */ | |
| 9393 i = col - wouldbe_col; | |
| 9394 if (i > 0) | |
| 9395 cost += i; | |
| 9396 if (cost < goto_cost && i > 0) | |
| 9397 { | |
| 9398 /* | |
| 9399 * Check if the attributes are correct without additionally | |
| 9400 * stopping highlighting. | |
| 9401 */ | |
| 9402 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9403 while (i && *p++ == attr) | |
| 9404 --i; | |
| 9405 if (i != 0) | |
| 9406 { | |
| 9407 /* | |
| 9408 * Try if it works when highlighting is stopped here. | |
| 9409 */ | |
| 9410 if (*--p == 0) | |
| 9411 { | |
| 9412 cost += noinvcurs; | |
| 9413 while (i && *p++ == 0) | |
| 9414 --i; | |
| 9415 } | |
| 9416 if (i != 0) | |
| 9417 cost = 999; /* different attributes, don't do it */ | |
| 9418 } | |
| 9419 if (enc_utf8) | |
| 9420 { | |
| 9421 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9422 for (i = wouldbe_col; i < col; ++i) | |
| 9423 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9424 { | |
| 9425 cost = 999; | |
| 9426 break; | |
| 9427 } | |
| 9428 } | |
| 9429 } | |
| 9430 | |
| 9431 /* | |
| 9432 * We can do it without term_windgoto()! | |
| 9433 */ | |
| 9434 if (cost < goto_cost) | |
| 9435 { | |
| 9436 if (plan == PLAN_LE) | |
| 9437 { | |
| 9438 if (noinvcurs) | |
| 9439 screen_stop_highlight(); | |
| 9440 while (screen_cur_col > col) | |
| 9441 { | |
| 9442 out_str(bs); | |
| 9443 --screen_cur_col; | |
| 9444 } | |
| 9445 } | |
| 9446 else if (plan == PLAN_CR) | |
| 9447 { | |
| 9448 if (noinvcurs) | |
| 9449 screen_stop_highlight(); | |
| 9450 out_char('\r'); | |
| 9451 screen_cur_col = 0; | |
| 9452 } | |
| 9453 else if (plan == PLAN_NL) | |
| 9454 { | |
| 9455 if (noinvcurs) | |
| 9456 screen_stop_highlight(); | |
| 9457 while (screen_cur_row < row) | |
| 9458 { | |
| 9459 out_char('\n'); | |
| 9460 ++screen_cur_row; | |
| 9461 } | |
| 9462 screen_cur_col = 0; | |
| 9463 } | |
| 9464 | |
| 9465 i = col - screen_cur_col; | |
| 9466 if (i > 0) | |
| 9467 { | |
| 9468 /* | |
| 9469 * Use cursor-right if it's one character only. Avoids | |
| 9470 * removing a line of pixels from the last bold char, when | |
| 9471 * using the bold trick in the GUI. | |
| 9472 */ | |
| 9473 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9474 { | |
| 9475 while (i-- > 0) | |
| 9476 out_char(*T_ND); | |
| 9477 } | |
| 9478 else | |
| 9479 { | |
| 9480 int off; | |
| 9481 | |
| 9482 off = LineOffset[row] + screen_cur_col; | |
| 9483 while (i-- > 0) | |
| 9484 { | |
| 9485 if (ScreenAttrs[off] != screen_attr) | |
| 9486 screen_stop_highlight(); | |
| 9487 out_flush_check(); | |
| 9488 out_char(ScreenLines[off]); | |
| 9489 if (enc_dbcs == DBCS_JPNU | |
| 9490 && ScreenLines[off] == 0x8e) | |
| 9491 out_char(ScreenLines2[off]); | |
| 9492 ++off; | |
| 9493 } | |
| 9494 } | |
| 9495 } | |
| 9496 } | |
| 9497 } | |
| 9498 else | |
| 9499 cost = 999; | |
| 9500 | |
| 9501 if (cost >= goto_cost) | |
| 9502 { | |
| 9503 if (noinvcurs) | |
| 9504 screen_stop_highlight(); | |
| 5995 | 9505 if (row == screen_cur_row && (col > screen_cur_col) |
| 9506 && *T_CRI != NUL) | |
| 7 | 9507 term_cursor_right(col - screen_cur_col); |
| 9508 else | |
| 9509 term_windgoto(row, col); | |
| 9510 } | |
| 9511 screen_cur_row = row; | |
| 9512 screen_cur_col = col; | |
| 9513 } | |
| 9514 } | |
| 9515 | |
| 9516 /* | |
| 9517 * Set cursor to its position in the current window. | |
| 9518 */ | |
| 9519 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9520 setcursor(void) |
| 7 | 9521 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9522 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
|
9523 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9524 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9525 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9526 * 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
|
9527 * 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
|
9528 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9529 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9530 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
|
9531 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9532 if (force || redrawing()) |
| 7 | 9533 { |
| 9534 validate_cursor(); | |
| 9535 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
|
9536 curwin->w_wincol + ( |
| 7 | 9537 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9538 /* With 'rightleft' set and the cursor on a double-wide |
| 9539 * character, position it on the leftmost column. */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9540 curwin->w_p_rl ? ((int)curwin->w_width - curwin->w_wcol |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9541 - ((has_mbyte |
| 1545 | 9542 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9543 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9544 #endif |
| 9545 curwin->w_wcol)); | |
| 9546 } | |
| 9547 } | |
| 9548 | |
| 9549 | |
| 9550 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9551 * 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
|
9552 * 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
|
9553 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9554 * scrolling. |
| 9555 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9556 */ | |
| 9557 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9558 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9559 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9560 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9561 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9562 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9563 int mayclear) |
| 7 | 9564 { |
| 9565 int did_delete; | |
| 9566 int nextrow; | |
| 9567 int lastrow; | |
| 9568 int retval; | |
| 9569 | |
| 9570 if (invalid) | |
| 9571 wp->w_lines_valid = 0; | |
| 9572 | |
| 9573 if (wp->w_height < 5) | |
| 9574 return FAIL; | |
| 9575 | |
| 9576 if (line_count > wp->w_height - row) | |
| 9577 line_count = wp->w_height - row; | |
| 9578 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9579 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9580 if (retval != MAYBE) |
| 9581 return retval; | |
| 9582 | |
| 9583 /* | |
| 9584 * If there is a next window or a status line, we first try to delete the | |
| 9585 * lines at the bottom to avoid messing what is after the window. | |
| 9586 * If this fails and there are following windows, don't do anything to avoid | |
| 9587 * messing up those windows, better just redraw. | |
| 9588 */ | |
| 9589 did_delete = FALSE; | |
| 9590 if (wp->w_next != NULL || wp->w_status_height) | |
| 9591 { | |
| 9592 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
|
9593 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9594 did_delete = TRUE; |
| 9595 else if (wp->w_next) | |
| 9596 return FAIL; | |
| 9597 } | |
| 9598 /* | |
| 9599 * if no lines deleted, blank the lines that will end up below the window | |
| 9600 */ | |
| 9601 if (!did_delete) | |
| 9602 { | |
| 9603 wp->w_redr_status = TRUE; | |
| 9604 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
|
9605 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9606 lastrow = nextrow + line_count; |
| 9607 if (lastrow > Rows) | |
| 9608 lastrow = Rows; | |
| 9609 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
|
9610 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9611 ' ', ' ', 0); |
| 9612 } | |
| 9613 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9614 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9615 == FAIL) |
| 9616 { | |
| 9617 /* deletion will have messed up other windows */ | |
| 9618 if (did_delete) | |
| 9619 { | |
| 9620 wp->w_redr_status = TRUE; | |
| 9621 win_rest_invalid(W_NEXT(wp)); | |
| 9622 } | |
| 9623 return FAIL; | |
| 9624 } | |
| 9625 | |
| 9626 return OK; | |
| 9627 } | |
| 9628 | |
| 9629 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9630 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9631 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9632 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9633 * scrolling | |
| 9634 * Return OK for success, FAIL if the lines are not deleted. | |
| 9635 */ | |
| 9636 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9637 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9638 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9639 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9640 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9641 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9642 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9643 int clear_attr) /* for clearing lines */ |
| 7 | 9644 { |
| 9645 int retval; | |
| 9646 | |
| 9647 if (invalid) | |
| 9648 wp->w_lines_valid = 0; | |
| 9649 | |
| 9650 if (line_count > wp->w_height - row) | |
| 9651 line_count = wp->w_height - row; | |
| 9652 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9653 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9654 if (retval != MAYBE) |
| 9655 return retval; | |
| 9656 | |
| 9657 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
|
9658 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9659 return FAIL; |
| 9660 | |
| 9661 /* | |
| 9662 * If there are windows or status lines below, try to put them at the | |
| 9663 * correct place. If we can't do that, they have to be redrawn. | |
| 9664 */ | |
| 9665 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9666 { | |
| 9667 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
|
9668 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9669 { |
| 9670 wp->w_redr_status = TRUE; | |
| 9671 win_rest_invalid(wp->w_next); | |
| 9672 } | |
| 9673 } | |
| 9674 /* | |
| 9675 * If this is the last window and there is no status line, redraw the | |
| 9676 * command line later. | |
| 9677 */ | |
| 9678 else | |
| 9679 redraw_cmdline = TRUE; | |
| 9680 return OK; | |
| 9681 } | |
| 9682 | |
| 9683 /* | |
| 9684 * Common code for win_ins_lines() and win_del_lines(). | |
| 9685 * Returns OK or FAIL when the work has been done. | |
| 9686 * Returns MAYBE when not finished yet. | |
| 9687 */ | |
| 9688 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9689 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9690 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9691 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9692 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9693 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9694 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9695 int clear_attr) |
| 7 | 9696 { |
| 9697 int retval; | |
| 9698 | |
| 9699 if (!redrawing() || line_count <= 0) | |
| 9700 return FAIL; | |
| 9701 | |
|
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
|
9702 /* 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
|
9703 * 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
|
9704 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
|
9705 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
|
9706 |
| 7 | 9707 /* 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
|
9708 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9709 { |
|
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
|
9710 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
|
9711 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9712 return FAIL; |
| 9713 } | |
| 9714 | |
| 9715 /* | |
| 9716 * Delete all remaining lines | |
| 9717 */ | |
| 9718 if (row + line_count >= wp->w_height) | |
| 9719 { | |
| 9720 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
|
9721 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9722 ' ', ' ', 0); |
| 9723 return OK; | |
| 9724 } | |
| 9725 | |
| 9726 /* | |
|
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
|
9727 * When scrolling, the message on the command line should be cleared, |
| 7 | 9728 * 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
|
9729 * Don't do this when avoiding to insert lines. |
| 7 | 9730 */ |
|
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
|
9731 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
|
9732 clear_cmdline = TRUE; |
| 7 | 9733 |
| 9734 /* | |
| 9735 * If the terminal can set a scroll region, use that. | |
| 9736 * Always do this in a vertically split window. This will redraw from | |
| 9737 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9738 * win_line(). | |
| 9739 * 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
|
9740 * 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
|
9741 * scroll-up . |
| 7 | 9742 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9743 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
|
9744 { |
| 7 | 9745 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9746 scroll_region_set(wp, row); | |
| 9747 if (del) | |
| 9748 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
|
9749 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9750 else |
| 9751 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
|
9752 wp->w_height - row, clear_attr, wp); |
| 7 | 9753 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9754 scroll_region_reset(); | |
| 9755 return retval; | |
| 9756 } | |
| 9757 | |
| 9758 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9759 return FAIL; | |
| 9760 | |
| 9761 return MAYBE; | |
| 9762 } | |
| 9763 | |
| 9764 /* | |
| 9765 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9766 */ | |
| 9767 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9768 win_rest_invalid(win_T *wp) |
| 7 | 9769 { |
| 9770 while (wp != NULL) | |
| 9771 { | |
| 9772 redraw_win_later(wp, NOT_VALID); | |
| 9773 wp->w_redr_status = TRUE; | |
| 9774 wp = wp->w_next; | |
| 9775 } | |
| 9776 redraw_cmdline = TRUE; | |
| 9777 } | |
| 9778 | |
| 9779 /* | |
| 9780 * The rest of the routines in this file perform screen manipulations. The | |
| 9781 * given operation is performed physically on the screen. The corresponding | |
| 9782 * change is also made to the internal screen image. In this way, the editor | |
| 9783 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9784 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9785 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9786 * screen changes, and in the meantime, everything still works. | |
| 9787 */ | |
| 9788 | |
| 9789 /* | |
| 9790 * types for inserting or deleting lines | |
| 9791 */ | |
| 9792 #define USE_T_CAL 1 | |
| 9793 #define USE_T_CDL 2 | |
| 9794 #define USE_T_AL 3 | |
| 9795 #define USE_T_CE 4 | |
| 9796 #define USE_T_DL 5 | |
| 9797 #define USE_T_SR 6 | |
| 9798 #define USE_NL 7 | |
| 9799 #define USE_T_CD 8 | |
| 9800 #define USE_REDRAW 9 | |
| 9801 | |
| 9802 /* | |
| 9803 * insert lines on the screen and update ScreenLines[] | |
| 9804 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9805 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9806 * 'row' and 'end' are relative to the start of the region. | |
| 9807 * | |
| 9808 * return FAIL for failure, OK for success. | |
| 9809 */ | |
| 446 | 9810 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9811 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9812 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9813 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9814 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9815 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9816 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9817 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9818 { |
| 9819 int i; | |
| 9820 int j; | |
| 9821 unsigned temp; | |
| 9822 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9823 int cursor_col = 0; |
| 7 | 9824 int type; |
| 9825 int result_empty; | |
| 9826 int can_ce = can_clear(T_CE); | |
| 9827 | |
| 9828 /* | |
| 9829 * FAIL if | |
| 9830 * - there is no valid screen | |
| 9831 * - the screen has to be redrawn completely | |
| 9832 * - the line count is less than one | |
| 9833 * - 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
|
9834 * - redrawing for a callback and there is a modeless selection |
| 7 | 9835 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9836 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
|
9837 #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
|
9838 || (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
|
9839 && 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
|
9840 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9841 ) |
| 7 | 9842 return FAIL; |
| 9843 | |
| 9844 /* | |
| 9845 * There are seven ways to insert lines: | |
| 9846 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9847 * characters from ScreenLines[]. | |
| 9848 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9849 * the insert is just empty lines | |
| 9850 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9851 * present or line_count > 1. It looks better if we do all the inserts | |
| 9852 * at once. | |
| 9853 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9854 * insert is just empty lines and T_CE is not present or line_count > | |
| 9855 * 1. | |
| 9856 * 4. Use T_AL (insert line) if it exists. | |
| 9857 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9858 * just empty lines. | |
| 9859 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9860 * just empty lines. | |
| 9861 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9862 * the 'da' flag is not set or we have clear line capability. | |
| 9863 * 8. redraw the characters from ScreenLines[]. | |
| 9864 * | |
| 9865 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9866 * the scrollbar for the window. It does have insert line, use that if it | |
| 9867 * exists. | |
| 9868 */ | |
| 9869 result_empty = (row + line_count >= end); | |
| 9870 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9871 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
|
9872 else if (can_clear(T_CD) && result_empty) |
| 7 | 9873 type = USE_T_CD; |
| 9874 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9875 type = USE_T_CAL; | |
| 9876 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9877 type = USE_T_CDL; | |
| 9878 else if (*T_AL != NUL) | |
| 9879 type = USE_T_AL; | |
| 9880 else if (can_ce && result_empty) | |
| 9881 type = USE_T_CE; | |
| 9882 else if (*T_DL != NUL && result_empty) | |
| 9883 type = USE_T_DL; | |
| 9884 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9885 type = USE_T_SR; | |
| 9886 else | |
| 9887 return FAIL; | |
| 9888 | |
| 9889 /* | |
| 9890 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9891 * care of t_db if necessary. | |
| 9892 */ | |
| 9893 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9894 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
|
9895 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9896 |
| 9897 /* | |
| 9898 * If text is retained below the screen, first clear or delete as many | |
| 9899 * lines at the bottom of the window as are about to be inserted so that | |
| 9900 * the deleted lines won't later surface during a screen_del_lines. | |
| 9901 */ | |
| 9902 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
|
9903 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9904 |
| 9905 #ifdef FEAT_CLIPBOARD | |
| 9906 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9907 * 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
|
9908 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9909 clip_clear_selection(&clip_star); |
| 7 | 9910 else |
| 9911 clip_scroll_selection(-line_count); | |
| 9912 #endif | |
| 9913 | |
| 9914 #ifdef FEAT_GUI | |
| 9915 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9916 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9917 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9918 #endif |
| 9919 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9920 if (wp != NULL && wp->w_wincol != 0 && *T_CSV != NUL && *T_CCS == NUL) |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9921 cursor_col = wp->w_wincol; |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9922 |
| 7 | 9923 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9924 cursor_row = row; | |
| 9925 else | |
| 9926 cursor_row = row + off; | |
| 9927 | |
| 9928 /* | |
| 9929 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9930 * Clear the inserted lines in ScreenLines[]. | |
| 9931 */ | |
| 9932 row += off; | |
| 9933 end += off; | |
| 9934 for (i = 0; i < line_count; ++i) | |
| 9935 { | |
| 9936 if (wp != NULL && wp->w_width != Columns) | |
| 9937 { | |
| 9938 /* need to copy part of a line */ | |
| 9939 j = end - 1 - i; | |
| 9940 while ((j -= line_count) >= row) | |
| 9941 linecopy(j + line_count, j, wp); | |
| 9942 j += line_count; | |
| 9943 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
|
9944 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
|
9945 clear_attr); |
| 7 | 9946 else |
| 9947 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9948 LineWraps[j] = FALSE; | |
| 9949 } | |
| 9950 else | |
| 9951 { | |
| 9952 j = end - 1 - i; | |
| 9953 temp = LineOffset[j]; | |
| 9954 while ((j -= line_count) >= row) | |
| 9955 { | |
| 9956 LineOffset[j + line_count] = LineOffset[j]; | |
| 9957 LineWraps[j + line_count] = LineWraps[j]; | |
| 9958 } | |
| 9959 LineOffset[j + line_count] = temp; | |
| 9960 LineWraps[j + line_count] = FALSE; | |
| 9961 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
|
9962 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9963 else |
| 9964 lineinvalid(temp, (int)Columns); | |
| 9965 } | |
| 9966 } | |
| 9967 | |
| 9968 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9969 windgoto(cursor_row, cursor_col); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9970 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
|
9971 screen_start_highlight(clear_attr); |
| 7 | 9972 |
| 9973 /* redraw the characters */ | |
| 9974 if (type == USE_REDRAW) | |
| 9975 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
|
9976 else if (type == USE_T_CAL) |
| 7 | 9977 { |
| 9978 term_append_lines(line_count); | |
| 9979 screen_start(); /* don't know where cursor is now */ | |
| 9980 } | |
| 9981 else | |
| 9982 { | |
| 9983 for (i = 0; i < line_count; i++) | |
| 9984 { | |
| 9985 if (type == USE_T_AL) | |
| 9986 { | |
| 9987 if (i && cursor_row != 0) | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9988 windgoto(cursor_row, cursor_col); |
| 7 | 9989 out_str(T_AL); |
| 9990 } | |
| 9991 else /* type == USE_T_SR */ | |
| 9992 out_str(T_SR); | |
| 9993 screen_start(); /* don't know where cursor is now */ | |
| 9994 } | |
| 9995 } | |
| 9996 | |
| 9997 /* | |
| 9998 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9999 * have been scrolled down into the region. | |
| 10000 */ | |
| 10001 if (type == USE_T_SR && *T_DA) | |
| 10002 { | |
| 10003 for (i = 0; i < line_count; ++i) | |
| 10004 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10005 windgoto(off + i, cursor_col); |
| 7 | 10006 out_str(T_CE); |
| 10007 screen_start(); /* don't know where cursor is now */ | |
| 10008 } | |
| 10009 } | |
| 10010 | |
| 10011 #ifdef FEAT_GUI | |
| 10012 gui_can_update_cursor(); | |
| 10013 if (gui.in_use) | |
| 10014 out_flush(); /* always flush after a scroll */ | |
| 10015 #endif | |
| 10016 return OK; | |
| 10017 } | |
| 10018 | |
| 10019 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10020 * 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
|
10021 * "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
|
10022 * 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
|
10023 * "row" and "end" are relative to the start of the region. |
| 7 | 10024 * |
| 10025 * Return OK for success, FAIL if the lines are not deleted. | |
| 10026 */ | |
| 10027 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10028 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10029 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10030 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10031 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10032 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10033 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
|
10034 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
|
10035 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10036 { |
| 10037 int j; | |
| 10038 int i; | |
| 10039 unsigned temp; | |
| 10040 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10041 int cursor_col = 0; |
| 7 | 10042 int cursor_end; |
| 10043 int result_empty; /* result is empty until end of region */ | |
| 10044 int can_delete; /* deleting line codes can be used */ | |
| 10045 int type; | |
| 10046 | |
| 10047 /* | |
| 10048 * FAIL if | |
| 10049 * - there is no valid screen | |
| 10050 * - the screen has to be redrawn completely | |
| 10051 * - the line count is less than one | |
| 10052 * - 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
|
10053 * - redrawing for a callback and there is a modeless selection |
| 7 | 10054 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10055 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
|
10056 || (!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
|
10057 #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
|
10058 || (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
|
10059 && 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
|
10060 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10061 ) |
| 7 | 10062 return FAIL; |
| 10063 | |
| 10064 /* | |
| 10065 * Check if the rest of the current region will become empty. | |
| 10066 */ | |
| 10067 result_empty = row + line_count >= end; | |
| 10068 | |
| 10069 /* | |
| 10070 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10071 * available. | |
| 10072 */ | |
| 10073 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10074 | |
| 10075 /* | |
| 10076 * There are six ways to delete lines: | |
| 10077 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10078 * characters from ScreenLines[]. | |
| 10079 * 1. Use T_CD if it exists and the result is empty. | |
| 10080 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10081 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10082 * none of the other ways work. | |
| 10083 * 4. Use T_CE (erase line) if the result is empty. | |
| 10084 * 5. Use T_DL (delete line) if it exists. | |
| 10085 * 6. redraw the characters from ScreenLines[]. | |
| 10086 */ | |
| 10087 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10088 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
|
10089 else if (can_clear(T_CD) && result_empty) |
| 7 | 10090 type = USE_T_CD; |
| 10091 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10092 /* | |
| 10093 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10094 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10095 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10096 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10097 * the trick... | |
| 10098 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10099 * (Olaf Seibert) | |
| 10100 */ | |
| 10101 else if (row == 0 && T_DB == empty_option | |
| 10102 && (line_count == 1 || *T_CDL == NUL)) | |
| 10103 #else | |
| 10104 else if (row == 0 && ( | |
| 10105 #ifndef AMIGA | |
| 10106 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10107 * up, so use delete-line command */ | |
| 10108 line_count == 1 || | |
| 10109 #endif | |
| 10110 *T_CDL == NUL)) | |
| 10111 #endif | |
| 10112 type = USE_NL; | |
| 10113 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10114 type = USE_T_CDL; | |
| 10115 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
|
10116 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10117 type = USE_T_CE; |
| 10118 else if (*T_DL != NUL && can_delete) | |
| 10119 type = USE_T_DL; | |
| 10120 else if (*T_CDL != NUL && can_delete) | |
| 10121 type = USE_T_CDL; | |
| 10122 else | |
| 10123 return FAIL; | |
| 10124 | |
| 10125 #ifdef FEAT_CLIPBOARD | |
| 10126 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10127 * 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
|
10128 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10129 clip_clear_selection(&clip_star); |
| 7 | 10130 else |
| 10131 clip_scroll_selection(line_count); | |
| 10132 #endif | |
| 10133 | |
| 10134 #ifdef FEAT_GUI | |
| 10135 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10136 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10137 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
|
10138 && gui.cursor_row < end + off); |
| 7 | 10139 #endif |
| 10140 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10141 if (wp != NULL && wp->w_wincol != 0 && *T_CSV != NUL && *T_CCS == NUL) |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10142 cursor_col = wp->w_wincol; |
|
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10143 |
| 7 | 10144 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10145 { | |
| 10146 cursor_row = row; | |
| 10147 cursor_end = end; | |
| 10148 } | |
| 10149 else | |
| 10150 { | |
| 10151 cursor_row = row + off; | |
| 10152 cursor_end = end + off; | |
| 10153 } | |
| 10154 | |
| 10155 /* | |
| 10156 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10157 * Clear the inserted lines in ScreenLines[]. | |
| 10158 */ | |
| 10159 row += off; | |
| 10160 end += off; | |
| 10161 for (i = 0; i < line_count; ++i) | |
| 10162 { | |
| 10163 if (wp != NULL && wp->w_width != Columns) | |
| 10164 { | |
| 10165 /* need to copy part of a line */ | |
| 10166 j = row + i; | |
| 10167 while ((j += line_count) <= end - 1) | |
| 10168 linecopy(j - line_count, j, wp); | |
| 10169 j -= line_count; | |
| 10170 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
|
10171 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
|
10172 clear_attr); |
| 7 | 10173 else |
| 10174 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10175 LineWraps[j] = FALSE; | |
| 10176 } | |
| 10177 else | |
| 10178 { | |
| 10179 /* whole width, moving the line pointers is faster */ | |
| 10180 j = row + i; | |
| 10181 temp = LineOffset[j]; | |
| 10182 while ((j += line_count) <= end - 1) | |
| 10183 { | |
| 10184 LineOffset[j - line_count] = LineOffset[j]; | |
| 10185 LineWraps[j - line_count] = LineWraps[j]; | |
| 10186 } | |
| 10187 LineOffset[j - line_count] = temp; | |
| 10188 LineWraps[j - line_count] = FALSE; | |
| 10189 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
|
10190 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10191 else |
| 10192 lineinvalid(temp, (int)Columns); | |
| 10193 } | |
| 10194 } | |
| 10195 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10196 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
|
10197 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10198 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
|
10199 screen_start_highlight(clear_attr); |
| 7 | 10200 |
| 10201 /* redraw the characters */ | |
| 10202 if (type == USE_REDRAW) | |
| 10203 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
|
10204 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10205 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10206 windgoto(cursor_row, cursor_col); |
| 7 | 10207 out_str(T_CD); |
| 10208 screen_start(); /* don't know where cursor is now */ | |
| 10209 } | |
| 10210 else if (type == USE_T_CDL) | |
| 10211 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10212 windgoto(cursor_row, cursor_col); |
| 7 | 10213 term_delete_lines(line_count); |
| 10214 screen_start(); /* don't know where cursor is now */ | |
| 10215 } | |
| 10216 /* | |
| 10217 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10218 * the whole screen (scroll region) up by outputting newlines on the | |
| 10219 * last line. | |
| 10220 */ | |
| 10221 else if (type == USE_NL) | |
| 10222 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10223 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10224 for (i = line_count; --i >= 0; ) |
| 10225 out_char('\n'); /* cursor will remain on same line */ | |
| 10226 } | |
| 10227 else | |
| 10228 { | |
| 10229 for (i = line_count; --i >= 0; ) | |
| 10230 { | |
| 10231 if (type == USE_T_DL) | |
| 10232 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10233 windgoto(cursor_row, cursor_col); |
| 7 | 10234 out_str(T_DL); /* delete a line */ |
| 10235 } | |
| 10236 else /* type == USE_T_CE */ | |
| 10237 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10238 windgoto(cursor_row + i, cursor_col); |
| 7 | 10239 out_str(T_CE); /* erase a line */ |
| 10240 } | |
| 10241 screen_start(); /* don't know where cursor is now */ | |
| 10242 } | |
| 10243 } | |
| 10244 | |
| 10245 /* | |
| 10246 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10247 * scrolled up at the bottom of the region. | |
| 10248 */ | |
| 10249 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10250 { | |
| 10251 for (i = line_count; i > 0; --i) | |
| 10252 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10253 windgoto(cursor_end - i, cursor_col); |
| 7 | 10254 out_str(T_CE); /* erase a line */ |
| 10255 screen_start(); /* don't know where cursor is now */ | |
| 10256 } | |
| 10257 } | |
| 10258 | |
| 10259 #ifdef FEAT_GUI | |
| 10260 gui_can_update_cursor(); | |
| 10261 if (gui.in_use) | |
| 10262 out_flush(); /* always flush after a scroll */ | |
| 10263 #endif | |
| 10264 | |
| 10265 return OK; | |
| 10266 } | |
| 10267 | |
| 10268 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10269 * Return TRUE when postponing displaying the mode message: when not redrawing |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10270 * or inside a mapping. |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10271 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10272 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10273 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10274 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10275 // Call char_avail() only when we are going to show something, because it |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10276 // takes a bit of time. redrawing() may also call char_avail_avail(). |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10277 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10278 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10279 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10280 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10281 { |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10282 redraw_mode = TRUE; // show mode later |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10283 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10284 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10285 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10286 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10287 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10288 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10289 * Show the current mode and ruler. |
| 7 | 10290 * |
| 10291 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10292 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10293 * cleared only if a mode is shown. | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10294 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 10295 * Return the length of the message (0 if no message). |
| 10296 */ | |
| 10297 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10298 showmode(void) |
| 7 | 10299 { |
| 10300 int need_clear; | |
| 10301 int length = 0; | |
| 10302 int do_mode; | |
| 10303 int attr; | |
| 10304 int nwr_save; | |
| 10305 #ifdef FEAT_INS_EXPAND | |
| 10306 int sub_attr; | |
| 10307 #endif | |
| 10308 | |
| 642 | 10309 do_mode = ((p_smd && msg_silent == 0) |
| 10310 && ((State & INSERT) | |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10311 || restart_edit != NUL |
| 5735 | 10312 || VIsual_active)); |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10313 if (do_mode || reg_recording != 0) |
| 7 | 10314 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10315 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10316 return 0; // show mode later |
| 7 | 10317 |
| 10318 nwr_save = need_wait_return; | |
| 10319 | |
| 10320 /* wait a bit before overwriting an important message */ | |
| 10321 check_for_delay(FALSE); | |
| 10322 | |
| 10323 /* if the cmdline is more than one line high, erase top lines */ | |
| 10324 need_clear = clear_cmdline; | |
| 10325 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10326 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10327 | |
| 10328 /* Position on the last line in the window, column 0 */ | |
| 10329 msg_pos_mode(); | |
| 10330 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10331 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10332 if (do_mode) |
| 10333 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10334 msg_puts_attr("--", attr); |
| 7 | 10335 #if defined(FEAT_XIM) |
| 2520 | 10336 if ( |
| 10337 # ifdef FEAT_GUI_GTK | |
| 10338 preedit_get_status() | |
| 1668 | 10339 # else |
| 10340 im_get_status() | |
| 2520 | 10341 # endif |
| 1668 | 10342 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10343 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10344 msg_puts_attr(" IM", attr); |
| 7 | 10345 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10346 msg_puts_attr(" XIM", attr); |
| 7 | 10347 # endif |
| 10348 #endif | |
| 10349 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10350 if (gui.in_use) | |
| 10351 { | |
| 10352 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10353 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10354 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10355 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10356 msg_puts_attr(" \355\225\234\352\270\200", attr); |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10357 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10358 msg_puts_attr(" \307\321\261\333", attr); |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10359 } |
| 7 | 10360 } |
| 10361 #endif | |
| 10362 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10363 /* CTRL-X in Insert mode */ |
| 10364 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10365 { |
| 10366 /* These messages can get long, avoid a wrap in a narrow | |
| 10367 * window. Prefer showing edit_submode_extra. */ | |
| 10368 length = (Rows - msg_row) * Columns - 3; | |
| 10369 if (edit_submode_extra != NULL) | |
| 10370 length -= vim_strsize(edit_submode_extra); | |
| 10371 if (length > 0) | |
| 10372 { | |
| 10373 if (edit_submode_pre != NULL) | |
| 10374 length -= vim_strsize(edit_submode_pre); | |
| 10375 if (length - vim_strsize(edit_submode) > 0) | |
| 10376 { | |
| 10377 if (edit_submode_pre != NULL) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10378 msg_puts_attr((char *)edit_submode_pre, attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10379 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10380 } |
| 10381 if (edit_submode_extra != NULL) | |
| 10382 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10383 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10384 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
|
10385 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10386 else |
| 10387 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10388 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10389 } |
| 10390 } | |
| 10391 } | |
| 10392 else | |
| 10393 #endif | |
| 10394 { | |
| 10395 if (State & VREPLACE_FLAG) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10396 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10397 else if (State & REPLACE_FLAG) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10398 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10399 else if (State & INSERT) |
| 10400 { | |
| 10401 #ifdef FEAT_RIGHTLEFT | |
| 10402 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10403 msg_puts_attr(_(" REVERSE"), attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10404 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10405 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10406 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10407 else if (restart_edit == 'I' || restart_edit == 'A') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10408 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10409 else if (restart_edit == 'R') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10410 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10411 else if (restart_edit == 'V') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10412 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10413 #ifdef FEAT_RIGHTLEFT |
| 10414 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10415 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10416 #endif |
| 10417 #ifdef FEAT_KEYMAP | |
| 10418 if (State & LANGMAP) | |
| 10419 { | |
| 10420 # ifdef FEAT_ARABIC | |
| 10421 if (curwin->w_p_arab) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10422 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10423 else |
| 10424 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10425 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
|
10426 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10427 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10428 } |
| 10429 #endif | |
| 10430 if ((State & INSERT) && p_paste) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10431 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10432 |
| 10433 if (VIsual_active) | |
| 10434 { | |
| 10435 char *p; | |
| 10436 | |
| 10437 /* Don't concatenate separate words to avoid translation | |
| 10438 * problems. */ | |
| 10439 switch ((VIsual_select ? 4 : 0) | |
| 10440 + (VIsual_mode == Ctrl_V) * 2 | |
| 10441 + (VIsual_mode == 'V')) | |
| 10442 { | |
| 10443 case 0: p = N_(" VISUAL"); break; | |
| 10444 case 1: p = N_(" VISUAL LINE"); break; | |
| 10445 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10446 case 4: p = N_(" SELECT"); break; | |
| 10447 case 5: p = N_(" SELECT LINE"); break; | |
| 10448 default: p = N_(" SELECT BLOCK"); break; | |
| 10449 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10450 msg_puts_attr(_(p), attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10451 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10452 msg_puts_attr(" --", attr); |
| 7 | 10453 } |
| 644 | 10454 |
| 7 | 10455 need_clear = TRUE; |
| 10456 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10457 if (reg_recording != 0 |
| 7 | 10458 #ifdef FEAT_INS_EXPAND |
| 10459 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10460 #endif | |
| 10461 ) | |
| 10462 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10463 recording_mode(attr); |
| 7 | 10464 need_clear = TRUE; |
| 10465 } | |
| 644 | 10466 |
| 10467 mode_displayed = TRUE; | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10468 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10469 msg_clr_eos(); |
| 10470 msg_didout = FALSE; /* overwrite this message */ | |
| 10471 length = msg_col; | |
| 10472 msg_col = 0; | |
| 10473 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10474 } | |
| 10475 else if (clear_cmdline && msg_silent == 0) | |
| 10476 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10477 msg_clr_cmdline(); | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10478 else if (redraw_mode) |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10479 { |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10480 msg_pos_mode(); |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10481 msg_clr_eos(); |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10482 } |
| 7 | 10483 |
| 10484 #ifdef FEAT_CMDL_INFO | |
| 10485 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10486 if (VIsual_active) | |
| 10487 clear_showcmd(); | |
| 10488 | |
| 10489 /* If the last window has no status line, the ruler is after the mode | |
| 10490 * 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
|
10491 if (redrawing() && lastwin->w_status_height == 0) |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10492 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10493 #endif |
| 10494 redraw_cmdline = FALSE; | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10495 redraw_mode = FALSE; |
| 7 | 10496 clear_cmdline = FALSE; |
| 10497 | |
| 10498 return length; | |
| 10499 } | |
| 10500 | |
| 10501 /* | |
| 10502 * Position for a mode message. | |
| 10503 */ | |
| 10504 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10505 msg_pos_mode(void) |
| 7 | 10506 { |
| 10507 msg_col = 0; | |
| 10508 msg_row = Rows - 1; | |
| 10509 } | |
| 10510 | |
| 10511 /* | |
| 10512 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10513 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10514 * Caller should check "mode_displayed". |
| 7 | 10515 */ |
| 10516 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10517 unshowmode(int force) |
| 7 | 10518 { |
| 10519 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10520 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10521 */ |
| 10522 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10523 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10524 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10525 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10526 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10527 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10528 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10529 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10530 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10531 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10532 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10533 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10534 int save_msg_row = msg_row; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10535 int save_msg_col = msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10536 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10537 msg_pos_mode(); |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10538 if (reg_recording != 0) |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10539 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
|
10540 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10541 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10542 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10543 msg_row = save_msg_row; |
| 7 | 10544 } |
| 10545 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10546 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10547 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10548 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10549 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10550 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10551 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10552 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10553 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10554 sprintf(s, " @%c", reg_recording); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10555 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10556 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10557 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10558 |
| 667 | 10559 /* |
| 10560 * Draw the tab pages line at the top of the Vim window. | |
| 10561 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10562 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10563 draw_tabline(void) |
| 667 | 10564 { |
| 10565 int tabcount = 0; | |
| 10566 tabpage_T *tp; | |
| 10567 int tabwidth; | |
| 10568 int col = 0; | |
| 673 | 10569 int scol = 0; |
| 667 | 10570 int attr; |
| 10571 win_T *wp; | |
| 671 | 10572 win_T *cwp; |
| 10573 int wincount; | |
| 10574 int modified; | |
| 667 | 10575 int c; |
| 10576 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10577 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
|
10578 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
|
10579 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10580 char_u *p; |
| 677 | 10581 int room; |
| 10582 int use_sep_chars = (t_colors < 8 | |
| 10583 #ifdef FEAT_GUI | |
| 10584 && !gui.in_use | |
| 10585 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10586 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10587 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10588 #endif |
| 677 | 10589 ); |
| 673 | 10590 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10591 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10592 return; |
| 673 | 10593 redraw_tabline = FALSE; |
| 667 | 10594 |
| 685 | 10595 #ifdef FEAT_GUI_TABLINE |
| 798 | 10596 /* Take care of a GUI tabline. */ |
| 685 | 10597 if (gui_use_tabline()) |
| 10598 { | |
| 10599 gui_update_tabline(); | |
| 10600 return; | |
| 10601 } | |
| 10602 #endif | |
| 10603 | |
| 10604 if (tabline_height() < 1) | |
| 667 | 10605 return; |
| 10606 | |
| 677 | 10607 #if defined(FEAT_STL_OPT) |
|
16320
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
10608 clear_TabPageIdxs(); |
| 681 | 10609 |
| 677 | 10610 /* Use the 'tabline' option if it's set. */ |
| 10611 if (*p_tal != NUL) | |
| 10612 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10613 int saved_did_emsg = did_emsg; |
| 680 | 10614 |
| 10615 /* Check for an error. If there is one we would loop in redrawing the | |
| 10616 * 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
|
10617 did_emsg = FALSE; |
| 677 | 10618 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10619 if (did_emsg) |
| 680 | 10620 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10621 (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
|
10622 did_emsg |= saved_did_emsg; |
| 680 | 10623 } |
| 10624 else | |
| 10625 #endif | |
| 10626 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10627 FOR_ALL_TABPAGES(tp) |
| 680 | 10628 ++tabcount; |
| 10629 | |
| 10630 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10631 if (tabwidth < 6) | |
| 10632 tabwidth = 6; | |
| 10633 | |
| 10634 attr = attr_nosel; | |
| 10635 tabcount = 0; | |
| 699 | 10636 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10637 tp = tp->tp_next) | |
| 680 | 10638 { |
| 10639 scol = col; | |
| 10640 | |
| 10641 if (tp->tp_topframe == topframe) | |
| 10642 attr = attr_sel; | |
| 10643 if (use_sep_chars && col > 0) | |
| 10644 screen_putchar('|', 0, col++, attr); | |
| 10645 | |
| 10646 if (tp->tp_topframe != topframe) | |
| 10647 attr = attr_nosel; | |
| 10648 | |
| 10649 screen_putchar(' ', 0, col++, attr); | |
| 10650 | |
| 10651 if (tp == curtab) | |
| 10652 { | |
| 10653 cwp = curwin; | |
| 10654 wp = firstwin; | |
| 10655 } | |
| 10656 else | |
| 10657 { | |
| 10658 cwp = tp->tp_curwin; | |
| 10659 wp = tp->tp_firstwin; | |
| 10660 } | |
| 10661 | |
| 10662 modified = FALSE; | |
| 10663 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10664 if (bufIsChanged(wp->w_buffer)) | |
| 10665 modified = TRUE; | |
| 10666 if (modified || wincount > 1) | |
| 10667 { | |
| 10668 if (wincount > 1) | |
| 10669 { | |
| 10670 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10671 len = (int)STRLEN(NameBuff); |
| 699 | 10672 if (col + len >= Columns - 3) |
| 10673 break; | |
| 680 | 10674 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10675 #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
|
10676 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10677 #else |
| 6106 | 10678 attr |
| 680 | 10679 #endif |
| 10680 ); | |
| 10681 col += len; | |
| 10682 } | |
| 10683 if (modified) | |
| 10684 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10685 screen_putchar(' ', 0, col++, attr); | |
| 10686 } | |
| 10687 | |
| 10688 room = scol - col + tabwidth - 1; | |
| 10689 if (room > 0) | |
| 10690 { | |
| 685 | 10691 /* Get buffer name in NameBuff[] */ |
| 10692 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10693 shorten_dir(NameBuff); |
| 680 | 10694 len = vim_strsize(NameBuff); |
| 10695 p = NameBuff; | |
| 10696 if (has_mbyte) | |
| 10697 while (len > room) | |
| 10698 { | |
| 10699 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10700 MB_PTR_ADV(p); |
| 680 | 10701 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10702 else if (len > room) |
| 677 | 10703 { |
| 680 | 10704 p += len - room; |
| 10705 len = room; | |
| 677 | 10706 } |
| 699 | 10707 if (len > Columns - col - 1) |
| 10708 len = Columns - col - 1; | |
| 680 | 10709 |
| 835 | 10710 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10711 col += len; |
| 10712 } | |
| 10713 screen_putchar(' ', 0, col++, attr); | |
| 10714 | |
| 10715 /* Store the tab page number in TabPageIdxs[], so that | |
| 10716 * jump_to_mouse() knows where each one is. */ | |
| 10717 ++tabcount; | |
| 10718 while (scol < col) | |
| 10719 TabPageIdxs[scol++] = tabcount; | |
| 10720 } | |
| 10721 | |
| 10722 if (use_sep_chars) | |
| 10723 c = '_'; | |
| 10724 else | |
| 10725 c = ' '; | |
| 10726 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10727 |
| 10728 /* Put an "X" for closing the current tab if there are several. */ | |
| 10729 if (first_tabpage->tp_next != NULL) | |
| 10730 { | |
| 10731 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10732 TabPageIdxs[Columns - 1] = -999; | |
| 10733 } | |
| 10734 } | |
| 834 | 10735 |
| 10736 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10737 * set. */ | |
| 10738 redraw_tabline = FALSE; | |
| 667 | 10739 } |
| 685 | 10740 |
| 10741 /* | |
| 10742 * Get buffer name for "buf" into NameBuff[]. | |
| 10743 * Takes care of special buffer names and translates special characters. | |
| 10744 */ | |
| 10745 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10746 get_trans_bufname(buf_T *buf) |
| 685 | 10747 { |
| 10748 if (buf_spname(buf) != NULL) | |
| 3839 | 10749 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10750 else |
| 10751 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10752 trans_characters(NameBuff, MAXPATHL); | |
| 10753 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10754 |
| 7 | 10755 /* |
| 10756 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10757 */ | |
| 10758 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
|
10759 fillchar_status(int *attr, win_T *wp) |
| 7 | 10760 { |
| 10761 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
|
10762 |
|
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
|
10763 #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
|
10764 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
|
10765 { |
|
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
|
10766 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
|
10767 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10768 *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
|
10769 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
|
10770 } |
|
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
|
10771 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10772 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10773 *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
|
10774 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
|
10775 } |
|
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
|
10776 } |
|
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
|
10777 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
|
10778 #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
|
10779 if (wp == curwin) |
| 7 | 10780 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10781 *attr = HL_ATTR(HLF_S); |
| 7 | 10782 fill = fill_stl; |
| 10783 } | |
| 10784 else | |
| 10785 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10786 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10787 fill = fill_stlnc; |
| 10788 } | |
| 10789 /* Use fill when there is highlighting, and highlighting of current | |
| 10790 * window differs, or the fillchars differ, or this is not the | |
| 10791 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10792 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
|
10793 || wp != curwin || ONE_WINDOW) |
| 7 | 10794 || (fill_stl != fill_stlnc))) |
| 10795 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
|
10796 if (wp == curwin) |
| 7 | 10797 return '^'; |
| 10798 return '='; | |
| 10799 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10800 |
| 7 | 10801 /* |
| 10802 * Get the character to use in a separator between vertically split windows. | |
| 10803 * Get its attributes in "*attr". | |
| 10804 */ | |
| 10805 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10806 fillchar_vsep(int *attr) |
| 7 | 10807 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10808 *attr = HL_ATTR(HLF_C); |
| 7 | 10809 if (*attr == 0 && fill_vert == ' ') |
| 10810 return '|'; | |
| 10811 else | |
| 10812 return fill_vert; | |
| 10813 } | |
| 10814 | |
| 10815 /* | |
| 10816 * Return TRUE if redrawing should currently be done. | |
| 10817 */ | |
| 10818 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10819 redrawing(void) |
| 7 | 10820 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10821 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10822 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
|
10823 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10824 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10825 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10826 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10827 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10828 || ignore_redraw_flag_for_testing |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10829 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10830 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10831 } |
| 10832 | |
| 10833 /* | |
| 10834 * Return TRUE if printing messages should currently be done. | |
| 10835 */ | |
| 10836 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10837 messaging(void) |
| 7 | 10838 { |
| 10839 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10840 } | |
| 10841 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10842 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10843 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10844 * 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
|
10845 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10846 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10847 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
|
10848 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10849 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10850 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
|
10851 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
|
10852 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10853 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10854 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
|
10855 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
|
10856 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
|
10857 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10858 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
|
10859 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
|
10860 ++item_count; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10861 wp->w_winbar_items = (winbar_item_T *)alloc_clear( |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
10862 sizeof(winbar_item_T) * (item_count + 1)); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10863 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10864 /* 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
|
10865 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
|
10866 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
|
10867 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10868 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
|
10869 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
|
10870 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10871 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10872 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10873 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
|
10874 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
|
10875 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10876 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10877 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10878 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
|
10879 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
|
10880 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
|
10881 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10882 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10883 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
|
10884 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
|
10885 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10886 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
|
10887 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10888 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10889 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
|
10890 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
|
10891 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10892 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10893 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
|
10894 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10895 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
|
10896 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10897 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10898 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
|
10899 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10900 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
|
10901 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10902 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10903 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
|
10904 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10905 screen_line(wp->w_winrow, wp->w_wincol, (int)wp->w_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
10906 (int)wp->w_width, 0); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10907 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10908 #endif |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10909 |
| 7 | 10910 /* |
| 10911 * Show current status info in ruler and various other places | |
| 10912 * If always is FALSE, only show ruler if position has changed. | |
| 10913 */ | |
| 10914 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10915 showruler(int always) |
| 7 | 10916 { |
| 10917 if (!always && !redrawing()) | |
| 10918 return; | |
| 574 | 10919 #ifdef FEAT_INS_EXPAND |
| 10920 if (pum_visible()) | |
| 10921 { | |
| 10922 /* Don't redraw right now, do it later. */ | |
| 10923 curwin->w_redr_status = TRUE; | |
| 10924 return; | |
| 10925 } | |
| 10926 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10927 #if defined(FEAT_STL_OPT) |
| 40 | 10928 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 10929 redraw_custom_statusline(curwin); |
| 7 | 10930 else |
| 10931 #endif | |
| 10932 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10933 win_redr_ruler(curwin, always, FALSE); |
| 7 | 10934 #endif |
| 10935 | |
| 10936 #ifdef FEAT_TITLE | |
| 10937 if (need_maketitle | |
| 10938 # ifdef FEAT_STL_OPT | |
| 10939 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10940 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10941 # endif | |
| 10942 ) | |
| 10943 maketitle(); | |
| 10944 #endif | |
| 1588 | 10945 /* Redraw the tab pages line if needed. */ |
| 10946 if (redraw_tabline) | |
| 10947 draw_tabline(); | |
| 7 | 10948 } |
| 10949 | |
| 10950 #ifdef FEAT_CMDL_INFO | |
| 10951 static void | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10952 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 10953 { |
| 1869 | 10954 #define RULER_BUF_LEN 70 |
| 10955 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10956 int row; |
| 10957 int fillchar; | |
| 10958 int attr; | |
| 10959 int empty_line = FALSE; | |
| 10960 colnr_T virtcol; | |
| 10961 int i; | |
| 1869 | 10962 size_t len; |
| 7 | 10963 int o; |
| 10964 int this_ru_col; | |
| 10965 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
10966 int width; |
| 7 | 10967 |
| 10968 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10969 if (!p_ru) | |
| 10970 return; | |
| 10971 | |
| 10972 /* | |
| 10973 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10974 * after deleting lines, before cursor.lnum is corrected. | |
| 10975 */ | |
| 10976 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10977 return; | |
| 10978 | |
| 10979 #ifdef FEAT_INS_EXPAND | |
| 10980 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10981 * the (long) mode message. */ | |
| 10982 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10983 if (edit_submode != NULL) | |
| 10984 return; | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10985 // Don't draw the ruler when the popup menu is visible, it may overlap. |
|
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10986 // Except when the popup menu will be redrawn anyway. |
|
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
10987 if (!ignore_pum && pum_visible()) |
| 540 | 10988 return; |
| 7 | 10989 #endif |
| 10990 | |
| 10991 #ifdef FEAT_STL_OPT | |
| 10992 if (*p_ruf) | |
| 10993 { | |
| 680 | 10994 int save_called_emsg = called_emsg; |
| 10995 | |
| 10996 called_emsg = FALSE; | |
| 7 | 10997 win_redr_custom(wp, TRUE); |
| 680 | 10998 if (called_emsg) |
| 10999 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 11000 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 11001 called_emsg |= save_called_emsg; |
| 7 | 11002 return; |
| 11003 } | |
| 11004 #endif | |
| 11005 | |
| 11006 /* | |
| 11007 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 11008 */ | |
| 11009 if (!(State & INSERT) | |
| 11010 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 11011 empty_line = TRUE; | |
| 11012 | |
| 11013 /* | |
| 11014 * Only draw the ruler when something changed. | |
| 11015 */ | |
| 11016 validate_virtcol_win(wp); | |
| 11017 if ( redraw_cmdline | |
| 11018 || always | |
| 11019 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 11020 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 11021 || wp->w_virtcol != wp->w_ru_virtcol | |
| 11022 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 11023 || wp->w_topline != wp->w_ru_topline | |
| 11024 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 11025 #ifdef FEAT_DIFF | |
| 11026 || wp->w_topfill != wp->w_ru_topfill | |
| 11027 #endif | |
| 11028 || empty_line != wp->w_ru_empty) | |
| 11029 { | |
| 11030 cursor_off(); | |
| 11031 if (wp->w_status_height) | |
| 11032 { | |
| 11033 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
|
11034 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
|
11035 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
|
11036 width = wp->w_width; |
| 7 | 11037 } |
| 11038 else | |
| 11039 { | |
| 11040 row = Rows - 1; | |
| 11041 fillchar = ' '; | |
| 11042 attr = 0; | |
| 11043 width = Columns; | |
| 11044 off = 0; | |
| 11045 } | |
| 11046 | |
| 11047 /* In list mode virtcol needs to be recomputed */ | |
| 11048 virtcol = wp->w_virtcol; | |
| 11049 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 11050 { | |
| 11051 wp->w_p_list = FALSE; | |
| 11052 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 11053 wp->w_p_list = TRUE; | |
| 11054 } | |
| 11055 | |
| 11056 /* | |
| 11057 * Some sprintfs return the length, some return a pointer. | |
| 11058 * To avoid portability problems we use strlen() here. | |
| 11059 */ | |
| 1869 | 11060 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11061 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11062 ? 0L | |
| 11063 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11064 len = STRLEN(buffer); |
| 11065 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11066 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11067 (int)virtcol + 1); | |
| 11068 | |
| 11069 /* | |
| 11070 * Add a "50%" if there is room for it. | |
| 11071 * On the last line, don't print in the last column (scrolls the | |
| 11072 * screen up on some terminals). | |
| 11073 */ | |
| 11074 i = (int)STRLEN(buffer); | |
| 1869 | 11075 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11076 o = i + vim_strsize(buffer + i + 1); |
| 11077 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11078 ++o; | |
| 11079 this_ru_col = ru_col - (Columns - width); | |
| 11080 if (this_ru_col < 0) | |
| 11081 this_ru_col = 0; | |
| 11082 /* Never use more than half the window/screen width, leave the other | |
| 11083 * 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
|
11084 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
|
11085 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
|
11086 if (this_ru_col + o < width) |
| 7 | 11087 { |
| 6466 | 11088 /* 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
|
11089 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11090 { |
| 11091 if (has_mbyte) | |
| 11092 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11093 else | |
| 11094 buffer[i++] = fillchar; | |
| 11095 ++o; | |
| 11096 } | |
| 1869 | 11097 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11098 } |
| 11099 /* Truncate at window boundary. */ | |
| 11100 if (has_mbyte) | |
| 11101 { | |
| 11102 o = 0; | |
| 474 | 11103 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11104 { |
| 11105 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
|
11106 if (this_ru_col + o > width) |
| 7 | 11107 { |
| 11108 buffer[i] = NUL; | |
| 11109 break; | |
| 11110 } | |
| 11111 } | |
| 11112 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
11113 else if (this_ru_col + (int)STRLEN(buffer) > width) |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11114 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
|
11115 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11116 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11117 i = redraw_cmdline; |
| 11118 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
|
11119 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
|
11120 (int)(off + width), |
| 7 | 11121 fillchar, fillchar, attr); |
| 11122 /* don't redraw the cmdline because of showing the ruler */ | |
| 11123 redraw_cmdline = i; | |
| 11124 wp->w_ru_cursor = wp->w_cursor; | |
| 11125 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11126 wp->w_ru_empty = empty_line; | |
| 11127 wp->w_ru_topline = wp->w_topline; | |
| 11128 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11129 #ifdef FEAT_DIFF | |
| 11130 wp->w_ru_topfill = wp->w_topfill; | |
| 11131 #endif | |
| 11132 } | |
| 11133 } | |
| 11134 #endif | |
| 13 | 11135 |
| 11136 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11137 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11138 * 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
|
11139 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11140 * Otherwise it depends on 'numberwidth' and the line count. |
| 11141 */ | |
| 11142 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11143 number_width(win_T *wp) |
| 13 | 11144 { |
| 11145 int n; | |
| 11146 linenr_T lnum; | |
| 11147 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11148 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
|
11149 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11150 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11151 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11152 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11153 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
|
11154 |
| 6679 | 11155 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11156 return wp->w_nrwidth_width; |
| 11157 wp->w_nrwidth_line_count = lnum; | |
| 11158 | |
| 11159 n = 0; | |
| 11160 do | |
| 11161 { | |
| 856 | 11162 lnum /= 10; |
| 11163 ++n; | |
| 13 | 11164 } while (lnum > 0); |
| 11165 | |
| 11166 /* 'numberwidth' gives the minimal width plus one */ | |
| 11167 if (n < wp->w_p_nuw - 1) | |
| 11168 n = wp->w_p_nuw - 1; | |
| 11169 | |
| 11170 wp->w_nrwidth_width = n; | |
| 6679 | 11171 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11172 return n; |
| 11173 } | |
| 11174 #endif | |
| 3986 | 11175 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11176 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 11177 /* |
| 11178 * Return the current cursor column. This is the actual position on the | |
| 11179 * screen. First column is 0. | |
| 11180 */ | |
| 11181 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11182 screen_screencol(void) |
| 3986 | 11183 { |
| 11184 return screen_cur_col; | |
| 11185 } | |
| 11186 | |
| 11187 /* | |
| 11188 * Return the current cursor row. This is the actual position on the screen. | |
| 11189 * First row is 0. | |
| 11190 */ | |
| 11191 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11192 screen_screenrow(void) |
| 3986 | 11193 { |
| 11194 return screen_cur_row; | |
| 11195 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11196 #endif |