Mercurial > vim
annotate src/screen.c @ 16998:2ec0f953ec3f v8.1.1499
patch 8.1.1499: ruler not updated after popup window was removed
commit https://github.com/vim/vim/commit/24a5ac5d4dbc4dc5d6d2b7e4dda6612dd9233f5d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 8 19:01:18 2019 +0200
patch 8.1.1499: ruler not updated after popup window was removed
Problem: Ruler not updated after popup window was removed.
Solution: use popup_mask in screen_puts().
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 08 Jun 2019 19:15:06 +0200 |
| parents | 9c4cf27deb87 |
| children | 79c3a52fdb07 |
| 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; |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
331 screenline = LALLOC_MULT(schar_T, rows * cols); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
332 screenattr = LALLOC_MULT(sattr_T, rows * cols); |
|
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 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
337 screenlineUC = LALLOC_MULT(u8char_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
342 screenlineC[i] = LALLOC_MULT(u8char_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
349 screenline2 = LALLOC_MULT(schar_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 if (ret != 2) |
|
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 /* 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
|
357 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 { |
| 6959 | 359 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 361 (size_t)cols * sizeof(schar_T)); |
| 362 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
363 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 364 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
366 { |
| 6959 | 367 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 369 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 for (i = 0; i < p_mco; ++i) |
| 6959 | 371 mch_memmove(screenlineC[i] + r * cols, |
| 372 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 373 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
375 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 376 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 378 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
380 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
383 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 if (must_redraw == 0) |
|
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 int off = (int)(current_ScreenLine - ScreenLines); |
|
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 /* 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
|
389 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 mch_memmove(current_ScreenLine, |
| 6959 | 392 screenline + r * cols, |
| 393 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 mch_memmove(ScreenAttrs + off, |
| 6959 | 395 screenattr + r * cols, |
| 396 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
397 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
398 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 mch_memmove(ScreenLinesUC + off, |
| 6959 | 400 screenlineUC + r * cols, |
| 401 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
402 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 404 screenlineC[i] + r * cols, |
| 405 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
406 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
407 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
408 mch_memmove(ScreenLines2 + off, |
| 6959 | 409 screenline2 + r * cols, |
| 410 (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
|
411 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
|
412 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 ret = 4; |
|
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 } |
|
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 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
428 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
429 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
430 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
431 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
432 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
434 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
435 #endif |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
436 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
437 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
438 * 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
|
439 * 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
|
440 * 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
|
441 * 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
|
442 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
443 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
444 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
445 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
|
446 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
447 ++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
|
448 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
449 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
|
450 ; // do nothing |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
451 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
|
452 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
453 // 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
|
454 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
|
455 { |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
456 // 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
|
457 // wildmenu entries. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
458 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
|
459 #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
|
460 && 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
|
461 #endif |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
462 && call_update_screen) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
463 update_screen(0); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
464 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
465 // 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
|
466 // editing the command. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
467 redrawcmdline_ex(FALSE); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
468 } |
|
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
|
469 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
470 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
|
471 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
472 // 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
|
473 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
474 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
475 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
476 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
477 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
478 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
|
479 // 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
|
480 // flicker. |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
481 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
482 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
483 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
484 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
|
485 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
486 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
487 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
488 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
489 /* |
| 7 | 490 * Changed something in the current window, at buffer line "lnum", that |
| 491 * requires that line and possibly other lines to be redrawn. | |
| 492 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 493 * Used to remove the "$" from a change command. | |
| 494 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 495 * may become invalid and the whole window will have to be redrawn. | |
| 496 */ | |
| 497 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
498 redrawWinline( |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
499 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
|
500 linenr_T lnum) |
|
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
501 { |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
502 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
|
503 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
|
504 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
|
505 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
|
506 redraw_win_later(wp, VALID); |
| 7 | 507 } |
| 508 | |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
509 /* |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
510 * To be called when "updating_screen" was set before and now the postponed |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
511 * side effects may take place. |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
512 */ |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
513 void |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
514 after_updating_screen(int may_resize_shell UNUSED) |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
515 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
516 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
|
517 #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
|
518 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
|
519 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
|
520 #endif |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
521 #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
|
522 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
|
523 #endif |
|
14428
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
524 |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
525 #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
|
526 // 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
|
527 // 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
|
528 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
|
529 #endif |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
530 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
531 |
| 7 | 532 /* |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
533 * Update all windows that are editing the current buffer. |
| 7 | 534 */ |
| 535 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
536 update_curbuf(int type) |
| 7 | 537 { |
| 538 redraw_curbuf_later(type); | |
| 539 update_screen(type); | |
| 540 } | |
| 541 | |
| 542 /* | |
| 543 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 544 * 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
|
545 * 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
|
546 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
547 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
|
548 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
|
549 { |
|
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
|
550 int type = type_arg; |
| 7 | 551 win_T *wp; |
| 552 static int did_intro = FALSE; | |
| 553 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 554 int did_one; | |
| 555 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
556 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
557 int did_undraw = FALSE; |
|
16405
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
558 int gui_cursor_col = 0; |
|
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
559 int gui_cursor_row = 0; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
560 #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
|
561 int no_update = FALSE; |
| 7 | 562 |
| 2008 | 563 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 564 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
|
565 return FAIL; |
| 7 | 566 |
|
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
|
567 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
|
568 { |
|
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 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
|
570 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
|
571 } |
|
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
|
572 |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
573 #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
|
574 { |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
575 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
|
576 |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
577 // 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
|
578 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
|
579 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
|
580 } |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
581 #endif |
|
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
582 |
| 7 | 583 if (must_redraw) |
| 584 { | |
| 585 if (type < must_redraw) /* use maximal type */ | |
| 586 type = must_redraw; | |
| 1331 | 587 |
| 588 /* must_redraw is reset here, so that when we run into some weird | |
| 589 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 590 * scrolling), or update_topline() in win_update() will cause a | |
| 591 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 592 must_redraw = 0; |
| 593 } | |
| 594 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
595 /* 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
|
596 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
|
597 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
598 && !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
|
599 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
600 ) |
| 7 | 601 type = NOT_VALID; |
| 602 | |
| 2008 | 603 /* Postpone the redrawing when it's not needed and when being called |
| 604 * recursively. */ | |
| 605 if (!redrawing() || updating_screen) | |
| 7 | 606 { |
| 607 redraw_later(type); /* remember type for next time */ | |
| 608 must_redraw = type; | |
| 609 if (type > INVERTED_ALL) | |
| 610 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
|
611 return FAIL; |
| 7 | 612 } |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
613 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
614 #ifdef FEAT_TEXT_PROP |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
615 // Update popup_mask if needed. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
616 type = may_update_popup_mask(type); |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
617 #endif |
| 7 | 618 |
| 619 updating_screen = TRUE; | |
| 620 #ifdef FEAT_SYN_HL | |
| 621 ++display_tick; /* let syntax code know we're in a next round of | |
| 622 * display updating */ | |
| 623 #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
|
624 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
|
625 ++no_win_do_lines_ins; |
| 7 | 626 |
| 627 /* | |
| 628 * if the screen was scrolled up when displaying a message, scroll it down | |
| 629 */ | |
| 630 if (msg_scrolled) | |
| 631 { | |
| 632 clear_cmdline = TRUE; | |
| 633 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 634 type = CLEAR; | |
| 635 else if (type != CLEAR) | |
| 636 { | |
| 637 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
|
638 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
|
639 == FAIL) |
| 7 | 640 type = CLEAR; |
| 641 FOR_ALL_WINDOWS(wp) | |
| 642 { | |
|
16910
6a99709c6ae3
patch 8.1.1456: WinBar not redrawn after scrolling one line
Bram Moolenaar <Bram@vim.org>
parents:
16904
diff
changeset
|
643 if (wp->w_winrow < msg_scrolled) |
| 7 | 644 { |
| 645 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 646 && wp->w_redr_type < REDRAW_TOP | |
| 647 && wp->w_lines_valid > 0 | |
| 648 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 649 { | |
| 650 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 651 wp->w_redr_type = REDRAW_TOP; | |
| 652 } | |
| 653 else | |
| 654 { | |
| 655 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
|
656 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
|
657 <= msg_scrolled) |
| 7 | 658 wp->w_redr_status = TRUE; |
| 659 } | |
| 660 } | |
| 661 } | |
|
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
|
662 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
|
663 redraw_cmdline = TRUE; |
| 673 | 664 redraw_tabline = TRUE; |
| 7 | 665 } |
| 666 msg_scrolled = 0; | |
| 667 need_wait_return = FALSE; | |
| 668 } | |
| 669 | |
| 670 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 671 compute_cmdrow(); | |
| 672 | |
| 673 /* Check for changed highlighting */ | |
| 674 if (need_highlight_changed) | |
| 675 highlight_changed(); | |
| 676 | |
| 677 if (type == CLEAR) /* first clear screen */ | |
| 678 { | |
| 679 screenclear(); /* will reset clear_cmdline */ | |
| 680 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
|
681 /* 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
|
682 must_redraw = 0; |
| 7 | 683 } |
| 684 | |
| 685 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 686 check_for_delay(FALSE); | |
| 687 | |
| 13 | 688 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
689 /* 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
|
690 * changes. */ |
| 13 | 691 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
692 && 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
|
693 ? number_width(curwin) : 0)) |
| 13 | 694 curwin->w_redr_type = NOT_VALID; |
| 695 #endif | |
| 696 | |
| 7 | 697 /* |
| 698 * Only start redrawing if there is really something to do. | |
| 699 */ | |
| 700 if (type == INVERTED) | |
| 701 update_curswant(); | |
| 702 if (curwin->w_redr_type < type | |
| 703 && !((type == VALID | |
| 704 && curwin->w_lines[0].wl_valid | |
| 705 #ifdef FEAT_DIFF | |
| 706 && curwin->w_topfill == curwin->w_old_topfill | |
| 707 && curwin->w_botfill == curwin->w_old_botfill | |
| 708 #endif | |
| 709 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 710 || (type == INVERTED | |
| 1043 | 711 && VIsual_active |
| 7 | 712 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 713 && curwin->w_old_visual_mode == VIsual_mode | |
| 714 && (curwin->w_valid & VALID_VIRTCOL) | |
| 715 && curwin->w_old_curswant == curwin->w_curswant) | |
| 716 )) | |
| 717 curwin->w_redr_type = type; | |
| 718 | |
| 849 | 719 /* Redraw the tab pages line if needed. */ |
| 720 if (redraw_tabline || type >= NOT_VALID) | |
| 721 draw_tabline(); | |
| 722 | |
| 7 | 723 #ifdef FEAT_SYN_HL |
| 724 /* | |
| 725 * Correct stored syntax highlighting info for changes in each displayed | |
| 726 * buffer. Each buffer must only be done once. | |
| 727 */ | |
| 728 FOR_ALL_WINDOWS(wp) | |
| 729 { | |
| 730 if (wp->w_buffer->b_mod_set) | |
| 731 { | |
| 732 win_T *wwp; | |
| 733 | |
| 734 /* Check if we already did this buffer. */ | |
| 735 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 736 if (wwp->w_buffer == wp->w_buffer) | |
| 737 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
738 if (wwp == wp && syntax_present(wp)) |
| 7 | 739 syn_stack_apply_changes(wp->w_buffer); |
| 740 } | |
| 741 } | |
| 742 #endif | |
| 743 | |
| 744 /* | |
| 745 * Go from top to bottom through the windows, redrawing the ones that need | |
| 746 * it. | |
| 747 */ | |
| 748 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 749 did_one = FALSE; | |
| 750 #endif | |
| 751 #ifdef FEAT_SEARCH_EXTRA | |
| 752 search_hl.rm.regprog = NULL; | |
| 753 #endif | |
| 754 FOR_ALL_WINDOWS(wp) | |
| 755 { | |
| 756 if (wp->w_redr_type != 0) | |
| 757 { | |
| 758 cursor_off(); | |
| 759 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 760 if (!did_one) | |
| 761 { | |
| 762 did_one = TRUE; | |
| 763 # ifdef FEAT_SEARCH_EXTRA | |
| 764 start_search_hl(); | |
| 765 # endif | |
| 766 # ifdef FEAT_CLIPBOARD | |
| 767 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 768 if (clip_star.available && clip_isautosel_star()) |
| 769 clip_update_selection(&clip_star); | |
| 770 if (clip_plus.available && clip_isautosel_plus()) | |
| 771 clip_update_selection(&clip_plus); | |
| 7 | 772 # endif |
| 773 #ifdef FEAT_GUI | |
| 774 /* Remove the cursor before starting to do anything, because | |
| 775 * scrolling may make it difficult to redraw the text under | |
| 776 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
777 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
|
778 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
779 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
780 gui_cursor_row = gui.cursor_row; |
| 7 | 781 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
782 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
783 } |
| 7 | 784 #endif |
| 785 } | |
| 786 #endif | |
| 787 win_update(wp); | |
| 788 } | |
| 789 | |
| 790 /* redraw status line after the window to minimize cursor movement */ | |
| 791 if (wp->w_redr_status) | |
| 792 { | |
| 793 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
794 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 795 } |
| 796 } | |
| 797 #if defined(FEAT_SEARCH_EXTRA) | |
| 798 end_search_hl(); | |
| 799 #endif | |
| 4107 | 800 #ifdef FEAT_INS_EXPAND |
| 801 /* 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
|
802 pum_may_redraw(); |
| 4107 | 803 #endif |
| 7 | 804 |
| 805 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 806 * 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
|
807 FOR_ALL_WINDOWS(wp) |
| 7 | 808 wp->w_buffer->b_mod_set = FALSE; |
| 809 | |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
810 after_updating_screen(TRUE); |
| 7 | 811 |
| 812 /* Clear or redraw the command line. Done last, because scrolling may | |
| 813 * 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
|
814 if (clear_cmdline || redraw_cmdline || redraw_mode) |
| 7 | 815 showmode(); |
| 816 | |
|
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
|
817 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
|
818 --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
|
819 |
| 7 | 820 /* 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
|
821 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
822 maybe_intro_message(); |
| 7 | 823 did_intro = TRUE; |
| 824 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
825 #ifdef FEAT_TEXT_PROP |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
826 // Display popup windows on top of the windows. |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
827 update_popups(); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
828 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
829 |
| 7 | 830 #ifdef FEAT_GUI |
| 831 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 832 * done. */ | |
| 833 if (gui.in_use) | |
| 834 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
835 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
|
836 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
837 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
838 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
|
839 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
840 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
841 /* 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
|
842 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
843 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
844 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
845 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 846 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
847 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
848 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
849 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
850 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
851 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
852 out_flush(); |
| 7 | 853 gui_update_scrollbars(FALSE); |
| 854 } | |
| 855 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
856 return OK; |
| 7 | 857 } |
| 858 | |
|
15947
4aaf68cbed32
patch 8.1.0979: compiler warning for unused functions
Bram Moolenaar <Bram@vim.org>
parents:
15939
diff
changeset
|
859 #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
|
860 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 * 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
|
862 * 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
|
863 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 /* 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
|
871 * 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
|
872 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
878 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
879 // Update popup_mask if needed. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
880 may_update_popup_mask(0); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
881 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
884 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 * 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
|
886 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
887 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 { |
|
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
|
890 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
|
891 showmode(); |
|
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_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
894 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
895 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
896 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
897 after_updating_screen(TRUE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
898 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
899 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
900 /* 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
|
901 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
902 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
903 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
904 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
|
905 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
906 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
907 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
908 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
909 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
910 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
911 #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
|
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 * 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
|
914 * 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
|
915 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
916 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
917 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
|
918 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
919 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
|
920 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
921 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
|
922 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
|
923 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
|
924 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
|
925 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
|
926 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
|
927 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
|
928 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
929 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
930 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
|
931 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
932 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
|
933 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
|
934 } |
|
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 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
937 * 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
|
938 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
939 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
940 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
|
941 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
942 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
|
943 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
944 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
|
945 /* 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
|
946 * 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
|
947 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
|
948 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
949 } |
| 7 | 950 #endif |
| 951 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
952 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 953 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
954 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 955 { |
| 956 win_T *wp; | |
| 957 int doit = FALSE; | |
| 958 | |
| 959 # ifdef FEAT_FOLDING | |
| 960 win_foldinfo.fi_level = 0; | |
| 961 # endif | |
| 962 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
963 // 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
|
964 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
|
965 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
966 // check if it resulted in the need to redraw a window |
| 7 | 967 FOR_ALL_WINDOWS(wp) |
| 968 if (wp->w_redr_type != 0) | |
| 969 doit = TRUE; | |
| 970 | |
| 3250 | 971 /* 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
|
972 * 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
|
973 */ |
| 3250 | 974 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
|
975 || 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
|
976 || msg_scrolled |
| 3250 | 977 #ifdef FEAT_GUI |
| 978 || gui.starting | |
| 979 #endif | |
| 980 || starting) | |
| 7 | 981 return; |
| 982 | |
| 983 /* update all windows that need updating */ | |
| 984 update_prepare(); | |
| 985 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
986 FOR_ALL_WINDOWS(wp) |
| 7 | 987 { |
| 988 if (wp->w_redr_type != 0) | |
| 989 win_update(wp); | |
| 990 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
|
991 win_redr_status(wp, FALSE); |
| 7 | 992 } |
| 993 | |
| 994 update_finish(); | |
| 995 } | |
| 996 #endif | |
| 997 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
998 /* |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
999 * 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
|
1000 * 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
|
1001 */ |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1002 static int |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1003 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
|
1004 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1005 int wcr_attr = 0; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1006 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1007 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
|
1008 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
|
1009 #ifdef FEAT_TEXT_PROP |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1010 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
|
1011 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
|
1012 #endif |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1013 return wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1014 } |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1015 |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1016 #ifdef FEAT_TEXT_PROP |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1017 /* |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1018 * Update "popup_mask" if needed. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1019 * Also recomputes the popup size and positions. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1020 * Also updates "popup_visible". |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1021 * If more redrawing is needed than "type_arg" a higher value is returned. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1022 */ |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1023 int |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1024 may_update_popup_mask(int type_arg) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1025 { |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1026 int type = type_arg; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1027 win_T *wp; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1028 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1029 if (popup_mask_tab != curtab) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1030 popup_mask_refresh = TRUE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1031 if (!popup_mask_refresh) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1032 { |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1033 // Check if any buffer has changed. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1034 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1035 if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer)) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1036 popup_mask_refresh = TRUE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1037 for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1038 if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer)) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1039 popup_mask_refresh = TRUE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1040 if (!popup_mask_refresh) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1041 return type; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1042 } |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1043 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1044 popup_mask_refresh = FALSE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1045 popup_mask_tab = curtab; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1046 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1047 popup_visible = FALSE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1048 vim_memset(popup_mask, 0, screen_Rows * screen_Columns * sizeof(short)); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1049 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1050 // Find the window with the lowest zindex that hasn't been handled yet, |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1051 // so that the window with a higher zindex overwrites the value in |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1052 // popup_mask. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1053 popup_reset_handled(); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1054 while ((wp = find_next_popup(TRUE)) != NULL) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1055 { |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1056 int top_off, bot_off; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1057 int left_off, right_off; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1058 short *p; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1059 int line, col; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1060 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1061 popup_visible = TRUE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1062 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1063 // Recompute the position if the text changed. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1064 if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer)) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1065 popup_adjust_position(wp); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1066 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1067 // the position and size are for the inside, add the padding and |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1068 // border |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1069 top_off = wp->w_popup_padding[0] + wp->w_popup_border[0]; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1070 bot_off = wp->w_popup_padding[2] + wp->w_popup_border[2]; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1071 left_off = wp->w_popup_padding[3] + wp->w_popup_border[3]; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1072 right_off = wp->w_popup_padding[1] + wp->w_popup_border[1]; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1073 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1074 for (line = wp->w_winrow + top_off; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1075 line < wp->w_winrow + wp->w_height + bot_off |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1076 && line < screen_Rows; ++line) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1077 for (col = wp->w_wincol + left_off; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1078 col < wp->w_wincol + wp->w_width + right_off |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1079 && col < screen_Columns; ++col) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1080 { |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1081 p = popup_mask + line * screen_Columns + col; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1082 if (*p != wp->w_zindex) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1083 { |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1084 *p = wp->w_zindex; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1085 type = NOT_VALID; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1086 } |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1087 } |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1088 } |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1089 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1090 return type; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1091 } |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1092 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1093 /* |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1094 * Return a string of "len" spaces in IObuff. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1095 */ |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1096 static char_u * |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1097 get_spaces(int len) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1098 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1099 vim_memset(IObuff, ' ', (size_t)len); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1100 IObuff[len] = NUL; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1101 return IObuff; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1102 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1103 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1104 static void |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1105 update_popups(void) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1106 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1107 win_T *wp; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1108 int top_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1109 int left_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1110 int total_width; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1111 int total_height; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1112 int popup_attr; |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1113 int border_attr[4]; |
|
16918
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1114 int border_char[8]; |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1115 char_u buf[MB_MAXBYTES]; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1116 int row; |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1117 int i; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1118 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1119 // Find the window with the lowest zindex that hasn't been updated yet, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1120 // so that the window with a higher zindex is drawn later, thus goes on |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1121 // top. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1122 popup_reset_handled(); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1123 while ((wp = find_next_popup(TRUE)) != NULL) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1124 { |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1125 // This drawing uses the zindex of the popup window, so that it's on |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1126 // top of the text but doesn't draw when another popup with higher |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1127 // zindex is on top of the character. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1128 screen_zindex = wp->w_zindex; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1129 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1130 // adjust w_winrow and w_wincol for border and padding, since |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1131 // win_update() doesn't handle them. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1132 top_off = wp->w_popup_padding[0] + wp->w_popup_border[0]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1133 left_off = wp->w_popup_padding[3] + wp->w_popup_border[3]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1134 wp->w_winrow += top_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1135 wp->w_wincol += left_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1136 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1137 // Draw the popup text. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1138 win_update(wp); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1139 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1140 wp->w_winrow -= top_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1141 wp->w_wincol -= left_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1142 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1143 total_width = wp->w_popup_border[3] + wp->w_popup_padding[3] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1144 + wp->w_width + wp->w_popup_padding[1] + wp->w_popup_border[1]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1145 total_height = wp->w_popup_border[0] + wp->w_popup_padding[0] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1146 + wp->w_height + wp->w_popup_padding[2] + wp->w_popup_border[2]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1147 popup_attr = get_wcr_attr(wp); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1148 |
|
16916
90cec755ff80
patch 8.1.1459: popup window border looks bad when 'ambiwidth' is "double"
Bram Moolenaar <Bram@vim.org>
parents:
16914
diff
changeset
|
1149 // We can only use these line drawing characters when 'encoding' is |
|
90cec755ff80
patch 8.1.1459: popup window border looks bad when 'ambiwidth' is "double"
Bram Moolenaar <Bram@vim.org>
parents:
16914
diff
changeset
|
1150 // "utf-8" and 'ambiwidth' is "single". |
|
16918
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1151 if (enc_utf8 && *p_ambw == 's') |
|
16886
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1152 { |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1153 border_char[0] = border_char[2] = 0x2550; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1154 border_char[1] = border_char[3] = 0x2551; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1155 border_char[4] = 0x2554; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1156 border_char[5] = 0x2557; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1157 border_char[6] = 0x255d; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1158 border_char[7] = 0x255a; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1159 } |
|
16918
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1160 else |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1161 { |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1162 border_char[0] = border_char[2] = '-'; |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1163 border_char[1] = border_char[3] = '|'; |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1164 for (i = 4; i < 8; ++i) |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1165 border_char[i] = '+'; |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1166 } |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1167 for (i = 0; i < 8; ++i) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1168 if (wp->w_border_char[i] != 0) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1169 border_char[i] = wp->w_border_char[i]; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1170 |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1171 for (i = 0; i < 4; ++i) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1172 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1173 border_attr[i] = popup_attr; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1174 if (wp->w_border_highlight[i] != NULL) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1175 border_attr[i] = syn_name2attr(wp->w_border_highlight[i]); |
|
16886
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1176 } |
|
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1177 |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1178 if (wp->w_popup_border[0] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1179 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1180 // top border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1181 screen_fill(wp->w_winrow, wp->w_winrow + 1, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1182 wp->w_wincol, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1183 wp->w_wincol + total_width, |
|
16886
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1184 wp->w_popup_border[3] != 0 |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1185 ? border_char[4] : border_char[0], |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1186 border_char[0], border_attr[0]); |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1187 if (wp->w_popup_border[1] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1188 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1189 buf[mb_char2bytes(border_char[5], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1190 screen_puts(buf, wp->w_winrow, |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1191 wp->w_wincol + total_width - 1, border_attr[1]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1192 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1193 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1194 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1195 if (wp->w_popup_padding[0] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1196 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1197 // top padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1198 row = wp->w_winrow + wp->w_popup_border[0]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1199 screen_fill(row, row + wp->w_popup_padding[0], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1200 wp->w_wincol + wp->w_popup_border[3], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1201 wp->w_wincol + total_width - wp->w_popup_border[1], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1202 ' ', ' ', popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1203 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1204 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1205 for (row = wp->w_winrow + wp->w_popup_border[0]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1206 row < wp->w_winrow + total_height - wp->w_popup_border[2]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1207 ++row) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1208 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1209 // left border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1210 if (wp->w_popup_border[3] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1211 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1212 buf[mb_char2bytes(border_char[3], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1213 screen_puts(buf, row, wp->w_wincol, border_attr[3]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1214 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1215 // left padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1216 if (wp->w_popup_padding[3] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1217 screen_puts(get_spaces(wp->w_popup_padding[3]), row, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1218 wp->w_wincol + wp->w_popup_border[3], popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1219 // right border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1220 if (wp->w_popup_border[1] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1221 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1222 buf[mb_char2bytes(border_char[1], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1223 screen_puts(buf, row, |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1224 wp->w_wincol + total_width - 1, border_attr[1]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1225 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1226 // right padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1227 if (wp->w_popup_padding[1] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1228 screen_puts(get_spaces(wp->w_popup_padding[1]), row, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1229 wp->w_wincol + wp->w_popup_border[3] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1230 + wp->w_popup_padding[3] + wp->w_width, popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1231 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1232 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1233 if (wp->w_popup_padding[2] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1234 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1235 // bottom padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1236 row = wp->w_winrow + wp->w_popup_border[0] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1237 + wp->w_popup_padding[0] + wp->w_height; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1238 screen_fill(row, row + wp->w_popup_padding[2], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1239 wp->w_wincol + wp->w_popup_border[3], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1240 wp->w_wincol + total_width - wp->w_popup_border[1], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1241 ' ', ' ', popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1242 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1243 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1244 if (wp->w_popup_border[2] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1245 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1246 // bottom border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1247 row = wp->w_winrow + total_height - 1; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1248 screen_fill(row , row + 1, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1249 wp->w_wincol, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1250 wp->w_wincol + total_width, |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1251 wp->w_popup_border[3] != 0 |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1252 ? border_char[7] : border_char[2], |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1253 border_char[2], border_attr[2]); |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1254 if (wp->w_popup_border[1] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1255 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1256 buf[mb_char2bytes(border_char[6], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1257 screen_puts(buf, row, |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1258 wp->w_wincol + total_width - 1, border_attr[2]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1259 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1260 } |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1261 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1262 // Back to the normal zindex. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
1263 screen_zindex = 0; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1264 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1265 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1266 #endif |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1267 |
| 7 | 1268 #if defined(FEAT_GUI) || defined(PROTO) |
| 1269 /* | |
| 1270 * Update a single window, its status line and maybe the command line msg. | |
| 1271 * Used for the GUI scrollbar. | |
| 1272 */ | |
| 1273 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1274 updateWindow(win_T *wp) |
| 7 | 1275 { |
| 2008 | 1276 /* return if already busy updating */ |
| 1277 if (updating_screen) | |
| 1278 return; | |
| 1279 | |
| 7 | 1280 update_prepare(); |
| 1281 | |
| 1282 #ifdef FEAT_CLIPBOARD | |
| 1283 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1284 if (clip_star.available && clip_isautosel_star()) |
| 1285 clip_update_selection(&clip_star); | |
| 1286 if (clip_plus.available && clip_isautosel_plus()) | |
| 1287 clip_update_selection(&clip_plus); | |
| 7 | 1288 #endif |
| 670 | 1289 |
| 7 | 1290 win_update(wp); |
| 670 | 1291 |
| 1292 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1293 if (redraw_tabline) |
| 677 | 1294 draw_tabline(); |
| 670 | 1295 |
| 7 | 1296 if (wp->w_redr_status |
| 1297 # ifdef FEAT_CMDL_INFO | |
| 1298 || p_ru | |
| 1299 # endif | |
| 1300 # ifdef FEAT_STL_OPT | |
| 40 | 1301 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1302 # endif |
| 1303 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1304 win_redr_status(wp, FALSE); |
| 7 | 1305 |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1306 #ifdef FEAT_TEXT_PROP |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1307 // Display popup windows on top of everything. |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1308 update_popups(); |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1309 #endif |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1310 |
| 7 | 1311 update_finish(); |
| 1312 } | |
| 1313 #endif | |
| 1314 | |
| 1315 /* | |
| 1316 * Update a single window. | |
| 1317 * | |
| 1318 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1319 * screen or scrolling lines). | |
| 1320 * | |
| 1321 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1322 * implies the one below it. | |
| 1323 * NOT_VALID redraw the whole window | |
| 743 | 1324 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1325 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1326 * INVERTED redraw the changed part of the Visual area | |
| 1327 * INVERTED_ALL redraw the whole Visual area | |
| 1328 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1329 * 2. update lines at the top when scrolled down | |
| 1330 * 3. redraw changed text: | |
| 301 | 1331 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1332 * b_mod_top and b_mod_bot. |
| 1333 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1334 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1335 * - continue redrawing when syntax status is invalid. | |
| 1336 * 4. if scrolled up, update lines at the bottom. | |
| 1337 * This results in three areas that may need updating: | |
| 1338 * top: from first row to top_end (when scrolled down) | |
| 1339 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1340 * bot: from bot_start to last row (when scrolled up) | |
| 1341 */ | |
| 1342 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1343 win_update(win_T *wp) |
| 7 | 1344 { |
| 1345 buf_T *buf = wp->w_buffer; | |
| 1346 int type; | |
| 1347 int top_end = 0; /* Below last row of the top area that needs | |
| 1348 updating. 0 when no top area updating. */ | |
| 1349 int mid_start = 999;/* first row of the mid area that needs | |
| 1350 updating. 999 when no mid area updating. */ | |
| 1351 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1352 updating. 0 when no mid area updating. */ | |
| 1353 int bot_start = 999;/* first row of the bot area that needs | |
| 1354 updating. 999 when no bot area updating */ | |
| 1355 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1356 w_topline got smaller a bit */ | |
| 1357 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1358 matchitem_T *cur; /* points to the match list */ |
| 7 | 1359 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1360 #endif | |
| 1361 | |
| 1362 int row; /* current window row to display */ | |
| 1363 linenr_T lnum; /* current buffer lnum to display */ | |
| 1364 int idx; /* current index in w_lines[] */ | |
| 1365 int srow; /* starting row of the current line */ | |
| 1366 | |
| 1367 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1368 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1369 int i; | |
| 1370 long j; | |
| 1371 static int recursive = FALSE; /* being called recursively */ | |
| 1372 int old_botline = wp->w_botline; | |
| 1373 #ifdef FEAT_FOLDING | |
| 1374 long fold_count; | |
| 1375 #endif | |
| 1376 #ifdef FEAT_SYN_HL | |
| 1377 /* remember what happened to the previous line, to know if | |
| 1378 * check_visual_highlight() can be used */ | |
| 1379 #define DID_NONE 1 /* didn't update a line */ | |
| 1380 #define DID_LINE 2 /* updated a normal line */ | |
| 1381 #define DID_FOLD 3 /* updated a folded line */ | |
| 1382 int did_update = DID_NONE; | |
| 1383 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1384 #endif | |
| 1385 linenr_T mod_top = 0; | |
| 1386 linenr_T mod_bot = 0; | |
| 1387 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1388 int save_got_int; | |
| 1389 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1390 #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
|
1391 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
|
1392 #endif |
| 7 | 1393 |
| 1394 type = wp->w_redr_type; | |
| 1395 | |
| 1396 if (type == NOT_VALID) | |
| 1397 { | |
| 1398 wp->w_redr_status = TRUE; | |
| 1399 wp->w_lines_valid = 0; | |
| 1400 } | |
| 1401 | |
| 1402 /* 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
|
1403 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1404 { |
| 1405 wp->w_redr_type = 0; | |
| 1406 return; | |
| 1407 } | |
| 1408 | |
| 1409 /* Window is zero-width: Only need to draw the separator. */ | |
| 1410 if (wp->w_width == 0) | |
| 1411 { | |
| 1412 /* draw the vertical separator right of this window */ | |
| 1413 draw_vsep_win(wp, 0); | |
| 1414 wp->w_redr_type = 0; | |
| 1415 return; | |
| 1416 } | |
| 1417 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1418 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1419 // 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
|
1420 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
|
1421 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1422 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
|
1423 # 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
|
1424 /* 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
|
1425 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
|
1426 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
|
1427 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1428 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
|
1429 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1430 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1431 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1432 |
| 7 | 1433 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1434 init_search_hl(wp); |
| 7 | 1435 #endif |
| 1436 | |
| 13 | 1437 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1438 /* 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
|
1439 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1440 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1441 if (wp->w_nrwidth != i) |
| 13 | 1442 { |
| 1443 type = NOT_VALID; | |
| 677 | 1444 wp->w_nrwidth = i; |
| 13 | 1445 } |
| 1446 else | |
| 1447 #endif | |
| 1448 | |
| 7 | 1449 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1450 { | |
| 1451 /* | |
| 1452 * When there are both inserted/deleted lines and specific lines to be | |
| 1453 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1454 * everything (only happens when redrawing is off for while). | |
| 1455 */ | |
| 1456 type = NOT_VALID; | |
| 1457 } | |
| 1458 else | |
| 1459 { | |
| 1460 /* | |
| 1461 * Set mod_top to the first line that needs displaying because of | |
| 1462 * changes. Set mod_bot to the first line after the changes. | |
| 1463 */ | |
| 1464 mod_top = wp->w_redraw_top; | |
| 1465 if (wp->w_redraw_bot != 0) | |
| 1466 mod_bot = wp->w_redraw_bot + 1; | |
| 1467 else | |
| 1468 mod_bot = 0; | |
| 1469 if (buf->b_mod_set) | |
| 1470 { | |
| 1471 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1472 { | |
| 1473 mod_top = buf->b_mod_top; | |
| 1474 #ifdef FEAT_SYN_HL | |
| 1475 /* Need to redraw lines above the change that may be included | |
| 1476 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1477 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1478 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1479 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1480 if (mod_top < 1) |
| 1481 mod_top = 1; | |
| 1482 } | |
| 1483 #endif | |
| 1484 } | |
| 1485 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1486 mod_bot = buf->b_mod_bot; | |
| 1487 | |
| 1488 #ifdef FEAT_SEARCH_EXTRA | |
| 1489 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1490 * change in one line may make the Search highlighting in a | |
| 1491 * previous line invalid. Simple solution: redraw all visible | |
| 1492 * lines above the change. | |
| 1326 | 1493 * Same for a match pattern. |
| 7 | 1494 */ |
| 699 | 1495 if (search_hl.rm.regprog != NULL |
| 1496 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1497 top_to_mod = TRUE; |
| 699 | 1498 else |
| 1326 | 1499 { |
| 1500 cur = wp->w_match_head; | |
| 1501 while (cur != NULL) | |
| 1502 { | |
| 1503 if (cur->match.regprog != NULL | |
| 1504 && re_multiline(cur->match.regprog)) | |
| 699 | 1505 { |
| 1506 top_to_mod = TRUE; | |
| 1507 break; | |
| 1508 } | |
| 1326 | 1509 cur = cur->next; |
| 1510 } | |
| 1511 } | |
| 7 | 1512 #endif |
| 1513 } | |
| 1514 #ifdef FEAT_FOLDING | |
| 1515 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1516 { | |
| 1517 linenr_T lnumt, lnumb; | |
| 1518 | |
| 1519 /* | |
| 1520 * A change in a line can cause lines above it to become folded or | |
| 1521 * unfolded. Find the top most buffer line that may be affected. | |
| 1522 * If the line was previously folded and displayed, get the first | |
| 1523 * line of that fold. If the line is folded now, get the first | |
| 1524 * folded line. Use the minimum of these two. | |
| 1525 */ | |
| 1526 | |
| 1527 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1528 * the line below it. If there is no valid entry, use w_topline. | |
| 1529 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1530 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1531 lnumt = wp->w_topline; | |
| 1532 lnumb = MAXLNUM; | |
| 1533 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1534 if (wp->w_lines[i].wl_valid) | |
| 1535 { | |
| 1536 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1537 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1538 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1539 { | |
| 1540 lnumb = wp->w_lines[i].wl_lnum; | |
| 1541 /* When there is a fold column it might need updating | |
| 1542 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1543 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1544 ++lnumb; |
| 1545 } | |
| 1546 } | |
| 1547 | |
| 1548 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1549 if (mod_top > lnumt) | |
| 1550 mod_top = lnumt; | |
| 1551 | |
| 1552 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1553 --mod_bot; | |
| 1554 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1555 ++mod_bot; | |
| 1556 if (mod_bot < lnumb) | |
| 1557 mod_bot = lnumb; | |
| 1558 } | |
| 1559 #endif | |
| 1560 | |
| 1561 /* When a change starts above w_topline and the end is below | |
| 1562 * w_topline, start redrawing at w_topline. | |
| 36 | 1563 * If the end of the change is above w_topline: do like no change was |
| 1564 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1565 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1566 { | |
| 1567 if (mod_bot > wp->w_topline) | |
| 1568 mod_top = wp->w_topline; | |
| 1569 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1570 else if (syntax_present(wp)) |
| 7 | 1571 top_end = 1; |
| 1572 #endif | |
| 1573 } | |
| 36 | 1574 |
| 1575 /* When line numbers are displayed need to redraw all lines below | |
| 1576 * inserted/deleted lines. */ | |
| 1577 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1578 mod_bot = MAXLNUM; | |
| 7 | 1579 } |
|
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
|
1580 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
|
1581 wp->w_redraw_bot = 0; |
| 7 | 1582 |
| 1583 /* | |
| 1584 * When only displaying the lines at the top, set top_end. Used when | |
| 1585 * window has scrolled down for msg_scrolled. | |
| 1586 */ | |
| 1587 if (type == REDRAW_TOP) | |
| 1588 { | |
| 1589 j = 0; | |
| 1590 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1591 { | |
| 1592 j += wp->w_lines[i].wl_size; | |
| 1593 if (j >= wp->w_upd_rows) | |
| 1594 { | |
| 1595 top_end = j; | |
| 1596 break; | |
| 1597 } | |
| 1598 } | |
| 1599 if (top_end == 0) | |
| 1600 /* not found (cannot happen?): redraw everything */ | |
| 1601 type = NOT_VALID; | |
| 1602 else | |
| 1603 /* top area defined, the rest is VALID */ | |
| 1604 type = VALID; | |
| 1605 } | |
| 1606 | |
| 1378 | 1607 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1608 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1609 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1610 * called. */ | |
| 1611 if (screen_cleared) | |
| 1612 screen_cleared = MAYBE; | |
| 1613 | |
| 7 | 1614 /* |
| 1615 * If there are no changes on the screen that require a complete redraw, | |
| 1616 * handle three cases: | |
| 1617 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1618 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1619 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1620 * w_lines[] that needs updating. | |
| 1621 */ | |
| 743 | 1622 if ((type == VALID || type == SOME_VALID |
| 1623 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1624 #ifdef FEAT_DIFF |
| 1625 && !wp->w_botfill && !wp->w_old_botfill | |
| 1626 #endif | |
| 1627 ) | |
| 1628 { | |
| 1629 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1630 { | |
| 1631 /* | |
| 1632 * w_topline is the first changed line, the scrolling will be done | |
| 1633 * further down. | |
| 1634 */ | |
| 1635 } | |
| 1636 else if (wp->w_lines[0].wl_valid | |
| 1637 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1638 #ifdef FEAT_DIFF | |
| 1639 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1640 && wp->w_topfill > wp->w_old_topfill) | |
| 1641 #endif | |
| 1642 )) | |
| 1643 { | |
| 1644 /* | |
| 1645 * New topline is above old topline: May scroll down. | |
| 1646 */ | |
| 1647 #ifdef FEAT_FOLDING | |
| 1648 if (hasAnyFolding(wp)) | |
| 1649 { | |
| 1650 linenr_T ln; | |
| 1651 | |
| 1652 /* count the number of lines we are off, counting a sequence | |
| 1653 * of folded lines as one */ | |
| 1654 j = 0; | |
| 1655 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1656 { | |
| 1657 ++j; | |
| 1658 if (j >= wp->w_height - 2) | |
| 1659 break; | |
| 1660 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1661 } | |
| 1662 } | |
| 1663 else | |
| 1664 #endif | |
| 1665 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1666 if (j < wp->w_height - 2) /* not too far off */ | |
| 1667 { | |
| 1668 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1669 #ifdef FEAT_DIFF | |
| 1670 /* insert extra lines for previously invisible filler lines */ | |
| 1671 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1672 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1673 - wp->w_old_topfill; | |
| 1674 #endif | |
| 1675 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1676 { | |
| 1677 /* | |
| 1678 * Try to insert the correct number of lines. | |
| 1679 * If not the last window, delete the lines at the bottom. | |
| 1680 * win_ins_lines may fail when the terminal can't do it. | |
| 1681 */ | |
| 1682 if (i > 0) | |
| 1683 check_for_delay(FALSE); | |
| 1684 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1685 { | |
| 1686 if (wp->w_lines_valid != 0) | |
| 1687 { | |
| 1688 /* Need to update rows that are new, stop at the | |
| 1689 * first one that scrolled down. */ | |
| 1690 top_end = i; | |
| 1691 scrolled_down = TRUE; | |
| 1692 | |
| 1693 /* Move the entries that were scrolled, disable | |
| 1694 * the entries for the lines to be redrawn. */ | |
| 1695 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1696 wp->w_lines_valid = wp->w_height; | |
| 1697 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1698 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1699 while (idx >= 0) | |
| 1700 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1701 } | |
| 1702 } | |
| 1703 else | |
| 1704 mid_start = 0; /* redraw all lines */ | |
| 1705 } | |
| 1706 else | |
| 1707 mid_start = 0; /* redraw all lines */ | |
| 1708 } | |
| 1709 else | |
| 1710 mid_start = 0; /* redraw all lines */ | |
| 1711 } | |
| 1712 else | |
| 1713 { | |
| 1714 /* | |
| 1715 * New topline is at or below old topline: May scroll up. | |
| 1716 * When topline didn't change, find first entry in w_lines[] that | |
| 1717 * needs updating. | |
| 1718 */ | |
| 1719 | |
| 1720 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1721 j = -1; | |
| 1722 row = 0; | |
| 1723 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1724 { | |
| 1725 if (wp->w_lines[i].wl_valid | |
| 1726 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1727 { | |
| 1728 j = i; | |
| 1729 break; | |
| 1730 } | |
| 1731 row += wp->w_lines[i].wl_size; | |
| 1732 } | |
| 1733 if (j == -1) | |
| 1734 { | |
| 1735 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1736 * lines */ | |
| 1737 mid_start = 0; | |
| 1738 } | |
| 1739 else | |
| 1740 { | |
| 1741 /* | |
| 1742 * Try to delete the correct number of lines. | |
| 1743 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1744 */ | |
| 1745 #ifdef FEAT_DIFF | |
| 1746 /* If the topline didn't change, delete old filler lines, | |
| 1747 * otherwise delete filler lines of the new topline... */ | |
| 1748 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1749 row += wp->w_old_topfill; | |
| 1750 else | |
| 1751 row += diff_check_fill(wp, wp->w_topline); | |
| 1752 /* ... but don't delete new filler lines. */ | |
| 1753 row -= wp->w_topfill; | |
| 1754 #endif | |
| 1755 if (row > 0) | |
| 1756 { | |
| 1757 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
|
1758 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
|
1759 == OK) |
| 7 | 1760 bot_start = wp->w_height - row; |
| 1761 else | |
| 1762 mid_start = 0; /* redraw all lines */ | |
| 1763 } | |
| 1764 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1765 { | |
| 1766 /* | |
| 1767 * Skip the lines (below the deleted lines) that are still | |
| 1768 * valid and don't need redrawing. Copy their info | |
| 1769 * upwards, to compensate for the deleted lines. Set | |
| 1770 * bot_start to the first row that needs redrawing. | |
| 1771 */ | |
| 1772 bot_start = 0; | |
| 1773 idx = 0; | |
| 1774 for (;;) | |
| 1775 { | |
| 1776 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1777 /* stop at line that didn't fit, unless it is still | |
| 1778 * valid (no lines deleted) */ | |
| 1779 if (row > 0 && bot_start + row | |
| 1780 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1781 { | |
| 1782 wp->w_lines_valid = idx + 1; | |
| 1783 break; | |
| 1784 } | |
| 1785 bot_start += wp->w_lines[idx++].wl_size; | |
| 1786 | |
| 1787 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1788 if (++j >= wp->w_lines_valid) | |
| 1789 { | |
| 1790 wp->w_lines_valid = idx; | |
| 1791 break; | |
| 1792 } | |
| 1793 } | |
| 1794 #ifdef FEAT_DIFF | |
| 1795 /* Correct the first entry for filler lines at the top | |
| 1796 * when it won't get updated below. */ | |
| 1797 if (wp->w_p_diff && bot_start > 0) | |
| 1798 wp->w_lines[0].wl_size = | |
| 1799 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1800 + wp->w_topfill; | |
| 1801 #endif | |
| 1802 } | |
| 1803 } | |
| 1804 } | |
| 1805 | |
| 1806 /* When starting redraw in the first line, redraw all lines. When | |
| 1807 * there is only one window it's probably faster to clear the screen | |
| 1808 * first. */ | |
| 1809 if (mid_start == 0) | |
| 1810 { | |
| 1811 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1812 if (ONE_WINDOW) |
| 981 | 1813 { |
| 1331 | 1814 /* Clear the screen when it was not done by win_del_lines() or |
| 1815 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1816 * then. */ | |
| 1817 if (screen_cleared != TRUE) | |
| 1818 screenclear(); | |
| 981 | 1819 /* The screen was cleared, redraw the tab pages line. */ |
| 1820 if (redraw_tabline) | |
| 1821 draw_tabline(); | |
| 1822 } | |
| 7 | 1823 } |
| 1331 | 1824 |
| 1825 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1826 * cleared (only happens for the first window) or when screenclear() | |
| 1827 * was called directly above, "must_redraw" will have been set to | |
| 1828 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1829 if (screen_cleared == TRUE) | |
| 1830 must_redraw = 0; | |
| 7 | 1831 } |
| 1832 else | |
| 1833 { | |
| 1834 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1835 mid_start = 0; | |
| 1836 mid_end = wp->w_height; | |
| 1837 } | |
| 1838 | |
| 743 | 1839 if (type == SOME_VALID) |
| 1840 { | |
| 1841 /* SOME_VALID: redraw all lines. */ | |
| 1842 mid_start = 0; | |
| 1843 mid_end = wp->w_height; | |
| 1844 type = NOT_VALID; | |
| 1845 } | |
| 1846 | |
| 7 | 1847 /* check if we are updating or removing the inverted part */ |
| 1848 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1849 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1850 { | |
| 1851 linenr_T from, to; | |
| 1852 | |
| 1853 if (VIsual_active) | |
| 1854 { | |
| 1855 if (VIsual_active | |
| 1856 && (VIsual_mode != wp->w_old_visual_mode | |
| 1857 || type == INVERTED_ALL)) | |
| 1858 { | |
| 1859 /* | |
| 1860 * If the type of Visual selection changed, redraw the whole | |
| 1861 * selection. Also when the ownership of the X selection is | |
| 1862 * gained or lost. | |
| 1863 */ | |
| 1864 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1865 { | |
| 1866 from = curwin->w_cursor.lnum; | |
| 1867 to = VIsual.lnum; | |
| 1868 } | |
| 1869 else | |
| 1870 { | |
| 1871 from = VIsual.lnum; | |
| 1872 to = curwin->w_cursor.lnum; | |
| 1873 } | |
| 1874 /* redraw more when the cursor moved as well */ | |
| 1875 if (wp->w_old_cursor_lnum < from) | |
| 1876 from = wp->w_old_cursor_lnum; | |
| 1877 if (wp->w_old_cursor_lnum > to) | |
| 1878 to = wp->w_old_cursor_lnum; | |
| 1879 if (wp->w_old_visual_lnum < from) | |
| 1880 from = wp->w_old_visual_lnum; | |
| 1881 if (wp->w_old_visual_lnum > to) | |
| 1882 to = wp->w_old_visual_lnum; | |
| 1883 } | |
| 1884 else | |
| 1885 { | |
| 1886 /* | |
| 1887 * Find the line numbers that need to be updated: The lines | |
| 1888 * between the old cursor position and the current cursor | |
| 1889 * position. Also check if the Visual position changed. | |
| 1890 */ | |
| 1891 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1892 { | |
| 1893 from = curwin->w_cursor.lnum; | |
| 1894 to = wp->w_old_cursor_lnum; | |
| 1895 } | |
| 1896 else | |
| 1897 { | |
| 1898 from = wp->w_old_cursor_lnum; | |
| 1899 to = curwin->w_cursor.lnum; | |
| 1900 if (from == 0) /* Visual mode just started */ | |
| 1901 from = to; | |
| 1902 } | |
| 1903 | |
| 422 | 1904 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1905 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1906 { |
| 1907 if (wp->w_old_visual_lnum < from | |
| 1908 && wp->w_old_visual_lnum != 0) | |
| 1909 from = wp->w_old_visual_lnum; | |
| 1910 if (wp->w_old_visual_lnum > to) | |
| 1911 to = wp->w_old_visual_lnum; | |
| 1912 if (VIsual.lnum < from) | |
| 1913 from = VIsual.lnum; | |
| 1914 if (VIsual.lnum > to) | |
| 1915 to = VIsual.lnum; | |
| 1916 } | |
| 1917 } | |
| 1918 | |
| 1919 /* | |
| 1920 * If in block mode and changed column or curwin->w_curswant: | |
| 1921 * update all lines. | |
| 1922 * First compute the actual start and end column. | |
| 1923 */ | |
| 1924 if (VIsual_mode == Ctrl_V) | |
| 1925 { | |
| 6266 | 1926 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1927 #if defined(FEAT_LINEBREAK) |
| 6266 | 1928 int save_ve_flags = ve_flags; |
| 1929 | |
| 1930 if (curwin->w_p_lbr) | |
| 1931 ve_flags = VE_ALL; | |
| 1932 #endif | |
| 7 | 1933 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
|
1934 #if defined(FEAT_LINEBREAK) |
| 6266 | 1935 ve_flags = save_ve_flags; |
| 1936 #endif | |
| 7 | 1937 ++toc; |
| 1938 if (curwin->w_curswant == MAXCOL) | |
| 1939 toc = MAXCOL; | |
| 1940 | |
| 1941 if (fromc != wp->w_old_cursor_fcol | |
| 1942 || toc != wp->w_old_cursor_lcol) | |
| 1943 { | |
| 1944 if (from > VIsual.lnum) | |
| 1945 from = VIsual.lnum; | |
| 1946 if (to < VIsual.lnum) | |
| 1947 to = VIsual.lnum; | |
| 1948 } | |
| 1949 wp->w_old_cursor_fcol = fromc; | |
| 1950 wp->w_old_cursor_lcol = toc; | |
| 1951 } | |
| 1952 } | |
| 1953 else | |
| 1954 { | |
| 1955 /* Use the line numbers of the old Visual area. */ | |
| 1956 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1957 { | |
| 1958 from = wp->w_old_cursor_lnum; | |
| 1959 to = wp->w_old_visual_lnum; | |
| 1960 } | |
| 1961 else | |
| 1962 { | |
| 1963 from = wp->w_old_visual_lnum; | |
| 1964 to = wp->w_old_cursor_lnum; | |
| 1965 } | |
| 1966 } | |
| 1967 | |
| 1968 /* | |
| 1969 * There is no need to update lines above the top of the window. | |
| 1970 */ | |
| 1971 if (from < wp->w_topline) | |
| 1972 from = wp->w_topline; | |
| 1973 | |
| 1974 /* | |
| 1975 * If we know the value of w_botline, use it to restrict the update to | |
| 1976 * the lines that are visible in the window. | |
| 1977 */ | |
| 1978 if (wp->w_valid & VALID_BOTLINE) | |
| 1979 { | |
| 1980 if (from >= wp->w_botline) | |
| 1981 from = wp->w_botline - 1; | |
| 1982 if (to >= wp->w_botline) | |
| 1983 to = wp->w_botline - 1; | |
| 1984 } | |
| 1985 | |
| 1986 /* | |
| 1987 * Find the minimal part to be updated. | |
| 1988 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1989 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1990 * top_end; need to redraw from top_end to the "to" line. | |
| 1991 * A middle mouse click with a Visual selection may change the text | |
| 1992 * above the Visual area and reset wl_valid, do count these for | |
| 1993 * mid_end (in srow). | |
| 1994 */ | |
| 1995 if (mid_start > 0) | |
| 1996 { | |
| 1997 lnum = wp->w_topline; | |
| 1998 idx = 0; | |
| 1999 srow = 0; | |
| 2000 if (scrolled_down) | |
| 2001 mid_start = top_end; | |
| 2002 else | |
| 2003 mid_start = 0; | |
| 2004 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 2005 { | |
| 2006 if (wp->w_lines[idx].wl_valid) | |
| 2007 mid_start += wp->w_lines[idx].wl_size; | |
| 2008 else if (!scrolled_down) | |
| 2009 srow += wp->w_lines[idx].wl_size; | |
| 2010 ++idx; | |
| 2011 # ifdef FEAT_FOLDING | |
| 2012 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 2013 lnum = wp->w_lines[idx].wl_lnum; | |
| 2014 else | |
| 2015 # endif | |
| 2016 ++lnum; | |
| 2017 } | |
| 2018 srow += mid_start; | |
| 2019 mid_end = wp->w_height; | |
| 2020 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 2021 { | |
| 2022 if (wp->w_lines[idx].wl_valid | |
| 2023 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 2024 { | |
| 2025 /* Only update until first row of this line */ | |
| 2026 mid_end = srow; | |
| 2027 break; | |
| 2028 } | |
| 2029 srow += wp->w_lines[idx].wl_size; | |
| 2030 } | |
| 2031 } | |
| 2032 } | |
| 2033 | |
| 2034 if (VIsual_active && buf == curwin->w_buffer) | |
| 2035 { | |
| 2036 wp->w_old_visual_mode = VIsual_mode; | |
| 2037 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 2038 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 2039 wp->w_old_visual_col = VIsual.col; |
| 7 | 2040 wp->w_old_curswant = curwin->w_curswant; |
| 2041 } | |
| 2042 else | |
| 2043 { | |
| 2044 wp->w_old_visual_mode = 0; | |
| 2045 wp->w_old_cursor_lnum = 0; | |
| 2046 wp->w_old_visual_lnum = 0; | |
| 422 | 2047 wp->w_old_visual_col = 0; |
| 7 | 2048 } |
| 2049 | |
| 2050 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2051 /* reset got_int, otherwise regexp won't work */ | |
| 2052 save_got_int = got_int; | |
| 2053 got_int = 0; | |
| 2054 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
2055 #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
|
2056 /* 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
|
2057 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
|
2058 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
|
2059 #endif |
| 7 | 2060 #ifdef FEAT_FOLDING |
| 2061 win_foldinfo.fi_level = 0; | |
| 2062 #endif | |
| 2063 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2064 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2065 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2066 * 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
|
2067 * 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
|
2068 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2069 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
|
2070 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
|
2071 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2072 |
| 7 | 2073 /* |
| 2074 * Update all the window rows. | |
| 2075 */ | |
| 2076 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 2077 row = 0; | |
| 2078 srow = 0; | |
| 2079 lnum = wp->w_topline; /* first line shown in window */ | |
| 2080 for (;;) | |
| 2081 { | |
| 2082 /* stop updating when reached the end of the window (check for _past_ | |
| 2083 * the end of the window is at the end of the loop) */ | |
| 2084 if (row == wp->w_height) | |
| 2085 { | |
| 2086 didline = TRUE; | |
| 2087 break; | |
| 2088 } | |
| 2089 | |
| 2090 /* stop updating when hit the end of the file */ | |
| 2091 if (lnum > buf->b_ml.ml_line_count) | |
| 2092 { | |
| 2093 eof = TRUE; | |
| 2094 break; | |
| 2095 } | |
| 2096 | |
| 2097 /* Remember the starting row of the line that is going to be dealt | |
| 2098 * with. It is used further down when the line doesn't fit. */ | |
| 2099 srow = row; | |
| 2100 | |
| 2101 /* | |
| 2102 * Update a line when it is in an area that needs updating, when it | |
| 2103 * 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
|
2104 * "bot_start" may be halfway a wrapped line after using |
| 7 | 2105 * win_del_lines(), check if the current line includes it. |
| 2106 * When syntax folding is being used, the saved syntax states will | |
| 2107 * already have been updated, we can't see where the syntax state is | |
| 2108 * the same again, just update until the end of the window. | |
| 2109 */ | |
| 2110 if (row < top_end | |
| 2111 || (row >= mid_start && row < mid_end) | |
| 2112 #ifdef FEAT_SEARCH_EXTRA | |
| 2113 || top_to_mod | |
| 2114 #endif | |
| 2115 || idx >= wp->w_lines_valid | |
| 2116 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 2117 || (mod_top != 0 | |
| 2118 && (lnum == mod_top | |
| 2119 || (lnum >= mod_top | |
| 2120 && (lnum < mod_bot | |
| 2121 #ifdef FEAT_SYN_HL | |
| 2122 || did_update == DID_FOLD | |
| 2123 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2124 && syntax_present(wp) |
| 7 | 2125 && ( |
| 2126 # ifdef FEAT_FOLDING | |
| 2127 (foldmethodIsSyntax(wp) | |
| 2128 && hasAnyFolding(wp)) || | |
| 2129 # endif | |
| 2130 syntax_check_changed(lnum))) | |
| 2131 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
2132 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 2133 /* match in fixed position might need redraw |
| 2134 * if lines were inserted or deleted */ | |
| 2135 || (wp->w_match_head != NULL | |
| 2136 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
2137 #endif |
| 7 | 2138 ))))) |
| 2139 { | |
| 2140 #ifdef FEAT_SEARCH_EXTRA | |
| 2141 if (lnum == mod_top) | |
| 2142 top_to_mod = FALSE; | |
| 2143 #endif | |
| 2144 | |
| 2145 /* | |
| 2146 * When at start of changed lines: May scroll following lines | |
| 2147 * up or down to minimize redrawing. | |
| 2148 * Don't do this when the change continues until the end. | |
| 3318 | 2149 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 2150 */ |
| 2151 if (lnum == mod_top | |
| 2152 && mod_bot != MAXLNUM | |
| 3318 | 2153 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 2154 { |
| 2155 int old_rows = 0; | |
| 2156 int new_rows = 0; | |
| 2157 int xtra_rows; | |
| 2158 linenr_T l; | |
| 2159 | |
| 2160 /* Count the old number of window rows, using w_lines[], which | |
| 2161 * should still contain the sizes for the lines as they are | |
| 2162 * currently displayed. */ | |
| 2163 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 2164 { | |
| 2165 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 2166 * lines are part of the changed area. */ | |
| 2167 if (wp->w_lines[i].wl_valid | |
| 2168 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 2169 break; | |
| 2170 old_rows += wp->w_lines[i].wl_size; | |
| 2171 #ifdef FEAT_FOLDING | |
| 2172 if (wp->w_lines[i].wl_valid | |
| 2173 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 2174 { | |
| 2175 /* Must have found the last valid entry above mod_bot. | |
| 2176 * Add following invalid entries. */ | |
| 2177 ++i; | |
| 2178 while (i < wp->w_lines_valid | |
| 2179 && !wp->w_lines[i].wl_valid) | |
| 2180 old_rows += wp->w_lines[i++].wl_size; | |
| 2181 break; | |
| 2182 } | |
| 2183 #endif | |
| 2184 } | |
| 2185 | |
| 2186 if (i >= wp->w_lines_valid) | |
| 2187 { | |
| 2188 /* We can't find a valid line below the changed lines, | |
| 2189 * need to redraw until the end of the window. | |
| 2190 * Inserting/deleting lines has no use. */ | |
| 2191 bot_start = 0; | |
| 2192 } | |
| 2193 else | |
| 2194 { | |
| 2195 /* Able to count old number of rows: Count new window | |
| 2196 * rows, and may insert/delete lines */ | |
| 2197 j = idx; | |
| 2198 for (l = lnum; l < mod_bot; ++l) | |
| 2199 { | |
| 2200 #ifdef FEAT_FOLDING | |
| 2201 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 2202 ++new_rows; | |
| 2203 else | |
| 2204 #endif | |
| 2205 #ifdef FEAT_DIFF | |
| 2206 if (l == wp->w_topline) | |
| 2207 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 2208 + wp->w_topfill; | |
| 2209 else | |
| 2210 #endif | |
| 2211 new_rows += plines_win(wp, l, TRUE); | |
| 2212 ++j; | |
| 2213 if (new_rows > wp->w_height - row - 2) | |
| 2214 { | |
| 2215 /* it's getting too much, must redraw the rest */ | |
| 2216 new_rows = 9999; | |
| 2217 break; | |
| 2218 } | |
| 2219 } | |
| 2220 xtra_rows = new_rows - old_rows; | |
| 2221 if (xtra_rows < 0) | |
| 2222 { | |
| 2223 /* May scroll text up. If there is not enough | |
| 2224 * remaining text or scrolling fails, must redraw the | |
| 2225 * rest. If scrolling works, must redraw the text | |
| 2226 * below the scrolled text. */ | |
| 2227 if (row - xtra_rows >= wp->w_height - 2) | |
| 2228 mod_bot = MAXLNUM; | |
| 2229 else | |
| 2230 { | |
| 2231 check_for_delay(FALSE); | |
| 2232 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
|
2233 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 2234 mod_bot = MAXLNUM; |
| 2235 else | |
| 2236 bot_start = wp->w_height + xtra_rows; | |
| 2237 } | |
| 2238 } | |
| 2239 else if (xtra_rows > 0) | |
| 2240 { | |
| 2241 /* May scroll text down. If there is not enough | |
| 2242 * remaining text of scrolling fails, must redraw the | |
| 2243 * rest. */ | |
| 2244 if (row + xtra_rows >= wp->w_height - 2) | |
| 2245 mod_bot = MAXLNUM; | |
| 2246 else | |
| 2247 { | |
| 2248 check_for_delay(FALSE); | |
| 2249 if (win_ins_lines(wp, row + old_rows, | |
| 2250 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2251 mod_bot = MAXLNUM; | |
| 2252 else if (top_end > row + old_rows) | |
| 2253 /* Scrolled the part at the top that requires | |
| 2254 * updating down. */ | |
| 2255 top_end += xtra_rows; | |
| 2256 } | |
| 2257 } | |
| 2258 | |
| 2259 /* When not updating the rest, may need to move w_lines[] | |
| 2260 * entries. */ | |
| 2261 if (mod_bot != MAXLNUM && i != j) | |
| 2262 { | |
| 2263 if (j < i) | |
| 2264 { | |
| 2265 int x = row + new_rows; | |
| 2266 | |
| 2267 /* move entries in w_lines[] upwards */ | |
| 2268 for (;;) | |
| 2269 { | |
| 2270 /* stop at last valid entry in w_lines[] */ | |
| 2271 if (i >= wp->w_lines_valid) | |
| 2272 { | |
| 2273 wp->w_lines_valid = j; | |
| 2274 break; | |
| 2275 } | |
| 2276 wp->w_lines[j] = wp->w_lines[i]; | |
| 2277 /* stop at a line that won't fit */ | |
| 2278 if (x + (int)wp->w_lines[j].wl_size | |
| 2279 > wp->w_height) | |
| 2280 { | |
| 2281 wp->w_lines_valid = j + 1; | |
| 2282 break; | |
| 2283 } | |
| 2284 x += wp->w_lines[j++].wl_size; | |
| 2285 ++i; | |
| 2286 } | |
| 2287 if (bot_start > x) | |
| 2288 bot_start = x; | |
| 2289 } | |
| 2290 else /* j > i */ | |
| 2291 { | |
| 2292 /* move entries in w_lines[] downwards */ | |
| 2293 j -= i; | |
| 2294 wp->w_lines_valid += j; | |
| 2295 if (wp->w_lines_valid > wp->w_height) | |
| 2296 wp->w_lines_valid = wp->w_height; | |
| 2297 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2298 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2299 | |
| 2300 /* The w_lines[] entries for inserted lines are | |
| 2301 * now invalid, but wl_size may be used above. | |
| 2302 * Reset to zero. */ | |
| 2303 while (i >= idx) | |
| 2304 { | |
| 2305 wp->w_lines[i].wl_size = 0; | |
| 2306 wp->w_lines[i--].wl_valid = FALSE; | |
| 2307 } | |
| 2308 } | |
| 2309 } | |
| 2310 } | |
| 2311 } | |
| 2312 | |
| 2313 #ifdef FEAT_FOLDING | |
| 2314 /* | |
| 2315 * When lines are folded, display one line for all of them. | |
| 2316 * Otherwise, display normally (can be several display lines when | |
| 2317 * 'wrap' is on). | |
| 2318 */ | |
| 2319 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2320 if (fold_count != 0) | |
| 2321 { | |
| 2322 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2323 ++row; | |
| 2324 --fold_count; | |
| 2325 wp->w_lines[idx].wl_folded = TRUE; | |
| 2326 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2327 # ifdef FEAT_SYN_HL | |
| 2328 did_update = DID_FOLD; | |
| 2329 # endif | |
| 2330 } | |
| 2331 else | |
| 2332 #endif | |
| 2333 if (idx < wp->w_lines_valid | |
| 2334 && wp->w_lines[idx].wl_valid | |
| 2335 && wp->w_lines[idx].wl_lnum == lnum | |
| 2336 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2337 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2338 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2339 && !bt_popup(wp->w_buffer) |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2340 #endif |
| 7 | 2341 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2342 #ifdef FEAT_DIFF | |
| 2343 && diff_check_fill(wp, lnum) == 0 | |
| 2344 #endif | |
| 2345 ) | |
| 2346 { | |
| 2347 /* This line is not going to fit. Don't draw anything here, | |
| 2348 * will draw "@ " lines below. */ | |
| 2349 row = wp->w_height + 1; | |
| 2350 } | |
| 2351 else | |
| 2352 { | |
| 2353 #ifdef FEAT_SEARCH_EXTRA | |
| 2354 prepare_search_hl(wp, lnum); | |
| 2355 #endif | |
| 2356 #ifdef FEAT_SYN_HL | |
| 2357 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2358 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
|
2359 && syntax_present(wp)) |
| 7 | 2360 syntax_end_parsing(syntax_last_parsed + 1); |
| 2361 #endif | |
| 2362 | |
| 2363 /* | |
| 2364 * Display one line. | |
| 2365 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2366 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
|
2367 mod_top == 0, FALSE); |
| 7 | 2368 |
| 2369 #ifdef FEAT_FOLDING | |
| 2370 wp->w_lines[idx].wl_folded = FALSE; | |
| 2371 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2372 #endif | |
| 2373 #ifdef FEAT_SYN_HL | |
| 2374 did_update = DID_LINE; | |
| 2375 syntax_last_parsed = lnum; | |
| 2376 #endif | |
| 2377 } | |
| 2378 | |
| 2379 wp->w_lines[idx].wl_lnum = lnum; | |
| 2380 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
|
2381 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2382 /* 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
|
2383 * 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
|
2384 * 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
|
2385 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2386 { |
| 2387 /* we may need the size of that too long line later on */ | |
| 3318 | 2388 if (dollar_vcol == -1) |
| 7 | 2389 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2390 ++idx; | |
| 2391 break; | |
| 2392 } | |
| 3318 | 2393 if (dollar_vcol == -1) |
| 7 | 2394 wp->w_lines[idx].wl_size = row - srow; |
| 2395 ++idx; | |
| 2396 #ifdef FEAT_FOLDING | |
| 2397 lnum += fold_count + 1; | |
| 2398 #else | |
| 2399 ++lnum; | |
| 2400 #endif | |
| 2401 } | |
| 2402 else | |
| 2403 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2404 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
|
2405 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2406 #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
|
2407 // '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
|
2408 // 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
|
2409 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
|
2410 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
|
2411 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
|
2412 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2413 #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
|
2414 (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
|
2415 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2416 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2417 // This line does not need to be drawn, advance to the next one. |
| 7 | 2418 row += wp->w_lines[idx++].wl_size; |
| 2419 if (row > wp->w_height) /* past end of screen */ | |
| 2420 break; | |
| 2421 #ifdef FEAT_FOLDING | |
| 2422 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2423 #else | |
| 2424 ++lnum; | |
| 2425 #endif | |
| 2426 #ifdef FEAT_SYN_HL | |
| 2427 did_update = DID_NONE; | |
| 2428 #endif | |
| 2429 } | |
| 2430 | |
| 2431 if (lnum > buf->b_ml.ml_line_count) | |
| 2432 { | |
| 2433 eof = TRUE; | |
| 2434 break; | |
| 2435 } | |
| 2436 } | |
| 2437 /* | |
| 2438 * End of loop over all window lines. | |
| 2439 */ | |
| 2440 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2441 #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
|
2442 /* 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
|
2443 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
|
2444 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2445 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
|
2446 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2447 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
|
2448 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
|
2449 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
|
2450 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
|
2451 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
|
2452 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2453 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
|
2454 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2455 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
|
2456 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2457 #endif |
| 7 | 2458 |
| 2459 if (idx > wp->w_lines_valid) | |
| 2460 wp->w_lines_valid = idx; | |
| 2461 | |
| 2462 #ifdef FEAT_SYN_HL | |
| 2463 /* | |
| 2464 * Let the syntax stuff know we stop parsing here. | |
| 2465 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2466 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2467 syntax_end_parsing(syntax_last_parsed + 1); |
| 2468 #endif | |
| 2469 | |
| 2470 /* | |
| 2471 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2472 * line we were working on, then the line didn't fit. | |
| 2473 */ | |
| 2474 wp->w_empty_rows = 0; | |
| 2475 #ifdef FEAT_DIFF | |
| 2476 wp->w_filler_rows = 0; | |
| 2477 #endif | |
| 2478 if (!eof && !didline) | |
| 2479 { | |
| 2480 if (lnum == wp->w_topline) | |
| 2481 { | |
| 2482 /* | |
| 2483 * Single line that does not fit! | |
| 2484 * Don't overwrite it, it can be edited. | |
| 2485 */ | |
| 2486 wp->w_botline = lnum + 1; | |
| 2487 } | |
| 2488 #ifdef FEAT_DIFF | |
| 2489 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2490 { | |
| 2491 /* Window ends in filler lines. */ | |
| 2492 wp->w_botline = lnum; | |
| 2493 wp->w_filler_rows = wp->w_height - srow; | |
| 2494 } | |
| 2495 #endif | |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2496 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2497 else if (bt_popup(wp->w_buffer)) |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2498 { |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2499 // popup line that doesn't fit is left as-is |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2500 wp->w_botline = lnum; |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2501 } |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2502 #endif |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2503 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
|
2504 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2505 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
|
2506 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2507 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2508 * 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
|
2509 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2510 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
|
2511 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2512 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
|
2513 (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
|
2514 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2515 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2516 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2517 } |
| 7 | 2518 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2519 { | |
| 2520 /* | |
| 2521 * Last line isn't finished: Display "@@@" at the end. | |
| 2522 */ | |
| 2523 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2524 W_WINROW(wp) + wp->w_height, | |
| 2525 (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
|
2526 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2527 set_empty_rows(wp, srow); |
| 2528 wp->w_botline = lnum; | |
| 2529 } | |
| 2530 else | |
| 2531 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2532 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2533 wp->w_botline = lnum; |
| 2534 } | |
| 2535 } | |
| 2536 else | |
| 2537 { | |
| 2538 draw_vsep_win(wp, row); | |
| 2539 if (eof) /* we hit the end of the file */ | |
| 2540 { | |
| 2541 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2542 #ifdef FEAT_DIFF | |
| 2543 j = diff_check_fill(wp, wp->w_botline); | |
| 2544 if (j > 0 && !wp->w_botfill) | |
| 2545 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2546 // Display filler lines at the end of the file. |
| 7 | 2547 if (char2cells(fill_diff) > 1) |
| 2548 i = '-'; | |
| 2549 else | |
| 2550 i = fill_diff; | |
| 2551 if (row + j > wp->w_height) | |
| 2552 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
|
2553 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2554 row += j; |
| 2555 } | |
| 2556 #endif | |
| 2557 } | |
| 3318 | 2558 else if (dollar_vcol == -1) |
| 7 | 2559 wp->w_botline = lnum; |
| 2560 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2561 // 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
|
2562 // put '~'s on rows that aren't part of the file. |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2563 win_draw_end(wp, |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2564 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2565 bt_popup(wp->w_buffer) ? ' ' : |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2566 #endif |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2567 '~', ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2568 } |
| 2569 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2570 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2571 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2572 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2573 |
| 7 | 2574 /* Reset the type of redrawing required, the window has been updated. */ |
| 2575 wp->w_redr_type = 0; | |
| 2576 #ifdef FEAT_DIFF | |
| 2577 wp->w_old_topfill = wp->w_topfill; | |
| 2578 wp->w_old_botfill = wp->w_botfill; | |
| 2579 #endif | |
| 2580 | |
| 3318 | 2581 if (dollar_vcol == -1) |
| 7 | 2582 { |
| 2583 /* | |
| 2584 * There is a trick with w_botline. If we invalidate it on each | |
| 2585 * change that might modify it, this will cause a lot of expensive | |
| 2586 * calls to plines() in update_topline() each time. Therefore the | |
| 2587 * value of w_botline is often approximated, and this value is used to | |
| 2588 * compute the value of w_topline. If the value of w_botline was | |
| 2589 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2590 * the visible part of the text). If it's not, we need to redraw | |
| 2591 * again. Mostly this just means scrolling up a few lines, so it | |
| 2592 * doesn't look too bad. Only do this for the current window (where | |
| 2593 * changes are relevant). | |
| 2594 */ | |
| 2595 wp->w_valid |= VALID_BOTLINE; | |
| 2596 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2597 { | |
| 2598 recursive = TRUE; | |
| 2599 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2600 update_topline(); /* may invalidate w_botline again */ | |
| 2601 if (must_redraw != 0) | |
| 2602 { | |
| 2603 /* Don't update for changes in buffer again. */ | |
| 2604 i = curbuf->b_mod_set; | |
| 2605 curbuf->b_mod_set = FALSE; | |
| 2606 win_update(curwin); | |
| 2607 must_redraw = 0; | |
| 2608 curbuf->b_mod_set = i; | |
| 2609 } | |
| 2610 recursive = FALSE; | |
| 2611 } | |
| 2612 } | |
| 2613 | |
| 2614 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2615 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2616 if (!got_int) | |
| 2617 got_int = save_got_int; | |
| 2618 #endif | |
| 2619 } | |
| 2620 | |
| 2621 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2622 * 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
|
2623 * 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
|
2624 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2625 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
|
2626 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
|
2627 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
|
2628 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
|
2629 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
|
2630 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
|
2631 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
|
2632 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
|
2633 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
|
2634 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
|
2635 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2636 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
|
2637 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2638 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
|
2639 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
|
2640 #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
|
2641 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
|
2642 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2643 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
|
2644 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
|
2645 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
|
2646 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2647 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2648 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2649 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
|
2650 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
|
2651 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
|
2652 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
|
2653 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2654 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2655 /* |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2656 * 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
|
2657 * 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
|
2658 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2659 */ |
| 2660 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2661 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2662 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2663 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2664 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
|
2665 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2666 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2667 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2668 hlf_T hl) |
| 7 | 2669 { |
| 2670 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
|
2671 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
|
2672 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
|
2673 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2674 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
|
2675 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2676 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
|
2677 { |
| 6553 | 2678 #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
|
2679 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
|
2680 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2681 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
|
2682 // 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
|
2683 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
|
2684 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
|
2685 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2686 #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
|
2687 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
|
2688 // 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
|
2689 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
|
2690 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
|
2691 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2692 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
|
2693 && 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
|
2694 // 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
|
2695 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
|
2696 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
|
2697 } |
| 7 | 2698 |
| 2699 #ifdef FEAT_RIGHTLEFT | |
| 2700 if (wp->w_p_rl) | |
| 2701 { | |
| 2702 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
|
2703 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
|
2704 c2, c2, attr); |
| 7 | 2705 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
|
2706 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
|
2707 c1, c2, attr); |
| 7 | 2708 } |
| 2709 else | |
| 2710 #endif | |
| 2711 { | |
| 2712 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
|
2713 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
|
2714 c1, c2, attr); |
| 7 | 2715 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2716 |
| 7 | 2717 set_empty_rows(wp, row); |
| 2718 } | |
| 2719 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2720 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2721 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2722 * 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
|
2723 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2724 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2725 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
|
2726 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2727 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2728 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2729 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2730 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2731 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2732 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2733 #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
|
2734 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2735 * 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
|
2736 * 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
|
2737 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2738 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2739 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
|
2740 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2741 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
|
2742 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2743 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2744 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2745 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2746 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
|
2747 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2748 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2749 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2750 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2751 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2752 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
|
2753 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
|
2754 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2755 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2756 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2757 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
|
2758 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2759 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2760 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2761 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2762 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2763 /* 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
|
2764 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
|
2765 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2766 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
|
2767 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
|
2768 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
|
2769 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2770 - (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
|
2771 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2772 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2773 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2774 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2775 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2776 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2777 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
|
2778 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
|
2779 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2780 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2781 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2782 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2783 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2784 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2785 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2786 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2787 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2788 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
|
2789 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2790 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2791 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
|
2792 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
|
2793 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2794 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2795 /* 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
|
2796 * 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
|
2797 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
|
2798 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2799 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2800 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2801 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
|
2802 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
|
2803 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2804 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2805 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2806 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
|
2807 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2808 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2809 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2810 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2811 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2812 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
|
2813 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2814 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2815 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2816 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2817 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2818 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2819 /* 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
|
2820 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
|
2821 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
|
2822 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2823 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
|
2824 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
|
2825 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2826 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2827 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2828 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2829 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
|
2830 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2831 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
|
2832 /* 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
|
2833 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
|
2834 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
|
2835 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2836 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
|
2837 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2838 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2839 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2840 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2841 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2842 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2843 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2844 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
|
2845 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2846 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
|
2847 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
|
2848 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2849 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2850 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2851 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
|
2852 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
|
2853 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2854 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2855 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
|
2856 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2857 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2858 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2859 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2860 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2861 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2862 |
| 7 | 2863 #ifdef FEAT_FOLDING |
| 2864 /* | |
| 6553 | 2865 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2866 * space is available for window "wp", minus "col". | |
| 2867 */ | |
| 2868 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2869 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2870 { |
| 2871 int fdc = wp->w_p_fdc; | |
| 2872 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
|
2873 int wwidth = wp->w_width; |
| 6553 | 2874 |
| 2875 if (fdc > wwidth - (col + wmw)) | |
| 2876 fdc = wwidth - (col + wmw); | |
| 2877 return fdc; | |
| 2878 } | |
| 2879 | |
| 2880 /* | |
| 7 | 2881 * Display one folded line. |
| 2882 */ | |
| 2883 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2884 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2885 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2886 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2887 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2888 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2889 int row) |
| 7 | 2890 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2891 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2892 pos_T *top, *bot; |
| 2893 linenr_T lnume = lnum + fold_count - 1; | |
| 2894 int len; | |
| 29 | 2895 char_u *text; |
| 7 | 2896 int fdc; |
| 2897 int col; | |
| 2898 int txtcol; | |
| 2899 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2900 int ri; |
| 7 | 2901 |
| 2902 /* Build the fold line: | |
| 2903 * 1. Add the cmdwin_type for the command-line window | |
| 2904 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2905 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2906 * 4. Compose the text |
| 2907 * 5. Add the text | |
| 2908 * 6. set highlighting for the Visual area an other text | |
| 2909 */ | |
| 2910 col = 0; | |
| 2911 | |
| 2912 /* | |
| 2913 * 1. Add the cmdwin_type for the command-line window | |
| 2914 * Ignores 'rightleft', this window is never right-left. | |
| 2915 */ | |
| 2916 #ifdef FEAT_CMDWIN | |
| 2917 if (cmdwin_type != 0 && wp == curwin) | |
| 2918 { | |
| 2919 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
|
2920 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2921 if (enc_utf8) |
| 2922 ScreenLinesUC[off] = 0; | |
| 2923 ++col; | |
| 2924 } | |
| 2925 #endif | |
| 2926 | |
| 2927 /* | |
| 2928 * 2. Add the 'foldcolumn' | |
| 6553 | 2929 * Reduce the width when there is not enough space. |
| 7 | 2930 */ |
| 6553 | 2931 fdc = compute_foldcolumn(wp, col); |
| 7 | 2932 if (fdc > 0) |
| 2933 { | |
| 2934 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2935 #ifdef FEAT_RIGHTLEFT | |
| 2936 if (wp->w_p_rl) | |
| 2937 { | |
| 2938 int i; | |
| 2939 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2940 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
|
2941 HL_ATTR(HLF_FC)); |
| 7 | 2942 /* reverse the fold column */ |
| 2943 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
|
2944 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2945 } |
| 2946 else | |
| 2947 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2948 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2949 col += fdc; |
| 2950 } | |
| 2951 | |
| 2952 #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
|
2953 # 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
|
2954 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2955 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
|
2956 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
|
2957 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
|
2958 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2959 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
|
2960 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
|
2961 } while (0) |
| 7 | 2962 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2963 # 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
|
2964 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2965 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
|
2966 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
|
2967 } while (0) |
| 7 | 2968 #endif |
| 2969 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2970 /* 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
|
2971 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2972 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2973 |
| 2974 #ifdef FEAT_SIGNS | |
| 2975 /* 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
|
2976 if (signcolumn_on(wp)) |
| 7 | 2977 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2978 len = wp->w_width - col; |
| 7 | 2979 if (len > 0) |
| 2980 { | |
| 2981 if (len > 2) | |
| 2982 len = 2; | |
| 2983 # ifdef FEAT_RIGHTLEFT | |
| 2984 if (wp->w_p_rl) | |
| 2985 /* 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
|
2986 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
|
2987 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2988 else |
| 2989 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2990 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2991 col += len; |
| 2992 } | |
| 2993 } | |
| 2994 #endif | |
| 2995 | |
| 2996 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2997 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2998 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2999 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3000 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3001 len = wp->w_width - col; |
| 7 | 3002 if (len > 0) |
| 3003 { | |
| 13 | 3004 int w = number_width(wp); |
| 5905 | 3005 long num; |
| 3006 char *fmt = "%*ld "; | |
| 13 | 3007 |
| 3008 if (len > w + 1) | |
| 3009 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3010 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3011 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
|
3012 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3013 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3014 else |
| 4065 | 3015 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3016 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3017 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
|
3018 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
|
3019 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3020 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3021 * line number */ |
| 4065 | 3022 num = lnum; |
| 3023 fmt = "%-*ld "; | |
| 3024 } | |
| 3025 } | |
| 3026 | |
| 3027 sprintf((char *)buf, fmt, w, num); | |
| 7 | 3028 #ifdef FEAT_RIGHTLEFT |
| 3029 if (wp->w_p_rl) | |
| 3030 /* 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
|
3031 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
|
3032 HL_ATTR(HLF_FL)); |
| 7 | 3033 else |
| 3034 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3035 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 3036 col += len; |
| 3037 } | |
| 3038 } | |
| 3039 | |
| 3040 /* | |
| 3041 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 3042 */ | |
| 29 | 3043 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 3044 |
| 3045 txtcol = col; /* remember where text starts */ | |
| 3046 | |
| 3047 /* | |
| 3048 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 3049 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 3050 * in columns number-col - window-width. | |
| 3051 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
3052 col = text_to_screenline(wp, text, col); |
| 7 | 3053 |
| 3054 /* Fill the rest of the line with the fold filler */ | |
| 3055 #ifdef FEAT_RIGHTLEFT | |
| 3056 if (wp->w_p_rl) | |
| 3057 col -= txtcol; | |
| 3058 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3059 while (col < wp->w_width |
| 7 | 3060 #ifdef FEAT_RIGHTLEFT |
| 3061 - (wp->w_p_rl ? txtcol : 0) | |
| 3062 #endif | |
| 3063 ) | |
| 3064 { | |
| 3065 if (enc_utf8) | |
| 3066 { | |
| 3067 if (fill_fold >= 0x80) | |
| 3068 { | |
| 3069 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 3070 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
|
3071 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 3072 } |
| 3073 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
3074 { |
| 7 | 3075 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
3076 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
3077 } |
|
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
|
3078 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
|
3079 } |
|
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
|
3080 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
|
3081 ScreenLines[off + col++] = fill_fold; |
| 7 | 3082 } |
| 3083 | |
| 3084 if (text != buf) | |
| 3085 vim_free(text); | |
| 3086 | |
| 3087 /* | |
| 3088 * 6. set highlighting for the Visual area an other text. | |
| 3089 * If all folded lines are in the Visual area, highlight the line. | |
| 3090 */ | |
| 3091 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3092 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
3093 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3094 { |
| 3095 /* Visual is after curwin->w_cursor */ | |
| 3096 top = &curwin->w_cursor; | |
| 3097 bot = &VIsual; | |
| 3098 } | |
| 3099 else | |
| 3100 { | |
| 3101 /* Visual is before curwin->w_cursor */ | |
| 3102 top = &VIsual; | |
| 3103 bot = &curwin->w_cursor; | |
| 3104 } | |
| 3105 if (lnum >= top->lnum | |
| 3106 && lnume <= bot->lnum | |
| 3107 && (VIsual_mode != 'v' | |
| 3108 || ((lnum > top->lnum | |
| 3109 || (lnum == top->lnum | |
| 3110 && top->col == 0)) | |
| 3111 && (lnume < bot->lnum | |
| 3112 || (lnume == bot->lnum | |
| 3113 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 3114 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 3115 { |
| 3116 if (VIsual_mode == Ctrl_V) | |
| 3117 { | |
| 3118 /* 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
|
3119 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 3120 { |
| 3040 | 3121 if (wp->w_old_cursor_lcol != MAXCOL |
| 3122 && 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
|
3123 < (colnr_T)wp->w_width) |
| 7 | 3124 len = wp->w_old_cursor_lcol; |
| 3125 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3126 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
|
3127 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 3128 len - (int)wp->w_old_cursor_fcol); |
| 7 | 3129 } |
| 3130 } | |
| 3131 else | |
| 216 | 3132 { |
| 7 | 3133 /* 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
|
3134 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 3135 } |
| 7 | 3136 } |
| 3137 } | |
| 3138 | |
| 743 | 3139 #ifdef FEAT_SYN_HL |
| 6685 | 3140 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 3141 if (wp->w_p_cc_cols) | |
| 3142 { | |
| 3143 int i = 0; | |
| 3144 int j = wp->w_p_cc_cols[i]; | |
| 3145 int old_txtcol = txtcol; | |
| 3146 | |
| 3147 while (j > -1) | |
| 3148 { | |
| 3149 txtcol += j; | |
| 3150 if (wp->w_p_wrap) | |
| 3151 txtcol -= wp->w_skipcol; | |
| 3152 else | |
| 3153 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
|
3154 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 3155 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
|
3156 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 3157 txtcol = old_txtcol; |
| 3158 j = wp->w_p_cc_cols[++i]; | |
| 3159 } | |
| 3160 } | |
| 3161 | |
| 743 | 3162 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 3163 if (wp->w_p_cuc) |
| 3164 { | |
| 3165 txtcol += wp->w_virtcol; | |
| 3166 if (wp->w_p_wrap) | |
| 3167 txtcol -= wp->w_skipcol; | |
| 3168 else | |
| 3169 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
|
3170 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 3171 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
|
3172 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 3173 } |
| 743 | 3174 #endif |
| 7 | 3175 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3176 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
|
3177 (int)wp->w_width, 0); |
| 7 | 3178 |
| 3179 /* | |
| 3180 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 3181 * updated (saves a call to plines() later). | |
| 3182 */ | |
| 3183 if (wp == curwin | |
| 3184 && lnum <= curwin->w_cursor.lnum | |
| 3185 && lnume >= curwin->w_cursor.lnum) | |
| 3186 { | |
| 3187 curwin->w_cline_row = row; | |
| 3188 curwin->w_cline_height = 1; | |
| 3189 curwin->w_cline_folded = TRUE; | |
| 3190 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 3191 } | |
| 3192 } | |
| 3193 | |
| 3194 /* | |
| 3195 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 3196 */ | |
| 3197 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3198 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3199 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3200 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3201 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3202 int attr) |
| 7 | 3203 { |
| 216 | 3204 int i; |
| 3205 | |
| 7 | 3206 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 3207 if (enc_utf8) | |
| 3208 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 3209 for (i = 0; i < len; ++i) |
| 3210 ScreenAttrs[off + i] = attr; | |
| 7 | 3211 } |
| 3212 | |
| 3213 /* | |
| 3214 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 3215 * Only to be called when 'foldcolumn' > 0. |
| 7 | 3216 */ |
| 3217 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3218 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3219 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3220 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3221 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3222 linenr_T lnum) /* current line number */ |
| 7 | 3223 { |
| 3224 int i = 0; | |
| 3225 int level; | |
| 3226 int first_level; | |
| 519 | 3227 int empty; |
| 6553 | 3228 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 3229 |
| 3230 /* Init to all spaces. */ | |
| 6929 | 3231 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 3232 |
| 3233 level = win_foldinfo.fi_level; | |
| 3234 if (level > 0) | |
| 3235 { | |
| 519 | 3236 /* If there is only one column put more info in it. */ |
| 6553 | 3237 empty = (fdc == 1) ? 0 : 1; |
| 519 | 3238 |
| 7 | 3239 /* If the column is too narrow, we start at the lowest level that |
| 3240 * fits and use numbers to indicated the depth. */ | |
| 6553 | 3241 first_level = level - fdc - closed + 1 + empty; |
| 7 | 3242 if (first_level < 1) |
| 3243 first_level = 1; | |
| 3244 | |
| 6553 | 3245 for (i = 0; i + empty < fdc; ++i) |
| 7 | 3246 { |
| 3247 if (win_foldinfo.fi_lnum == lnum | |
| 3248 && first_level + i >= win_foldinfo.fi_low_level) | |
| 3249 p[i] = '-'; | |
| 3250 else if (first_level == 1) | |
| 3251 p[i] = '|'; | |
| 3252 else if (first_level + i <= 9) | |
| 3253 p[i] = '0' + first_level + i; | |
| 3254 else | |
| 3255 p[i] = '>'; | |
| 3256 if (first_level + i == level) | |
| 3257 break; | |
| 3258 } | |
| 3259 } | |
| 3260 if (closed) | |
| 6553 | 3261 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3262 } |
| 3263 #endif /* FEAT_FOLDING */ | |
| 3264 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3265 #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
|
3266 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
|
3267 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
|
3268 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3269 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3270 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
|
3271 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3272 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
|
3273 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
|
3274 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
|
3275 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3276 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
|
3277 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
|
3278 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
|
3279 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
|
3280 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
|
3281 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3282 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
|
3283 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3284 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
|
3285 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3286 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
|
3287 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
|
3288 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
|
3289 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
|
3290 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
|
3291 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3292 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3293 |
| 7 | 3294 /* |
| 3295 * Display line "lnum" of window 'wp' on the screen. | |
| 3296 * Start at row "startrow", stop when "endrow" is reached. | |
| 3297 * wp->w_virtcol needs to be valid. | |
| 3298 * | |
| 3299 * Return the number of last row the line occupies. | |
| 3300 */ | |
| 3301 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3302 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3303 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3304 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3305 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3306 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
|
3307 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
|
3308 int number_only) // only update the number column |
| 7 | 3309 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3310 int col = 0; /* visual column on screen */ |
| 7 | 3311 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3312 int c = 0; /* init for GCC */ | |
| 3313 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3314 #ifdef FEAT_LINEBREAK |
| 3315 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3316 #endif | |
| 7 | 3317 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3318 char_u *line; /* current line */ | |
| 3319 char_u *ptr; /* current position in "line" */ | |
| 3320 int row; /* row in the window, excl w_winrow */ | |
| 3321 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3322 | |
| 3323 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3324 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3325 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3326 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3327 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
|
3328 int c_final = NUL; /* final char, mandatory if set */ |
| 7 | 3329 int extra_attr = 0; /* attributes when n_extra != 0 */ |
| 3330 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3331 displaying lcs_eol at end-of-line */ | |
| 3332 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3333 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3334 | |
| 3335 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3336 int saved_n_extra = 0; | |
| 3337 char_u *saved_p_extra = NULL; | |
| 3338 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
|
3339 int saved_c_final = 0; |
| 7 | 3340 int saved_char_attr = 0; |
| 3341 | |
| 3342 int n_attr = 0; /* chars with special attr */ | |
| 3343 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3344 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3345 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3346 | |
| 3347 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3348 | |
| 3349 int fromcol, tocol; /* start/end of inverting */ | |
| 3350 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3351 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3352 pos_T *top, *bot; | |
| 1813 | 3353 int lnum_in_visual_area = FALSE; |
| 7 | 3354 pos_T pos; |
| 3355 long v; | |
| 3356 | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3357 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
|
3358 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
|
3359 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
|
3360 // 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
|
3361 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
|
3362 // highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3363 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
|
3364 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
|
3365 // 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
|
3366 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
|
3367 int search_attr = 0; // attributes desired by 'hlsearch' |
| 7 | 3368 #ifdef FEAT_SYN_HL |
| 743 | 3369 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3370 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3371 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3372 int save_did_emsg; | |
| 1437 | 3373 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
|
3374 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3375 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3376 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3377 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3378 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3379 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
|
3380 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3381 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3382 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3383 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
|
3384 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
|
3385 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
|
3386 #endif |
| 743 | 3387 #ifdef FEAT_SPELL |
| 221 | 3388 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3389 # define SPWORDLEN 150 |
| 3390 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3391 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3392 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3393 starts */ |
| 221 | 3394 int spell_attr = 0; /* attributes desired by spelling */ |
| 3395 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3396 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3397 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3398 * there are no spell errors */ |
| 386 | 3399 static int cap_col = -1; /* column to check for Cap word */ |
| 3400 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3401 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3402 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3403 int extra_check = 0; // has extra highlighting |
| 7 | 3404 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3405 int mb_l = 1; /* multi-byte byte length */ | |
| 3406 int mb_c = 0; /* decoded multi-byte character */ | |
| 3407 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3408 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3409 #ifdef FEAT_DIFF |
| 3410 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3411 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3412 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3413 int change_start = MAXCOL; /* first col of changed area */ |
| 3414 int change_end = -1; /* last col of changed area */ | |
| 3415 #endif | |
| 3416 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3417 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3418 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
|
3419 chars */ |
| 7 | 3420 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3421 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3422 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3423 # define LINE_ATTR |
| 1536 | 3424 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3425 #endif |
| 3426 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3427 matchitem_T *cur; /* points to the match list */ |
| 3428 match_T *shl; /* points to search_hl or a match */ | |
| 3429 int shl_flag; /* flag to indicate whether search_hl | |
| 3430 has been processed or not */ | |
| 5979 | 3431 int pos_inprogress; /* marks that position match search is |
| 3432 in progress */ | |
| 1326 | 3433 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3434 equals startcol of search_hl or one | |
| 3435 of the matches */ | |
| 7 | 3436 #endif |
| 3437 #ifdef FEAT_ARABIC | |
| 3438 int prev_c = 0; /* previous Arabic character */ | |
| 3439 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3440 #endif | |
| 910 | 3441 #if defined(LINE_ATTR) |
| 867 | 3442 int did_line_attr = 0; |
| 3443 #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
|
3444 #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
|
3445 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3446 #endif |
| 7 | 3447 |
| 3448 /* draw_state: items that are drawn in sequence: */ | |
| 3449 #define WL_START 0 /* nothing done yet */ | |
| 3450 #ifdef FEAT_CMDWIN | |
| 3451 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3452 #else | |
| 3453 # define WL_CMDLINE WL_START | |
| 3454 #endif | |
| 3455 #ifdef FEAT_FOLDING | |
| 3456 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3457 #else | |
| 3458 # define WL_FOLD WL_CMDLINE | |
| 3459 #endif | |
| 3460 #ifdef FEAT_SIGNS | |
| 3461 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3462 #else | |
| 3463 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3464 #endif | |
| 3465 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3466 #ifdef FEAT_LINEBREAK |
| 3467 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3468 #else | |
| 3469 # define WL_BRI WL_NR | |
| 3470 #endif | |
| 7 | 3471 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3472 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3473 #else |
| 5995 | 3474 # define WL_SBR WL_BRI |
| 7 | 3475 #endif |
| 3476 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3477 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3478 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3479 int feedback_col = 0; |
| 3480 int feedback_old_attr = -1; | |
| 3481 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3482 int screen_line_flags = 0; |
| 7 | 3483 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3484 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3485 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
|
3486 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
|
3487 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
|
3488 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
|
3489 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3490 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
|
3491 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3492 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
|
3493 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3494 int match_conc = 0; /* cchar for match functions */ |
| 6520 | 3495 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3496 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3497 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3498 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3499 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3500 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3501 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3502 col -= boguscols; \ |
| 6520 | 3503 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3504 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3505 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3506 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3507 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3508 #endif |
| 7 | 3509 |
| 3510 if (startrow > endrow) /* past the end already! */ | |
| 3511 return startrow; | |
| 3512 | |
| 3513 row = startrow; | |
| 3514 screen_row = row + W_WINROW(wp); | |
| 3515 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3516 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
|
3517 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3518 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3519 * 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
|
3520 * 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
|
3521 */ |
| 7 | 3522 #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
|
3523 extra_check = wp->w_p_lbr; |
| 7 | 3524 #endif |
| 3525 #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
|
3526 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
|
3527 # 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
|
3528 && !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
|
3529 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3530 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3531 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3532 /* 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
|
3533 * 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
|
3534 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
|
3535 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
|
3536 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
|
3537 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
|
3538 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
|
3539 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3540 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3541 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
|
3542 #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
|
3543 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
|
3544 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3545 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3546 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
|
3547 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
|
3548 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3549 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3550 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3551 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3552 /* 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
|
3553 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
|
3554 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
|
3555 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3556 #endif |
| 3557 | |
|
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
|
3558 #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
|
3559 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
|
3560 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3561 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
|
3562 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3563 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
|
3564 } |
|
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
|
3565 #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
|
3566 |
| 743 | 3567 #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
|
3568 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
|
3569 && *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
|
3570 && 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
|
3571 && *(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
|
3572 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3573 /* 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
|
3574 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
|
3575 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
|
3576 |
|
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
|
3577 /* 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
|
3578 * 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
|
3579 * 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
|
3580 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
|
3581 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
|
3582 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3583 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
|
3584 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
|
3585 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3586 |
|
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
|
3587 /* 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
|
3588 * 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
|
3589 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
|
3590 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
|
3591 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
|
3592 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3593 /* 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
|
3594 * 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
|
3595 * 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
|
3596 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
|
3597 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
|
3598 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
|
3599 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
|
3600 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
|
3601 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3602 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3603 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3604 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3605 * 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
|
3606 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3607 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
|
3608 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
|
3609 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
|
3610 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3611 /* 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
|
3612 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
|
3613 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3614 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
|
3615 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
|
3616 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3617 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
|
3618 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3619 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
|
3620 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
|
3621 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3622 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
|
3623 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
|
3624 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3625 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
|
3626 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3627 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
|
3628 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
|
3629 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3630 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3631 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
|
3632 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3633 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3634 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
|
3635 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
|
3636 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3637 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
|
3638 fromcol = 0; |
| 7 | 3639 else |
| 3640 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3641 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
|
3642 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
|
3643 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
|
3644 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3645 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3646 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
|
3647 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3648 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
|
3649 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3650 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
|
3651 tocol = MAXCOL; |
| 7 | 3652 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3653 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
|
3654 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
|
3655 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3656 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3657 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
|
3658 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
|
3659 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
|
3660 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3661 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3662 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
|
3663 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3664 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3665 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3666 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3667 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3668 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3669 /* 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
|
3670 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
|
3671 #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
|
3672 && !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
|
3673 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3674 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3675 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
|
3676 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3677 /* 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
|
3678 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
|
3679 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3680 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3681 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3682 #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
|
3683 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
|
3684 && 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
|
3685 || (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
|
3686 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3687 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
|
3688 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3689 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3690 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3691 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3692 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3693 * 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
|
3694 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3695 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
|
3696 && 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
|
3697 && 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
|
3698 && 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
|
3699 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3700 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
|
3701 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
|
3702 (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
|
3703 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3704 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
|
3705 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
|
3706 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3707 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
|
3708 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
|
3709 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
|
3710 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3711 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3712 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
|
3713 /* 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
|
3714 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
|
3715 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
|
3716 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3717 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
|
3718 } |
| 7 | 3719 } |
| 3720 | |
| 3721 #ifdef FEAT_DIFF | |
| 3722 filler_lines = diff_check(wp, lnum); | |
| 3723 if (filler_lines < 0) | |
| 3724 { | |
| 3725 if (filler_lines == -1) | |
| 3726 { | |
| 3727 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3728 diff_hlf = HLF_ADD; /* added line */ | |
| 3729 else if (change_start == 0) | |
| 3730 diff_hlf = HLF_TXD; /* changed text */ | |
| 3731 else | |
| 3732 diff_hlf = HLF_CHD; /* changed line */ | |
| 3733 } | |
| 3734 else | |
| 3735 diff_hlf = HLF_ADD; /* added line */ | |
| 3736 filler_lines = 0; | |
| 3737 area_highlighting = TRUE; | |
| 3738 } | |
| 3739 if (lnum == wp->w_topline) | |
| 3740 filler_lines = wp->w_topfill; | |
| 3741 filler_todo = filler_lines; | |
| 3742 #endif | |
| 3743 | |
| 3744 #ifdef LINE_ATTR | |
| 3745 # ifdef FEAT_SIGNS | |
| 3746 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3747 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3748 if (v != 0) | |
| 3749 line_attr = sign_get_attr((int)v, TRUE); | |
| 3750 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3751 # if defined(FEAT_QUICKFIX) |
| 7 | 3752 /* Highlight the current line in the quickfix window. */ |
| 644 | 3753 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
|
3754 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3755 # endif |
| 3756 if (line_attr != 0) | |
| 3757 area_highlighting = TRUE; | |
| 3758 #endif | |
| 3759 | |
| 3760 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3761 ptr = line; | |
| 3762 | |
| 743 | 3763 #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
|
3764 if (has_spell && !number_only) |
| 348 | 3765 { |
| 386 | 3766 /* For checking first word with a capital skip white space. */ |
| 3767 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
|
3768 cap_col = getwhitecols(line); |
| 386 | 3769 |
| 348 | 3770 /* To be able to spell-check over line boundaries copy the end of the |
| 3771 * current line into nextline[]. Above the start of the next line was | |
| 3772 * copied to nextline[SPWORDLEN]. */ | |
| 3773 if (nextline[SPWORDLEN] == NUL) | |
| 3774 { | |
| 3775 /* No next line or it is empty. */ | |
| 3776 nextlinecol = MAXCOL; | |
| 3777 nextline_idx = 0; | |
| 3778 } | |
| 3779 else | |
| 3780 { | |
| 835 | 3781 v = (long)STRLEN(line); |
| 348 | 3782 if (v < SPWORDLEN) |
| 3783 { | |
| 3784 /* Short line, use it completely and append the start of the | |
| 3785 * next line. */ | |
| 3786 nextlinecol = 0; | |
| 3787 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3788 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3789 nextline_idx = v + 1; |
| 3790 } | |
| 3791 else | |
| 3792 { | |
| 3793 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3794 nextlinecol = v - SPWORDLEN; | |
| 3795 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3796 nextline_idx = SPWORDLEN + 1; | |
| 3797 } | |
| 3798 } | |
| 3799 } | |
| 3800 #endif | |
| 3801 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3802 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3803 { |
|
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
|
3804 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
|
3805 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3806 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3807 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3808 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3809 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
|
3810 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
|
3811 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3812 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3813 } |
| 7 | 3814 } |
| 3815 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3816 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
|
3817 if (wcr_attr != 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3818 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3819 win_attr = wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3820 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3821 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3822 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3823 if (bt_popup(wp->w_buffer)) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3824 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3825 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3826 |
| 7 | 3827 /* |
| 3828 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3829 * first character to be displayed. | |
| 3830 */ | |
| 3831 if (wp->w_p_wrap) | |
| 3832 v = wp->w_skipcol; | |
| 3833 else | |
| 3834 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
|
3835 if (v > 0 && !number_only) |
| 7 | 3836 { |
| 3837 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3838 |
| 7 | 3839 while (vcol < v && *ptr != NUL) |
| 3840 { | |
| 5995 | 3841 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3842 vcol += c; |
| 3843 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3844 MB_PTR_ADV(ptr); |
| 7 | 3845 } |
| 3846 | |
| 1984 | 3847 /* When: |
| 3848 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3849 * - 'colorcolumn' is set, or |
| 1984 | 3850 * - 'virtualedit' is set, or |
| 3851 * - the visual mode is active, | |
| 3852 * the end of the line may be before the start of the displayed part. | |
| 3853 */ | |
| 3854 if (vcol < v && ( | |
| 5735 | 3855 #ifdef FEAT_SYN_HL |
| 3856 wp->w_p_cuc || draw_color_col || | |
| 3857 #endif | |
| 3858 virtual_active() || | |
| 3859 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3860 vcol = v; |
| 3861 | |
| 3862 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3863 * that character but skip the first few screen characters. */ | |
| 3864 if (vcol > v) | |
| 3865 { | |
| 3866 vcol -= c; | |
| 3867 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
|
3868 /* 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
|
3869 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3870 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
|
3871 n_skip = v - vcol; |
| 7 | 3872 } |
| 3873 | |
| 3874 /* | |
| 3875 * Adjust for when the inverted text is before the screen, | |
| 3876 * and when the start of the inverted text is before the screen. | |
| 3877 */ | |
| 3878 if (tocol <= vcol) | |
| 3879 fromcol = 0; | |
| 3880 else if (fromcol >= 0 && fromcol < vcol) | |
| 3881 fromcol = vcol; | |
| 3882 | |
| 3883 #ifdef FEAT_LINEBREAK | |
| 3884 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3885 if (wp->w_p_wrap) | |
| 3886 need_showbreak = TRUE; | |
| 3887 #endif | |
| 743 | 3888 #ifdef FEAT_SPELL |
| 499 | 3889 /* When spell checking a word we need to figure out the start of the |
| 3890 * word and if it's badly spelled or not. */ | |
| 3891 if (has_spell) | |
| 3892 { | |
| 3893 int len; | |
| 1536 | 3894 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3895 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3896 |
| 3897 pos = wp->w_cursor; | |
| 3898 wp->w_cursor.lnum = lnum; | |
| 1536 | 3899 wp->w_cursor.col = linecol; |
| 534 | 3900 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3901 |
| 3902 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3903 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3904 ptr = line + linecol; | |
| 3905 | |
| 530 | 3906 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3907 { |
| 3908 /* no bad word found at line start, don't check until end of a | |
| 3909 * word */ | |
| 534 | 3910 spell_hlf = HLF_COUNT; |
| 3572 | 3911 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3912 } |
| 3913 else | |
| 534 | 3914 { |
| 499 | 3915 /* bad word found, use attributes until end of word */ |
| 3916 word_end = wp->w_cursor.col + len + 1; | |
| 3917 | |
| 534 | 3918 /* Turn index into actual attributes. */ |
| 3919 if (spell_hlf != HLF_COUNT) | |
| 3920 spell_attr = highlight_attr[spell_hlf]; | |
| 3921 } | |
| 499 | 3922 wp->w_cursor = pos; |
| 501 | 3923 |
| 743 | 3924 # ifdef FEAT_SYN_HL |
| 501 | 3925 /* Need to restart syntax highlighting for this line. */ |
| 3926 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3927 syntax_start(wp, lnum); |
| 743 | 3928 # endif |
| 499 | 3929 } |
| 3930 #endif | |
| 7 | 3931 } |
| 3932 | |
| 3933 /* | |
| 3934 * Correct highlighting for cursor that can't be disabled. | |
| 3935 * Avoids having to check this for each character. | |
| 3936 */ | |
| 3937 if (fromcol >= 0) | |
| 3938 { | |
| 3939 if (noinvcur) | |
| 3940 { | |
| 3941 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3942 { | |
| 3943 /* highlighting starts at cursor, let it start just after the | |
| 3944 * cursor */ | |
| 3945 fromcol_prev = fromcol; | |
| 3946 fromcol = -1; | |
| 3947 } | |
| 3948 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3949 /* restart highlighting after the cursor */ | |
| 3950 fromcol_prev = wp->w_virtcol; | |
| 3951 } | |
| 3952 if (fromcol >= tocol) | |
| 3953 fromcol = -1; | |
| 3954 } | |
| 3955 | |
| 3956 #ifdef FEAT_SEARCH_EXTRA | |
| 3957 /* | |
| 1326 | 3958 * Handle highlighting the last used search pattern and matches. |
| 3959 * 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
|
3960 * Not in a popup window. |
| 7 | 3961 */ |
| 1326 | 3962 cur = wp->w_match_head; |
| 3963 shl_flag = FALSE; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3964 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
|
3965 && !(screen_line_flags & SLF_POPUP)) |
| 1326 | 3966 { |
| 3967 if (shl_flag == FALSE) | |
| 3968 { | |
| 3969 shl = &search_hl; | |
| 3970 shl_flag = TRUE; | |
| 3971 } | |
| 3972 else | |
| 3973 shl = &cur->hl; | |
| 36 | 3974 shl->startcol = MAXCOL; |
| 3975 shl->endcol = MAXCOL; | |
| 7 | 3976 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3977 shl->is_addpos = FALSE; |
| 5979 | 3978 v = (long)(ptr - line); |
| 3979 if (cur != NULL) | |
| 3980 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3981 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
|
3982 shl == &search_hl ? NULL : cur); |
| 5979 | 3983 |
| 3984 /* Need to get the line again, a multi-line regexp may have made it | |
| 3985 * invalid. */ | |
| 3986 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3987 ptr = line + v; | |
| 3988 | |
| 3989 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3990 { | |
| 3991 if (shl->lnum == lnum) | |
| 3992 shl->startcol = shl->rm.startpos[0].col; | |
| 3993 else | |
| 3994 shl->startcol = 0; | |
| 3995 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3996 - shl->rm.startpos[0].lnum) | |
| 3997 shl->endcol = shl->rm.endpos[0].col; | |
| 3998 else | |
| 3999 shl->endcol = MAXCOL; | |
| 4000 /* Highlight one character for an empty match. */ | |
| 4001 if (shl->startcol == shl->endcol) | |
| 4002 { | |
| 4003 if (has_mbyte && line[shl->endcol] != NUL) | |
| 4004 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 4005 else |
| 5979 | 4006 ++shl->endcol; |
| 4007 } | |
| 4008 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 4009 { | |
| 4010 shl->attr_cur = shl->attr; | |
| 4011 search_attr = shl->attr; | |
| 4012 } | |
| 4013 area_highlighting = TRUE; | |
| 7 | 4014 } |
| 1326 | 4015 if (shl != &search_hl && cur != NULL) |
| 4016 cur = cur->next; | |
| 7 | 4017 } |
| 4018 #endif | |
| 4019 | |
| 743 | 4020 #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
|
4021 // 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
|
4022 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
|
4023 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
4024 // 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
|
4025 // 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
|
4026 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
|
4027 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
4028 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
|
4029 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
4030 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
4031 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 4032 } |
| 4033 #endif | |
| 4034 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4035 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4036 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4037 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4038 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4039 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
|
4040 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4041 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4042 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4043 // 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
|
4044 // aligned. |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
4045 text_props = ALLOC_MULT(textprop_T, text_prop_count); |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4046 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4047 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
|
4048 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
|
4049 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4050 // Allocate an array for the indexes. |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
4051 text_prop_idxs = ALLOC_MULT(int, text_prop_count); |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4052 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4053 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4054 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4055 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4056 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4057 |
| 504 | 4058 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 4059 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4060 |
| 7 | 4061 #ifdef FEAT_RIGHTLEFT |
| 4062 if (wp->w_p_rl) | |
| 4063 { | |
| 4064 /* Rightleft window: process the text in the normal direction, but put | |
| 4065 * it in current_ScreenLine[] from right to left. Start at the | |
| 4066 * 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
|
4067 col = wp->w_width - 1; |
| 7 | 4068 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4069 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 4070 } |
| 4071 #endif | |
| 4072 | |
| 4073 /* | |
| 4074 * Repeat for the whole displayed line. | |
| 4075 */ | |
| 4076 for (;;) | |
| 4077 { | |
| 6947 | 4078 #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
|
4079 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
|
4080 int did_decrement_ptr = FALSE; |
| 6947 | 4081 #endif |
| 7 | 4082 /* Skip this quickly when working on the text. */ |
| 4083 if (draw_state != WL_LINE) | |
| 4084 { | |
| 4085 #ifdef FEAT_CMDWIN | |
| 4086 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 4087 { | |
| 4088 draw_state = WL_CMDLINE; | |
| 4089 if (cmdwin_type != 0 && wp == curwin) | |
| 4090 { | |
| 4091 /* Draw the cmdline character. */ | |
| 4092 n_extra = 1; | |
| 1340 | 4093 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
|
4094 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
|
4095 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_AT)); |
| 7 | 4096 } |
| 4097 } | |
| 4098 #endif | |
| 4099 | |
| 4100 #ifdef FEAT_FOLDING | |
| 4101 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 4102 { | |
| 6553 | 4103 int fdc = compute_foldcolumn(wp, 0); |
| 4104 | |
| 7 | 4105 draw_state = WL_FOLD; |
| 6553 | 4106 if (fdc > 0) |
| 7 | 4107 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4108 /* 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
|
4109 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4110 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4111 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4112 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4113 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4114 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4115 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
|
4116 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4117 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4118 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4119 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
|
4120 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
|
4121 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
|
4122 } |
| 7 | 4123 } |
| 4124 } | |
| 4125 #endif | |
| 4126 | |
| 4127 #ifdef FEAT_SIGNS | |
| 4128 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 4129 { | |
| 4130 draw_state = WL_SIGN; | |
| 4131 /* Show the sign column when there are any signs in this | |
| 4132 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
4133 if (signcolumn_on(wp)) |
| 7 | 4134 { |
| 2661 | 4135 int text_sign; |
| 7 | 4136 # ifdef FEAT_SIGN_ICONS |
| 2661 | 4137 int icon_sign; |
| 7 | 4138 # endif |
| 4139 | |
| 4140 /* Draw two cells with the sign value or blank. */ | |
| 4141 c_extra = ' '; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4142 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
|
4143 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC)); |
| 7 | 4144 n_extra = 2; |
| 4145 | |
| 5921 | 4146 if (row == startrow |
| 4147 #ifdef FEAT_DIFF | |
| 4148 + filler_lines && filler_todo <= 0 | |
| 4149 #endif | |
| 4150 ) | |
| 7 | 4151 { |
| 4152 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 4153 SIGN_TEXT); | |
| 4154 # ifdef FEAT_SIGN_ICONS | |
| 4155 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 4156 SIGN_ICON); | |
| 4157 if (gui.in_use && icon_sign != 0) | |
| 4158 { | |
| 4159 /* Use the image in this position. */ | |
| 4160 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
|
4161 c_final = NUL; |
| 7 | 4162 # ifdef FEAT_NETBEANS_INTG |
| 4163 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
|
4164 { |
| 7 | 4165 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
|
4166 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4167 } |
| 7 | 4168 # endif |
| 4169 char_attr = icon_sign; | |
| 4170 } | |
| 4171 else | |
| 4172 # endif | |
| 4173 if (text_sign != 0) | |
| 4174 { | |
| 4175 p_extra = sign_get_text(text_sign); | |
| 4176 if (p_extra != NULL) | |
| 4177 { | |
| 4178 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
|
4179 c_final = NUL; |
| 835 | 4180 n_extra = (int)STRLEN(p_extra); |
| 7 | 4181 } |
| 4182 char_attr = sign_get_attr(text_sign, FALSE); | |
| 4183 } | |
| 4184 } | |
| 4185 } | |
| 4186 } | |
| 4187 #endif | |
| 4188 | |
| 4189 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 4190 { | |
| 4191 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4192 /* 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
|
4193 * 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
|
4194 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 4195 && (row == startrow |
| 4196 #ifdef FEAT_DIFF | |
| 4197 + filler_lines | |
| 4198 #endif | |
| 4199 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 4200 { | |
| 4201 /* Draw the line number (empty space after wrapping). */ | |
| 4202 if (row == startrow | |
| 4203 #ifdef FEAT_DIFF | |
| 4204 + filler_lines | |
| 4205 #endif | |
| 4206 ) | |
| 4207 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4208 long num; |
| 4065 | 4209 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4210 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4211 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
|
4212 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4213 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4214 else |
| 4065 | 4215 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4216 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 4217 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
|
4218 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 4219 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4220 /* 'number' + 'relativenumber' */ |
| 4065 | 4221 num = lnum; |
| 4222 fmt = "%-*ld "; | |
| 4223 } | |
| 4224 } | |
| 4225 | |
| 4226 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4227 number_width(wp), num); |
| 7 | 4228 if (wp->w_skipcol > 0) |
| 4229 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 4230 *p_extra = '-'; | |
| 4231 #ifdef FEAT_RIGHTLEFT | |
| 4232 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
|
4233 { |
|
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
|
4234 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
|
4235 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
|
4236 |
|
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
|
4237 // 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
|
4238 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
|
4239 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
|
4240 { |
|
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
|
4241 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
|
4242 *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
|
4243 *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
|
4244 } |
|
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
|
4245 } |
| 7 | 4246 #endif |
| 4247 p_extra = extra; | |
| 4248 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
|
4249 c_final = NUL; |
| 7 | 4250 } |
| 4251 else | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4252 { |
| 7 | 4253 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4254 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4255 } |
| 13 | 4256 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
|
4257 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_N)); |
| 743 | 4258 #ifdef FEAT_SYN_HL |
| 4259 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 4260 * the current line differently. |
| 4261 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 4262 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4263 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 4264 && 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
|
4265 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); |
| 743 | 4266 #endif |
| 7 | 4267 } |
| 4268 } | |
| 4269 | |
| 5995 | 4270 #ifdef FEAT_LINEBREAK |
| 4271 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4272 && n_extra == 0 && *p_sbr != NUL) | |
| 4273 /* draw indent after showbreak value */ | |
| 4274 draw_state = WL_BRI; | |
| 4275 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4276 /* After the showbreak, draw the breakindent */ | |
| 4277 draw_state = WL_BRI - 1; | |
| 4278 | |
| 4279 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4280 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4281 { | |
| 4282 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4283 /* 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
|
4284 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
|
4285 && (row != startrow || need_showbreak) |
| 5995 | 4286 # ifdef FEAT_DIFF |
| 4287 && filler_lines == 0 | |
| 6834 | 4288 # endif |
| 5995 | 4289 ) |
| 4290 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4291 char_attr = 0; |
| 6834 | 4292 # ifdef FEAT_DIFF |
| 5995 | 4293 if (diff_hlf != (hlf_T)0) |
| 6106 | 4294 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4295 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4296 # ifdef FEAT_SYN_HL |
| 6106 | 4297 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4298 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
|
4299 HL_ATTR(HLF_CUL)); |
| 6834 | 4300 # endif |
| 6106 | 4301 } |
| 6834 | 4302 # endif |
| 6028 | 4303 p_extra = NULL; |
| 5995 | 4304 c_extra = ' '; |
| 4305 n_extra = get_breakindent_win(wp, | |
| 4306 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4307 /* Correct end of highlighted area for 'breakindent', | |
| 4308 * required when 'linebreak' is also set. */ | |
| 4309 if (tocol == vcol) | |
| 4310 tocol += n_extra; | |
| 4311 } | |
| 4312 } | |
| 4313 #endif | |
| 4314 | |
| 7 | 4315 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4316 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4317 { | |
| 4318 draw_state = WL_SBR; | |
| 4319 # ifdef FEAT_DIFF | |
| 4320 if (filler_todo > 0) | |
| 4321 { | |
| 4322 /* Draw "deleted" diff line(s). */ | |
| 4323 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
|
4324 { |
| 7 | 4325 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4326 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4327 } |
| 7 | 4328 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4329 { |
| 7 | 4330 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
|
4331 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4332 } |
| 7 | 4333 # ifdef FEAT_RIGHTLEFT |
| 4334 if (wp->w_p_rl) | |
| 4335 n_extra = col + 1; | |
| 4336 else | |
| 4337 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4338 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
|
4339 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4340 } |
| 4341 # endif | |
| 4342 # ifdef FEAT_LINEBREAK | |
| 4343 if (*p_sbr != NUL && need_showbreak) | |
| 4344 { | |
| 4345 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4346 p_extra = p_sbr; | |
| 4347 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
|
4348 c_final = NUL; |
| 7 | 4349 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
|
4350 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4351 need_showbreak = FALSE; |
| 6503 | 4352 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4353 /* Correct end of highlighted area for 'showbreak', |
| 4354 * required when 'linebreak' is also set. */ | |
| 4355 if (tocol == vcol) | |
| 4356 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4357 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4358 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4359 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4360 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
|
4361 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4362 #endif |
| 7 | 4363 } |
| 4364 # endif | |
| 4365 } | |
| 4366 #endif | |
| 4367 | |
| 4368 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4369 { | |
| 4370 draw_state = WL_LINE; | |
| 4371 if (saved_n_extra) | |
| 4372 { | |
| 4373 /* Continue item from end of wrapped line. */ | |
| 4374 n_extra = saved_n_extra; | |
| 4375 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
|
4376 c_final = saved_c_final; |
| 7 | 4377 p_extra = saved_p_extra; |
| 4378 char_attr = saved_char_attr; | |
| 4379 } | |
| 4380 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4381 char_attr = win_attr; |
| 7 | 4382 } |
| 4383 } | |
| 4384 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4385 // 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
|
4386 // 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
|
4387 // 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
|
4388 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4389 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4390 #ifdef FEAT_DIFF |
| 4391 && filler_todo <= 0 | |
| 4392 #endif | |
| 4393 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4394 || (number_only && draw_state > WL_NR)) |
| 7 | 4395 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4396 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
|
4397 screen_line_flags); |
| 819 | 4398 /* Pretend we have finished updating the window. Except when |
| 4399 * 'cursorcolumn' is set. */ | |
| 4400 #ifdef FEAT_SYN_HL | |
| 4401 if (wp->w_p_cuc) | |
| 4402 row = wp->w_cline_row + wp->w_cline_height; | |
| 4403 else | |
| 4404 #endif | |
| 4405 row = wp->w_height; | |
| 7 | 4406 break; |
| 4407 } | |
| 4408 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4409 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
|
4410 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4411 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4412 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4413 )) |
| 7 | 4414 { |
| 4415 /* handle Visual or match highlighting in this line */ | |
| 4416 if (vcol == fromcol | |
| 4417 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4418 && (*mb_ptr2cells)(ptr) > 1) | |
| 4419 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4420 && vcol_prev < vcol /* not at margin */ |
| 7 | 4421 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4422 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4423 else if (area_attr != 0 |
| 4424 && (vcol == tocol | |
| 4425 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4426 area_attr = 0; /* stop highlighting */ | |
| 4427 | |
| 4428 #ifdef FEAT_SEARCH_EXTRA | |
| 4429 if (!n_extra) | |
| 4430 { | |
| 4431 /* | |
| 4432 * Check for start/end of search pattern match. | |
| 4433 * After end, check for start/end of next match. | |
| 4434 * When another match, have to check for start again. | |
| 4435 * Watch out for matching an empty string! | |
| 1326 | 4436 * Do this for 'search_hl' and the match list (ordered by |
| 4437 * priority). | |
| 7 | 4438 */ |
| 36 | 4439 v = (long)(ptr - line); |
| 1326 | 4440 cur = wp->w_match_head; |
| 4441 shl_flag = FALSE; | |
| 4442 while (cur != NULL || shl_flag == FALSE) | |
| 4443 { | |
| 4444 if (shl_flag == FALSE | |
| 4445 && ((cur != NULL | |
| 4446 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4447 || cur == NULL)) | |
| 4448 { | |
| 4449 shl = &search_hl; | |
| 4450 shl_flag = TRUE; | |
| 4451 } | |
| 4452 else | |
| 4453 shl = &cur->hl; | |
| 5979 | 4454 if (cur != NULL) |
| 4455 cur->pos.cur = 0; | |
| 4456 pos_inprogress = TRUE; | |
| 4457 while (shl->rm.regprog != NULL | |
| 4458 || (cur != NULL && pos_inprogress)) | |
| 7 | 4459 { |
| 36 | 4460 if (shl->startcol != MAXCOL |
| 4461 && v >= (long)shl->startcol | |
| 4462 && v < (long)shl->endcol) | |
| 7 | 4463 { |
| 6430 | 4464 int tmp_col = v + MB_PTR2LEN(ptr); |
| 4465 | |
| 4466 if (shl->endcol < tmp_col) | |
| 4467 shl->endcol = tmp_col; | |
| 7 | 4468 shl->attr_cur = shl->attr; |
| 6947 | 4469 #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
|
4470 // 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
|
4471 // the match. |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4472 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
|
4473 && 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
|
4474 && 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
|
4475 == cur->hlg_id) |
| 6947 | 4476 { |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4477 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4478 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4479 match_conc = cur->conceal_char; |
| 4480 } | |
| 4481 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4482 has_match_conc = match_conc = 0; |
| 6947 | 4483 #endif |
| 7 | 4484 } |
| 6430 | 4485 else if (v == (long)shl->endcol) |
| 7 | 4486 { |
| 4487 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4488 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
|
4489 shl == &search_hl ? NULL : cur); |
| 5979 | 4490 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4491 ? FALSE : TRUE; |
| 7 | 4492 |
| 4493 /* Need to get the line again, a multi-line regexp | |
| 4494 * may have made it invalid. */ | |
| 4495 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4496 ptr = line + v; | |
| 4497 | |
| 4498 if (shl->lnum == lnum) | |
| 4499 { | |
| 36 | 4500 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4501 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4502 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4503 else |
| 36 | 4504 shl->endcol = MAXCOL; |
| 4505 | |
| 4506 if (shl->startcol == shl->endcol) | |
| 7 | 4507 { |
| 4508 /* highlight empty match, try again after | |
| 4509 * it */ | |
| 4510 if (has_mbyte) | |
| 474 | 4511 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4512 + shl->endcol); |
| 7 | 4513 else |
| 36 | 4514 ++shl->endcol; |
| 7 | 4515 } |
| 4516 | |
| 4517 /* Loop to check if the match starts at the | |
| 4518 * current position */ | |
| 4519 continue; | |
| 4520 } | |
| 4521 } | |
| 4522 break; | |
| 4523 } | |
| 1326 | 4524 if (shl != &search_hl && cur != NULL) |
| 4525 cur = cur->next; | |
| 4526 } | |
| 4527 | |
| 4528 /* Use attributes from match with highest priority among | |
| 4529 * 'search_hl' and the match list. */ | |
| 4530 search_attr = search_hl.attr_cur; | |
| 4531 cur = wp->w_match_head; | |
| 4532 shl_flag = FALSE; | |
| 4533 while (cur != NULL || shl_flag == FALSE) | |
| 4534 { | |
| 4535 if (shl_flag == FALSE | |
| 4536 && ((cur != NULL | |
| 4537 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4538 || cur == NULL)) | |
| 699 | 4539 { |
| 1326 | 4540 shl = &search_hl; |
| 4541 shl_flag = TRUE; | |
| 699 | 4542 } |
| 1326 | 4543 else |
| 4544 shl = &cur->hl; | |
| 4545 if (shl->attr_cur != 0) | |
| 4546 search_attr = shl->attr_cur; | |
| 4547 if (shl != &search_hl && cur != NULL) | |
| 4548 cur = cur->next; | |
| 4549 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4550 /* 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
|
4551 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
|
4552 || (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
|
4553 search_attr = 0; |
| 7 | 4554 } |
| 4555 #endif | |
| 4556 | |
| 4557 #ifdef FEAT_DIFF | |
| 674 | 4558 if (diff_hlf != (hlf_T)0) |
| 7 | 4559 { |
| 1295 | 4560 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4561 && n_extra == 0) | |
| 7 | 4562 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4563 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4564 && n_extra == 0) | |
| 7 | 4565 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
|
4566 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4567 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
|
4568 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4569 } |
| 4570 #endif | |
| 4571 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4572 #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
|
4573 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
|
4574 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4575 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4576 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
|
4577 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4578 // 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
|
4579 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
|
4580 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4581 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
|
4582 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4583 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
|
4584 + 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
|
4585 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4586 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
|
4587 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
|
4588 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
|
4589 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4590 * (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
|
4591 --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
|
4592 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4593 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4594 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4595 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4596 // 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
|
4597 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
|
4598 && 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
|
4599 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
|
4600 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4601 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
|
4602 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
|
4603 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
|
4604 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4605 // 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
|
4606 // 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
|
4607 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
|
4608 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
|
4609 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
|
4610 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
|
4611 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4612 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
|
4613 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4614 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
|
4615 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
|
4616 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
|
4617 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4618 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
|
4619 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4620 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
|
4621 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4622 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
|
4623 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4624 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
|
4625 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
|
4626 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4627 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4628 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4629 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4630 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4631 |
| 674 | 4632 /* Decide which of the highlight attributes to use. */ |
| 4633 attr_pri = TRUE; | |
| 6717 | 4634 #ifdef LINE_ATTR |
| 674 | 4635 if (area_attr != 0) |
| 6717 | 4636 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4637 else if (search_attr != 0) |
| 6717 | 4638 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
|
4639 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4640 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
|
4641 { |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4642 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
|
4643 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
|
4644 } |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4645 # endif |
| 674 | 4646 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4647 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4648 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4649 // 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
|
4650 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4651 char_attr = line_attr; |
| 6717 | 4652 #else |
| 4653 if (area_attr != 0) | |
| 4654 char_attr = area_attr; | |
| 4655 else if (search_attr != 0) | |
| 4656 char_attr = search_attr; | |
| 674 | 4657 #endif |
| 4658 else | |
| 4659 { | |
| 4660 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4661 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4662 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
|
4663 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4664 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
|
4665 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
|
4666 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
|
4667 else |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4668 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
|
4669 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
|
4670 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4671 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4672 #endif |
| 674 | 4673 #ifdef FEAT_SYN_HL |
| 4674 if (has_syntax) | |
| 4675 char_attr = syntax_attr; | |
| 4676 else | |
| 4677 #endif | |
| 4678 char_attr = 0; | |
| 4679 } | |
| 7 | 4680 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4681 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4682 char_attr = win_attr; |
| 7 | 4683 |
| 4684 /* | |
| 4685 * Get the next character to put on the screen. | |
| 4686 */ | |
| 4687 /* | |
| 1340 | 4688 * The "p_extra" points to the extra stuff that is inserted to |
| 4689 * represent special characters (non-printable stuff) and other | |
| 4690 * 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
|
4691 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4692 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4693 * "p_extra[n_extra]". | |
| 7 | 4694 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4695 */ | |
| 4696 if (n_extra > 0) | |
| 4697 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4698 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
|
4699 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4700 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4701 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
|
4702 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4703 { |
| 4704 mb_utf8 = TRUE; | |
| 714 | 4705 u8cc[0] = 0; |
| 819 | 4706 c = 0xc0; |
| 7 | 4707 } |
| 4708 else | |
| 4709 mb_utf8 = FALSE; | |
| 4710 } | |
| 4711 else | |
| 4712 { | |
| 4713 c = *p_extra; | |
| 4714 if (has_mbyte) | |
| 4715 { | |
| 4716 mb_c = c; | |
| 4717 if (enc_utf8) | |
| 4718 { | |
| 4719 /* If the UTF-8 character is more than one byte: | |
| 4720 * 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
|
4721 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4722 mb_utf8 = FALSE; |
| 4723 if (mb_l > n_extra) | |
| 4724 mb_l = 1; | |
| 4725 else if (mb_l > 1) | |
| 4726 { | |
| 714 | 4727 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4728 mb_utf8 = TRUE; |
| 819 | 4729 c = 0xc0; |
| 7 | 4730 } |
| 4731 } | |
| 4732 else | |
| 4733 { | |
| 4734 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4735 mb_l = MB_BYTE2LEN(c); | |
| 4736 if (mb_l >= n_extra) | |
| 4737 mb_l = 1; | |
| 4738 else if (mb_l > 1) | |
| 4739 mb_c = (c << 8) + p_extra[1]; | |
| 4740 } | |
| 504 | 4741 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4742 mb_l = 1; | |
| 4743 | |
| 7 | 4744 /* If a double-width char doesn't fit display a '>' in the |
| 4745 * last column. */ | |
| 504 | 4746 if (( |
| 7 | 4747 # ifdef FEAT_RIGHTLEFT |
| 4748 wp->w_p_rl ? (col <= 0) : | |
| 4749 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4750 (col >= wp->w_width - 1)) |
| 7 | 4751 && (*mb_char2cells)(mb_c) == 2) |
| 4752 { | |
| 4753 c = '>'; | |
| 4754 mb_c = c; | |
| 4755 mb_l = 1; | |
| 4756 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
|
4757 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4758 /* put the pointer back to output the double-width |
| 4759 * character at the start of the next line. */ | |
| 4760 ++n_extra; | |
| 4761 --p_extra; | |
| 4762 } | |
| 4763 else | |
| 4764 { | |
| 4765 n_extra -= mb_l - 1; | |
| 4766 p_extra += mb_l - 1; | |
| 4767 } | |
| 4768 } | |
| 4769 ++p_extra; | |
| 4770 } | |
| 4771 --n_extra; | |
| 4772 } | |
| 4773 else | |
| 4774 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4775 #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
|
4776 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4777 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4778 |
| 6026 | 4779 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
|
4780 VIM_CLEAR(p_extra_free); |
| 7 | 4781 /* |
| 4782 * Get a character from the line itself. | |
| 4783 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4784 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4785 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4786 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4787 #endif |
| 7 | 4788 if (has_mbyte) |
| 4789 { | |
| 4790 mb_c = c; | |
| 4791 if (enc_utf8) | |
| 4792 { | |
| 4793 /* If the UTF-8 character is more than one byte: Decode it | |
| 4794 * 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
|
4795 mb_l = utfc_ptr2len(ptr); |
| 7 | 4796 mb_utf8 = FALSE; |
| 4797 if (mb_l > 1) | |
| 4798 { | |
| 714 | 4799 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4800 /* Overlong encoded ASCII or ASCII with composing char |
| 4801 * is displayed normally, except a NUL. */ | |
| 4802 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
|
4803 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4804 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4805 #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
|
4806 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4807 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4808 } |
| 7 | 4809 mb_utf8 = TRUE; |
| 507 | 4810 |
| 4811 /* At start of the line we can have a composing char. | |
| 4812 * Draw it as a space with a composing char. */ | |
| 4813 if (utf_iscomposing(mb_c)) | |
| 4814 { | |
| 1326 | 4815 int i; |
| 4816 | |
| 714 | 4817 for (i = Screen_mco - 1; i > 0; --i) |
| 4818 u8cc[i] = u8cc[i - 1]; | |
| 4819 u8cc[0] = mb_c; | |
| 507 | 4820 mb_c = ' '; |
| 4821 } | |
| 7 | 4822 } |
| 4823 | |
| 4824 if ((mb_l == 1 && c >= 0x80) | |
| 4825 || (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
|
4826 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4827 { |
| 4828 /* | |
| 4829 * Illegal UTF-8 byte: display as <xx>. | |
| 4830 * Non-BMP character : display as ? or fullwidth ?. | |
| 4831 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4832 transchar_hex(extra, mb_c); |
| 714 | 4833 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4834 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
|
4835 rl_mirror(extra); |
| 714 | 4836 # endif |
| 7 | 4837 p_extra = extra; |
| 4838 c = *p_extra; | |
| 4839 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4840 mb_utf8 = (c >= 0x80); | |
| 4841 n_extra = (int)STRLEN(p_extra); | |
| 4842 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
|
4843 c_final = NUL; |
| 7 | 4844 if (area_attr == 0 && search_attr == 0) |
| 4845 { | |
| 4846 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
|
4847 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4848 saved_attr2 = char_attr; /* save current attr */ |
| 4849 } | |
| 4850 } | |
| 4851 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4852 mb_l = 1; | |
| 4853 #ifdef FEAT_ARABIC | |
| 4854 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4855 { | |
| 4856 /* Do Arabic shaping. */ | |
| 714 | 4857 int pc, pc1, nc; |
| 4858 int pcc[MAX_MCO]; | |
| 7 | 4859 |
| 4860 /* The idea of what is the previous and next | |
| 4861 * character depends on 'rightleft'. */ | |
| 4862 if (wp->w_p_rl) | |
| 4863 { | |
| 4864 pc = prev_c; | |
| 4865 pc1 = prev_c1; | |
| 4866 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4867 prev_c1 = u8cc[0]; |
| 7 | 4868 } |
| 4869 else | |
| 4870 { | |
| 714 | 4871 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4872 nc = prev_c; |
| 714 | 4873 pc1 = pcc[0]; |
| 7 | 4874 } |
| 4875 prev_c = mb_c; | |
| 4876 | |
| 714 | 4877 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4878 } |
| 4879 else | |
| 4880 prev_c = mb_c; | |
| 4881 #endif | |
| 4882 } | |
| 4883 else /* enc_dbcs */ | |
| 4884 { | |
| 4885 mb_l = MB_BYTE2LEN(c); | |
| 4886 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4887 mb_l = 1; | |
| 4888 else if (mb_l > 1) | |
| 4889 { | |
| 4890 /* We assume a second byte below 32 is illegal. | |
| 4891 * Hopefully this is OK for all double-byte encodings! | |
| 4892 */ | |
| 4893 if (ptr[1] >= 32) | |
| 4894 mb_c = (c << 8) + ptr[1]; | |
| 4895 else | |
| 4896 { | |
| 4897 if (ptr[1] == NUL) | |
| 4898 { | |
| 4899 /* head byte at end of line */ | |
| 4900 mb_l = 1; | |
| 4901 transchar_nonprint(extra, c); | |
| 4902 } | |
| 4903 else | |
| 4904 { | |
| 4905 /* illegal tail byte */ | |
| 4906 mb_l = 2; | |
| 4907 STRCPY(extra, "XX"); | |
| 4908 } | |
| 4909 p_extra = extra; | |
| 4910 n_extra = (int)STRLEN(extra) - 1; | |
| 4911 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
|
4912 c_final = NUL; |
| 7 | 4913 c = *p_extra++; |
| 4914 if (area_attr == 0 && search_attr == 0) | |
| 4915 { | |
| 4916 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
|
4917 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4918 saved_attr2 = char_attr; /* save current attr */ |
| 4919 } | |
| 4920 mb_c = c; | |
| 4921 } | |
| 4922 } | |
| 4923 } | |
| 4924 /* If a double-width char doesn't fit display a '>' in the | |
| 4925 * last column; the character is displayed at the start of the | |
| 4926 * next line. */ | |
| 4927 if (( | |
| 4928 # ifdef FEAT_RIGHTLEFT | |
| 4929 wp->w_p_rl ? (col <= 0) : | |
| 4930 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4931 (col >= wp->w_width - 1)) |
| 7 | 4932 && (*mb_char2cells)(mb_c) == 2) |
| 4933 { | |
| 4934 c = '>'; | |
| 4935 mb_c = c; | |
| 4936 mb_utf8 = FALSE; | |
| 4937 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
|
4938 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
|
4939 // 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
|
4940 // displayed at the start of the next line. |
| 7 | 4941 --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
|
4942 #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
|
4943 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
|
4944 #endif |
| 7 | 4945 } |
| 4946 else if (*ptr != NUL) | |
| 4947 ptr += mb_l - 1; | |
| 4948 | |
| 4949 /* 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
|
4950 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4951 * 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
|
4952 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4953 { |
| 4954 n_extra = 1; | |
| 3586 | 4955 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
|
4956 c_final = NUL; |
| 7 | 4957 c = ' '; |
| 4958 if (area_attr == 0 && search_attr == 0) | |
| 4959 { | |
| 4960 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
|
4961 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4962 saved_attr2 = char_attr; /* save current attr */ |
| 4963 } | |
| 4964 mb_c = c; | |
| 4965 mb_utf8 = FALSE; | |
| 4966 mb_l = 1; | |
| 4967 } | |
| 4968 | |
| 4969 } | |
| 4970 ++ptr; | |
| 4971 | |
| 4972 if (extra_check) | |
| 4973 { | |
| 743 | 4974 #ifdef FEAT_SPELL |
| 221 | 4975 int can_spell = TRUE; |
| 743 | 4976 #endif |
| 4977 | |
|
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
|
4978 #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
|
4979 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
|
4980 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4981 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
|
4982 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4983 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
|
4984 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
|
4985 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
|
4986 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
|
4987 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4988 #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
|
4989 |
| 743 | 4990 #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
|
4991 // 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
|
4992 // (double-wide char that doesn't fit). |
| 221 | 4993 v = (long)(ptr - line); |
| 4994 if (has_syntax && v > 0) | |
| 7 | 4995 { |
| 4996 /* Get the syntax attribute for the character. If there | |
| 4997 * is an error, disable syntax highlighting. */ | |
| 4998 save_did_emsg = did_emsg; | |
| 4999 did_emsg = FALSE; | |
| 5000 | |
| 221 | 5001 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 5002 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5003 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5004 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5005 NULL, FALSE); |
| 7 | 5006 |
| 5007 if (did_emsg) | |
| 482 | 5008 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5009 wp->w_s->b_syn_error = TRUE; |
| 482 | 5010 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5011 syntax_attr = 0; |
| 482 | 5012 } |
| 7 | 5013 else |
| 5014 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5015 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5016 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5017 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5018 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
|
5019 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
5020 #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
|
5021 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
|
5022 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
5023 #endif |
| 7 | 5024 |
| 5025 /* Need to get the line again, a multi-line regexp may | |
| 5026 * have made it invalid. */ | |
| 5027 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 5028 ptr = line + v; | |
| 5029 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
5030 # 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
|
5031 // 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
|
5032 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
|
5033 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
5034 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
5035 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
|
5036 # 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
|
5037 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
|
5038 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
5039 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
|
5040 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
|
5041 else |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
5042 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
|
5043 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
5044 # 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
|
5045 /* 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
|
5046 * 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
|
5047 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
|
5048 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
|
5049 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
|
5050 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
|
5051 # endif |
| 7 | 5052 } |
| 743 | 5053 #endif |
| 5054 | |
| 5055 #ifdef FEAT_SPELL | |
| 301 | 5056 /* Check spelling (unless at the end of the line). |
| 319 | 5057 * Only do this when there is no syntax highlighting, the |
| 5058 * @Spell cluster is not used or the current syntax item | |
| 5059 * contains the @Spell cluster. */ | |
| 348 | 5060 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 5061 { |
| 230 | 5062 spell_attr = 0; |
| 743 | 5063 if (c != 0 && ( |
| 5064 # ifdef FEAT_SYN_HL | |
| 5065 !has_syntax || | |
| 5066 # endif | |
| 5067 can_spell)) | |
| 221 | 5068 { |
| 348 | 5069 char_u *prev_ptr, *p; |
| 5070 int len; | |
| 534 | 5071 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 5072 if (has_mbyte) |
| 5073 { | |
| 5074 prev_ptr = ptr - mb_l; | |
| 5075 v -= mb_l - 1; | |
| 5076 } | |
| 5077 else | |
| 5078 prev_ptr = ptr - 1; | |
| 348 | 5079 |
| 5080 /* Use nextline[] if possible, it has the start of the | |
| 5081 * next line concatenated. */ | |
| 5082 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 5083 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 5084 else | |
| 5085 p = prev_ptr; | |
| 835 | 5086 cap_col -= (int)(prev_ptr - line); |
| 625 | 5087 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 5088 nochange); | |
| 348 | 5089 word_end = v + len; |
| 301 | 5090 |
| 5091 /* In Insert mode only highlight a word that | |
| 5092 * doesn't touch the cursor. */ | |
| 534 | 5093 if (spell_hlf != HLF_COUNT |
| 301 | 5094 && (State & INSERT) != 0 |
| 5095 && wp->w_cursor.lnum == lnum | |
| 5096 && wp->w_cursor.col >= | |
| 5097 (colnr_T)(prev_ptr - line) | |
| 5098 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 5099 { |
| 534 | 5100 spell_hlf = HLF_COUNT; |
| 301 | 5101 spell_redraw_lnum = lnum; |
| 221 | 5102 } |
| 348 | 5103 |
| 534 | 5104 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 5105 && (p - nextline) + len > nextline_idx) |
| 5106 { | |
| 5107 /* Remember that the good word continues at the | |
| 5108 * start of the next line. */ | |
| 5109 checked_lnum = lnum + 1; | |
| 835 | 5110 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 5111 } |
| 386 | 5112 |
| 534 | 5113 /* Turn index into actual attributes. */ |
| 5114 if (spell_hlf != HLF_COUNT) | |
| 5115 spell_attr = highlight_attr[spell_hlf]; | |
| 5116 | |
| 386 | 5117 if (cap_col > 0) |
| 5118 { | |
| 5119 if (p != prev_ptr | |
| 5120 && (p - nextline) + cap_col >= nextline_idx) | |
| 5121 { | |
| 5122 /* Remember that the word in the next line | |
| 5123 * must start with a capital. */ | |
| 5124 capcol_lnum = lnum + 1; | |
| 835 | 5125 cap_col = (int)((p - nextline) + cap_col |
| 5126 - nextline_idx); | |
| 386 | 5127 } |
| 5128 else | |
| 5129 /* Compute the actual column. */ | |
| 835 | 5130 cap_col += (int)(prev_ptr - line); |
| 386 | 5131 } |
| 221 | 5132 } |
| 5133 } | |
| 5134 if (spell_attr != 0) | |
| 348 | 5135 { |
| 674 | 5136 if (!attr_pri) |
| 348 | 5137 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 5138 else | |
| 5139 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 5140 } | |
| 7 | 5141 #endif |
| 5142 #ifdef FEAT_LINEBREAK | |
| 5143 /* | |
| 221 | 5144 * Found last space before word: check for line break. |
| 7 | 5145 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
5146 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
|
5147 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 5148 { |
| 6693 | 5149 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
|
5150 char_u *p = ptr - (mb_off + 1); |
| 6681 | 5151 |
| 5995 | 5152 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 5153 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 5154 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5155 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
|
5156 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
5157 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
|
5158 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
|
5159 # else |
| 6371 | 5160 n_extra = (int)wp->w_buffer->b_p_ts |
| 5161 - 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
|
5162 # endif |
| 6371 | 5163 |
| 6693 | 5164 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
|
5165 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5166 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5167 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5168 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5169 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5170 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5171 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5172 #endif |
| 6026 | 5173 if (!wp->w_p_list) |
| 5174 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5175 } |
| 7 | 5176 } |
| 5177 #endif | |
| 5178 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5179 // '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
|
5180 // 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
|
5181 // 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
|
5182 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
|
5183 && ((((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
|
5184 || (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
|
5185 && ((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
|
5186 || (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
|
5187 && 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
|
5188 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5189 && 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
|
5190 && 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
|
5191 && 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
|
5192 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5193 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
|
5194 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
|
5195 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5196 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
|
5197 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
|
5198 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
|
5199 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5200 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
|
5201 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
|
5202 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5203 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
|
5204 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
|
5205 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5206 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5207 else |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5208 mb_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5209 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5210 |
| 7 | 5211 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 5212 { | |
| 5213 c = lcs_trail; | |
| 674 | 5214 if (!attr_pri) |
| 7 | 5215 { |
| 5216 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
|
5217 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5218 saved_attr2 = char_attr; /* save current attr */ |
| 5219 } | |
| 5220 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
|
5221 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5222 { |
| 5223 mb_utf8 = TRUE; | |
| 714 | 5224 u8cc[0] = 0; |
| 819 | 5225 c = 0xc0; |
| 7 | 5226 } |
| 5227 else | |
| 5228 mb_utf8 = FALSE; | |
| 5229 } | |
| 5230 } | |
| 5231 | |
| 5232 /* | |
| 5233 * Handling of non-printable characters. | |
| 5234 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
5235 if (!vim_isprintc(c)) |
| 7 | 5236 { |
| 5237 /* | |
| 5238 * when getting a character from the file, we may have to | |
| 5239 * turn it into something else on the way to putting it | |
| 5240 * into "ScreenLines". | |
| 5241 */ | |
| 5242 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 5243 { | |
| 6026 | 5244 int tab_len = 0; |
| 6503 | 5245 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 5246 #ifdef FEAT_LINEBREAK | |
| 5247 /* only adjust the tab_len, when at the first column | |
| 5248 * after the showbreak value was drawn */ | |
| 5249 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 5250 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 5251 #endif | |
| 7 | 5252 /* 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
|
5253 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5254 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
|
5255 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
|
5256 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
|
5257 #else |
| 6026 | 5258 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
|
5259 - 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
|
5260 #endif |
| 6503 | 5261 |
| 6026 | 5262 #ifdef FEAT_LINEBREAK |
| 6100 | 5263 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 5264 #endif |
| 5265 /* tab amount depends on current column */ | |
| 5266 n_extra = tab_len; | |
| 5267 #ifdef FEAT_LINEBREAK | |
| 5268 else | |
| 5269 { | |
| 5270 char_u *p; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5271 int len; |
| 6026 | 5272 int i; |
| 5273 int saved_nextra = n_extra; | |
| 5274 | |
| 6172 | 5275 #ifdef FEAT_CONCEAL |
| 6627 | 5276 if (vcol_off > 0) |
| 6172 | 5277 /* there are characters to conceal */ |
| 5278 tab_len += vcol_off; | |
| 6520 | 5279 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 5280 */ | |
| 5281 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 5282 && n_extra > tab_len) | |
| 5283 tab_len += n_extra - tab_len; | |
| 5284 #endif | |
| 5285 | |
| 6026 | 5286 /* if n_extra > 0, it gives the number of chars, to |
| 5287 * use for a tab, else we need to calculate the width | |
| 5288 * for a tab */ | |
| 5289 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 5290 if (n_extra > 0) | |
| 5291 len += n_extra - tab_len; | |
| 5292 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
|
5293 p = alloc(len + 1); |
| 6026 | 5294 vim_memset(p, ' ', len); |
| 5295 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5296 vim_free(p_extra_free); |
| 6026 | 5297 p_extra_free = p; |
| 5298 for (i = 0; i < tab_len; i++) | |
| 5299 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5300 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5301 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5302 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5303 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5304 } |
| 6026 | 5305 mb_char2bytes(lcs_tab2, p); |
| 5306 p += mb_char2len(lcs_tab2); | |
| 5307 n_extra += mb_char2len(lcs_tab2) | |
| 5308 - (saved_nextra > 0 ? 1 : 0); | |
| 5309 } | |
| 5310 p_extra = p_extra_free; | |
| 6172 | 5311 #ifdef FEAT_CONCEAL |
| 5312 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 5313 * macro below, so need to adjust for that here */ | |
| 6627 | 5314 if (vcol_off > 0) |
| 6172 | 5315 n_extra -= vcol_off; |
| 5316 #endif | |
| 6026 | 5317 } |
| 5318 #endif | |
| 3984 | 5319 #ifdef FEAT_CONCEAL |
| 6627 | 5320 { |
| 5321 int vc_saved = vcol_off; | |
| 5322 | |
| 5323 /* Tab alignment should be identical regardless of | |
| 5324 * 'conceallevel' value. So tab compensates of all | |
| 5325 * previous concealed characters, and thus resets | |
| 5326 * vcol_off and boguscols accumulated so far in the | |
| 5327 * line. Note that the tab can be longer than | |
| 5328 * 'tabstop' when there are concealed characters. */ | |
| 5329 FIX_FOR_BOGUSCOLS; | |
| 5330 | |
| 5331 /* Make sure, the highlighting for the tab char will be | |
| 5332 * correctly set further below (effectively reverts the | |
| 5333 * FIX_FOR_BOGSUCOLS macro */ | |
| 5334 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 5335 && lcs_tab1) |
| 6627 | 5336 tab_len += vc_saved; |
| 5337 } | |
| 3984 | 5338 #endif |
| 7 | 5339 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 5340 if (wp->w_p_list) | |
| 5341 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5342 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5343 #ifdef FEAT_LINEBREAK |
| 5344 if (wp->w_p_lbr) | |
| 5345 c_extra = NUL; /* using p_extra from above */ | |
| 5346 else | |
| 5347 #endif | |
| 5348 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
|
5349 c_final = lcs_tab3; |
| 6026 | 5350 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
|
5351 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5352 saved_attr2 = char_attr; /* save current attr */ |
| 5353 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
|
5354 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5355 { |
| 5356 mb_utf8 = TRUE; | |
| 714 | 5357 u8cc[0] = 0; |
| 819 | 5358 c = 0xc0; |
| 7 | 5359 } |
| 5360 } | |
| 5361 else | |
| 5362 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5363 c_final = NUL; |
| 7 | 5364 c_extra = ' '; |
| 5365 c = ' '; | |
| 5366 } | |
| 5367 } | |
| 36 | 5368 else if (c == NUL |
| 6799 | 5369 && (wp->w_p_list |
| 36 | 5370 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5371 && tocol > vcol | |
| 5372 && VIsual_mode != Ctrl_V | |
| 5373 && ( | |
| 5374 # ifdef FEAT_RIGHTLEFT | |
| 5375 wp->w_p_rl ? (col >= 0) : | |
| 5376 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5377 (col < wp->w_width)) |
| 36 | 5378 && !(noinvcur |
| 1850 | 5379 && lnum == wp->w_cursor.lnum |
| 36 | 5380 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5381 && lcs_eol_one > 0) |
| 7 | 5382 { |
| 36 | 5383 /* Display a '$' after the line or highlight an extra |
| 5384 * character if the line break is included. */ | |
| 7 | 5385 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5386 /* For a diff line the highlighting continues after the | |
| 5387 * "$". */ | |
| 5388 if ( | |
| 5389 # ifdef FEAT_DIFF | |
| 534 | 5390 diff_hlf == (hlf_T)0 |
| 7 | 5391 # ifdef LINE_ATTR |
| 5392 && | |
| 5393 # endif | |
| 5394 # endif | |
| 5395 # ifdef LINE_ATTR | |
| 5396 line_attr == 0 | |
| 5397 # endif | |
| 5398 ) | |
| 5399 #endif | |
| 5400 { | |
| 5401 /* In virtualedit, visual selections may extend | |
| 5402 * beyond end of line. */ | |
| 5403 if (area_highlighting && virtual_active() | |
| 5404 && tocol != MAXCOL && vcol < tocol) | |
| 5405 n_extra = 0; | |
| 5406 else | |
| 5407 { | |
| 5408 p_extra = at_end_str; | |
| 5409 n_extra = 1; | |
| 5410 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
|
5411 c_final = NUL; |
| 7 | 5412 } |
| 5413 } | |
| 6799 | 5414 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5415 c = lcs_eol; |
| 5416 else | |
| 5417 c = ' '; | |
| 7 | 5418 lcs_eol_one = -1; |
| 5419 --ptr; /* put it back at the NUL */ | |
| 674 | 5420 if (!attr_pri) |
| 7 | 5421 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5422 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5423 n_attr = 1; |
| 5424 } | |
| 5425 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
|
5426 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5427 { |
| 5428 mb_utf8 = TRUE; | |
| 714 | 5429 u8cc[0] = 0; |
| 819 | 5430 c = 0xc0; |
| 7 | 5431 } |
| 5432 else | |
| 5433 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5434 } | |
| 5435 else if (c != NUL) | |
| 5436 { | |
| 5437 p_extra = transchar(c); | |
| 6064 | 5438 if (n_extra == 0) |
| 5439 n_extra = byte2cells(c) - 1; | |
| 7 | 5440 #ifdef FEAT_RIGHTLEFT |
| 5441 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5442 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5443 #endif | |
| 5444 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
|
5445 c_final = NUL; |
| 6026 | 5446 #ifdef FEAT_LINEBREAK |
| 5447 if (wp->w_p_lbr) | |
| 5448 { | |
| 5449 char_u *p; | |
| 5450 | |
| 5451 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
|
5452 p = alloc(n_extra + 1); |
| 6026 | 5453 vim_memset(p, ' ', n_extra); |
| 5454 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5455 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5456 vim_free(p_extra_free); |
| 6026 | 5457 p_extra_free = p_extra = p; |
| 5458 } | |
| 5459 else | |
| 5460 #endif | |
| 5461 { | |
| 5462 n_extra = byte2cells(c) - 1; | |
| 5463 c = *p_extra++; | |
| 5464 } | |
| 674 | 5465 if (!attr_pri) |
| 7 | 5466 { |
| 5467 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
|
5468 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5469 saved_attr2 = char_attr; /* save current attr */ |
| 5470 } | |
| 5471 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5472 } | |
| 5473 else if (VIsual_active | |
| 5474 && (VIsual_mode == Ctrl_V | |
| 5475 || VIsual_mode == 'v') | |
| 5476 && virtual_active() | |
| 5477 && tocol != MAXCOL | |
| 5478 && vcol < tocol | |
| 5479 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5480 #ifdef FEAT_RIGHTLEFT |
| 7 | 5481 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5482 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5483 (col < wp->w_width))) |
| 7 | 5484 { |
| 5485 c = ' '; | |
| 5486 --ptr; /* put it back at the NUL */ | |
| 5487 } | |
| 910 | 5488 #if defined(LINE_ATTR) |
| 7 | 5489 else if (( |
| 5490 # ifdef FEAT_DIFF | |
| 910 | 5491 diff_hlf != (hlf_T)0 || |
| 7 | 5492 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5493 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5494 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
|
5495 # endif |
| 7 | 5496 line_attr != 0 |
| 5497 ) && ( | |
| 5498 # ifdef FEAT_RIGHTLEFT | |
| 5499 wp->w_p_rl ? (col >= 0) : | |
| 5500 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5501 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5502 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5503 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5504 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5505 < wp->w_width))) |
| 7 | 5506 { |
| 5507 /* Highlight until the right side of the window */ | |
| 5508 c = ' '; | |
| 5509 --ptr; /* put it back at the NUL */ | |
| 867 | 5510 |
| 5511 /* Remember we do the char for line highlighting. */ | |
| 5512 ++did_line_attr; | |
| 5513 | |
| 5514 /* 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
|
5515 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
|
5516 && (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
|
5517 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5518 char_attr = line_attr; |
| 7 | 5519 # ifdef FEAT_DIFF |
| 5520 if (diff_hlf == HLF_TXD) | |
| 5521 { | |
| 5522 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5523 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5524 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5525 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5526 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5527 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
|
5528 HL_ATTR(HLF_CUL)); |
| 6106 | 5529 } |
| 7 | 5530 } |
| 5531 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5532 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5533 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
|
5534 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5535 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
|
5536 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
|
5537 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
|
5538 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
|
5539 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5540 # endif |
| 7 | 5541 } |
| 5542 #endif | |
| 5543 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5544 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5545 #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
|
5546 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
|
5547 && (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
|
5548 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
|
5549 && ((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
|
5550 && !(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
|
5551 && 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
|
5552 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5553 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5554 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5555 && (syn_get_sub_char() != NUL || match_conc |
| 5556 || 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
|
5557 && 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
|
5558 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5559 /* 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
|
5560 * character. */ |
| 6947 | 5561 if (match_conc) |
| 5562 c = match_conc; | |
| 5563 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
|
5564 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5565 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5566 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5567 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5568 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5569 |
|
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
|
5570 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5571 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5572 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5573 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5574 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5575 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
|
5576 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5577 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5578 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5579 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5580 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5581 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5582 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5583 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5584 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5585 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5586 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5587 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5588 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5589 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5590 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5591 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5592 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5593 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5594 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5595 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5596 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5597 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5598 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
|
5599 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
|
5600 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5601 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5602 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5603 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5604 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5605 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5606 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
|
5607 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5608 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5609 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5610 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
|
5611 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5612 } |
|
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
|
5613 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5614 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
|
5615 // 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
|
5616 ++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
|
5617 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5618 #endif // FEAT_CONCEAL |
| 7 | 5619 } |
| 5620 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5621 #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
|
5622 /* 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
|
5623 * 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
|
5624 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
|
5625 && 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
|
5626 && 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
|
5627 && (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
|
5628 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5629 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5630 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
|
5631 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
|
5632 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5633 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5634 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
|
5635 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
|
5636 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
|
5637 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5638 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5639 |
| 7 | 5640 /* Don't override visual selection highlighting. */ |
| 5641 if (n_attr > 0 | |
| 5642 && draw_state == WL_LINE | |
| 674 | 5643 && !attr_pri) |
| 7 | 5644 char_attr = extra_attr; |
| 5645 | |
| 42 | 5646 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5647 /* XIM don't send preedit_start and preedit_end, but they send |
| 5648 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5649 * 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
|
5650 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
|
5651 && xic != NULL |
| 1850 | 5652 && lnum == wp->w_cursor.lnum |
| 7 | 5653 && (State & INSERT) |
| 5654 && !p_imdisable | |
| 5655 && im_is_preediting() | |
| 5656 && draw_state == WL_LINE) | |
| 5657 { | |
| 5658 colnr_T tcol; | |
| 5659 | |
| 5660 if (preedit_end_col == MAXCOL) | |
| 1850 | 5661 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5662 else |
| 5663 tcol = preedit_end_col; | |
| 5664 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5665 { | |
| 5666 if (feedback_old_attr < 0) | |
| 5667 { | |
| 5668 feedback_col = 0; | |
| 5669 feedback_old_attr = char_attr; | |
| 5670 } | |
| 5671 char_attr = im_get_feedback_attr(feedback_col); | |
| 5672 if (char_attr < 0) | |
| 5673 char_attr = feedback_old_attr; | |
| 5674 feedback_col++; | |
| 5675 } | |
| 5676 else if (feedback_old_attr >= 0) | |
| 5677 { | |
| 5678 char_attr = feedback_old_attr; | |
| 5679 feedback_old_attr = -1; | |
| 5680 feedback_col = 0; | |
| 5681 } | |
| 5682 } | |
| 5683 #endif | |
| 5684 /* | |
| 5685 * Handle the case where we are in column 0 but not on the first | |
| 5686 * character of the line and the user wants us to show us a | |
| 5687 * special character (via 'listchars' option "precedes:<char>". | |
| 5688 */ | |
| 5689 if (lcs_prec_todo != NUL | |
| 6276 | 5690 && wp->w_p_list |
| 7 | 5691 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5692 #ifdef FEAT_DIFF | |
| 5693 && filler_todo <= 0 | |
| 5694 #endif | |
| 5695 && draw_state > WL_NR | |
| 5696 && c != NUL) | |
| 5697 { | |
| 5698 c = lcs_prec; | |
| 5699 lcs_prec_todo = NUL; | |
| 3586 | 5700 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5701 { | |
| 5702 /* Double-width character being overwritten by the "precedes" | |
| 5703 * character, need to fill up half the character. */ | |
| 5704 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
|
5705 c_final = NUL; |
| 3586 | 5706 n_extra = 1; |
| 5707 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
|
5708 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5709 } |
| 7 | 5710 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
|
5711 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5712 { |
| 5713 mb_utf8 = TRUE; | |
| 714 | 5714 u8cc[0] = 0; |
| 819 | 5715 c = 0xc0; |
| 7 | 5716 } |
| 5717 else | |
| 5718 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5719 if (!attr_pri) |
| 7 | 5720 { |
| 5721 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
|
5722 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5723 n_attr3 = 1; |
| 5724 } | |
| 5725 } | |
| 5726 | |
| 5727 /* | |
| 867 | 5728 * At end of the text line or just after the last character. |
| 7 | 5729 */ |
| 867 | 5730 if (c == NUL |
| 910 | 5731 #if defined(LINE_ATTR) |
| 867 | 5732 || did_line_attr == 1 |
| 5733 #endif | |
| 5734 ) | |
| 5735 { | |
| 5736 #ifdef FEAT_SEARCH_EXTRA | |
| 5737 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5738 |
| 5739 /* we're not really at that column when skipping some text */ | |
| 1439 | 5740 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5741 ++prevcol; |
| 867 | 5742 #endif |
| 5743 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5744 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5745 * highlight match at end of line. If it's beyond the last |
| 5746 * char on the screen, just overwrite that one (tricky!) Not | |
| 5747 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5748 #ifdef FEAT_SEARCH_EXTRA |
| 5749 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5750 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5751 prevcol_hl_flag = TRUE; |
| 5752 else | |
| 5753 { | |
| 5754 cur = wp->w_match_head; | |
| 5755 while (cur != NULL) | |
| 5756 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5757 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5758 { |
| 5759 prevcol_hl_flag = TRUE; | |
| 5760 break; | |
| 5761 } | |
| 5762 cur = cur->next; | |
| 5763 } | |
| 5764 } | |
| 5765 #endif | |
| 7 | 5766 if (lcs_eol == lcs_eol_one |
| 1850 | 5767 && ((area_attr != 0 && vcol == fromcol |
| 5768 && (VIsual_mode != Ctrl_V | |
| 5769 || lnum == VIsual.lnum | |
| 5770 || lnum == curwin->w_cursor.lnum) | |
| 5771 && c == NUL) | |
| 7 | 5772 #ifdef FEAT_SEARCH_EXTRA |
| 5773 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5774 || (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
|
5775 # 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
|
5776 && !(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
|
5777 && !(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
|
5778 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5779 # 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
|
5780 && 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
|
5781 # endif |
| 910 | 5782 # if defined(LINE_ATTR) |
| 867 | 5783 && did_line_attr <= 1 |
| 5784 # endif | |
| 5785 ) | |
| 7 | 5786 #endif |
| 5787 )) | |
| 5788 { | |
| 5789 int n = 0; | |
| 5790 | |
| 5791 #ifdef FEAT_RIGHTLEFT | |
| 5792 if (wp->w_p_rl) | |
| 5793 { | |
| 5794 if (col < 0) | |
| 5795 n = 1; | |
| 5796 } | |
| 5797 else | |
| 5798 #endif | |
| 5799 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5800 if (col >= wp->w_width) |
| 7 | 5801 n = -1; |
| 5802 } | |
| 5803 if (n != 0) | |
| 5804 { | |
| 5805 /* At the window boundary, highlight the last character | |
| 5806 * instead (better than nothing). */ | |
| 5807 off += n; | |
| 5808 col += n; | |
| 5809 } | |
| 5810 else | |
| 5811 { | |
| 5812 /* Add a blank character to highlight. */ | |
| 5813 ScreenLines[off] = ' '; | |
| 5814 if (enc_utf8) | |
| 5815 ScreenLinesUC[off] = 0; | |
| 5816 } | |
| 5817 #ifdef FEAT_SEARCH_EXTRA | |
| 5818 if (area_attr == 0) | |
| 5819 { | |
| 1326 | 5820 /* Use attributes from match with highest priority among |
| 5821 * 'search_hl' and the match list. */ | |
| 5822 char_attr = search_hl.attr; | |
| 5823 cur = wp->w_match_head; | |
| 5824 shl_flag = FALSE; | |
| 5825 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5826 { |
| 1326 | 5827 if (shl_flag == FALSE |
| 5828 && ((cur != NULL | |
| 5829 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5830 || cur == NULL)) | |
| 699 | 5831 { |
| 1326 | 5832 shl = &search_hl; |
| 5833 shl_flag = TRUE; | |
| 699 | 5834 } |
| 1326 | 5835 else |
| 5836 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5837 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
|
5838 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5839 char_attr = shl->attr; |
| 5840 if (shl != &search_hl && cur != NULL) | |
| 5841 cur = cur->next; | |
| 699 | 5842 } |
| 7 | 5843 } |
| 5844 #endif | |
| 5845 ScreenAttrs[off] = char_attr; | |
| 5846 #ifdef FEAT_RIGHTLEFT | |
| 5847 if (wp->w_p_rl) | |
| 1437 | 5848 { |
| 7 | 5849 --col; |
| 1437 | 5850 --off; |
| 5851 } | |
| 7 | 5852 else |
| 5853 #endif | |
| 1437 | 5854 { |
| 7 | 5855 ++col; |
| 1437 | 5856 ++off; |
| 5857 } | |
| 743 | 5858 ++vcol; |
| 1437 | 5859 #ifdef FEAT_SYN_HL |
| 5860 eol_hl_off = 1; | |
| 5861 #endif | |
| 743 | 5862 } |
| 867 | 5863 } |
| 5864 | |
| 5865 /* | |
| 5866 * At end of the text line. | |
| 5867 */ | |
| 5868 if (c == NUL) | |
| 5869 { | |
| 743 | 5870 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5871 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5872 if (wp->w_p_wrap) |
| 5873 v = wp->w_skipcol; | |
| 5874 else | |
| 5875 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5876 |
| 820 | 5877 /* check if line ends before left margin */ |
| 5878 if (vcol < v + col - win_col_off(wp)) | |
| 5879 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
|
5880 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5881 // 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
|
5882 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5883 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5884 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5885 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5886 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5887 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5888 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
|
5889 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5890 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5891 && (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
|
5892 && (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
|
5893 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
|
5894 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5895 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5896 || win_attr != 0) |
| 743 | 5897 # ifdef FEAT_RIGHTLEFT |
| 5898 && !wp->w_p_rl | |
| 5899 # endif | |
| 5900 ) | |
| 5901 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5902 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5903 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5904 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5905 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5906 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5907 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5908 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5909 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
|
5910 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5911 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5912 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5913 while (col < wp->w_width) |
| 743 | 5914 { |
| 5915 ScreenLines[off] = ' '; | |
| 5916 if (enc_utf8) | |
| 5917 ScreenLinesUC[off] = 0; | |
| 5918 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5919 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5920 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
|
5921 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5922 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5923 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
|
5924 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
|
5925 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
|
5926 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5927 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5928 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5929 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5930 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5931 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5932 |
| 743 | 5933 ++vcol; |
| 5934 } | |
| 5935 } | |
| 5936 #endif | |
| 7 | 5937 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5938 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
|
5939 (int)wp->w_width, screen_line_flags); |
| 7 | 5940 row++; |
| 5941 | |
| 5942 /* | |
| 5943 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5944 * updated (saves a call to plines() later). | |
| 5945 */ | |
| 5946 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5947 { | |
| 5948 curwin->w_cline_row = startrow; | |
| 5949 curwin->w_cline_height = row - startrow; | |
| 5950 #ifdef FEAT_FOLDING | |
| 5951 curwin->w_cline_folded = FALSE; | |
| 5952 #endif | |
| 5953 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5954 } | |
| 5955 | |
| 5956 break; | |
| 5957 } | |
| 5958 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5959 // 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
|
5960 // '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
|
5961 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
|
5962 && wp->w_p_list |
| 7 | 5963 && !wp->w_p_wrap |
| 5964 #ifdef FEAT_DIFF | |
| 5965 && filler_todo <= 0 | |
| 5966 #endif | |
| 5967 && ( | |
| 5968 #ifdef FEAT_RIGHTLEFT | |
| 5969 wp->w_p_rl ? col == 0 : | |
| 5970 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5971 col == wp->w_width - 1) |
| 7 | 5972 && (*ptr != NUL |
| 1555 | 5973 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5974 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5975 { | |
| 5976 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
|
5977 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5978 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
|
5979 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5980 { |
| 5981 mb_utf8 = TRUE; | |
| 714 | 5982 u8cc[0] = 0; |
| 819 | 5983 c = 0xc0; |
| 7 | 5984 } |
| 5985 else | |
| 5986 mb_utf8 = FALSE; | |
| 5987 } | |
| 5988 | |
| 743 | 5989 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5990 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5991 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5992 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
|
5993 |
| 743 | 5994 /* 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
|
5995 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5996 * 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
|
5997 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5998 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
|
5999 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
|
6000 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
6001 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6002 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
|
6003 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
6004 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
6005 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
|
6006 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
|
6007 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
6008 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
|
6009 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
6010 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
|
6011 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
|
6012 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
6013 } |
| 743 | 6014 #endif |
| 6015 | |
| 7 | 6016 /* |
| 6017 * Store character to be displayed. | |
| 6018 * Skip characters that are left of the screen for 'nowrap'. | |
| 6019 */ | |
| 6020 vcol_prev = vcol; | |
| 6021 if (draw_state < WL_LINE || n_skip <= 0) | |
| 6022 { | |
| 6023 /* | |
| 6024 * Store the character. | |
| 6025 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6026 #if defined(FEAT_RIGHTLEFT) |
| 7 | 6027 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 6028 { | |
| 6029 /* A double-wide character is: put first halve in left cell. */ | |
| 6030 --off; | |
| 6031 --col; | |
| 6032 } | |
| 6033 #endif | |
| 6034 ScreenLines[off] = c; | |
| 6035 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
6036 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
6037 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
6038 ScreenLines[off] = 0x8e; |
| 7 | 6039 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
6040 } |
| 7 | 6041 else if (enc_utf8) |
| 6042 { | |
| 6043 if (mb_utf8) | |
| 6044 { | |
| 1326 | 6045 int i; |
| 6046 | |
| 7 | 6047 ScreenLinesUC[off] = mb_c; |
| 819 | 6048 if ((c & 0xff) == 0) |
| 6049 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 6050 for (i = 0; i < Screen_mco; ++i) |
| 6051 { | |
| 6052 ScreenLinesC[i][off] = u8cc[i]; | |
| 6053 if (u8cc[i] == 0) | |
| 6054 break; | |
| 6055 } | |
| 7 | 6056 } |
| 6057 else | |
| 6058 ScreenLinesUC[off] = 0; | |
| 6059 } | |
| 6060 if (multi_attr) | |
| 6061 { | |
| 6062 ScreenAttrs[off] = multi_attr; | |
| 6063 multi_attr = 0; | |
| 6064 } | |
| 6065 else | |
| 6066 ScreenAttrs[off] = char_attr; | |
| 6067 | |
| 6068 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 6069 { | |
| 6070 /* Need to fill two screen columns. */ | |
| 6071 ++off; | |
| 6072 ++col; | |
| 6073 if (enc_utf8) | |
| 6074 /* UTF-8: Put a 0 in the second screen char. */ | |
| 6075 ScreenLines[off] = 0; | |
| 6076 else | |
| 6077 /* DBCS: Put second byte in the second screen char. */ | |
| 6078 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6079 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6080 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6081 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6082 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6083 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6084 ++vcol; |
| 7 | 6085 /* When "tocol" is halfway a character, set it to the end of |
| 6086 * the character, otherwise highlighting won't stop. */ | |
| 6087 if (tocol == vcol) | |
| 6088 ++tocol; | |
| 6089 #ifdef FEAT_RIGHTLEFT | |
| 6090 if (wp->w_p_rl) | |
| 6091 { | |
| 6092 /* now it's time to backup one cell */ | |
| 6093 --off; | |
| 6094 --col; | |
| 6095 } | |
| 6096 #endif | |
| 6097 } | |
| 6098 #ifdef FEAT_RIGHTLEFT | |
| 6099 if (wp->w_p_rl) | |
| 6100 { | |
| 6101 --off; | |
| 6102 --col; | |
| 6103 } | |
| 6104 else | |
| 6105 #endif | |
| 6106 { | |
| 6107 ++off; | |
| 6108 ++col; | |
| 6109 } | |
| 6110 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6111 #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
|
6112 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
|
6113 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6114 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6115 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6116 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6117 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6118 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6119 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6120 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6121 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6122 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6123 * 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
|
6124 * 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
|
6125 * 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
|
6126 * 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
|
6127 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6128 * 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
|
6129 * 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
|
6130 * 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
|
6131 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6132 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6133 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6134 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6135 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6136 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6137 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6138 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6139 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6140 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6141 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6142 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6143 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6144 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6145 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6146 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6147 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6148 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6149 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6150 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6151 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6152 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6153 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
|
6154 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6155 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6156 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6157 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6158 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6159 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6160 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6161 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6162 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6163 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6164 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6165 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6166 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6167 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6168 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6169 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6170 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6171 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6172 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6173 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6174 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6175 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6176 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6177 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6178 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6179 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6180 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6181 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6182 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6183 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6184 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6185 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6186 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6187 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6188 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6189 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6190 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6191 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6192 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6193 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6194 #endif /* FEAT_CONCEAL */ |
| 7 | 6195 else |
| 6196 --n_skip; | |
| 6197 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
6198 /* 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
|
6199 * column. */ |
| 1849 | 6200 if (draw_state > WL_NR |
| 7 | 6201 #ifdef FEAT_DIFF |
| 6202 && filler_todo <= 0 | |
| 6203 #endif | |
| 6204 ) | |
| 6205 ++vcol; | |
| 6206 | |
| 743 | 6207 #ifdef FEAT_SYN_HL |
| 6208 if (vcol_save_attr >= 0) | |
| 6209 char_attr = vcol_save_attr; | |
| 6210 #endif | |
| 6211 | |
| 7 | 6212 /* restore attributes after "predeces" in 'listchars' */ |
| 6213 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 6214 char_attr = saved_attr3; | |
| 6215 | |
| 6216 /* restore attributes after last 'listchars' or 'number' char */ | |
| 6217 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 6218 char_attr = saved_attr2; | |
| 6219 | |
| 6220 /* | |
| 6221 * At end of screen line and there is more to come: Display the line | |
| 1378 | 6222 * so far. If there is no more to display it is caught above. |
| 7 | 6223 */ |
| 6224 if (( | |
| 6225 #ifdef FEAT_RIGHTLEFT | |
| 6226 wp->w_p_rl ? (col < 0) : | |
| 6227 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6228 (col >= wp->w_width)) |
| 7 | 6229 && (*ptr != NUL |
| 6230 #ifdef FEAT_DIFF | |
| 6231 || filler_todo > 0 | |
| 6232 #endif | |
| 2724 | 6233 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 6234 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 6235 ) | |
| 6236 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6237 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6238 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
|
6239 (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
|
6240 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6241 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6242 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
|
6243 (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
|
6244 #endif |
| 7 | 6245 ++row; |
| 6246 ++screen_row; | |
| 6247 | |
| 6248 /* When not wrapping and finished diff lines, or when displayed | |
| 6249 * '$' and highlighting until last column, break here. */ | |
| 6250 if ((!wp->w_p_wrap | |
| 6251 #ifdef FEAT_DIFF | |
| 6252 && filler_todo <= 0 | |
| 6253 #endif | |
| 6254 ) || lcs_eol_one == -1) | |
| 6255 break; | |
| 6256 | |
| 6257 /* When the window is too narrow draw all "@" lines. */ | |
| 6258 if (draw_state != WL_LINE | |
| 6259 #ifdef FEAT_DIFF | |
| 6260 && filler_todo <= 0 | |
| 6261 #endif | |
| 6262 ) | |
| 6263 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
6264 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 6265 draw_vsep_win(wp, row); |
| 6266 row = endrow; | |
| 6267 } | |
| 6268 | |
| 6269 /* When line got too long for screen break here. */ | |
| 6270 if (row == endrow) | |
| 6271 { | |
| 6272 ++row; | |
| 6273 break; | |
| 6274 } | |
| 6275 | |
| 6276 if (screen_cur_row == screen_row - 1 | |
| 6277 #ifdef FEAT_DIFF | |
| 6278 && filler_todo <= 0 | |
| 6279 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6280 && wp->w_width == Columns) |
| 7 | 6281 { |
| 6282 /* Remember that the line wraps, used for modeless copy. */ | |
| 6283 LineWraps[screen_row - 1] = TRUE; | |
| 6284 | |
| 6285 /* | |
| 6286 * Special trick to make copy/paste of wrapped lines work with | |
| 6287 * xterm/screen: write an extra character beyond the end of | |
| 6288 * the line. This will work with all terminal types | |
| 6289 * (regardless of the xn,am settings). | |
| 6290 * Only do this on a fast tty. | |
| 6291 * Only do this if the cursor is on the current line | |
| 6292 * (something has been written in it). | |
| 6293 * Don't do this for the GUI. | |
| 6294 * Don't do this for double-width characters. | |
| 6295 * Don't do this for a window not at the right screen border. | |
| 6296 */ | |
| 6297 if (p_tf | |
| 6298 #ifdef FEAT_GUI | |
| 6299 && !gui.in_use | |
| 6300 #endif | |
| 6301 && !(has_mbyte | |
| 1378 | 6302 && ((*mb_off2cells)(LineOffset[screen_row], |
| 6303 LineOffset[screen_row] + screen_Columns) | |
| 6304 == 2 | |
| 7 | 6305 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 6306 + (int)Columns - 2, |
| 6307 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6308 == 2))) |
| 7 | 6309 { |
| 6310 /* First make sure we are at the end of the screen line, | |
| 6311 * then output the same character again to let the | |
| 6312 * terminal know about the wrap. If the terminal doesn't | |
| 6313 * 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
|
6314 if (screen_cur_col != wp->w_width) |
| 7 | 6315 screen_char(LineOffset[screen_row - 1] |
| 6316 + (unsigned)Columns - 1, | |
| 6317 screen_row - 1, (int)(Columns - 1)); | |
| 6318 | |
| 6319 /* When there is a multi-byte character, just output a | |
| 6320 * space to keep it simple. */ | |
| 148 | 6321 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 6322 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 6323 out_char(' '); |
| 6324 else | |
| 6325 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 6326 + (Columns - 1)]); | |
| 6327 /* force a redraw of the first char on the next line */ | |
| 6328 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 6329 screen_start(); /* don't know where cursor is now */ | |
| 6330 } | |
| 6331 } | |
| 6332 | |
| 6333 col = 0; | |
| 6334 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6335 #ifdef FEAT_RIGHTLEFT | |
| 6336 if (wp->w_p_rl) | |
| 6337 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6338 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 6339 off += col; |
| 6340 } | |
| 6341 #endif | |
| 6342 | |
| 6343 /* reset the drawing state for the start of a wrapped line */ | |
| 6344 draw_state = WL_START; | |
| 6345 saved_n_extra = n_extra; | |
| 6346 saved_p_extra = p_extra; | |
| 6347 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
|
6348 saved_c_final = c_final; |
| 7 | 6349 saved_char_attr = char_attr; |
| 6350 n_extra = 0; | |
| 6351 lcs_prec_todo = lcs_prec; | |
| 6352 #ifdef FEAT_LINEBREAK | |
| 6353 # ifdef FEAT_DIFF | |
| 6354 if (filler_todo <= 0) | |
| 6355 # endif | |
| 6356 need_showbreak = TRUE; | |
| 6357 #endif | |
| 6358 #ifdef FEAT_DIFF | |
| 6359 --filler_todo; | |
| 6360 /* When the filler lines are actually below the last line of the | |
| 6361 * file, don't draw the line itself, break here. */ | |
| 6362 if (filler_todo == 0 && wp->w_botfill) | |
| 6363 break; | |
| 6364 #endif | |
| 6365 } | |
| 6366 | |
| 6367 } /* for every character in the line */ | |
| 6368 | |
| 743 | 6369 #ifdef FEAT_SPELL |
| 386 | 6370 /* After an empty line check first word for capital. */ |
| 6371 if (*skipwhite(line) == NUL) | |
| 6372 { | |
| 6373 capcol_lnum = lnum + 1; | |
| 6374 cap_col = 0; | |
| 6375 } | |
| 6376 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6377 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6378 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6379 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6380 #endif |
| 386 | 6381 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6382 vim_free(p_extra_free); |
| 7 | 6383 return row; |
| 6384 } | |
| 6385 | |
| 714 | 6386 /* |
| 6387 * 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
|
6388 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6389 */ |
| 6390 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6391 comp_char_differs(int off_from, int off_to) |
| 714 | 6392 { |
| 6393 int i; | |
| 6394 | |
| 6395 for (i = 0; i < Screen_mco; ++i) | |
| 6396 { | |
| 6397 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6398 return TRUE; | |
| 6399 if (ScreenLinesC[i][off_from] == 0) | |
| 6400 break; | |
| 6401 } | |
| 6402 return FALSE; | |
| 6403 } | |
| 6404 | |
| 7 | 6405 /* |
| 6406 * Check whether the given character needs redrawing: | |
| 6407 * - the (first byte of the) character is different | |
| 6408 * - the attributes are different | |
| 6409 * - the character is multi-byte and the next byte is different | |
| 1616 | 6410 * - the character is two cells wide and the second cell differs. |
| 7 | 6411 */ |
| 6412 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6413 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6414 { |
| 6415 if (cols > 0 | |
| 6416 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6417 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6418 || (enc_dbcs != 0 | |
| 6419 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6420 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6421 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6422 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6423 != ScreenLines[off_to + 1]))) | |
| 6424 || (enc_utf8 | |
| 6425 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6426 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6427 && comp_char_differs(off_from, off_to)) |
| 3759 | 6428 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6429 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6430 != ScreenLines[off_to + 1]))))) |
| 7 | 6431 return TRUE; |
| 6432 return FALSE; | |
| 6433 } | |
| 6434 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6435 #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
|
6436 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6437 * 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
|
6438 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6439 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6440 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
|
6441 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6442 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
|
6443 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6444 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6445 |
| 7 | 6446 /* |
| 6447 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6448 * have actually changed. Handle insert/delete character. | |
| 6449 * "coloff" gives the first column on the screen for this line. | |
| 6450 * "endcol" gives the columns where valid characters are. | |
| 6451 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6452 * 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
|
6453 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6454 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6455 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6456 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6457 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6458 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6459 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6460 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6461 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6462 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6463 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
|
6464 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6465 int flags UNUSED) |
| 7 | 6466 { |
| 6467 unsigned off_from; | |
| 6468 unsigned off_to; | |
| 1378 | 6469 unsigned max_off_from; |
| 6470 unsigned max_off_to; | |
| 7 | 6471 int col = 0; |
| 6472 int hl; | |
| 6473 int force = FALSE; /* force update rest of the line */ | |
| 6474 int redraw_this /* bool: does character need redraw? */ | |
| 6475 #ifdef FEAT_GUI | |
| 6476 = TRUE /* For GUI when while-loop empty */ | |
| 6477 #endif | |
| 6478 ; | |
| 6479 int redraw_next; /* redraw_this for next character */ | |
| 6480 int clear_next = FALSE; | |
| 6481 int char_cells; /* 1: normal char */ | |
| 6482 /* 2: occupies two display cells */ | |
| 6483 # define CHAR_CELLS char_cells | |
| 6484 | |
| 3413 | 6485 /* Check for illegal row and col, just in case. */ |
| 6486 if (row >= Rows) | |
| 6487 row = Rows - 1; | |
| 6488 if (endcol > Columns) | |
| 6489 endcol = Columns; | |
| 6490 | |
| 7 | 6491 # ifdef FEAT_CLIPBOARD |
| 6492 clip_may_clear_selection(row, row); | |
| 6493 # endif | |
| 6494 | |
| 6495 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6496 off_to = LineOffset[row] + coloff; | |
| 1378 | 6497 max_off_from = off_from + screen_Columns; |
| 6498 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6499 |
| 6500 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6501 if (flags & SLF_RIGHTLEFT) |
| 7 | 6502 { |
| 6503 /* Clear rest first, because it's left of the text. */ | |
| 6504 if (clear_width > 0) | |
| 6505 { | |
| 6506 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6507 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6508 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6509 { |
| 6510 ++off_to; | |
| 6511 ++col; | |
| 6512 } | |
| 6513 if (col <= endcol) | |
| 6514 screen_fill(row, row + 1, col + coloff, | |
| 6515 endcol + coloff + 1, ' ', ' ', 0); | |
| 6516 } | |
| 6517 col = endcol + 1; | |
| 6518 off_to = LineOffset[row] + col + coloff; | |
| 6519 off_from += col; | |
| 6520 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6521 } | |
| 6522 #endif /* FEAT_RIGHTLEFT */ | |
| 6523 | |
| 6524 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6525 | |
| 6526 while (col < endcol) | |
| 6527 { | |
| 6528 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6529 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6530 else |
| 6531 char_cells = 1; | |
| 6532 | |
| 6533 redraw_this = redraw_next; | |
| 6534 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6535 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6536 | |
| 6537 #ifdef FEAT_GUI | |
| 6538 /* If the next character was bold, then redraw the current character to | |
| 6539 * remove any pixels that might have spilt over into us. This only | |
| 6540 * happens in the GUI. | |
| 6541 */ | |
| 6542 if (redraw_next && gui.in_use) | |
| 6543 { | |
| 6544 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6545 if (hl > HL_ALL) |
| 6546 hl = syn_attr2attr(hl); | |
| 6547 if (hl & HL_BOLD) | |
| 7 | 6548 redraw_this = TRUE; |
| 6549 } | |
| 6550 #endif | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6551 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6552 // Skip if under a(nother) popup. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6553 if (popup_mask[row * screen_Columns + col + coloff] > screen_zindex) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6554 redraw_this = FALSE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6555 #endif |
| 7 | 6556 |
| 6557 if (redraw_this) | |
| 6558 { | |
| 6559 /* | |
| 6560 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6561 * Attributes for characters are stored at the position where the | |
| 6562 * cursor is when writing the highlighting code. The | |
| 6563 * start-highlighting code must be written with the cursor on the | |
| 6564 * first highlighted character. The stop-highlighting code must | |
| 6565 * be written with the cursor just after the last highlighted | |
| 6566 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6567 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6568 * to clear the rest of the line, and force redrawing it |
| 6569 * completely. | |
| 6570 */ | |
| 6571 if ( p_wiv | |
| 6572 && !force | |
| 6573 #ifdef FEAT_GUI | |
| 6574 && !gui.in_use | |
| 6575 #endif | |
| 6576 && ScreenAttrs[off_to] != 0 | |
| 6577 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6578 { | |
| 6579 /* | |
| 6580 * Need to remove highlighting attributes here. | |
| 6581 */ | |
| 6582 windgoto(row, col + coloff); | |
| 6583 out_str(T_CE); /* clear rest of this screen line */ | |
| 6584 screen_start(); /* don't know where cursor is now */ | |
| 6585 force = TRUE; /* force redraw of rest of the line */ | |
| 6586 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6587 | |
| 6588 /* | |
| 6589 * If the previous character was highlighted, need to stop | |
| 6590 * highlighting at this character. | |
| 6591 */ | |
| 6592 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6593 { | |
| 6594 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6595 term_windgoto(row, col + coloff); | |
| 6596 screen_stop_highlight(); | |
| 6597 } | |
| 6598 else | |
| 6599 screen_attr = 0; /* highlighting has stopped */ | |
| 6600 } | |
| 6601 if (enc_dbcs != 0) | |
| 6602 { | |
| 6603 /* Check if overwriting a double-byte with a single-byte or | |
| 6604 * the other way around requires another character to be | |
| 6605 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6606 * ScreenLinesUC[] is sufficient. */ | |
| 6607 if (char_cells == 1 | |
| 6608 && col + 1 < endcol | |
| 1378 | 6609 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6610 { |
| 6611 /* Writing a single-cell character over a double-cell | |
| 6612 * character: need to redraw the next cell. */ | |
| 6613 ScreenLines[off_to + 1] = 0; | |
| 6614 redraw_next = TRUE; | |
| 6615 } | |
| 6616 else if (char_cells == 2 | |
| 6617 && col + 2 < endcol | |
| 1378 | 6618 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6619 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6620 { |
| 6621 /* Writing the second half of a double-cell character over | |
| 6622 * a double-cell character: need to redraw the second | |
| 6623 * cell. */ | |
| 6624 ScreenLines[off_to + 2] = 0; | |
| 6625 redraw_next = TRUE; | |
| 6626 } | |
| 6627 | |
| 6628 if (enc_dbcs == DBCS_JPNU) | |
| 6629 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6630 } | |
| 6631 /* When writing a single-width character over a double-width | |
| 6632 * character and at the end of the redrawn text, need to clear out | |
| 6633 * the right halve of the old character. | |
| 6634 * Also required when writing the right halve of a double-width | |
| 6635 * char over the left halve of an existing one. */ | |
| 6636 if (has_mbyte && col + char_cells == endcol | |
| 6637 && ((char_cells == 1 | |
| 1378 | 6638 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6639 || (char_cells == 2 |
| 1378 | 6640 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6641 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6642 clear_next = TRUE; |
| 6643 | |
| 6644 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6645 if (enc_utf8) | |
| 6646 { | |
| 6647 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6648 if (ScreenLinesUC[off_from] != 0) | |
| 6649 { | |
| 714 | 6650 int i; |
| 6651 | |
| 6652 for (i = 0; i < Screen_mco; ++i) | |
| 6653 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6654 } |
| 6655 } | |
| 6656 if (char_cells == 2) | |
| 6657 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6658 | |
| 6659 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6660 /* The bold trick makes a single column of pixels appear in the |
| 6661 * next character. When a bold character is removed, the next | |
| 7 | 6662 * character should be redrawn too. This happens for our own GUI |
| 6663 * and for some xterms. */ | |
| 6664 if ( | |
| 6665 # ifdef FEAT_GUI | |
| 6666 gui.in_use | |
| 6667 # endif | |
| 6668 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6669 || | |
| 6670 # endif | |
| 6671 # ifdef UNIX | |
| 6672 term_is_xterm | |
| 6673 # endif | |
| 6674 ) | |
| 6675 { | |
| 6676 hl = ScreenAttrs[off_to]; | |
| 743 | 6677 if (hl > HL_ALL) |
| 6678 hl = syn_attr2attr(hl); | |
| 6679 if (hl & HL_BOLD) | |
| 7 | 6680 redraw_next = TRUE; |
| 6681 } | |
| 6682 #endif | |
| 6683 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6684 |
| 819 | 6685 /* For simplicity set the attributes of second half of a |
| 6686 * double-wide character equal to the first half. */ | |
| 6687 if (char_cells == 2) | |
| 6688 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6689 | |
| 7 | 6690 if (enc_dbcs != 0 && char_cells == 2) |
| 6691 screen_char_2(off_to, row, col + coloff); | |
| 6692 else | |
| 6693 screen_char(off_to, row, col + coloff); | |
| 6694 } | |
| 6695 else if ( p_wiv | |
| 6696 #ifdef FEAT_GUI | |
| 6697 && !gui.in_use | |
| 6698 #endif | |
| 6699 && col + coloff > 0) | |
| 6700 { | |
| 6701 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6702 { | |
| 6703 /* | |
| 6704 * Don't output stop-highlight when moving the cursor, it will | |
| 6705 * stop the highlighting when it should continue. | |
| 6706 */ | |
| 6707 screen_attr = 0; | |
| 6708 } | |
| 6709 else if (screen_attr != 0) | |
| 6710 screen_stop_highlight(); | |
| 6711 } | |
| 6712 | |
| 6713 off_to += CHAR_CELLS; | |
| 6714 off_from += CHAR_CELLS; | |
| 6715 col += CHAR_CELLS; | |
| 6716 } | |
| 6717 | |
| 6718 if (clear_next) | |
| 6719 { | |
| 6720 /* Clear the second half of a double-wide character of which the left | |
| 6721 * half was overwritten with a single-wide character. */ | |
| 6722 ScreenLines[off_to] = ' '; | |
| 6723 if (enc_utf8) | |
| 6724 ScreenLinesUC[off_to] = 0; | |
| 6725 screen_char(off_to, row, col + coloff); | |
| 6726 } | |
| 6727 | |
| 6728 if (clear_width > 0 | |
| 6729 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6730 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6731 #endif |
| 6732 ) | |
| 6733 { | |
| 6734 #ifdef FEAT_GUI | |
| 6735 int startCol = col; | |
| 6736 #endif | |
| 6737 | |
| 6738 /* blank out the rest of the line */ | |
| 6739 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6740 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6741 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6742 { |
| 6743 ++off_to; | |
| 6744 ++col; | |
| 6745 } | |
| 6746 if (col < clear_width) | |
| 6747 { | |
| 6748 #ifdef FEAT_GUI | |
| 6749 /* | |
| 6750 * In the GUI, clearing the rest of the line may leave pixels | |
| 6751 * behind if the first character cleared was bold. Some bold | |
| 6752 * fonts spill over the left. In this case we redraw the previous | |
| 6753 * character too. If we didn't skip any blanks above, then we | |
| 6754 * only redraw if the character wasn't already redrawn anyway. | |
| 6755 */ | |
| 996 | 6756 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6757 { |
| 6758 hl = ScreenAttrs[off_to]; | |
| 6759 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6760 { |
| 6761 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6762 |
| 996 | 6763 if (enc_utf8) |
| 6764 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6765 * that its width is 2. */ | |
| 6766 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6767 else if (enc_dbcs != 0) | |
| 6768 { | |
| 6769 /* find previous character by counting from first | |
| 6770 * column and get its width. */ | |
| 6771 unsigned off = LineOffset[row]; | |
| 1378 | 6772 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6773 |
| 6774 while (off < off_to) | |
| 6775 { | |
| 1378 | 6776 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6777 off += prev_cells; |
| 6778 } | |
| 6779 } | |
| 6780 | |
| 6781 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6782 screen_char_2(off_to - prev_cells, row, | |
| 6783 col + coloff - prev_cells); | |
| 6784 else | |
| 6785 screen_char(off_to - prev_cells, row, | |
| 6786 col + coloff - prev_cells); | |
| 6787 } | |
| 7 | 6788 } |
| 6789 #endif | |
| 6790 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6791 ' ', ' ', 0); | |
| 6792 off_to += clear_width - col; | |
| 6793 col = clear_width; | |
| 6794 } | |
| 6795 } | |
| 6796 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6797 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6798 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6799 && !(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
|
6800 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6801 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6802 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6803 // For a window that has a right neighbor, draw the separator char |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6804 // right of the window contents. But not on top of a popup window. |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6805 if (coloff + col < Columns) |
| 7 | 6806 { |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6807 #ifdef FEAT_TEXT_PROP |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6808 if (popup_mask[row * screen_Columns + col + coloff] |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6809 <= screen_zindex) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6810 #endif |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6811 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6812 int c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6813 |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6814 c = fillchar_vsep(&hl); |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6815 if (ScreenLines[off_to] != (schar_T)c |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6816 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6817 != (c >= 0x80 ? c : 0)) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6818 || ScreenAttrs[off_to] != hl) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6819 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6820 ScreenLines[off_to] = c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6821 ScreenAttrs[off_to] = hl; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6822 if (enc_utf8) |
| 7 | 6823 { |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6824 if (c >= 0x80) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6825 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6826 ScreenLinesUC[off_to] = c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6827 ScreenLinesC[0][off_to] = 0; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6828 } |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6829 else |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6830 ScreenLinesUC[off_to] = 0; |
| 7 | 6831 } |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6832 screen_char(off_to, row, col + coloff); |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6833 } |
| 7 | 6834 } |
| 6835 } | |
| 6836 else | |
| 6837 LineWraps[row] = FALSE; | |
| 6838 } | |
| 6839 } | |
| 6840 | |
| 474 | 6841 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6842 /* |
| 474 | 6843 * Mirror text "str" for right-left displaying. |
| 6844 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6845 */ |
| 474 | 6846 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6847 rl_mirror(char_u *str) |
| 7 | 6848 { |
| 6849 char_u *p1, *p2; | |
| 6850 int t; | |
| 6851 | |
| 6852 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6853 { | |
| 6854 t = *p1; | |
| 6855 *p1 = *p2; | |
| 6856 *p2 = t; | |
| 6857 } | |
| 6858 } | |
| 6859 #endif | |
| 6860 | |
| 6861 /* | |
| 6862 * mark all status lines for redraw; used after first :cd | |
| 6863 */ | |
| 6864 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6865 status_redraw_all(void) |
| 7 | 6866 { |
| 6867 win_T *wp; | |
| 6868 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6869 FOR_ALL_WINDOWS(wp) |
| 7 | 6870 if (wp->w_status_height) |
| 6871 { | |
| 6872 wp->w_redr_status = TRUE; | |
| 6873 redraw_later(VALID); | |
| 6874 } | |
| 6875 } | |
| 6876 | |
| 6877 /* | |
| 6878 * mark all status lines of the current buffer for redraw | |
| 6879 */ | |
| 6880 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6881 status_redraw_curbuf(void) |
| 7 | 6882 { |
| 6883 win_T *wp; | |
| 6884 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6885 FOR_ALL_WINDOWS(wp) |
| 7 | 6886 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6887 { | |
| 6888 wp->w_redr_status = TRUE; | |
| 6889 redraw_later(VALID); | |
| 6890 } | |
| 6891 } | |
| 6892 | |
| 6893 /* | |
| 6894 * Redraw all status lines that need to be redrawn. | |
| 6895 */ | |
| 6896 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6897 redraw_statuslines(void) |
| 7 | 6898 { |
| 6899 win_T *wp; | |
| 6900 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6901 FOR_ALL_WINDOWS(wp) |
| 7 | 6902 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
|
6903 win_redr_status(wp, FALSE); |
| 673 | 6904 if (redraw_tabline) |
| 677 | 6905 draw_tabline(); |
| 7 | 6906 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6907 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6908 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6909 /* |
| 6910 * Redraw all status lines at the bottom of frame "frp". | |
| 6911 */ | |
| 6912 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6913 win_redraw_last_status(frame_T *frp) |
| 7 | 6914 { |
| 6915 if (frp->fr_layout == FR_LEAF) | |
| 6916 frp->fr_win->w_redr_status = TRUE; | |
| 6917 else if (frp->fr_layout == FR_ROW) | |
| 6918 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6919 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6920 win_redraw_last_status(frp); |
| 6921 } | |
| 6922 else /* frp->fr_layout == FR_COL */ | |
| 6923 { | |
| 6924 frp = frp->fr_child; | |
| 6925 while (frp->fr_next != NULL) | |
| 6926 frp = frp->fr_next; | |
| 6927 win_redraw_last_status(frp); | |
| 6928 } | |
| 6929 } | |
| 6930 #endif | |
| 6931 | |
| 6932 /* | |
| 6933 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6934 */ | |
| 6935 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6936 draw_vsep_win(win_T *wp, int row) |
| 7 | 6937 { |
| 6938 int hl; | |
| 6939 int c; | |
| 6940 | |
| 6941 if (wp->w_vsep_width) | |
| 6942 { | |
| 6943 /* draw the vertical separator right of this window */ | |
| 6944 c = fillchar_vsep(&hl); | |
| 6945 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6946 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6947 c, ' ', hl); | |
| 6948 } | |
| 6949 } | |
| 6950 | |
| 6951 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6952 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6953 |
| 6954 /* | |
| 1378 | 6955 * Get the length of an item as it will be shown in the status line. |
| 7 | 6956 */ |
| 6957 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6958 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6959 { |
| 6960 int len = 0; | |
| 6961 | |
| 6962 #ifdef FEAT_MENU | |
| 6963 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6964 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6965 | |
| 6966 /* Check for menu separators - replace with '|'. */ | |
| 6967 if (emenu && menu_is_separator(s)) | |
| 6968 return 1; | |
| 6969 #endif | |
| 6970 | |
| 6971 while (*s != NUL) | |
| 6972 { | |
| 1685 | 6973 s += skip_status_match_char(xp, s); |
| 42 | 6974 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6975 MB_PTR_ADV(s); |
| 7 | 6976 } |
| 6977 | |
| 6978 return len; | |
| 6979 } | |
| 6980 | |
| 6981 /* | |
| 1685 | 6982 * Return the number of characters that should be skipped in a status match. |
| 277 | 6983 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6984 */ | |
| 6985 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6986 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6987 { |
| 1685 | 6988 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6989 #ifdef FEAT_MENU |
| 6990 || ((xp->xp_context == EXPAND_MENUS | |
| 6991 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6992 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6993 #endif | |
| 1685 | 6994 ) |
| 6995 { | |
| 6996 #ifndef BACKSLASH_IN_FILENAME | |
| 6997 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6998 return 2; | |
| 6999 #endif | |
| 7000 return 1; | |
| 7001 } | |
| 7002 return 0; | |
| 277 | 7003 } |
| 7004 | |
| 7005 /* | |
| 7 | 7006 * Show wildchar matches in the status line. |
| 7007 * Show at least the "match" item. | |
| 7008 * We start at item 'first_match' in the list and show all matches that fit. | |
| 7009 * | |
| 7010 * If inversion is possible we use it. Else '=' characters are used. | |
| 7011 */ | |
| 7012 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7013 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7014 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7015 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7016 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7017 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7018 int showtail) |
| 7 | 7019 { |
| 7020 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 7021 int row; | |
| 7022 char_u *buf; | |
| 7023 int len; | |
| 1378 | 7024 int clen; /* length in screen cells */ |
| 7 | 7025 int fillchar; |
| 7026 int attr; | |
| 7027 int i; | |
| 7028 int highlight = TRUE; | |
| 7029 char_u *selstart = NULL; | |
| 7030 int selstart_col = 0; | |
| 7031 char_u *selend = NULL; | |
| 7032 static int first_match = 0; | |
| 7033 int add_left = FALSE; | |
| 7034 char_u *s; | |
| 7035 #ifdef FEAT_MENU | |
| 7036 int emenu; | |
| 7037 #endif | |
| 7038 int l; | |
| 7039 | |
| 7040 if (matches == NULL) /* interrupted completion? */ | |
| 7041 return; | |
| 7042 | |
| 39 | 7043 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
|
7044 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 7045 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
|
7046 buf = alloc(Columns + 1); |
| 7 | 7047 if (buf == NULL) |
| 7048 return; | |
| 7049 | |
| 7050 if (match == -1) /* don't show match but original text */ | |
| 7051 { | |
| 7052 match = 0; | |
| 7053 highlight = FALSE; | |
| 7054 } | |
| 7055 /* count 1 for the ending ">" */ | |
| 7056 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 7057 if (match == 0) | |
| 7058 first_match = 0; | |
| 7059 else if (match < first_match) | |
| 7060 { | |
| 7061 /* jumping left, as far as we can go */ | |
| 7062 first_match = match; | |
| 7063 add_left = TRUE; | |
| 7064 } | |
| 7065 else | |
| 7066 { | |
| 7067 /* check if match fits on the screen */ | |
| 7068 for (i = first_match; i < match; ++i) | |
| 7069 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 7070 if (first_match > 0) | |
| 7071 clen += 2; | |
| 7072 /* jumping right, put match at the left */ | |
| 7073 if ((long)clen > Columns) | |
| 7074 { | |
| 7075 first_match = match; | |
| 7076 /* if showing the last match, we can add some on the left */ | |
| 7077 clen = 2; | |
| 7078 for (i = match; i < num_matches; ++i) | |
| 7079 { | |
| 7080 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 7081 if ((long)clen >= Columns) | |
| 7082 break; | |
| 7083 } | |
| 7084 if (i == num_matches) | |
| 7085 add_left = TRUE; | |
| 7086 } | |
| 7087 } | |
| 7088 if (add_left) | |
| 7089 while (first_match > 0) | |
| 7090 { | |
| 7091 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 7092 if ((long)clen >= Columns) | |
| 7093 break; | |
| 7094 --first_match; | |
| 7095 } | |
| 7096 | |
|
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
|
7097 fillchar = fillchar_status(&attr, curwin); |
| 7 | 7098 |
| 7099 if (first_match == 0) | |
| 7100 { | |
| 7101 *buf = NUL; | |
| 7102 len = 0; | |
| 7103 } | |
| 7104 else | |
| 7105 { | |
| 7106 STRCPY(buf, "< "); | |
| 7107 len = 2; | |
| 7108 } | |
| 7109 clen = len; | |
| 7110 | |
| 7111 i = first_match; | |
| 7112 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 7113 { | |
| 7114 if (i == match) | |
| 7115 { | |
| 7116 selstart = buf + len; | |
| 7117 selstart_col = clen; | |
| 7118 } | |
| 7119 | |
| 7120 s = L_MATCH(i); | |
| 7121 /* Check for menu separators - replace with '|' */ | |
| 7122 #ifdef FEAT_MENU | |
| 7123 emenu = (xp->xp_context == EXPAND_MENUS | |
| 7124 || xp->xp_context == EXPAND_MENUNAMES); | |
| 7125 if (emenu && menu_is_separator(s)) | |
| 7126 { | |
| 7127 STRCPY(buf + len, transchar('|')); | |
| 7128 l = (int)STRLEN(buf + len); | |
| 7129 len += l; | |
| 7130 clen += l; | |
| 7131 } | |
| 7132 else | |
| 7133 #endif | |
| 7134 for ( ; *s != NUL; ++s) | |
| 7135 { | |
| 1685 | 7136 s += skip_status_match_char(xp, s); |
| 7 | 7137 clen += ptr2cells(s); |
| 474 | 7138 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 7139 { |
| 7140 STRNCPY(buf + len, s, l); | |
| 7141 s += l - 1; | |
| 7142 len += l; | |
| 7143 } | |
| 7144 else | |
| 7145 { | |
| 7146 STRCPY(buf + len, transchar_byte(*s)); | |
| 7147 len += (int)STRLEN(buf + len); | |
| 7148 } | |
| 7149 } | |
| 7150 if (i == match) | |
| 7151 selend = buf + len; | |
| 7152 | |
| 7153 *(buf + len++) = ' '; | |
| 7154 *(buf + len++) = ' '; | |
| 7155 clen += 2; | |
| 7156 if (++i == num_matches) | |
| 7157 break; | |
| 7158 } | |
| 7159 | |
| 7160 if (i != num_matches) | |
| 7161 { | |
| 7162 *(buf + len++) = '>'; | |
| 7163 ++clen; | |
| 7164 } | |
| 7165 | |
| 7166 buf[len] = NUL; | |
| 7167 | |
| 7168 row = cmdline_row - 1; | |
| 7169 if (row >= 0) | |
| 7170 { | |
| 7171 if (wild_menu_showing == 0) | |
| 7172 { | |
| 7173 if (msg_scrolled > 0) | |
| 7174 { | |
| 7175 /* Put the wildmenu just above the command line. If there is | |
| 7176 * no room, scroll the screen one line up. */ | |
| 7177 if (cmdline_row == Rows - 1) | |
| 7178 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
7179 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 7180 ++msg_scrolled; |
| 7181 } | |
| 7182 else | |
| 7183 { | |
| 7184 ++cmdline_row; | |
| 7185 ++row; | |
| 7186 } | |
| 7187 wild_menu_showing = WM_SCROLLED; | |
| 7188 } | |
| 7189 else | |
| 7190 { | |
| 7191 /* Create status line if needed by setting 'laststatus' to 2. | |
| 7192 * Set 'winminheight' to zero to avoid that the window is | |
| 7193 * resized. */ | |
| 7194 if (lastwin->w_status_height == 0) | |
| 7195 { | |
| 7196 save_p_ls = p_ls; | |
| 7197 save_p_wmh = p_wmh; | |
| 7198 p_ls = 2; | |
| 7199 p_wmh = 0; | |
| 7200 last_status(FALSE); | |
| 7201 } | |
| 7202 wild_menu_showing = WM_SHOWN; | |
| 7203 } | |
| 7204 } | |
| 7205 | |
| 7206 screen_puts(buf, row, 0, attr); | |
| 7207 if (selstart != NULL && highlight) | |
| 7208 { | |
| 7209 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7210 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 7211 } |
| 7212 | |
| 7213 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 7214 } | |
| 7215 | |
| 7216 win_redraw_last_status(topframe); | |
| 7217 vim_free(buf); | |
| 7218 } | |
| 7219 #endif | |
| 7220 | |
| 7221 /* | |
| 7222 * Redraw the status line of window wp. | |
| 7223 * | |
| 7224 * 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
|
7225 * 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
|
7226 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7227 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7228 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
7229 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 7230 { |
| 7231 int row; | |
| 7232 char_u *p; | |
| 7233 int len; | |
| 7234 int fillchar; | |
| 7235 int attr; | |
| 7236 int this_ru_col; | |
| 1910 | 7237 static int busy = FALSE; |
| 7238 | |
| 7239 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 7240 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 7241 if (busy) | |
| 7242 return; | |
| 7243 busy = TRUE; | |
| 7 | 7244 |
| 7245 wp->w_redr_status = FALSE; | |
| 7246 if (wp->w_status_height == 0) | |
| 7247 { | |
| 7248 /* no status line, can only be last window */ | |
| 7249 redraw_cmdline = TRUE; | |
| 7250 } | |
| 540 | 7251 else if (!redrawing() |
| 7252 #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
|
7253 // 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
|
7254 // 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
|
7255 || (!ignore_pum && pum_visible()) |
| 540 | 7256 #endif |
| 7257 ) | |
| 7 | 7258 { |
| 7259 /* Don't redraw right now, do it later. */ | |
| 7260 wp->w_redr_status = TRUE; | |
| 7261 } | |
| 7262 #ifdef FEAT_STL_OPT | |
| 40 | 7263 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 7264 { |
| 7265 /* redraw custom status line */ | |
| 1983 | 7266 redraw_custom_statusline(wp); |
| 7 | 7267 } |
| 7268 #endif | |
| 7269 else | |
| 7270 { | |
|
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
|
7271 fillchar = fillchar_status(&attr, wp); |
| 7 | 7272 |
| 685 | 7273 get_trans_bufname(wp->w_buffer); |
| 7 | 7274 p = NameBuff; |
| 7275 len = (int)STRLEN(p); | |
| 7276 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7277 if (bt_help(wp->w_buffer) |
| 7 | 7278 #ifdef FEAT_QUICKFIX |
| 7279 || wp->w_p_pvw | |
| 7280 #endif | |
| 7281 || bufIsChanged(wp->w_buffer) | |
| 7282 || wp->w_buffer->b_p_ro) | |
| 7283 *(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
|
7284 if (bt_help(wp->w_buffer)) |
| 7 | 7285 { |
| 809 | 7286 STRCPY(p + len, _("[Help]")); |
| 7 | 7287 len += (int)STRLEN(p + len); |
| 7288 } | |
| 7289 #ifdef FEAT_QUICKFIX | |
| 7290 if (wp->w_p_pvw) | |
| 7291 { | |
| 7292 STRCPY(p + len, _("[Preview]")); | |
| 7293 len += (int)STRLEN(p + len); | |
| 7294 } | |
| 7295 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7296 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
|
7297 #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
|
7298 && !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
|
7299 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7300 ) |
| 7 | 7301 { |
| 7302 STRCPY(p + len, "[+]"); | |
| 7303 len += 3; | |
| 7304 } | |
| 7305 if (wp->w_buffer->b_p_ro) | |
| 7306 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
7307 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
|
7308 len += (int)STRLEN(p + len); |
| 7 | 7309 } |
| 7310 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7311 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
|
7312 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
|
7313 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 7314 if (this_ru_col <= 1) |
| 7315 { | |
| 7316 p = (char_u *)"<"; /* No room for file name! */ | |
| 7317 len = 1; | |
| 7318 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7319 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7320 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7321 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7322 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7323 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7324 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7325 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7326 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7327 * 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
|
7328 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
|
7329 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7330 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7331 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7332 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7333 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7334 p = p + i - 1; |
| 7 | 7335 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7336 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7337 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7338 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7339 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7340 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7341 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7342 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7343 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7344 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7345 } |
| 7 | 7346 |
| 7347 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
|
7348 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
|
7349 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
|
7350 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 7351 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7352 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 7353 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 7354 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
|
7355 - 1 + wp->w_wincol), attr); |
| 7 | 7356 |
| 7357 #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
|
7358 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 7359 #endif |
| 7360 } | |
| 7361 | |
| 7362 /* | |
| 7363 * May need to draw the character below the vertical separator. | |
| 7364 */ | |
| 7365 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7366 { | |
| 7367 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
|
7368 fillchar = fillchar_status(&attr, wp); |
| 7 | 7369 else |
| 7370 fillchar = fillchar_vsep(&attr); | |
| 7371 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7372 attr); | |
| 7373 } | |
| 1910 | 7374 busy = FALSE; |
| 7 | 7375 } |
| 7376 | |
| 680 | 7377 #ifdef FEAT_STL_OPT |
| 7378 /* | |
| 7379 * Redraw the status line according to 'statusline' and take care of any | |
| 7380 * errors encountered. | |
| 7381 */ | |
| 7382 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7383 redraw_custom_statusline(win_T *wp) |
| 680 | 7384 { |
| 1983 | 7385 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7386 int saved_did_emsg = did_emsg; |
| 1983 | 7387 |
| 7388 /* When called recursively return. This can happen when the statusline | |
| 7389 * contains an expression that triggers a redraw. */ | |
| 7390 if (entered) | |
| 7391 return; | |
| 7392 entered = TRUE; | |
| 680 | 7393 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7394 did_emsg = FALSE; |
| 680 | 7395 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7396 if (did_emsg) |
| 1983 | 7397 { |
| 7398 /* When there is an error disable the statusline, otherwise the | |
| 7399 * display is messed up with errors and a redraw triggers the problem | |
| 7400 * again and again. */ | |
| 680 | 7401 set_string_option_direct((char_u *)"statusline", -1, |
| 7402 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7403 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7404 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7405 did_emsg |= saved_did_emsg; |
| 1983 | 7406 entered = FALSE; |
| 680 | 7407 } |
| 7408 #endif | |
| 7409 | |
| 7 | 7410 /* |
| 7411 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7412 * line of the window right of it. If not, then it's a vertical separator. | |
| 7413 * Only call if (wp->w_vsep_width != 0). | |
| 7414 */ | |
| 7415 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7416 stl_connected(win_T *wp) |
| 7 | 7417 { |
| 7418 frame_T *fr; | |
| 7419 | |
| 7420 fr = wp->w_frame; | |
| 7421 while (fr->fr_parent != NULL) | |
| 7422 { | |
| 7423 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7424 { | |
| 7425 if (fr->fr_next != NULL) | |
| 7426 break; | |
| 7427 } | |
| 7428 else | |
| 7429 { | |
| 7430 if (fr->fr_next != NULL) | |
| 7431 return TRUE; | |
| 7432 } | |
| 7433 fr = fr->fr_parent; | |
| 7434 } | |
| 7435 return FALSE; | |
| 7436 } | |
| 7437 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7438 |
| 7 | 7439 /* |
| 7440 * Get the value to show for the language mappings, active 'keymap'. | |
| 7441 */ | |
| 7442 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7443 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7444 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7445 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
|
7446 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
|
7447 int len) /* length of buffer */ |
| 7 | 7448 { |
| 7449 char_u *p; | |
| 7450 | |
| 7451 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7452 return FALSE; | |
| 7453 | |
| 7454 { | |
| 7455 #ifdef FEAT_EVAL | |
| 7456 buf_T *old_curbuf = curbuf; | |
| 7457 win_T *old_curwin = curwin; | |
| 7458 char_u *s; | |
| 7459 | |
| 7460 curbuf = wp->w_buffer; | |
| 7461 curwin = wp; | |
| 7462 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7463 ++emsg_skip; | |
| 714 | 7464 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7465 --emsg_skip; |
| 7466 curbuf = old_curbuf; | |
| 7467 curwin = old_curwin; | |
| 7468 if (p == NULL || *p == NUL) | |
| 7469 #endif | |
| 7470 { | |
| 7471 #ifdef FEAT_KEYMAP | |
| 7472 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7473 p = wp->w_buffer->b_p_keymap; | |
| 7474 else | |
| 7475 #endif | |
| 7476 p = (char_u *)"lang"; | |
| 7477 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7478 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7479 buf[0] = NUL; |
| 7480 #ifdef FEAT_EVAL | |
| 7481 vim_free(s); | |
| 7482 #endif | |
| 7483 } | |
| 7484 return buf[0] != NUL; | |
| 7485 } | |
| 7486 | |
| 7487 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7488 /* | |
| 677 | 7489 * Redraw the status line or ruler of window "wp". |
| 7490 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7491 */ |
| 7492 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7493 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7494 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7495 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7496 { |
| 5539 | 7497 static int entered = FALSE; |
| 7 | 7498 int attr; |
| 7499 int curattr; | |
| 7500 int row; | |
| 7501 int col = 0; | |
| 7502 int maxwidth; | |
| 7503 int width; | |
| 7504 int n; | |
| 7505 int len; | |
| 7506 int fillchar; | |
| 7507 char_u buf[MAXPATHL]; | |
| 1983 | 7508 char_u *stl; |
| 7 | 7509 char_u *p; |
| 681 | 7510 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7511 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7512 int use_sandbox = FALSE; |
| 2693 | 7513 win_T *ewp; |
| 7514 int p_crb_save; | |
| 7 | 7515 |
| 5539 | 7516 /* There is a tiny chance that this gets called recursively: When |
| 7517 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7518 * Avoid trouble by not allowing recursion. */ | |
| 7519 if (entered) | |
| 7520 return; | |
| 7521 entered = TRUE; | |
| 7522 | |
| 7 | 7523 /* setup environment for the task at hand */ |
| 677 | 7524 if (wp == NULL) |
| 7525 { | |
| 7526 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7527 stl = p_tal; |
| 677 | 7528 row = 0; |
| 707 | 7529 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7530 attr = HL_ATTR(HLF_TPF); |
| 677 | 7531 maxwidth = Columns; |
| 7532 # ifdef FEAT_EVAL | |
| 681 | 7533 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7534 # endif |
| 7535 } | |
| 40 | 7536 else |
| 677 | 7537 { |
| 7538 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
|
7539 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
|
7540 maxwidth = wp->w_width; |
| 677 | 7541 |
| 7542 if (draw_ruler) | |
| 7543 { | |
| 1983 | 7544 stl = p_ruf; |
| 677 | 7545 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7546 if (*stl == '%') |
| 7547 { | |
| 7548 if (*++stl == '-') | |
| 7549 stl++; | |
| 7550 if (atoi((char *)stl)) | |
| 7551 while (VIM_ISDIGIT(*stl)) | |
| 7552 stl++; | |
| 7553 if (*stl++ != '(') | |
| 7554 stl = p_ruf; | |
| 677 | 7555 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7556 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
|
7557 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
|
7558 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
|
7559 maxwidth = wp->w_width - col; |
| 677 | 7560 if (!wp->w_status_height) |
| 7561 { | |
| 7562 row = Rows - 1; | |
| 7563 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7564 fillchar = ' '; | |
| 7565 attr = 0; | |
| 7566 } | |
| 7567 | |
| 7568 # ifdef FEAT_EVAL | |
| 681 | 7569 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7570 # endif |
| 7571 } | |
| 7572 else | |
| 7573 { | |
| 7574 if (*wp->w_p_stl != NUL) | |
| 1983 | 7575 stl = wp->w_p_stl; |
| 677 | 7576 else |
| 1983 | 7577 stl = p_stl; |
| 677 | 7578 # ifdef FEAT_EVAL |
| 681 | 7579 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7580 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7581 # endif |
| 7582 } | |
| 7583 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7584 col += wp->w_wincol; |
| 677 | 7585 } |
| 7586 | |
| 7 | 7587 if (maxwidth <= 0) |
| 5539 | 7588 goto theend; |
| 677 | 7589 |
| 2693 | 7590 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7591 * the cursor away and back. */ | |
| 7592 ewp = wp == NULL ? curwin : wp; | |
| 7593 p_crb_save = ewp->w_p_crb; | |
| 7594 ewp->w_p_crb = FALSE; | |
| 7595 | |
| 1983 | 7596 /* Make a copy, because the statusline may include a function call that |
| 7597 * might change the option value and free the memory. */ | |
| 7598 stl = vim_strsave(stl); | |
| 2693 | 7599 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7600 stl, use_sandbox, |
| 681 | 7601 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7602 vim_free(stl); |
| 2693 | 7603 ewp->w_p_crb = p_crb_save; |
| 2661 | 7604 |
| 7605 /* Make all characters printable. */ | |
| 7606 p = transstr(buf); | |
| 7607 if (p != NULL) | |
| 7608 { | |
| 7609 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7610 vim_free(p); | |
| 7611 } | |
| 7612 | |
| 7613 /* fill up with "fillchar" */ | |
| 835 | 7614 len = (int)STRLEN(buf); |
| 1883 | 7615 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7616 { |
| 7617 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7618 ++width; | |
| 7619 } | |
| 7620 buf[len] = NUL; | |
| 7621 | |
| 681 | 7622 /* |
| 7623 * Draw each snippet with the specified highlighting. | |
| 7624 */ | |
| 7 | 7625 curattr = attr; |
| 7626 p = buf; | |
| 681 | 7627 for (n = 0; hltab[n].start != NULL; n++) |
| 7628 { | |
| 7629 len = (int)(hltab[n].start - p); | |
| 7 | 7630 screen_puts_len(p, len, row, col, curattr); |
| 7631 col += vim_strnsize(p, len); | |
| 681 | 7632 p = hltab[n].start; |
| 7633 | |
| 7634 if (hltab[n].userhl == 0) | |
| 7 | 7635 curattr = attr; |
| 681 | 7636 else if (hltab[n].userhl < 0) |
| 7637 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
|
7638 #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
|
7639 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
|
7640 && 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
|
7641 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
|
7642 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
|
7643 && 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
|
7644 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
|
7645 #endif |
| 680 | 7646 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7647 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7648 else |
| 681 | 7649 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7650 } |
| 7651 screen_puts(p, row, col, curattr); | |
| 681 | 7652 |
| 7653 if (wp == NULL) | |
| 7654 { | |
| 7655 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7656 col = 0; | |
| 7657 len = 0; | |
| 7658 p = buf; | |
| 7659 fillchar = 0; | |
| 7660 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7661 { | |
| 7662 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7663 while (col < len) | |
| 7664 TabPageIdxs[col++] = fillchar; | |
| 7665 p = tabtab[n].start; | |
| 7666 fillchar = tabtab[n].userhl; | |
| 7667 } | |
| 7668 while (col < Columns) | |
| 7669 TabPageIdxs[col++] = fillchar; | |
| 7670 } | |
| 5539 | 7671 |
| 7672 theend: | |
| 7673 entered = FALSE; | |
| 7 | 7674 } |
| 7675 | |
| 7676 #endif /* FEAT_STL_OPT */ | |
| 7677 | |
| 7678 /* | |
| 7679 * Output a single character directly to the screen and update ScreenLines. | |
| 7680 */ | |
| 7681 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7682 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7683 { |
| 3549 | 7684 char_u buf[MB_MAXBYTES + 1]; |
| 7685 | |
| 7686 if (has_mbyte) | |
| 7687 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7688 else | |
| 7689 { | |
| 7690 buf[0] = c; | |
| 7691 buf[1] = NUL; | |
| 7692 } | |
| 7 | 7693 screen_puts(buf, row, col, attr); |
| 7694 } | |
| 7695 | |
| 7696 /* | |
| 7697 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7698 * Also return its attribute in *attrp; | |
| 7699 */ | |
| 7700 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7701 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7702 { |
| 7703 unsigned off; | |
| 7704 | |
| 7705 /* safety check */ | |
| 7706 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7707 { | |
| 7708 off = LineOffset[row] + col; | |
| 7709 *attrp = ScreenAttrs[off]; | |
| 7710 bytes[0] = ScreenLines[off]; | |
| 7711 bytes[1] = NUL; | |
| 7712 | |
| 7713 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7714 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7715 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7716 { | |
| 7717 bytes[0] = ScreenLines[off]; | |
| 7718 bytes[1] = ScreenLines2[off]; | |
| 7719 bytes[2] = NUL; | |
| 7720 } | |
| 7721 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7722 { | |
| 7723 bytes[1] = ScreenLines[off + 1]; | |
| 7724 bytes[2] = NUL; | |
| 7725 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7726 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7727 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7728 |
| 714 | 7729 /* |
| 7730 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7731 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7732 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7733 */ |
| 7734 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7735 screen_comp_differs(int off, int *u8cc) |
| 714 | 7736 { |
| 7737 int i; | |
| 7738 | |
| 7739 for (i = 0; i < Screen_mco; ++i) | |
| 7740 { | |
| 7741 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7742 return TRUE; | |
| 7743 if (u8cc[i] == 0) | |
| 7744 break; | |
| 7745 } | |
| 7746 return FALSE; | |
| 7747 } | |
| 7748 | |
| 7 | 7749 /* |
| 7750 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7751 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7752 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7753 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7754 */ | |
| 7755 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7756 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7757 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7758 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7759 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7760 int attr) |
| 7 | 7761 { |
| 7762 screen_puts_len(text, -1, row, col, attr); | |
| 7763 } | |
| 7764 | |
| 7765 /* | |
| 7766 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7767 * a NUL. | |
| 7768 */ | |
| 7769 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7770 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7771 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7772 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7773 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7774 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7775 int attr) |
| 7 | 7776 { |
| 7777 unsigned off; | |
| 7778 char_u *ptr = text; | |
| 5923 | 7779 int len = textlen; |
| 7 | 7780 int c; |
| 1378 | 7781 unsigned max_off; |
| 7 | 7782 int mbyte_blen = 1; |
| 7783 int mbyte_cells = 1; | |
| 7784 int u8c = 0; | |
| 714 | 7785 int u8cc[MAX_MCO]; |
| 7 | 7786 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7787 #ifdef FEAT_ARABIC |
| 7 | 7788 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7789 int pc, nc, nc1; |
| 7790 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7791 #endif |
| 1843 | 7792 int force_redraw_this; |
| 7793 int force_redraw_next = FALSE; | |
| 7794 int need_redraw; | |
| 7 | 7795 |
|
16914
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7796 // Safety check. The check for negative row and column is to fix issue |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7797 // #4102. TODO: find out why row/col could be negative. |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7798 if (ScreenLines == NULL |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7799 || row >= screen_Rows || row < 0 |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7800 || col >= screen_Columns || col < 0) |
| 7 | 7801 return; |
| 1843 | 7802 off = LineOffset[row] + col; |
| 7 | 7803 |
| 1668 | 7804 /* When drawing over the right halve of a double-wide char clear out the |
| 7805 * left halve. Only needed in a terminal. */ | |
| 1685 | 7806 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
|
7807 #ifdef FEAT_GUI |
| 1668 | 7808 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7809 #endif |
| 1668 | 7810 && mb_fix_col(col, row) != col) |
| 1843 | 7811 { |
| 7812 ScreenLines[off - 1] = ' '; | |
| 7813 ScreenAttrs[off - 1] = 0; | |
| 7814 if (enc_utf8) | |
| 7815 { | |
| 7816 ScreenLinesUC[off - 1] = 0; | |
| 7817 ScreenLinesC[0][off - 1] = 0; | |
| 7818 } | |
| 7819 /* redraw the previous cell, make it empty */ | |
| 7820 screen_char(off - 1, row, col - 1); | |
| 7821 /* force the cell at "col" to be redrawn */ | |
| 7822 force_redraw_next = TRUE; | |
| 7823 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7824 |
| 1378 | 7825 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7826 while (col < screen_Columns |
| 7827 && (len < 0 || (int)(ptr - text) < len) | |
| 7828 && *ptr != NUL) | |
| 7 | 7829 { |
| 7830 c = *ptr; | |
| 7831 /* check if this is the first byte of a multibyte */ | |
| 7832 if (has_mbyte) | |
| 7833 { | |
| 7834 if (enc_utf8 && len > 0) | |
| 474 | 7835 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7836 else |
| 474 | 7837 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7838 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7839 mbyte_cells = 1; | |
| 7840 else if (enc_dbcs != 0) | |
| 7841 mbyte_cells = mbyte_blen; | |
| 7842 else /* enc_utf8 */ | |
| 7843 { | |
| 7844 if (len >= 0) | |
| 714 | 7845 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7846 (int)((text + len) - ptr)); |
| 7847 else | |
| 714 | 7848 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7849 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7850 #ifdef FEAT_ARABIC |
| 7 | 7851 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7852 { | |
| 7853 /* Do Arabic shaping. */ | |
| 7854 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7855 { | |
| 7856 /* Past end of string to be displayed. */ | |
| 7857 nc = NUL; | |
| 7858 nc1 = NUL; | |
| 7859 } | |
| 7860 else | |
| 714 | 7861 { |
| 1994 | 7862 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7863 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7864 nc1 = pcc[0]; |
| 7865 } | |
| 7 | 7866 pc = prev_c; |
| 7867 prev_c = u8c; | |
| 714 | 7868 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7869 } |
| 7870 else | |
| 7871 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7872 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7873 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7874 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7875 /* 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
|
7876 * 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
|
7877 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7878 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7879 } |
| 7 | 7880 } |
| 7881 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7882 |
| 1843 | 7883 force_redraw_this = force_redraw_next; |
| 7884 force_redraw_next = FALSE; | |
| 7885 | |
| 7886 need_redraw = ScreenLines[off] != c | |
| 7 | 7887 || (mbyte_cells == 2 |
| 7888 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7889 || (enc_dbcs == DBCS_JPNU | |
| 7890 && c == 0x8e | |
| 7891 && ScreenLines2[off] != ptr[1]) | |
| 7892 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7893 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7894 (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
|
7895 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7896 && screen_comp_differs(off, u8cc)))) |
| 7 | 7897 || ScreenAttrs[off] != attr |
| 1843 | 7898 || exmode_active; |
| 7899 | |
|
16998
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7900 if ((need_redraw || force_redraw_this) |
|
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7901 #ifdef FEAT_TEXT_PROP |
|
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7902 && popup_mask[row * screen_Columns + col] <= screen_zindex |
|
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7903 #endif |
|
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7904 ) |
| 7 | 7905 { |
| 7906 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7907 /* The bold trick makes a single row of pixels appear in the next | |
| 7908 * character. When a bold character is removed, the next | |
| 7909 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7910 * and for some xterms. */ |
| 7911 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7912 # ifdef FEAT_GUI |
| 7913 gui.in_use | |
| 7914 # endif | |
| 7915 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7916 || | |
| 7917 # endif | |
| 7918 # ifdef UNIX | |
| 7919 term_is_xterm | |
| 7920 # endif | |
| 1843 | 7921 )) |
| 7922 { | |
| 7923 int n = ScreenAttrs[off]; | |
| 7924 | |
| 7925 if (n > HL_ALL) | |
| 7926 n = syn_attr2attr(n); | |
| 7927 if (n & HL_BOLD) | |
| 7928 force_redraw_next = TRUE; | |
| 7 | 7929 } |
| 7930 #endif | |
| 7931 /* When at the end of the text and overwriting a two-cell | |
| 7932 * character with a one-cell character, need to clear the next | |
| 7933 * cell. Also when overwriting the left halve of a two-cell char | |
| 7934 * with the right halve of a two-cell char. Do this only once | |
| 7935 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7936 if (clear_next_cell) | |
| 7937 clear_next_cell = FALSE; | |
| 7938 else if (has_mbyte | |
| 7939 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7940 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7941 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7942 || (mbyte_cells == 2 |
| 1378 | 7943 && (*mb_off2cells)(off, max_off) == 1 |
| 7944 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7945 clear_next_cell = TRUE; |
| 7946 | |
| 7947 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7948 * it confuses mb_off2cells(). */ | |
| 7949 if (enc_dbcs | |
| 1378 | 7950 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7951 || (mbyte_cells == 2 |
| 1378 | 7952 && (*mb_off2cells)(off, max_off) == 1 |
| 7953 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7954 ScreenLines[off + mbyte_blen] = 0; |
| 7955 ScreenLines[off] = c; | |
| 7956 ScreenAttrs[off] = attr; | |
| 7957 if (enc_utf8) | |
| 7958 { | |
| 714 | 7959 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7960 ScreenLinesUC[off] = 0; |
| 7961 else | |
| 7962 { | |
| 714 | 7963 int i; |
| 7964 | |
| 7 | 7965 ScreenLinesUC[off] = u8c; |
| 714 | 7966 for (i = 0; i < Screen_mco; ++i) |
| 7967 { | |
| 7968 ScreenLinesC[i][off] = u8cc[i]; | |
| 7969 if (u8cc[i] == 0) | |
| 7970 break; | |
| 7971 } | |
| 7 | 7972 } |
| 7973 if (mbyte_cells == 2) | |
| 7974 { | |
| 7975 ScreenLines[off + 1] = 0; | |
| 7976 ScreenAttrs[off + 1] = attr; | |
| 7977 } | |
| 7978 screen_char(off, row, col); | |
| 7979 } | |
| 7980 else if (mbyte_cells == 2) | |
| 7981 { | |
| 7982 ScreenLines[off + 1] = ptr[1]; | |
| 7983 ScreenAttrs[off + 1] = attr; | |
| 7984 screen_char_2(off, row, col); | |
| 7985 } | |
| 7986 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7987 { | |
| 7988 ScreenLines2[off] = ptr[1]; | |
| 7989 screen_char(off, row, col); | |
| 7990 } | |
| 7991 else | |
| 7992 screen_char(off, row, col); | |
| 7993 } | |
| 7994 if (has_mbyte) | |
| 7995 { | |
| 7996 off += mbyte_cells; | |
| 7997 col += mbyte_cells; | |
| 7998 ptr += mbyte_blen; | |
| 7999 if (clear_next_cell) | |
| 5923 | 8000 { |
| 8001 /* This only happens at the end, display one space next. */ | |
| 7 | 8002 ptr = (char_u *)" "; |
| 5923 | 8003 len = -1; |
| 8004 } | |
| 7 | 8005 } |
| 8006 else | |
| 8007 { | |
| 8008 ++off; | |
| 8009 ++col; | |
| 8010 ++ptr; | |
| 8011 } | |
| 8012 } | |
| 1843 | 8013 |
| 8014 /* If we detected the next character needs to be redrawn, but the text | |
| 8015 * doesn't extend up to there, update the character here. */ | |
| 8016 if (force_redraw_next && col < screen_Columns) | |
| 8017 { | |
| 8018 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 8019 screen_char_2(off, row, col); | |
| 8020 else | |
| 8021 screen_char(off, row, col); | |
| 8022 } | |
| 7 | 8023 } |
| 8024 | |
| 8025 #ifdef FEAT_SEARCH_EXTRA | |
| 8026 /* | |
| 1326 | 8027 * Prepare for 'hlsearch' highlighting. |
| 7 | 8028 */ |
| 8029 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8030 start_search_hl(void) |
| 7 | 8031 { |
| 8032 if (p_hls && !no_hlsearch) | |
| 8033 { | |
| 8034 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
|
8035 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 8036 # ifdef FEAT_RELTIME |
| 8037 /* Set the time limit to 'redrawtime'. */ | |
| 8038 profile_setlimit(p_rdt, &search_hl.tm); | |
| 8039 # endif | |
| 7 | 8040 } |
| 8041 } | |
| 8042 | |
| 8043 /* | |
| 1326 | 8044 * Clean up for 'hlsearch' highlighting. |
| 7 | 8045 */ |
| 8046 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8047 end_search_hl(void) |
| 7 | 8048 { |
| 8049 if (search_hl.rm.regprog != NULL) | |
| 8050 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
8051 vim_regfree(search_hl.rm.regprog); |
| 7 | 8052 search_hl.rm.regprog = NULL; |
| 8053 } | |
| 8054 } | |
| 8055 | |
| 8056 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8057 * 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
|
8058 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8059 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8060 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
|
8061 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8062 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8063 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8064 /* 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
|
8065 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8066 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8067 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8068 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8069 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8070 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8071 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8072 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8073 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
|
8074 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
|
8075 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8076 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8077 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8078 /* 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
|
8079 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
|
8080 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8081 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8082 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8083 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
|
8084 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8085 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8086 /* 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
|
8087 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8088 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8089 /* |
| 7 | 8090 * Advance to the match in window "wp" line "lnum" or past it. |
| 8091 */ | |
| 8092 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8093 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 8094 { |
| 1326 | 8095 matchitem_T *cur; /* points to the match list */ |
| 8096 match_T *shl; /* points to search_hl or a match */ | |
| 8097 int shl_flag; /* flag to indicate whether search_hl | |
| 8098 has been processed or not */ | |
| 5979 | 8099 int pos_inprogress; /* marks that position match search is |
| 8100 in progress */ | |
| 7 | 8101 int n; |
| 8102 | |
| 8103 /* | |
| 8104 * When using a multi-line pattern, start searching at the top | |
| 8105 * of the window or just after a closed fold. | |
| 1326 | 8106 * Do this both for search_hl and the match list. |
| 7 | 8107 */ |
| 1326 | 8108 cur = wp->w_match_head; |
| 8109 shl_flag = FALSE; | |
| 8110 while (cur != NULL || shl_flag == FALSE) | |
| 8111 { | |
| 8112 if (shl_flag == FALSE) | |
| 8113 { | |
| 8114 shl = &search_hl; | |
| 8115 shl_flag = TRUE; | |
| 8116 } | |
| 8117 else | |
| 8118 shl = &cur->hl; | |
| 7 | 8119 if (shl->rm.regprog != NULL |
| 8120 && shl->lnum == 0 | |
| 8121 && re_multiline(shl->rm.regprog)) | |
| 8122 { | |
| 8123 if (shl->first_lnum == 0) | |
| 8124 { | |
| 8125 # ifdef FEAT_FOLDING | |
| 8126 for (shl->first_lnum = lnum; | |
| 8127 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 8128 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 8129 NULL, NULL, TRUE, NULL)) | |
| 8130 break; | |
| 8131 # else | |
| 8132 shl->first_lnum = wp->w_topline; | |
| 8133 # endif | |
| 8134 } | |
| 5979 | 8135 if (cur != NULL) |
| 8136 cur->pos.cur = 0; | |
| 8137 pos_inprogress = TRUE; | |
| 7 | 8138 n = 0; |
| 5979 | 8139 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 8140 || (cur != NULL && pos_inprogress))) | |
| 8141 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
8142 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
|
8143 shl == &search_hl ? NULL : cur); |
| 5979 | 8144 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 8145 ? FALSE : TRUE; | |
| 7 | 8146 if (shl->lnum != 0) |
| 8147 { | |
| 8148 shl->first_lnum = shl->lnum | |
| 8149 + shl->rm.endpos[0].lnum | |
| 8150 - shl->rm.startpos[0].lnum; | |
| 8151 n = shl->rm.endpos[0].col; | |
| 8152 } | |
| 8153 else | |
| 8154 { | |
| 8155 ++shl->first_lnum; | |
| 8156 n = 0; | |
| 8157 } | |
| 8158 } | |
| 8159 } | |
| 1326 | 8160 if (shl != &search_hl && cur != NULL) |
| 8161 cur = cur->next; | |
| 7 | 8162 } |
| 8163 } | |
| 8164 | |
| 8165 /* | |
| 1326 | 8166 * Search for a next 'hlsearch' or match. |
| 7 | 8167 * Uses shl->buf. |
| 8168 * Sets shl->lnum and shl->rm contents. | |
| 8169 * Note: Assumes a previous match is always before "lnum", unless | |
| 8170 * shl->lnum is zero. | |
| 8171 * Careful: Any pointers for buffer lines will become invalid. | |
| 8172 */ | |
| 8173 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8174 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8175 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8176 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
|
8177 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8178 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
|
8179 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 8180 { |
| 8181 linenr_T l; | |
| 8182 colnr_T matchcol; | |
| 8183 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
|
8184 int save_called_emsg = called_emsg; |
| 7 | 8185 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8186 // 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
|
8187 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
|
8188 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8189 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
|
8190 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8191 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8192 |
| 7 | 8193 if (shl->lnum != 0) |
| 8194 { | |
| 8195 /* Check for three situations: | |
| 8196 * 1. If the "lnum" is below a previous match, start a new search. | |
| 8197 * 2. If the previous match includes "mincol", use it. | |
| 8198 * 3. Continue after the previous match. | |
| 8199 */ | |
| 8200 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 8201 if (lnum > l) | |
| 8202 shl->lnum = 0; | |
| 8203 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 8204 return; | |
| 8205 } | |
| 8206 | |
| 8207 /* | |
| 8208 * Repeat searching for a match until one is found that includes "mincol" | |
| 8209 * or none is found in this line. | |
| 8210 */ | |
| 8211 called_emsg = FALSE; | |
| 8212 for (;;) | |
| 8213 { | |
| 1521 | 8214 #ifdef FEAT_RELTIME |
| 8215 /* Stop searching after passing the time limit. */ | |
| 8216 if (profile_passed_limit(&(shl->tm))) | |
| 8217 { | |
| 8218 shl->lnum = 0; /* no match found in time */ | |
| 8219 break; | |
| 8220 } | |
| 8221 #endif | |
| 7 | 8222 /* Three situations: |
| 8223 * 1. No useful previous match: search from start of line. | |
| 8224 * 2. Not Vi compatible or empty match: continue at next character. | |
| 8225 * Break the loop if this is beyond the end of the line. | |
| 8226 * 3. Vi compatible searching: continue at end of previous match. | |
| 8227 */ | |
| 8228 if (shl->lnum == 0) | |
| 8229 matchcol = 0; | |
| 8230 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 8231 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 8232 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 8233 { | |
| 688 | 8234 char_u *ml; |
| 685 | 8235 |
| 8236 matchcol = shl->rm.startpos[0].col; | |
| 688 | 8237 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 8238 if (*ml == NUL) |
| 8239 { | |
| 8240 ++matchcol; | |
| 7 | 8241 shl->lnum = 0; |
| 8242 break; | |
| 8243 } | |
| 685 | 8244 if (has_mbyte) |
| 8245 matchcol += mb_ptr2len(ml); | |
| 8246 else | |
| 8247 ++matchcol; | |
| 7 | 8248 } |
| 8249 else | |
| 8250 matchcol = shl->rm.endpos[0].col; | |
| 8251 | |
| 8252 shl->lnum = lnum; | |
| 5979 | 8253 if (shl->rm.regprog != NULL) |
| 8254 { | |
| 6394 | 8255 /* Remember whether shl->rm is using a copy of the regprog in |
| 8256 * cur->match. */ | |
| 8257 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 8258 && shl == &cur->hl | |
| 8259 && 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
|
8260 int timed_out = FALSE; |
| 6394 | 8261 |
| 5979 | 8262 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 8263 matchcol, | |
| 1521 | 8264 #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
|
8265 &(shl->tm), &timed_out |
| 1521 | 8266 #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
|
8267 NULL, NULL |
| 5979 | 8268 #endif |
| 8269 ); | |
| 6394 | 8270 /* Copy the regprog, in case it got freed and recompiled. */ |
| 8271 if (regprog_is_copy) | |
| 8272 cur->match.regprog = cur->hl.rm.regprog; | |
| 8273 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8274 if (called_emsg || got_int || timed_out) |
| 5979 | 8275 { |
| 8276 /* Error while handling regexp: stop using this regexp. */ | |
| 8277 if (shl == &search_hl) | |
| 8278 { | |
| 8279 /* don't free regprog in the match list, it's a copy */ | |
| 8280 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
|
8281 set_no_hlsearch(TRUE); |
| 5979 | 8282 } |
| 8283 shl->rm.regprog = NULL; | |
| 8284 shl->lnum = 0; | |
| 8285 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 8286 message */ | |
| 8287 break; | |
| 8288 } | |
| 8289 } | |
| 8290 else if (cur != NULL) | |
| 8291 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 8292 else |
| 8293 nmatched = 0; | |
| 7 | 8294 if (nmatched == 0) |
| 8295 { | |
| 8296 shl->lnum = 0; /* no match found */ | |
| 8297 break; | |
| 8298 } | |
| 8299 if (shl->rm.startpos[0].lnum > 0 | |
| 8300 || shl->rm.startpos[0].col >= mincol | |
| 8301 || nmatched > 1 | |
| 8302 || shl->rm.endpos[0].col > mincol) | |
| 8303 { | |
| 8304 shl->lnum += shl->rm.startpos[0].lnum; | |
| 8305 break; /* useful match found */ | |
| 8306 } | |
| 8307 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8308 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8309 // 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
|
8310 called_emsg = save_called_emsg; |
| 7 | 8311 } |
| 8312 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8313 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8314 * 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
|
8315 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8316 */ |
| 5979 | 8317 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8318 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8319 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
|
8320 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8321 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8322 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 8323 { |
| 8324 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8325 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8326 |
| 5979 | 8327 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 8328 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8329 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8330 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8331 if (pos->lnum == 0) |
| 5979 | 8332 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8333 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8334 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8335 if (pos->lnum == lnum) |
| 5979 | 8336 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8337 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8338 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8339 /* 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
|
8340 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8341 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
|
8342 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8343 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8344 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8345 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8346 posmatch->pos[found] = tmp; |
| 5979 | 8347 } |
| 8348 } | |
| 8349 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8350 found = i; |
| 5979 | 8351 } |
| 8352 } | |
| 8353 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8354 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8355 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8356 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
|
8357 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8358 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
|
8359 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8360 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8361 shl->lnum = lnum; |
| 5979 | 8362 shl->rm.startpos[0].lnum = 0; |
| 8363 shl->rm.startpos[0].col = start; | |
| 8364 shl->rm.endpos[0].lnum = 0; | |
| 8365 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
|
8366 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8367 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8368 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8369 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8370 return 0; |
| 5979 | 8371 } |
| 5985 | 8372 #endif |
| 5979 | 8373 |
| 7 | 8374 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8375 screen_start_highlight(int attr) |
| 7 | 8376 { |
| 8377 attrentry_T *aep = NULL; | |
| 8378 | |
| 8379 screen_attr = attr; | |
| 8380 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
8381 #ifdef MSWIN |
| 7 | 8382 && termcap_active |
| 8383 #endif | |
| 8384 ) | |
| 8385 { | |
| 8386 #ifdef FEAT_GUI | |
| 8387 if (gui.in_use) | |
| 8388 { | |
| 8389 char buf[20]; | |
| 8390 | |
| 681 | 8391 /* The GUI handles this internally. */ |
| 8392 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8393 OUT_STR(buf); |
| 8394 } | |
| 8395 else | |
| 8396 #endif | |
| 8397 { | |
| 8398 if (attr > HL_ALL) /* special HL attr. */ | |
| 8399 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8400 if (IS_CTERM) |
| 7 | 8401 aep = syn_cterm_attr2entry(attr); |
| 8402 else | |
| 8403 aep = syn_term_attr2entry(attr); | |
| 8404 if (aep == NULL) /* did ":syntax clear" */ | |
| 8405 attr = 0; | |
| 8406 else | |
| 8407 attr = aep->ae_attr; | |
| 8408 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8409 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8410 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
|
8411 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
|
8412 #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
|
8413 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
|
8414 ? 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
|
8415 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8416 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8417 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8418 /* If the Normal FG color has BOLD attribute and the new HL |
| 8419 * has a FG color defined, clear BOLD. */ | |
| 8420 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
|
8421 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8422 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
|
8423 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
|
8424 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
|
8425 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
|
8426 || ((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
|
8427 && *T_US != NUL) |
| 7 | 8428 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
|
8429 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8430 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
|
8431 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8432 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
|
8433 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
|
8434 out_str(T_STS); |
| 7 | 8435 |
| 8436 /* | |
| 8437 * Output the color or start string after bold etc., in case the | |
| 8438 * bold etc. override the color setting. | |
| 8439 */ | |
| 8440 if (aep != NULL) | |
| 8441 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8442 #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
|
8443 /* 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
|
8444 * 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
|
8445 * 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
|
8446 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
|
8447 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8448 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
|
8449 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
|
8450 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8451 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8452 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8453 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
|
8454 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8455 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
|
8456 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
|
8457 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8458 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8459 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
|
8460 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8461 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
|
8462 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8463 } |
| 8464 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8465 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8466 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
|
8467 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8468 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
|
8469 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
|
8470 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8471 |
|
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
|
8472 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
|
8473 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8474 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
|
8475 out_str(aep->ae_u.term.start); |
| 7 | 8476 } |
| 8477 } | |
| 8478 } | |
| 8479 } | |
| 8480 } | |
| 8481 | |
| 8482 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8483 screen_stop_highlight(void) |
| 7 | 8484 { |
| 8485 int do_ME = FALSE; /* output T_ME code */ | |
| 8486 | |
| 8487 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
|
8488 #ifdef MSWIN |
| 7 | 8489 && termcap_active |
| 8490 #endif | |
| 8491 ) | |
| 8492 { | |
| 8493 #ifdef FEAT_GUI | |
| 8494 if (gui.in_use) | |
| 8495 { | |
| 8496 char buf[20]; | |
| 8497 | |
| 8498 /* use internal GUI code */ | |
| 8499 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8500 OUT_STR(buf); | |
| 8501 } | |
| 8502 else | |
| 8503 #endif | |
| 8504 { | |
| 8505 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8506 { | |
| 8507 attrentry_T *aep; | |
| 8508 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8509 if (IS_CTERM) |
| 7 | 8510 { |
| 8511 /* | |
| 8512 * Assume that t_me restores the original colors! | |
| 8513 */ | |
| 8514 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
|
8515 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8516 #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
|
8517 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
|
8518 ? 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
|
8519 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8520 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8521 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
|
8522 #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
|
8523 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
|
8524 ? 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
|
8525 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8526 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8527 aep->ae_u.cterm.bg_color))) |
| 7 | 8528 do_ME = TRUE; |
| 8529 } | |
| 8530 else | |
| 8531 { | |
| 8532 aep = syn_term_attr2entry(screen_attr); | |
| 8533 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8534 { | |
| 8535 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8536 do_ME = TRUE; | |
| 8537 else | |
| 8538 out_str(aep->ae_u.term.stop); | |
| 8539 } | |
| 8540 } | |
| 8541 if (aep == NULL) /* did ":syntax clear" */ | |
| 8542 screen_attr = 0; | |
| 8543 else | |
| 8544 screen_attr = aep->ae_attr; | |
| 8545 } | |
| 8546 | |
| 8547 /* | |
| 8548 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8549 * same sequence several times. | |
| 8550 */ | |
| 8551 if (screen_attr & HL_STANDOUT) | |
| 8552 { | |
| 8553 if (STRCMP(T_SE, T_ME) == 0) | |
| 8554 do_ME = TRUE; | |
| 8555 else | |
| 8556 out_str(T_SE); | |
| 8557 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8558 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
|
8559 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8560 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
|
8561 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8562 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8563 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
|
8564 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8565 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
|
8566 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8567 { |
| 8568 if (STRCMP(T_UE, T_ME) == 0) | |
| 8569 do_ME = TRUE; | |
| 8570 else | |
| 8571 out_str(T_UE); | |
| 8572 } | |
| 8573 if (screen_attr & HL_ITALIC) | |
| 8574 { | |
| 8575 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8576 do_ME = TRUE; | |
| 8577 else | |
| 8578 out_str(T_CZR); | |
| 8579 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8580 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8581 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8582 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
|
8583 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8584 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8585 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8586 } |
| 7 | 8587 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8588 out_str(T_ME); | |
| 8589 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8590 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8591 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8592 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8593 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
|
8594 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
|
8595 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
|
8596 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
|
8597 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8598 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8599 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8600 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8601 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8602 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8603 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8604 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8605 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
|
8606 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8607 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
|
8608 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8609 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8610 } |
| 7 | 8611 } |
| 8612 } | |
| 8613 } | |
| 8614 screen_attr = 0; | |
| 8615 } | |
| 8616 | |
| 8617 /* | |
| 8618 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8619 * The machine specific code may override this again. | |
| 8620 */ | |
| 8621 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8622 reset_cterm_colors(void) |
| 7 | 8623 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8624 if (IS_CTERM) |
| 7 | 8625 { |
| 8626 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8627 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8628 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
|
8629 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8630 : (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
|
8631 #else |
| 7 | 8632 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
|
8633 #endif |
| 7 | 8634 { |
| 8635 out_str(T_OP); | |
| 8636 screen_attr = -1; | |
| 8637 } | |
| 8638 if (cterm_normal_fg_bold) | |
| 8639 { | |
| 8640 out_str(T_ME); | |
| 8641 screen_attr = -1; | |
| 8642 } | |
| 8643 } | |
| 8644 } | |
| 8645 | |
| 8646 /* | |
| 8647 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8648 * using the attributes from ScreenAttrs["off"]. | |
| 8649 */ | |
| 8650 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8651 screen_char(unsigned off, int row, int col) |
| 7 | 8652 { |
| 8653 int attr; | |
| 8654 | |
| 8655 /* Check for illegal values, just in case (could happen just after | |
| 8656 * resizing). */ | |
| 8657 if (row >= screen_Rows || col >= screen_Columns) | |
| 8658 return; | |
| 8659 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8660 #ifdef FEAT_INS_EXPAND |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8661 // Skip if under the popup menu. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8662 // Popup windows with zindex higher than POPUPMENU_ZINDEX go on top. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8663 if (pum_under_menu(row, col) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8664 # ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8665 && screen_zindex <= POPUPMENU_ZINDEX |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8666 # endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8667 ) |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8668 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8669 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8670 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8671 // Skip if under a(nother) popup. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8672 if (popup_mask[row * screen_Columns + col] > screen_zindex) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8673 return; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8674 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8675 |
| 6602 | 8676 /* Outputting a character in the last cell on the screen may scroll the |
| 8677 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8678 * mark the character invalid (update it when scrolled up). */ | |
| 8679 if (*T_XN == NUL | |
| 8680 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8681 #ifdef FEAT_RIGHTLEFT |
| 8682 /* account for first command-line character in rightleft mode */ | |
| 8683 && !cmdmsg_rl | |
| 8684 #endif | |
| 8685 ) | |
| 8686 { | |
| 8687 ScreenAttrs[off] = (sattr_T)-1; | |
| 8688 return; | |
| 8689 } | |
| 8690 | |
| 8691 /* | |
| 8692 * Stop highlighting first, so it's easier to move the cursor. | |
| 8693 */ | |
| 8694 if (screen_char_attr != 0) | |
| 8695 attr = screen_char_attr; | |
| 8696 else | |
| 8697 attr = ScreenAttrs[off]; | |
| 8698 if (screen_attr != attr) | |
| 8699 screen_stop_highlight(); | |
| 8700 | |
| 8701 windgoto(row, col); | |
| 8702 | |
| 8703 if (screen_attr != attr) | |
| 8704 screen_start_highlight(attr); | |
| 8705 | |
| 8706 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8707 { | |
| 8708 char_u buf[MB_MAXBYTES + 1]; | |
| 8709 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8710 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
|
8711 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8712 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8713 #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
|
8714 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8715 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8716 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8717 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8718 /* 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
|
8719 * 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
|
8720 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
|
8721 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
|
8722 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8723 /* 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
|
8724 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8725 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
|
8726 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8727 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8728 ++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
|
8729 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8730 /* 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
|
8731 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
|
8732 out_str(buf); |
| 7 | 8733 } |
| 8734 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8735 { |
| 7 | 8736 out_flush_check(); |
| 8737 out_char(ScreenLines[off]); | |
| 8738 /* double-byte character in single-width cell */ | |
| 8739 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8740 out_char(ScreenLines2[off]); | |
| 8741 } | |
| 8742 | |
| 8743 screen_cur_col++; | |
| 8744 } | |
| 8745 | |
| 8746 /* | |
| 8747 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8748 * on the screen at position 'row' and 'col'. | |
| 8749 * The attributes of the first byte is used for all. This is required to | |
| 8750 * output the two bytes of a double-byte character with nothing in between. | |
| 8751 */ | |
| 8752 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8753 screen_char_2(unsigned off, int row, int col) |
| 7 | 8754 { |
| 8755 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8756 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8757 return; | |
| 8758 | |
| 8759 /* Outputting the last character on the screen may scrollup the screen. | |
| 8760 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8761 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8762 { | |
| 8763 ScreenAttrs[off] = (sattr_T)-1; | |
| 8764 return; | |
| 8765 } | |
| 8766 | |
| 8767 /* Output the first byte normally (positions the cursor), then write the | |
| 8768 * second byte directly. */ | |
| 8769 screen_char(off, row, col); | |
| 8770 out_char(ScreenLines[off + 1]); | |
| 8771 ++screen_cur_col; | |
| 8772 } | |
| 8773 | |
| 8774 /* | |
| 8775 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8776 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8777 */ | |
| 8778 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8779 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8780 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8781 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8782 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8783 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8784 int invert) |
| 7 | 8785 { |
| 8786 int r, c; | |
| 8787 int off; | |
| 1378 | 8788 int max_off; |
| 7 | 8789 |
| 534 | 8790 /* Can't use ScreenLines unless initialized */ |
| 8791 if (ScreenLines == NULL) | |
| 8792 return; | |
| 8793 | |
| 7 | 8794 if (invert) |
| 8795 screen_char_attr = HL_INVERSE; | |
| 8796 for (r = row; r < row + height; ++r) | |
| 8797 { | |
| 8798 off = LineOffset[r]; | |
| 1378 | 8799 max_off = off + screen_Columns; |
| 7 | 8800 for (c = col; c < col + width; ++c) |
| 8801 { | |
| 1378 | 8802 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8803 { |
| 8804 screen_char_2(off + c, r, c); | |
| 8805 ++c; | |
| 8806 } | |
| 8807 else | |
| 8808 { | |
| 8809 screen_char(off + c, r, c); | |
| 1378 | 8810 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8811 ++c; |
| 8812 } | |
| 8813 } | |
| 8814 } | |
| 8815 screen_char_attr = 0; | |
| 8816 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8817 |
| 7 | 8818 /* |
| 8819 * Redraw the characters for a vertically split window. | |
| 8820 */ | |
| 8821 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8822 redraw_block(int row, int end, win_T *wp) |
| 7 | 8823 { |
| 8824 int col; | |
| 8825 int width; | |
| 8826 | |
| 8827 # ifdef FEAT_CLIPBOARD | |
| 8828 clip_may_clear_selection(row, end - 1); | |
| 8829 # endif | |
| 8830 | |
| 8831 if (wp == NULL) | |
| 8832 { | |
| 8833 col = 0; | |
| 8834 width = Columns; | |
| 8835 } | |
| 8836 else | |
| 8837 { | |
| 8838 col = wp->w_wincol; | |
| 8839 width = wp->w_width; | |
| 8840 } | |
| 8841 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8842 } | |
| 8843 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8844 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8845 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
|
8846 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8847 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8848 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8849 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8850 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8851 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8852 |
| 7 | 8853 /* |
| 8854 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8855 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8856 * Use attributes 'attr'. | |
| 8857 */ | |
| 8858 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8859 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8860 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8861 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8862 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8863 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8864 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8865 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8866 int attr) |
| 7 | 8867 { |
| 8868 int row; | |
| 8869 int col; | |
| 8870 int off; | |
| 8871 int end_off; | |
| 8872 int did_delete; | |
| 8873 int c; | |
| 8874 int norm_term; | |
| 8875 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8876 int force_next = FALSE; | |
| 8877 #endif | |
| 8878 | |
| 8879 if (end_row > screen_Rows) /* safety check */ | |
| 8880 end_row = screen_Rows; | |
| 8881 if (end_col > screen_Columns) /* safety check */ | |
| 8882 end_col = screen_Columns; | |
| 8883 if (ScreenLines == NULL | |
| 8884 || start_row >= end_row | |
| 8885 || start_col >= end_col) /* nothing to do */ | |
| 8886 return; | |
| 8887 | |
| 8888 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8889 norm_term = ( | |
| 8890 #ifdef FEAT_GUI | |
| 8891 !gui.in_use && | |
| 8892 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8893 !IS_CTERM); |
| 7 | 8894 for (row = start_row; row < end_row; ++row) |
| 8895 { | |
| 1668 | 8896 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8897 #ifdef FEAT_GUI |
| 1668 | 8898 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8899 #endif |
| 1668 | 8900 ) |
| 8901 { | |
| 8902 /* When drawing over the right halve of a double-wide char clear | |
| 8903 * out the left halve. When drawing over the left halve of a | |
| 8904 * double wide-char clear out the right halve. Only needed in a | |
| 8905 * terminal. */ | |
| 1685 | 8906 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8907 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8908 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8909 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8910 } |
| 7 | 8911 /* |
| 8912 * Try to use delete-line termcap code, when no attributes or in a | |
| 8913 * "normal" terminal, where a bold/italic space is just a | |
| 8914 * space. | |
| 8915 */ | |
| 8916 did_delete = FALSE; | |
| 8917 if (c2 == ' ' | |
| 8918 && end_col == Columns | |
| 8919 && can_clear(T_CE) | |
| 8920 && (attr == 0 | |
| 8921 || (norm_term | |
| 8922 && attr <= HL_ALL | |
| 8923 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8924 { | |
| 8925 /* | |
| 8926 * check if we really need to clear something | |
| 8927 */ | |
| 8928 col = start_col; | |
| 8929 if (c1 != ' ') /* don't clear first char */ | |
| 8930 ++col; | |
| 8931 | |
| 8932 off = LineOffset[row] + col; | |
| 8933 end_off = LineOffset[row] + end_col; | |
| 8934 | |
| 8935 /* skip blanks (used often, keep it fast!) */ | |
| 8936 if (enc_utf8) | |
| 8937 while (off < end_off && ScreenLines[off] == ' ' | |
| 8938 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8939 ++off; | |
| 8940 else | |
| 8941 while (off < end_off && ScreenLines[off] == ' ' | |
| 8942 && ScreenAttrs[off] == 0) | |
| 8943 ++off; | |
| 8944 if (off < end_off) /* something to be cleared */ | |
| 8945 { | |
| 8946 col = off - LineOffset[row]; | |
| 8947 screen_stop_highlight(); | |
| 8948 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8949 out_str(T_CE); | |
| 8950 screen_start(); /* don't know where cursor is now */ | |
| 8951 col = end_col - col; | |
| 8952 while (col--) /* clear chars in ScreenLines */ | |
| 8953 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8954 space_to_screenline(off, 0); |
| 7 | 8955 ++off; |
| 8956 } | |
| 8957 } | |
| 8958 did_delete = TRUE; /* the chars are cleared now */ | |
| 8959 } | |
| 8960 | |
| 8961 off = LineOffset[row] + start_col; | |
| 8962 c = c1; | |
| 8963 for (col = start_col; col < end_col; ++col) | |
| 8964 { | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8965 if ((ScreenLines[off] != c |
| 714 | 8966 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8967 != (c >= 0x80 ? c : 0)) | |
| 7 | 8968 || ScreenAttrs[off] != attr |
| 8969 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8970 || force_next | |
| 8971 #endif | |
| 8972 ) | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8973 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8974 // Skip if under a(nother) popup. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8975 && popup_mask[row * screen_Columns + col] <= screen_zindex |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8976 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8977 ) |
| 7 | 8978 { |
| 8979 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8980 /* The bold trick may make a single row of pixels appear in | |
| 8981 * the next character. When a bold character is removed, the | |
| 8982 * next character should be redrawn too. This happens for our | |
| 8983 * own GUI and for some xterms. */ | |
| 8984 if ( | |
| 8985 # ifdef FEAT_GUI | |
| 8986 gui.in_use | |
| 8987 # endif | |
| 8988 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8989 || | |
| 8990 # endif | |
| 8991 # ifdef UNIX | |
| 8992 term_is_xterm | |
| 8993 # endif | |
| 8994 ) | |
| 8995 { | |
| 8996 if (ScreenLines[off] != ' ' | |
| 8997 && (ScreenAttrs[off] > HL_ALL | |
| 8998 || ScreenAttrs[off] & HL_BOLD)) | |
| 8999 force_next = TRUE; | |
| 9000 else | |
| 9001 force_next = FALSE; | |
| 9002 } | |
| 9003 #endif | |
| 9004 ScreenLines[off] = c; | |
| 9005 if (enc_utf8) | |
| 9006 { | |
| 9007 if (c >= 0x80) | |
| 9008 { | |
| 9009 ScreenLinesUC[off] = c; | |
| 714 | 9010 ScreenLinesC[0][off] = 0; |
| 7 | 9011 } |
| 9012 else | |
| 9013 ScreenLinesUC[off] = 0; | |
| 9014 } | |
| 9015 ScreenAttrs[off] = attr; | |
| 9016 if (!did_delete || c != ' ') | |
| 9017 screen_char(off, row, col); | |
| 9018 } | |
| 9019 ++off; | |
| 9020 if (col == start_col) | |
| 9021 { | |
| 9022 if (did_delete) | |
| 9023 break; | |
| 9024 c = c2; | |
| 9025 } | |
| 9026 } | |
| 9027 if (end_col == Columns) | |
| 9028 LineWraps[row] = FALSE; | |
| 9029 if (row == Rows - 1) /* overwritten the command line */ | |
| 9030 { | |
| 9031 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
|
9032 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
|
9033 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 9034 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 9035 if (start_col == 0) |
| 9036 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 9037 } |
| 9038 } | |
| 9039 } | |
| 9040 | |
| 9041 /* | |
| 9042 * Check if there should be a delay. Used before clearing or redrawing the | |
| 9043 * screen or the command line. | |
| 9044 */ | |
| 9045 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9046 check_for_delay(int check_msg_scroll) |
| 7 | 9047 { |
| 9048 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 9049 && !did_wait_return | |
| 9050 && emsg_silent == 0) | |
| 9051 { | |
| 9052 out_flush(); | |
| 9053 ui_delay(1000L, TRUE); | |
| 9054 emsg_on_display = FALSE; | |
| 9055 if (check_msg_scroll) | |
| 9056 msg_scroll = FALSE; | |
| 9057 } | |
| 9058 } | |
| 9059 | |
| 9060 /* | |
|
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
|
9061 * 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
|
9062 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
9063 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
|
9064 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
|
9065 { |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
9066 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
|
9067 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
9068 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
|
9069 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
|
9070 } |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
9071 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
9072 /* |
| 7 | 9073 * screen_valid - allocate screen buffers if size changed |
| 3263 | 9074 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 9075 * Returns TRUE if there is a valid screen to write to. |
| 9076 * Returns FALSE when starting up and screen not initialized yet. | |
| 9077 */ | |
| 9078 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9079 screen_valid(int doclear) |
| 7 | 9080 { |
| 3263 | 9081 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 9082 return (ScreenLines != NULL); |
| 9083 } | |
| 9084 | |
| 9085 /* | |
| 9086 * Resize the shell to Rows and Columns. | |
| 9087 * Allocate ScreenLines[] and associated items. | |
| 9088 * | |
| 9089 * There may be some time between setting Rows and Columns and (re)allocating | |
| 9090 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 9091 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 9092 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 9093 * final size of the shell is needed. | |
| 9094 */ | |
| 9095 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9096 screenalloc(int doclear) |
| 7 | 9097 { |
| 9098 int new_row, old_row; | |
| 9099 #ifdef FEAT_GUI | |
| 9100 int old_Rows; | |
| 9101 #endif | |
| 9102 win_T *wp; | |
| 9103 int outofmem = FALSE; | |
| 9104 int len; | |
| 9105 schar_T *new_ScreenLines; | |
| 9106 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 9107 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 9108 schar_T *new_ScreenLines2 = NULL; |
| 714 | 9109 int i; |
| 7 | 9110 sattr_T *new_ScreenAttrs; |
| 9111 unsigned *new_LineOffset; | |
| 9112 char_u *new_LineWraps; | |
| 681 | 9113 short *new_TabPageIdxs; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9114 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9115 short *new_popup_mask; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9116 #endif |
| 671 | 9117 tabpage_T *tp; |
| 7 | 9118 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 9119 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 9120 int retry_count = 0; |
| 9121 | |
| 9122 retry: | |
| 7 | 9123 /* |
| 9124 * Allocation of the screen buffers is done only when the size changes and | |
| 9125 * when Rows and Columns have been set and we have started doing full | |
| 9126 * screen stuff. | |
| 9127 */ | |
| 9128 if ((ScreenLines != NULL | |
| 9129 && Rows == screen_Rows | |
| 9130 && Columns == screen_Columns | |
| 9131 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 9132 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9133 && p_mco == Screen_mco) |
| 7 | 9134 || Rows == 0 |
| 9135 || Columns == 0 | |
| 9136 || (!full_screen && ScreenLines == NULL)) | |
| 9137 return; | |
| 9138 | |
| 9139 /* | |
| 9140 * It's possible that we produce an out-of-memory message below, which | |
| 9141 * will cause this function to be called again. To break the loop, just | |
| 9142 * return here. | |
| 9143 */ | |
| 9144 if (entered) | |
| 9145 return; | |
| 9146 entered = TRUE; | |
| 9147 | |
| 911 | 9148 /* |
| 9149 * Note that the window sizes are updated before reallocating the arrays, | |
| 9150 * thus we must not redraw here! | |
| 9151 */ | |
| 9152 ++RedrawingDisabled; | |
| 9153 | |
| 7 | 9154 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 9155 | |
| 9156 comp_col(); /* recompute columns for shown command and ruler */ | |
| 9157 | |
| 9158 /* | |
| 9159 * We're changing the size of the screen. | |
| 9160 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 9161 * - Move lines from the old arrays into the new arrays, clear extra | |
| 9162 * lines (unless the screen is going to be cleared). | |
| 9163 * - Free the old arrays. | |
| 9164 * | |
| 9165 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 9166 * Continuing with the old ScreenLines may result in a crash, because the | |
| 9167 * size is wrong. | |
| 9168 */ | |
| 671 | 9169 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9170 win_free_lsize(wp); |
| 1946 | 9171 if (aucmd_win != NULL) |
| 9172 win_free_lsize(aucmd_win); | |
|
16882
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9173 #ifdef FEAT_TEXT_PROP |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9174 // global popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9175 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9176 win_free_lsize(wp); |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9177 // tab-local popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9178 FOR_ALL_TABPAGES(tp) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9179 for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9180 win_free_lsize(wp); |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9181 #endif |
| 7 | 9182 |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9183 new_ScreenLines = LALLOC_MULT(schar_T, (Rows + 1) * Columns); |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
9184 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 9185 if (enc_utf8) |
| 9186 { | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9187 new_ScreenLinesUC = LALLOC_MULT(u8char_T, (Rows + 1) * Columns); |
| 714 | 9188 for (i = 0; i < p_mco; ++i) |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9189 new_ScreenLinesC[i] = LALLOC_CLEAR_MULT(u8char_T, |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9190 (Rows + 1) * Columns); |
| 7 | 9191 } |
| 9192 if (enc_dbcs == DBCS_JPNU) | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9193 new_ScreenLines2 = LALLOC_MULT(schar_T, (Rows + 1) * Columns); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9194 new_ScreenAttrs = LALLOC_MULT(sattr_T, (Rows + 1) * Columns); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9195 new_LineOffset = LALLOC_MULT(unsigned, Rows); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9196 new_LineWraps = LALLOC_MULT(char_u, Rows); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9197 new_TabPageIdxs = LALLOC_MULT(short, Columns); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9198 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9199 new_popup_mask = LALLOC_MULT(short, Rows * Columns); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9200 #endif |
| 7 | 9201 |
| 677 | 9202 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9203 { |
| 9204 if (win_alloc_lines(wp) == FAIL) | |
| 9205 { | |
| 9206 outofmem = TRUE; | |
| 1819 | 9207 goto give_up; |
| 9208 } | |
| 9209 } | |
| 1946 | 9210 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 9211 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 9212 outofmem = TRUE; |
|
16882
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9213 #ifdef FEAT_TEXT_PROP |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9214 // global popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9215 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9216 if (win_alloc_lines(wp) == FAIL) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9217 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9218 outofmem = TRUE; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9219 goto give_up; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9220 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9221 // tab-local popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9222 FOR_ALL_TABPAGES(tp) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9223 for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9224 if (win_alloc_lines(wp) == FAIL) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9225 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9226 outofmem = TRUE; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9227 goto give_up; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9228 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9229 #endif |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9230 |
| 1819 | 9231 give_up: |
| 7 | 9232 |
| 714 | 9233 for (i = 0; i < p_mco; ++i) |
| 9234 if (new_ScreenLinesC[i] == NULL) | |
| 9235 break; | |
| 7 | 9236 if (new_ScreenLines == NULL |
| 714 | 9237 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 9238 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 9239 || new_ScreenAttrs == NULL | |
| 9240 || new_LineOffset == NULL | |
| 9241 || new_LineWraps == NULL | |
| 671 | 9242 || new_TabPageIdxs == NULL |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9243 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9244 || new_popup_mask == NULL |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9245 #endif |
| 7 | 9246 || outofmem) |
| 9247 { | |
| 944 | 9248 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 9249 { |
| 9250 /* guess the size */ | |
| 9251 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 9252 | |
| 9253 /* Remember we did this to avoid getting outofmem messages over | |
| 9254 * and over again. */ | |
| 944 | 9255 done_outofmem_msg = TRUE; |
| 534 | 9256 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9257 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9258 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 9259 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
|
9260 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
|
9261 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9262 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9263 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9264 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9265 VIM_CLEAR(new_TabPageIdxs); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9266 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9267 VIM_CLEAR(new_popup_mask); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9268 #endif |
| 7 | 9269 } |
| 9270 else | |
| 9271 { | |
| 944 | 9272 done_outofmem_msg = FALSE; |
| 534 | 9273 |
| 7 | 9274 for (new_row = 0; new_row < Rows; ++new_row) |
| 9275 { | |
| 9276 new_LineOffset[new_row] = new_row * Columns; | |
| 9277 new_LineWraps[new_row] = FALSE; | |
| 9278 | |
| 9279 /* | |
| 9280 * If the screen is not going to be cleared, copy as much as | |
| 9281 * possible from the old screen to the new one and clear the rest | |
| 9282 * (used when resizing the window at the "--more--" prompt or when | |
| 9283 * executing an external command, for the GUI). | |
| 9284 */ | |
| 3263 | 9285 if (!doclear) |
| 7 | 9286 { |
| 9287 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 9288 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 9289 if (enc_utf8) | |
| 9290 { | |
| 9291 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 9292 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 9293 for (i = 0; i < p_mco; ++i) |
| 9294 (void)vim_memset(new_ScreenLinesC[i] | |
| 9295 + new_row * Columns, | |
| 7 | 9296 0, (size_t)Columns * sizeof(u8char_T)); |
| 9297 } | |
| 9298 if (enc_dbcs == DBCS_JPNU) | |
| 9299 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 9300 0, (size_t)Columns * sizeof(schar_T)); | |
| 9301 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 9302 0, (size_t)Columns * sizeof(sattr_T)); | |
| 9303 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 9304 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 9305 { |
| 9306 if (screen_Columns < Columns) | |
| 9307 len = screen_Columns; | |
| 9308 else | |
| 9309 len = Columns; | |
| 571 | 9310 /* When switching to utf-8 don't copy characters, they |
| 714 | 9311 * may be invalid now. Also when p_mco changes. */ |
| 9312 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 9313 && p_mco == Screen_mco) | |
| 26 | 9314 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 9315 ScreenLines + LineOffset[old_row], | |
| 9316 (size_t)len * sizeof(schar_T)); | |
| 714 | 9317 if (enc_utf8 && ScreenLinesUC != NULL |
| 9318 && p_mco == Screen_mco) | |
| 7 | 9319 { |
| 9320 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 9321 ScreenLinesUC + LineOffset[old_row], | |
| 9322 (size_t)len * sizeof(u8char_T)); | |
| 714 | 9323 for (i = 0; i < p_mco; ++i) |
| 9324 mch_memmove(new_ScreenLinesC[i] | |
| 9325 + new_LineOffset[new_row], | |
| 9326 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 9327 (size_t)len * sizeof(u8char_T)); |
| 9328 } | |
| 9329 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 9330 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 9331 ScreenLines2 + LineOffset[old_row], | |
| 9332 (size_t)len * sizeof(schar_T)); | |
| 9333 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 9334 ScreenAttrs + LineOffset[old_row], | |
| 9335 (size_t)len * sizeof(sattr_T)); | |
| 9336 } | |
| 9337 } | |
| 9338 } | |
| 9339 /* Use the last line of the screen for the current line. */ | |
| 9340 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 9341 } | |
| 9342 | |
| 356 | 9343 free_screenlines(); |
| 9344 | |
| 7 | 9345 ScreenLines = new_ScreenLines; |
| 9346 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 9347 for (i = 0; i < p_mco; ++i) |
| 9348 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 9349 Screen_mco = p_mco; | |
| 7 | 9350 ScreenLines2 = new_ScreenLines2; |
| 9351 ScreenAttrs = new_ScreenAttrs; | |
| 9352 LineOffset = new_LineOffset; | |
| 9353 LineWraps = new_LineWraps; | |
| 671 | 9354 TabPageIdxs = new_TabPageIdxs; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9355 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9356 popup_mask = new_popup_mask; |
|
16990
f824831e2805
patch 8.1.1495: memory access error
Bram Moolenaar <Bram@vim.org>
parents:
16986
diff
changeset
|
9357 vim_memset(popup_mask, 0, Rows * Columns * sizeof(short)); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9358 popup_mask_refresh = TRUE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9359 #endif |
| 7 | 9360 |
| 9361 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9362 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9363 #ifdef FEAT_GUI | |
| 9364 old_Rows = screen_Rows; | |
| 9365 #endif | |
| 9366 screen_Rows = Rows; | |
| 9367 screen_Columns = Columns; | |
| 9368 | |
| 9369 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9370 if (doclear) |
| 7 | 9371 screenclear2(); |
| 9372 #ifdef FEAT_GUI | |
| 9373 else if (gui.in_use | |
| 9374 && !gui.starting | |
| 9375 && ScreenLines != NULL | |
| 9376 && old_Rows != Rows) | |
| 9377 { | |
| 9378 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9379 /* | |
| 9380 * Adjust the position of the cursor, for when executing an external | |
| 9381 * command. | |
| 9382 */ | |
| 9383 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9384 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9385 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9386 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9387 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9388 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9389 } | |
| 9390 #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
|
9391 clear_TabPageIdxs(); |
| 7 | 9392 |
| 9393 entered = FALSE; | |
| 911 | 9394 --RedrawingDisabled; |
| 766 | 9395 |
| 1824 | 9396 /* |
| 9397 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9398 * in case applying autocommands always changes Rows or Columns. | |
| 9399 */ | |
| 9400 if (starting == 0 && ++retry_count <= 3) | |
| 9401 { | |
| 766 | 9402 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9403 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9404 * jump back to check if we need to allocate the screen again. */ | |
| 9405 goto retry; | |
| 9406 } | |
| 7 | 9407 } |
| 9408 | |
| 9409 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9410 free_screenlines(void) |
| 356 | 9411 { |
| 714 | 9412 int i; |
| 9413 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9414 VIM_CLEAR(ScreenLinesUC); |
| 714 | 9415 for (i = 0; i < Screen_mco; ++i) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9416 VIM_CLEAR(ScreenLinesC[i]); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9417 VIM_CLEAR(ScreenLines2); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9418 VIM_CLEAR(ScreenLines); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9419 VIM_CLEAR(ScreenAttrs); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9420 VIM_CLEAR(LineOffset); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9421 VIM_CLEAR(LineWraps); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9422 VIM_CLEAR(TabPageIdxs); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9423 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9424 VIM_CLEAR(popup_mask); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9425 #endif |
| 356 | 9426 } |
| 9427 | |
| 9428 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9429 screenclear(void) |
| 7 | 9430 { |
| 9431 check_for_delay(FALSE); | |
| 9432 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9433 screenclear2(); /* clear the screen */ | |
| 9434 } | |
| 9435 | |
| 9436 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9437 screenclear2(void) |
| 7 | 9438 { |
| 9439 int i; | |
| 9440 | |
| 9441 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9442 #ifdef FEAT_GUI | |
| 9443 || (gui.in_use && gui.starting) | |
| 9444 #endif | |
| 9445 ) | |
| 9446 return; | |
| 9447 | |
| 9448 #ifdef FEAT_GUI | |
| 9449 if (!gui.in_use) | |
| 9450 #endif | |
| 9451 screen_attr = -1; /* force setting the Normal colors */ | |
| 9452 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9453 | |
| 9454 #ifdef FEAT_CLIPBOARD | |
| 9455 /* disable selection without redrawing it */ | |
| 9456 clip_scroll_selection(9999); | |
| 9457 #endif | |
| 9458 | |
| 9459 /* blank out ScreenLines */ | |
| 9460 for (i = 0; i < Rows; ++i) | |
| 9461 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9462 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9463 LineWraps[i] = FALSE; |
| 9464 } | |
| 9465 | |
| 9466 if (can_clear(T_CL)) | |
| 9467 { | |
| 9468 out_str(T_CL); /* clear the display */ | |
| 9469 clear_cmdline = FALSE; | |
| 644 | 9470 mode_displayed = FALSE; |
| 7 | 9471 } |
| 9472 else | |
| 9473 { | |
| 9474 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9475 for (i = 0; i < Rows; ++i) | |
| 9476 lineinvalid(LineOffset[i], (int)Columns); | |
| 9477 clear_cmdline = TRUE; | |
| 9478 } | |
| 9479 | |
| 9480 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9481 | |
| 9482 win_rest_invalid(firstwin); | |
| 9483 redraw_cmdline = TRUE; | |
| 673 | 9484 redraw_tabline = TRUE; |
| 7 | 9485 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9486 must_redraw = NOT_VALID; | |
| 9487 compute_cmdrow(); | |
| 9488 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9489 msg_col = 0; | |
| 9490 screen_start(); /* don't know where cursor is now */ | |
| 9491 msg_scrolled = 0; /* can't scroll back */ | |
| 9492 msg_didany = FALSE; | |
| 9493 msg_didout = FALSE; | |
| 9494 } | |
| 9495 | |
| 9496 /* | |
| 9497 * Clear one line in ScreenLines. | |
| 9498 */ | |
| 9499 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9500 lineclear(unsigned off, int width, int attr) |
| 7 | 9501 { |
| 9502 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9503 if (enc_utf8) | |
| 9504 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9505 (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
|
9506 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9507 } |
| 9508 | |
| 9509 /* | |
| 9510 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9511 * invalid value. | |
| 9512 */ | |
| 9513 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9514 lineinvalid(unsigned off, int width) |
| 7 | 9515 { |
| 9516 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9517 } | |
| 9518 | |
| 9519 /* | |
| 9520 * Copy part of a Screenline for vertically split window "wp". | |
| 9521 */ | |
| 9522 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9523 linecopy(int to, int from, win_T *wp) |
| 7 | 9524 { |
| 9525 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9526 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9527 | |
| 9528 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9529 wp->w_width * sizeof(schar_T)); | |
| 9530 if (enc_utf8) | |
| 9531 { | |
| 714 | 9532 int i; |
| 9533 | |
| 7 | 9534 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9535 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9536 for (i = 0; i < p_mco; ++i) |
| 9537 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9538 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9539 } |
| 9540 if (enc_dbcs == DBCS_JPNU) | |
| 9541 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9542 wp->w_width * sizeof(schar_T)); | |
| 9543 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9544 wp->w_width * sizeof(sattr_T)); | |
| 9545 } | |
| 9546 | |
| 9547 /* | |
| 9548 * Return TRUE if clearing with term string "p" would work. | |
| 9549 * It can't work when the string is empty or it won't set the right background. | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9550 * Don't clear to end-of-line when there are popups, it may cause flicker. |
| 7 | 9551 */ |
| 9552 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9553 can_clear(char_u *p) |
| 7 | 9554 { |
| 9555 return (*p != NUL && (t_colors <= 1 | |
| 9556 #ifdef FEAT_GUI | |
| 9557 || gui.in_use | |
| 9558 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9559 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9560 || (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
|
9561 || (!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
|
9562 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9563 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9564 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9565 || *T_UT != NUL) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9566 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9567 && !(p == T_CE && popup_visible) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9568 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9569 ); |
| 7 | 9570 } |
| 9571 | |
| 9572 /* | |
| 9573 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9574 * something directly to the screen (shell commands) or a terminal control | |
| 9575 * code. | |
| 9576 */ | |
| 9577 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9578 screen_start(void) |
| 7 | 9579 { |
| 9580 screen_cur_row = screen_cur_col = 9999; | |
| 9581 } | |
| 9582 | |
| 9583 /* | |
| 9584 * Move the cursor to position "row","col" in the screen. | |
| 9585 * This tries to find the most efficient way to move, minimizing the number of | |
| 9586 * characters sent to the terminal. | |
| 9587 */ | |
| 9588 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9589 windgoto(int row, int col) |
| 7 | 9590 { |
| 205 | 9591 sattr_T *p; |
| 7 | 9592 int i; |
| 9593 int plan; | |
| 9594 int cost; | |
| 9595 int wouldbe_col; | |
| 9596 int noinvcurs; | |
| 9597 char_u *bs; | |
| 9598 int goto_cost; | |
| 9599 int attr; | |
| 9600 | |
| 1213 | 9601 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9602 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9603 | |
| 9604 #define PLAN_LE 1 | |
| 9605 #define PLAN_CR 2 | |
| 9606 #define PLAN_NL 3 | |
| 9607 #define PLAN_WRITE 4 | |
| 9608 /* Can't use ScreenLines unless initialized */ | |
| 9609 if (ScreenLines == NULL) | |
| 9610 return; | |
| 9611 | |
| 9612 if (col != screen_cur_col || row != screen_cur_row) | |
| 9613 { | |
| 9614 /* Check for valid position. */ | |
| 9615 if (row < 0) /* window without text lines? */ | |
| 9616 row = 0; | |
| 9617 if (row >= screen_Rows) | |
| 9618 row = screen_Rows - 1; | |
| 9619 if (col >= screen_Columns) | |
| 9620 col = screen_Columns - 1; | |
| 9621 | |
| 9622 /* check if no cursor movement is allowed in highlight mode */ | |
| 9623 if (screen_attr && *T_MS == NUL) | |
| 9624 noinvcurs = HIGHL_COST; | |
| 9625 else | |
| 9626 noinvcurs = 0; | |
| 9627 goto_cost = GOTO_COST + noinvcurs; | |
| 9628 | |
| 9629 /* | |
| 9630 * Plan how to do the positioning: | |
| 9631 * 1. Use CR to move it to column 0, same row. | |
| 9632 * 2. Use T_LE to move it a few columns to the left. | |
| 9633 * 3. Use NL to move a few lines down, column 0. | |
| 9634 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9635 * | |
| 9636 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9637 * position is unknown then (some terminals wrap, some don't ) | |
| 9638 * | |
| 1213 | 9639 * First check if the highlighting attributes allow us to write |
| 7 | 9640 * characters to move the cursor to the right. |
| 9641 */ | |
| 9642 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9643 { | |
| 9644 /* | |
| 9645 * If the cursor is in the same row, bigger col, we can use CR | |
| 9646 * or T_LE. | |
| 9647 */ | |
| 9648 bs = NULL; /* init for GCC */ | |
| 9649 attr = screen_attr; | |
| 9650 if (row == screen_cur_row && col < screen_cur_col) | |
| 9651 { | |
| 9652 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9653 if (*T_LE) | |
| 9654 bs = T_LE; /* "cursor left" */ | |
| 9655 else | |
| 9656 bs = T_BC; /* "backspace character (old) */ | |
| 9657 if (*bs) | |
| 9658 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9659 else | |
| 9660 cost = 999; | |
| 9661 if (col + 1 < cost) /* using CR is less characters */ | |
| 9662 { | |
| 9663 plan = PLAN_CR; | |
| 9664 wouldbe_col = 0; | |
| 9665 cost = 1; /* CR is just one character */ | |
| 9666 } | |
| 9667 else | |
| 9668 { | |
| 9669 plan = PLAN_LE; | |
| 9670 wouldbe_col = col; | |
| 9671 } | |
| 9672 if (noinvcurs) /* will stop highlighting */ | |
| 9673 { | |
| 9674 cost += noinvcurs; | |
| 9675 attr = 0; | |
| 9676 } | |
| 9677 } | |
| 9678 | |
| 9679 /* | |
| 9680 * If the cursor is above where we want to be, we can use CR LF. | |
| 9681 */ | |
| 9682 else if (row > screen_cur_row) | |
| 9683 { | |
| 9684 plan = PLAN_NL; | |
| 9685 wouldbe_col = 0; | |
| 9686 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9687 if (noinvcurs) /* will stop highlighting */ | |
| 9688 { | |
| 9689 cost += noinvcurs; | |
| 9690 attr = 0; | |
| 9691 } | |
| 9692 } | |
| 9693 | |
| 9694 /* | |
| 9695 * If the cursor is in the same row, smaller col, just use write. | |
| 9696 */ | |
| 9697 else | |
| 9698 { | |
| 9699 plan = PLAN_WRITE; | |
| 9700 wouldbe_col = screen_cur_col; | |
| 9701 cost = 0; | |
| 9702 } | |
| 9703 | |
| 9704 /* | |
| 9705 * Check if any characters that need to be written have the | |
| 9706 * correct attributes. Also avoid UTF-8 characters. | |
| 9707 */ | |
| 9708 i = col - wouldbe_col; | |
| 9709 if (i > 0) | |
| 9710 cost += i; | |
| 9711 if (cost < goto_cost && i > 0) | |
| 9712 { | |
| 9713 /* | |
| 9714 * Check if the attributes are correct without additionally | |
| 9715 * stopping highlighting. | |
| 9716 */ | |
| 9717 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9718 while (i && *p++ == attr) | |
| 9719 --i; | |
| 9720 if (i != 0) | |
| 9721 { | |
| 9722 /* | |
| 9723 * Try if it works when highlighting is stopped here. | |
| 9724 */ | |
| 9725 if (*--p == 0) | |
| 9726 { | |
| 9727 cost += noinvcurs; | |
| 9728 while (i && *p++ == 0) | |
| 9729 --i; | |
| 9730 } | |
| 9731 if (i != 0) | |
| 9732 cost = 999; /* different attributes, don't do it */ | |
| 9733 } | |
| 9734 if (enc_utf8) | |
| 9735 { | |
| 9736 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9737 for (i = wouldbe_col; i < col; ++i) | |
| 9738 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9739 { | |
| 9740 cost = 999; | |
| 9741 break; | |
| 9742 } | |
| 9743 } | |
| 9744 } | |
| 9745 | |
| 9746 /* | |
| 9747 * We can do it without term_windgoto()! | |
| 9748 */ | |
| 9749 if (cost < goto_cost) | |
| 9750 { | |
| 9751 if (plan == PLAN_LE) | |
| 9752 { | |
| 9753 if (noinvcurs) | |
| 9754 screen_stop_highlight(); | |
| 9755 while (screen_cur_col > col) | |
| 9756 { | |
| 9757 out_str(bs); | |
| 9758 --screen_cur_col; | |
| 9759 } | |
| 9760 } | |
| 9761 else if (plan == PLAN_CR) | |
| 9762 { | |
| 9763 if (noinvcurs) | |
| 9764 screen_stop_highlight(); | |
| 9765 out_char('\r'); | |
| 9766 screen_cur_col = 0; | |
| 9767 } | |
| 9768 else if (plan == PLAN_NL) | |
| 9769 { | |
| 9770 if (noinvcurs) | |
| 9771 screen_stop_highlight(); | |
| 9772 while (screen_cur_row < row) | |
| 9773 { | |
| 9774 out_char('\n'); | |
| 9775 ++screen_cur_row; | |
| 9776 } | |
| 9777 screen_cur_col = 0; | |
| 9778 } | |
| 9779 | |
| 9780 i = col - screen_cur_col; | |
| 9781 if (i > 0) | |
| 9782 { | |
| 9783 /* | |
| 9784 * Use cursor-right if it's one character only. Avoids | |
| 9785 * removing a line of pixels from the last bold char, when | |
| 9786 * using the bold trick in the GUI. | |
| 9787 */ | |
| 9788 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9789 { | |
| 9790 while (i-- > 0) | |
| 9791 out_char(*T_ND); | |
| 9792 } | |
| 9793 else | |
| 9794 { | |
| 9795 int off; | |
| 9796 | |
| 9797 off = LineOffset[row] + screen_cur_col; | |
| 9798 while (i-- > 0) | |
| 9799 { | |
| 9800 if (ScreenAttrs[off] != screen_attr) | |
| 9801 screen_stop_highlight(); | |
| 9802 out_flush_check(); | |
| 9803 out_char(ScreenLines[off]); | |
| 9804 if (enc_dbcs == DBCS_JPNU | |
| 9805 && ScreenLines[off] == 0x8e) | |
| 9806 out_char(ScreenLines2[off]); | |
| 9807 ++off; | |
| 9808 } | |
| 9809 } | |
| 9810 } | |
| 9811 } | |
| 9812 } | |
| 9813 else | |
| 9814 cost = 999; | |
| 9815 | |
| 9816 if (cost >= goto_cost) | |
| 9817 { | |
| 9818 if (noinvcurs) | |
| 9819 screen_stop_highlight(); | |
| 5995 | 9820 if (row == screen_cur_row && (col > screen_cur_col) |
| 9821 && *T_CRI != NUL) | |
| 7 | 9822 term_cursor_right(col - screen_cur_col); |
| 9823 else | |
| 9824 term_windgoto(row, col); | |
| 9825 } | |
| 9826 screen_cur_row = row; | |
| 9827 screen_cur_col = col; | |
| 9828 } | |
| 9829 } | |
| 9830 | |
| 9831 /* | |
| 9832 * Set cursor to its position in the current window. | |
| 9833 */ | |
| 9834 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9835 setcursor(void) |
| 7 | 9836 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9837 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
|
9838 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9839 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9840 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9841 * 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
|
9842 * 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
|
9843 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9844 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9845 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
|
9846 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9847 if (force || redrawing()) |
| 7 | 9848 { |
| 9849 validate_cursor(); | |
| 9850 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
|
9851 curwin->w_wincol + ( |
| 7 | 9852 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9853 /* With 'rightleft' set and the cursor on a double-wide |
| 9854 * 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
|
9855 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
|
9856 - ((has_mbyte |
| 1545 | 9857 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9858 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9859 #endif |
| 9860 curwin->w_wcol)); | |
| 9861 } | |
| 9862 } | |
| 9863 | |
| 9864 | |
| 9865 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9866 * 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
|
9867 * 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
|
9868 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9869 * scrolling. |
| 9870 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9871 */ | |
| 9872 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9873 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9874 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9875 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9876 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9877 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9878 int mayclear) |
| 7 | 9879 { |
| 9880 int did_delete; | |
| 9881 int nextrow; | |
| 9882 int lastrow; | |
| 9883 int retval; | |
| 9884 | |
| 9885 if (invalid) | |
| 9886 wp->w_lines_valid = 0; | |
| 9887 | |
| 9888 if (wp->w_height < 5) | |
| 9889 return FAIL; | |
| 9890 | |
| 9891 if (line_count > wp->w_height - row) | |
| 9892 line_count = wp->w_height - row; | |
| 9893 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9894 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9895 if (retval != MAYBE) |
| 9896 return retval; | |
| 9897 | |
| 9898 /* | |
| 9899 * If there is a next window or a status line, we first try to delete the | |
| 9900 * lines at the bottom to avoid messing what is after the window. | |
| 9901 * If this fails and there are following windows, don't do anything to avoid | |
| 9902 * messing up those windows, better just redraw. | |
| 9903 */ | |
| 9904 did_delete = FALSE; | |
| 9905 if (wp->w_next != NULL || wp->w_status_height) | |
| 9906 { | |
| 9907 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
|
9908 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9909 did_delete = TRUE; |
| 9910 else if (wp->w_next) | |
| 9911 return FAIL; | |
| 9912 } | |
| 9913 /* | |
| 9914 * if no lines deleted, blank the lines that will end up below the window | |
| 9915 */ | |
| 9916 if (!did_delete) | |
| 9917 { | |
| 9918 wp->w_redr_status = TRUE; | |
| 9919 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
|
9920 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9921 lastrow = nextrow + line_count; |
| 9922 if (lastrow > Rows) | |
| 9923 lastrow = Rows; | |
| 9924 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
|
9925 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9926 ' ', ' ', 0); |
| 9927 } | |
| 9928 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9929 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9930 == FAIL) |
| 9931 { | |
| 9932 /* deletion will have messed up other windows */ | |
| 9933 if (did_delete) | |
| 9934 { | |
| 9935 wp->w_redr_status = TRUE; | |
| 9936 win_rest_invalid(W_NEXT(wp)); | |
| 9937 } | |
| 9938 return FAIL; | |
| 9939 } | |
| 9940 | |
| 9941 return OK; | |
| 9942 } | |
| 9943 | |
| 9944 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9945 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9946 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9947 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9948 * scrolling | |
| 9949 * Return OK for success, FAIL if the lines are not deleted. | |
| 9950 */ | |
| 9951 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9952 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9953 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9954 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9955 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9956 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9957 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9958 int clear_attr) /* for clearing lines */ |
| 7 | 9959 { |
| 9960 int retval; | |
| 9961 | |
| 9962 if (invalid) | |
| 9963 wp->w_lines_valid = 0; | |
| 9964 | |
| 9965 if (line_count > wp->w_height - row) | |
| 9966 line_count = wp->w_height - row; | |
| 9967 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9968 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9969 if (retval != MAYBE) |
| 9970 return retval; | |
| 9971 | |
| 9972 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
|
9973 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9974 return FAIL; |
| 9975 | |
| 9976 /* | |
| 9977 * If there are windows or status lines below, try to put them at the | |
| 9978 * correct place. If we can't do that, they have to be redrawn. | |
| 9979 */ | |
| 9980 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9981 { | |
| 9982 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
|
9983 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9984 { |
| 9985 wp->w_redr_status = TRUE; | |
| 9986 win_rest_invalid(wp->w_next); | |
| 9987 } | |
| 9988 } | |
| 9989 /* | |
| 9990 * If this is the last window and there is no status line, redraw the | |
| 9991 * command line later. | |
| 9992 */ | |
| 9993 else | |
| 9994 redraw_cmdline = TRUE; | |
| 9995 return OK; | |
| 9996 } | |
| 9997 | |
| 9998 /* | |
| 9999 * Common code for win_ins_lines() and win_del_lines(). | |
| 10000 * Returns OK or FAIL when the work has been done. | |
| 10001 * Returns MAYBE when not finished yet. | |
| 10002 */ | |
| 10003 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10004 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10005 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10006 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10007 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10008 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10009 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10010 int clear_attr) |
| 7 | 10011 { |
| 10012 int retval; | |
| 10013 | |
| 10014 if (!redrawing() || line_count <= 0) | |
| 10015 return FAIL; | |
| 10016 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10017 // When inserting lines would result in loss of command output, just redraw |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10018 // the lines. |
|
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
|
10019 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
|
10020 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
|
10021 |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10022 // 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
|
10023 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 10024 { |
|
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
|
10025 if (!no_win_do_lines_ins) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10026 screenclear(); // will set wp->w_lines_valid to 0 |
| 7 | 10027 return FAIL; |
| 10028 } | |
| 10029 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10030 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10031 // this doesn't work when tere are popups visible |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10032 if (popup_visible) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10033 return FAIL; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10034 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10035 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10036 // Delete all remaining lines |
| 7 | 10037 if (row + line_count >= wp->w_height) |
| 10038 { | |
| 10039 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
|
10040 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 10041 ' ', ' ', 0); |
| 10042 return OK; | |
| 10043 } | |
| 10044 | |
| 10045 /* | |
|
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
|
10046 * When scrolling, the message on the command line should be cleared, |
| 7 | 10047 * 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
|
10048 * Don't do this when avoiding to insert lines. |
| 7 | 10049 */ |
|
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
|
10050 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
|
10051 clear_cmdline = TRUE; |
| 7 | 10052 |
| 10053 /* | |
| 10054 * If the terminal can set a scroll region, use that. | |
| 10055 * Always do this in a vertically split window. This will redraw from | |
| 10056 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 10057 * win_line(). | |
| 10058 * 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
|
10059 * 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
|
10060 * scroll-up . |
| 7 | 10061 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10062 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
|
10063 { |
| 7 | 10064 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 10065 scroll_region_set(wp, row); | |
| 10066 if (del) | |
| 10067 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
|
10068 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 10069 else |
| 10070 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
|
10071 wp->w_height - row, clear_attr, wp); |
| 7 | 10072 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 10073 scroll_region_reset(); | |
| 10074 return retval; | |
| 10075 } | |
| 10076 | |
| 10077 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 10078 return FAIL; | |
| 10079 | |
| 10080 return MAYBE; | |
| 10081 } | |
| 10082 | |
| 10083 /* | |
| 10084 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 10085 */ | |
| 10086 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10087 win_rest_invalid(win_T *wp) |
| 7 | 10088 { |
| 10089 while (wp != NULL) | |
| 10090 { | |
| 10091 redraw_win_later(wp, NOT_VALID); | |
| 10092 wp->w_redr_status = TRUE; | |
| 10093 wp = wp->w_next; | |
| 10094 } | |
| 10095 redraw_cmdline = TRUE; | |
| 10096 } | |
| 10097 | |
| 10098 /* | |
| 10099 * The rest of the routines in this file perform screen manipulations. The | |
| 10100 * given operation is performed physically on the screen. The corresponding | |
| 10101 * change is also made to the internal screen image. In this way, the editor | |
| 10102 * anticipates the effect of editing changes on the appearance of the screen. | |
| 10103 * That way, when we call screenupdate a complete redraw isn't usually | |
| 10104 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 10105 * screen changes, and in the meantime, everything still works. | |
| 10106 */ | |
| 10107 | |
| 10108 /* | |
| 10109 * types for inserting or deleting lines | |
| 10110 */ | |
| 10111 #define USE_T_CAL 1 | |
| 10112 #define USE_T_CDL 2 | |
| 10113 #define USE_T_AL 3 | |
| 10114 #define USE_T_CE 4 | |
| 10115 #define USE_T_DL 5 | |
| 10116 #define USE_T_SR 6 | |
| 10117 #define USE_NL 7 | |
| 10118 #define USE_T_CD 8 | |
| 10119 #define USE_REDRAW 9 | |
| 10120 | |
| 10121 /* | |
| 10122 * insert lines on the screen and update ScreenLines[] | |
| 10123 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 10124 * When scrolling region used 'off' is the offset from the top for the region. | |
| 10125 * 'row' and 'end' are relative to the start of the region. | |
| 10126 * | |
| 10127 * return FAIL for failure, OK for success. | |
| 10128 */ | |
| 446 | 10129 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10130 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10131 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10132 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10133 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10134 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10135 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10136 win_T *wp) /* NULL or window to use width from */ |
| 7 | 10137 { |
| 10138 int i; | |
| 10139 int j; | |
| 10140 unsigned temp; | |
| 10141 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10142 int cursor_col = 0; |
| 7 | 10143 int type; |
| 10144 int result_empty; | |
| 10145 int can_ce = can_clear(T_CE); | |
| 10146 | |
| 10147 /* | |
| 10148 * FAIL if | |
| 10149 * - there is no valid screen | |
| 10150 * - the screen has to be redrawn completely | |
| 10151 * - the line count is less than one | |
| 10152 * - 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
|
10153 * - redrawing for a callback and there is a modeless selection |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10154 * - there is a popup window |
| 7 | 10155 */ |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10156 if (!screen_valid(TRUE) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10157 || line_count <= 0 || line_count > p_ttyscroll |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10158 #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
|
10159 || (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
|
10160 && 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
|
10161 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10162 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10163 || popup_visible |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10164 #endif |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10165 ) |
| 7 | 10166 return FAIL; |
| 10167 | |
| 10168 /* | |
| 10169 * There are seven ways to insert lines: | |
| 10170 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10171 * characters from ScreenLines[]. | |
| 10172 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 10173 * the insert is just empty lines | |
| 10174 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 10175 * present or line_count > 1. It looks better if we do all the inserts | |
| 10176 * at once. | |
| 10177 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 10178 * insert is just empty lines and T_CE is not present or line_count > | |
| 10179 * 1. | |
| 10180 * 4. Use T_AL (insert line) if it exists. | |
| 10181 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 10182 * just empty lines. | |
| 10183 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 10184 * just empty lines. | |
| 10185 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 10186 * the 'da' flag is not set or we have clear line capability. | |
| 10187 * 8. redraw the characters from ScreenLines[]. | |
| 10188 * | |
| 10189 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 10190 * the scrollbar for the window. It does have insert line, use that if it | |
| 10191 * exists. | |
| 10192 */ | |
| 10193 result_empty = (row + line_count >= end); | |
| 10194 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10195 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
|
10196 else if (can_clear(T_CD) && result_empty) |
| 7 | 10197 type = USE_T_CD; |
| 10198 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 10199 type = USE_T_CAL; | |
| 10200 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 10201 type = USE_T_CDL; | |
| 10202 else if (*T_AL != NUL) | |
| 10203 type = USE_T_AL; | |
| 10204 else if (can_ce && result_empty) | |
| 10205 type = USE_T_CE; | |
| 10206 else if (*T_DL != NUL && result_empty) | |
| 10207 type = USE_T_DL; | |
| 10208 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 10209 type = USE_T_SR; | |
| 10210 else | |
| 10211 return FAIL; | |
| 10212 | |
| 10213 /* | |
| 10214 * For clearing the lines screen_del_lines() is used. This will also take | |
| 10215 * care of t_db if necessary. | |
| 10216 */ | |
| 10217 if (type == USE_T_CD || type == USE_T_CDL || | |
| 10218 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
|
10219 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 10220 |
| 10221 /* | |
| 10222 * If text is retained below the screen, first clear or delete as many | |
| 10223 * lines at the bottom of the window as are about to be inserted so that | |
| 10224 * the deleted lines won't later surface during a screen_del_lines. | |
| 10225 */ | |
| 10226 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
|
10227 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 10228 |
| 10229 #ifdef FEAT_CLIPBOARD | |
| 10230 /* Remove a modeless selection when inserting lines halfway the screen | |
| 10231 * 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
|
10232 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10233 clip_clear_selection(&clip_star); |
| 7 | 10234 else |
| 10235 clip_scroll_selection(-line_count); | |
| 10236 #endif | |
| 10237 | |
| 10238 #ifdef FEAT_GUI | |
| 10239 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10240 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10241 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 10242 #endif |
| 10243 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10244 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
|
10245 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
|
10246 |
| 7 | 10247 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10248 cursor_row = row; | |
| 10249 else | |
| 10250 cursor_row = row + off; | |
| 10251 | |
| 10252 /* | |
| 10253 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 10254 * Clear the inserted lines in ScreenLines[]. | |
| 10255 */ | |
| 10256 row += off; | |
| 10257 end += off; | |
| 10258 for (i = 0; i < line_count; ++i) | |
| 10259 { | |
| 10260 if (wp != NULL && wp->w_width != Columns) | |
| 10261 { | |
| 10262 /* need to copy part of a line */ | |
| 10263 j = end - 1 - i; | |
| 10264 while ((j -= line_count) >= row) | |
| 10265 linecopy(j + line_count, j, wp); | |
| 10266 j += line_count; | |
| 10267 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
|
10268 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
|
10269 clear_attr); |
| 7 | 10270 else |
| 10271 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10272 LineWraps[j] = FALSE; | |
| 10273 } | |
| 10274 else | |
| 10275 { | |
| 10276 j = end - 1 - i; | |
| 10277 temp = LineOffset[j]; | |
| 10278 while ((j -= line_count) >= row) | |
| 10279 { | |
| 10280 LineOffset[j + line_count] = LineOffset[j]; | |
| 10281 LineWraps[j + line_count] = LineWraps[j]; | |
| 10282 } | |
| 10283 LineOffset[j + line_count] = temp; | |
| 10284 LineWraps[j + line_count] = FALSE; | |
| 10285 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
|
10286 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10287 else |
| 10288 lineinvalid(temp, (int)Columns); | |
| 10289 } | |
| 10290 } | |
| 10291 | |
| 10292 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10293 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
|
10294 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
|
10295 screen_start_highlight(clear_attr); |
| 7 | 10296 |
| 10297 /* redraw the characters */ | |
| 10298 if (type == USE_REDRAW) | |
| 10299 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
|
10300 else if (type == USE_T_CAL) |
| 7 | 10301 { |
| 10302 term_append_lines(line_count); | |
| 10303 screen_start(); /* don't know where cursor is now */ | |
| 10304 } | |
| 10305 else | |
| 10306 { | |
| 10307 for (i = 0; i < line_count; i++) | |
| 10308 { | |
| 10309 if (type == USE_T_AL) | |
| 10310 { | |
| 10311 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
|
10312 windgoto(cursor_row, cursor_col); |
| 7 | 10313 out_str(T_AL); |
| 10314 } | |
| 10315 else /* type == USE_T_SR */ | |
| 10316 out_str(T_SR); | |
| 10317 screen_start(); /* don't know where cursor is now */ | |
| 10318 } | |
| 10319 } | |
| 10320 | |
| 10321 /* | |
| 10322 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 10323 * have been scrolled down into the region. | |
| 10324 */ | |
| 10325 if (type == USE_T_SR && *T_DA) | |
| 10326 { | |
| 10327 for (i = 0; i < line_count; ++i) | |
| 10328 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10329 windgoto(off + i, cursor_col); |
| 7 | 10330 out_str(T_CE); |
| 10331 screen_start(); /* don't know where cursor is now */ | |
| 10332 } | |
| 10333 } | |
| 10334 | |
| 10335 #ifdef FEAT_GUI | |
| 10336 gui_can_update_cursor(); | |
| 10337 if (gui.in_use) | |
| 10338 out_flush(); /* always flush after a scroll */ | |
| 10339 #endif | |
| 10340 return OK; | |
| 10341 } | |
| 10342 | |
| 10343 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10344 * 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
|
10345 * "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
|
10346 * 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
|
10347 * "row" and "end" are relative to the start of the region. |
| 7 | 10348 * |
| 10349 * Return OK for success, FAIL if the lines are not deleted. | |
| 10350 */ | |
| 10351 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10352 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10353 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10354 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10355 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10356 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10357 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
|
10358 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
|
10359 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10360 { |
| 10361 int j; | |
| 10362 int i; | |
| 10363 unsigned temp; | |
| 10364 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10365 int cursor_col = 0; |
| 7 | 10366 int cursor_end; |
| 10367 int result_empty; /* result is empty until end of region */ | |
| 10368 int can_delete; /* deleting line codes can be used */ | |
| 10369 int type; | |
| 10370 | |
| 10371 /* | |
| 10372 * FAIL if | |
| 10373 * - there is no valid screen | |
| 10374 * - the screen has to be redrawn completely | |
| 10375 * - the line count is less than one | |
| 10376 * - 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
|
10377 * - redrawing for a callback and there is a modeless selection |
| 7 | 10378 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10379 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
|
10380 || (!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
|
10381 #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
|
10382 || (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
|
10383 && 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
|
10384 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10385 ) |
| 7 | 10386 return FAIL; |
| 10387 | |
| 10388 /* | |
| 10389 * Check if the rest of the current region will become empty. | |
| 10390 */ | |
| 10391 result_empty = row + line_count >= end; | |
| 10392 | |
| 10393 /* | |
| 10394 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10395 * available. | |
| 10396 */ | |
| 10397 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10398 | |
| 10399 /* | |
| 10400 * There are six ways to delete lines: | |
| 10401 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10402 * characters from ScreenLines[]. | |
| 10403 * 1. Use T_CD if it exists and the result is empty. | |
| 10404 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10405 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10406 * none of the other ways work. | |
| 10407 * 4. Use T_CE (erase line) if the result is empty. | |
| 10408 * 5. Use T_DL (delete line) if it exists. | |
| 10409 * 6. redraw the characters from ScreenLines[]. | |
| 10410 */ | |
| 10411 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10412 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
|
10413 else if (can_clear(T_CD) && result_empty) |
| 7 | 10414 type = USE_T_CD; |
| 10415 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10416 /* | |
| 10417 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10418 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10419 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10420 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10421 * the trick... | |
| 10422 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10423 * (Olaf Seibert) | |
| 10424 */ | |
| 10425 else if (row == 0 && T_DB == empty_option | |
| 10426 && (line_count == 1 || *T_CDL == NUL)) | |
| 10427 #else | |
| 10428 else if (row == 0 && ( | |
| 10429 #ifndef AMIGA | |
| 10430 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10431 * up, so use delete-line command */ | |
| 10432 line_count == 1 || | |
| 10433 #endif | |
| 10434 *T_CDL == NUL)) | |
| 10435 #endif | |
| 10436 type = USE_NL; | |
| 10437 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10438 type = USE_T_CDL; | |
| 10439 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
|
10440 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10441 type = USE_T_CE; |
| 10442 else if (*T_DL != NUL && can_delete) | |
| 10443 type = USE_T_DL; | |
| 10444 else if (*T_CDL != NUL && can_delete) | |
| 10445 type = USE_T_CDL; | |
| 10446 else | |
| 10447 return FAIL; | |
| 10448 | |
| 10449 #ifdef FEAT_CLIPBOARD | |
| 10450 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10451 * 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
|
10452 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10453 clip_clear_selection(&clip_star); |
| 7 | 10454 else |
| 10455 clip_scroll_selection(line_count); | |
| 10456 #endif | |
| 10457 | |
| 10458 #ifdef FEAT_GUI | |
| 10459 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10460 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10461 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
|
10462 && gui.cursor_row < end + off); |
| 7 | 10463 #endif |
| 10464 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10465 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
|
10466 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
|
10467 |
| 7 | 10468 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10469 { | |
| 10470 cursor_row = row; | |
| 10471 cursor_end = end; | |
| 10472 } | |
| 10473 else | |
| 10474 { | |
| 10475 cursor_row = row + off; | |
| 10476 cursor_end = end + off; | |
| 10477 } | |
| 10478 | |
| 10479 /* | |
| 10480 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10481 * Clear the inserted lines in ScreenLines[]. | |
| 10482 */ | |
| 10483 row += off; | |
| 10484 end += off; | |
| 10485 for (i = 0; i < line_count; ++i) | |
| 10486 { | |
| 10487 if (wp != NULL && wp->w_width != Columns) | |
| 10488 { | |
| 10489 /* need to copy part of a line */ | |
| 10490 j = row + i; | |
| 10491 while ((j += line_count) <= end - 1) | |
| 10492 linecopy(j - line_count, j, wp); | |
| 10493 j -= line_count; | |
| 10494 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
|
10495 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
|
10496 clear_attr); |
| 7 | 10497 else |
| 10498 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10499 LineWraps[j] = FALSE; | |
| 10500 } | |
| 10501 else | |
| 10502 { | |
| 10503 /* whole width, moving the line pointers is faster */ | |
| 10504 j = row + i; | |
| 10505 temp = LineOffset[j]; | |
| 10506 while ((j += line_count) <= end - 1) | |
| 10507 { | |
| 10508 LineOffset[j - line_count] = LineOffset[j]; | |
| 10509 LineWraps[j - line_count] = LineWraps[j]; | |
| 10510 } | |
| 10511 LineOffset[j - line_count] = temp; | |
| 10512 LineWraps[j - line_count] = FALSE; | |
| 10513 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
|
10514 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10515 else |
| 10516 lineinvalid(temp, (int)Columns); | |
| 10517 } | |
| 10518 } | |
| 10519 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10520 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
|
10521 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10522 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
|
10523 screen_start_highlight(clear_attr); |
| 7 | 10524 |
| 10525 /* redraw the characters */ | |
| 10526 if (type == USE_REDRAW) | |
| 10527 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
|
10528 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10529 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10530 windgoto(cursor_row, cursor_col); |
| 7 | 10531 out_str(T_CD); |
| 10532 screen_start(); /* don't know where cursor is now */ | |
| 10533 } | |
| 10534 else if (type == USE_T_CDL) | |
| 10535 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10536 windgoto(cursor_row, cursor_col); |
| 7 | 10537 term_delete_lines(line_count); |
| 10538 screen_start(); /* don't know where cursor is now */ | |
| 10539 } | |
| 10540 /* | |
| 10541 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10542 * the whole screen (scroll region) up by outputting newlines on the | |
| 10543 * last line. | |
| 10544 */ | |
| 10545 else if (type == USE_NL) | |
| 10546 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10547 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10548 for (i = line_count; --i >= 0; ) |
| 10549 out_char('\n'); /* cursor will remain on same line */ | |
| 10550 } | |
| 10551 else | |
| 10552 { | |
| 10553 for (i = line_count; --i >= 0; ) | |
| 10554 { | |
| 10555 if (type == USE_T_DL) | |
| 10556 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10557 windgoto(cursor_row, cursor_col); |
| 7 | 10558 out_str(T_DL); /* delete a line */ |
| 10559 } | |
| 10560 else /* type == USE_T_CE */ | |
| 10561 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10562 windgoto(cursor_row + i, cursor_col); |
| 7 | 10563 out_str(T_CE); /* erase a line */ |
| 10564 } | |
| 10565 screen_start(); /* don't know where cursor is now */ | |
| 10566 } | |
| 10567 } | |
| 10568 | |
| 10569 /* | |
| 10570 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10571 * scrolled up at the bottom of the region. | |
| 10572 */ | |
| 10573 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10574 { | |
| 10575 for (i = line_count; i > 0; --i) | |
| 10576 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10577 windgoto(cursor_end - i, cursor_col); |
| 7 | 10578 out_str(T_CE); /* erase a line */ |
| 10579 screen_start(); /* don't know where cursor is now */ | |
| 10580 } | |
| 10581 } | |
| 10582 | |
| 10583 #ifdef FEAT_GUI | |
| 10584 gui_can_update_cursor(); | |
| 10585 if (gui.in_use) | |
| 10586 out_flush(); /* always flush after a scroll */ | |
| 10587 #endif | |
| 10588 | |
| 10589 return OK; | |
| 10590 } | |
| 10591 | |
| 10592 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10593 * 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
|
10594 * 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
|
10595 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10596 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10597 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10598 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10599 // 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
|
10600 // 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
|
10601 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10602 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10603 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10604 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10605 { |
|
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
|
10606 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
|
10607 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10608 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10609 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10610 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10611 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10612 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10613 * Show the current mode and ruler. |
| 7 | 10614 * |
| 10615 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10616 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10617 * 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
|
10618 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 10619 * Return the length of the message (0 if no message). |
| 10620 */ | |
| 10621 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10622 showmode(void) |
| 7 | 10623 { |
| 10624 int need_clear; | |
| 10625 int length = 0; | |
| 10626 int do_mode; | |
| 10627 int attr; | |
| 10628 int nwr_save; | |
| 10629 #ifdef FEAT_INS_EXPAND | |
| 10630 int sub_attr; | |
| 10631 #endif | |
| 10632 | |
| 642 | 10633 do_mode = ((p_smd && msg_silent == 0) |
| 10634 && ((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
|
10635 || restart_edit != NUL |
| 5735 | 10636 || 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
|
10637 if (do_mode || reg_recording != 0) |
| 7 | 10638 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10639 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10640 return 0; // show mode later |
| 7 | 10641 |
| 10642 nwr_save = need_wait_return; | |
| 10643 | |
| 10644 /* wait a bit before overwriting an important message */ | |
| 10645 check_for_delay(FALSE); | |
| 10646 | |
| 10647 /* if the cmdline is more than one line high, erase top lines */ | |
| 10648 need_clear = clear_cmdline; | |
| 10649 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10650 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10651 | |
| 10652 /* Position on the last line in the window, column 0 */ | |
| 10653 msg_pos_mode(); | |
| 10654 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10655 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10656 if (do_mode) |
| 10657 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10658 msg_puts_attr("--", attr); |
| 7 | 10659 #if defined(FEAT_XIM) |
| 2520 | 10660 if ( |
| 10661 # ifdef FEAT_GUI_GTK | |
| 10662 preedit_get_status() | |
| 1668 | 10663 # else |
| 10664 im_get_status() | |
| 2520 | 10665 # endif |
| 1668 | 10666 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10667 # 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
|
10668 msg_puts_attr(" IM", attr); |
| 7 | 10669 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10670 msg_puts_attr(" XIM", attr); |
| 7 | 10671 # endif |
| 10672 #endif | |
| 10673 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10674 if (gui.in_use) | |
| 10675 { | |
| 10676 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10677 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10678 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10679 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10680 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
|
10681 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10682 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
|
10683 } |
| 7 | 10684 } |
| 10685 #endif | |
| 10686 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10687 /* CTRL-X in Insert mode */ |
| 10688 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10689 { |
| 10690 /* These messages can get long, avoid a wrap in a narrow | |
| 10691 * window. Prefer showing edit_submode_extra. */ | |
| 10692 length = (Rows - msg_row) * Columns - 3; | |
| 10693 if (edit_submode_extra != NULL) | |
| 10694 length -= vim_strsize(edit_submode_extra); | |
| 10695 if (length > 0) | |
| 10696 { | |
| 10697 if (edit_submode_pre != NULL) | |
| 10698 length -= vim_strsize(edit_submode_pre); | |
| 10699 if (length - vim_strsize(edit_submode) > 0) | |
| 10700 { | |
| 10701 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
|
10702 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
|
10703 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10704 } |
| 10705 if (edit_submode_extra != NULL) | |
| 10706 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10707 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10708 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
|
10709 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10710 else |
| 10711 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10712 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10713 } |
| 10714 } | |
| 10715 } | |
| 10716 else | |
| 10717 #endif | |
| 10718 { | |
| 10719 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
|
10720 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10721 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
|
10722 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10723 else if (State & INSERT) |
| 10724 { | |
| 10725 #ifdef FEAT_RIGHTLEFT | |
| 10726 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10727 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
|
10728 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10729 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10730 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10731 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
|
10732 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10733 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
|
10734 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10735 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
|
10736 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10737 #ifdef FEAT_RIGHTLEFT |
| 10738 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10739 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10740 #endif |
| 10741 #ifdef FEAT_KEYMAP | |
| 10742 if (State & LANGMAP) | |
| 10743 { | |
| 10744 # ifdef FEAT_ARABIC | |
| 10745 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
|
10746 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10747 else |
| 10748 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10749 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
|
10750 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10751 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10752 } |
| 10753 #endif | |
| 10754 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
|
10755 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10756 |
| 10757 if (VIsual_active) | |
| 10758 { | |
| 10759 char *p; | |
| 10760 | |
| 10761 /* Don't concatenate separate words to avoid translation | |
| 10762 * problems. */ | |
| 10763 switch ((VIsual_select ? 4 : 0) | |
| 10764 + (VIsual_mode == Ctrl_V) * 2 | |
| 10765 + (VIsual_mode == 'V')) | |
| 10766 { | |
| 10767 case 0: p = N_(" VISUAL"); break; | |
| 10768 case 1: p = N_(" VISUAL LINE"); break; | |
| 10769 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10770 case 4: p = N_(" SELECT"); break; | |
| 10771 case 5: p = N_(" SELECT LINE"); break; | |
| 10772 default: p = N_(" SELECT BLOCK"); break; | |
| 10773 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10774 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
|
10775 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10776 msg_puts_attr(" --", attr); |
| 7 | 10777 } |
| 644 | 10778 |
| 7 | 10779 need_clear = TRUE; |
| 10780 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10781 if (reg_recording != 0 |
| 7 | 10782 #ifdef FEAT_INS_EXPAND |
| 10783 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10784 #endif | |
| 10785 ) | |
| 10786 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10787 recording_mode(attr); |
| 7 | 10788 need_clear = TRUE; |
| 10789 } | |
| 644 | 10790 |
| 10791 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
|
10792 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10793 msg_clr_eos(); |
| 10794 msg_didout = FALSE; /* overwrite this message */ | |
| 10795 length = msg_col; | |
| 10796 msg_col = 0; | |
| 10797 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10798 } | |
| 10799 else if (clear_cmdline && msg_silent == 0) | |
| 10800 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10801 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
|
10802 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
|
10803 { |
|
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
|
10804 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
|
10805 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
|
10806 } |
| 7 | 10807 |
| 10808 #ifdef FEAT_CMDL_INFO | |
| 10809 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10810 if (VIsual_active) | |
| 10811 clear_showcmd(); | |
| 10812 | |
| 10813 /* If the last window has no status line, the ruler is after the mode | |
| 10814 * 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
|
10815 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
|
10816 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10817 #endif |
| 10818 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
|
10819 redraw_mode = FALSE; |
| 7 | 10820 clear_cmdline = FALSE; |
| 10821 | |
| 10822 return length; | |
| 10823 } | |
| 10824 | |
| 10825 /* | |
| 10826 * Position for a mode message. | |
| 10827 */ | |
| 10828 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10829 msg_pos_mode(void) |
| 7 | 10830 { |
| 10831 msg_col = 0; | |
| 10832 msg_row = Rows - 1; | |
| 10833 } | |
| 10834 | |
| 10835 /* | |
| 10836 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10837 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10838 * Caller should check "mode_displayed". |
| 7 | 10839 */ |
| 10840 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10841 unshowmode(int force) |
| 7 | 10842 { |
| 10843 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10844 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10845 */ |
| 10846 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10847 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10848 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10849 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10850 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10851 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10852 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10853 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10854 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10855 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10856 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10857 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10858 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
|
10859 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
|
10860 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10861 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
|
10862 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
|
10863 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
|
10864 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10865 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10866 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10867 msg_row = save_msg_row; |
| 7 | 10868 } |
| 10869 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10870 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10871 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10872 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10873 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10874 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10875 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10876 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10877 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10878 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
|
10879 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10880 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10881 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10882 |
| 667 | 10883 /* |
| 10884 * Draw the tab pages line at the top of the Vim window. | |
| 10885 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10886 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10887 draw_tabline(void) |
| 667 | 10888 { |
| 10889 int tabcount = 0; | |
| 10890 tabpage_T *tp; | |
| 10891 int tabwidth; | |
| 10892 int col = 0; | |
| 673 | 10893 int scol = 0; |
| 667 | 10894 int attr; |
| 10895 win_T *wp; | |
| 671 | 10896 win_T *cwp; |
| 10897 int wincount; | |
| 10898 int modified; | |
| 667 | 10899 int c; |
| 10900 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10901 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
|
10902 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
|
10903 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10904 char_u *p; |
| 677 | 10905 int room; |
| 10906 int use_sep_chars = (t_colors < 8 | |
| 10907 #ifdef FEAT_GUI | |
| 10908 && !gui.in_use | |
| 10909 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10910 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10911 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10912 #endif |
| 677 | 10913 ); |
| 673 | 10914 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10915 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10916 return; |
| 673 | 10917 redraw_tabline = FALSE; |
| 667 | 10918 |
| 685 | 10919 #ifdef FEAT_GUI_TABLINE |
| 798 | 10920 /* Take care of a GUI tabline. */ |
| 685 | 10921 if (gui_use_tabline()) |
| 10922 { | |
| 10923 gui_update_tabline(); | |
| 10924 return; | |
| 10925 } | |
| 10926 #endif | |
| 10927 | |
| 10928 if (tabline_height() < 1) | |
| 667 | 10929 return; |
| 10930 | |
| 677 | 10931 #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
|
10932 clear_TabPageIdxs(); |
| 681 | 10933 |
| 677 | 10934 /* Use the 'tabline' option if it's set. */ |
| 10935 if (*p_tal != NUL) | |
| 10936 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10937 int saved_did_emsg = did_emsg; |
| 680 | 10938 |
| 10939 /* Check for an error. If there is one we would loop in redrawing the | |
| 10940 * 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
|
10941 did_emsg = FALSE; |
| 677 | 10942 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10943 if (did_emsg) |
| 680 | 10944 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10945 (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
|
10946 did_emsg |= saved_did_emsg; |
| 680 | 10947 } |
| 10948 else | |
| 10949 #endif | |
| 10950 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10951 FOR_ALL_TABPAGES(tp) |
| 680 | 10952 ++tabcount; |
| 10953 | |
| 10954 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10955 if (tabwidth < 6) | |
| 10956 tabwidth = 6; | |
| 10957 | |
| 10958 attr = attr_nosel; | |
| 10959 tabcount = 0; | |
| 699 | 10960 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10961 tp = tp->tp_next) | |
| 680 | 10962 { |
| 10963 scol = col; | |
| 10964 | |
| 10965 if (tp->tp_topframe == topframe) | |
| 10966 attr = attr_sel; | |
| 10967 if (use_sep_chars && col > 0) | |
| 10968 screen_putchar('|', 0, col++, attr); | |
| 10969 | |
| 10970 if (tp->tp_topframe != topframe) | |
| 10971 attr = attr_nosel; | |
| 10972 | |
| 10973 screen_putchar(' ', 0, col++, attr); | |
| 10974 | |
| 10975 if (tp == curtab) | |
| 10976 { | |
| 10977 cwp = curwin; | |
| 10978 wp = firstwin; | |
| 10979 } | |
| 10980 else | |
| 10981 { | |
| 10982 cwp = tp->tp_curwin; | |
| 10983 wp = tp->tp_firstwin; | |
| 10984 } | |
| 10985 | |
| 10986 modified = FALSE; | |
| 10987 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10988 if (bufIsChanged(wp->w_buffer)) | |
| 10989 modified = TRUE; | |
| 10990 if (modified || wincount > 1) | |
| 10991 { | |
| 10992 if (wincount > 1) | |
| 10993 { | |
| 10994 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10995 len = (int)STRLEN(NameBuff); |
| 699 | 10996 if (col + len >= Columns - 3) |
| 10997 break; | |
| 680 | 10998 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10999 #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
|
11000 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 11001 #else |
| 6106 | 11002 attr |
| 680 | 11003 #endif |
| 11004 ); | |
| 11005 col += len; | |
| 11006 } | |
| 11007 if (modified) | |
| 11008 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 11009 screen_putchar(' ', 0, col++, attr); | |
| 11010 } | |
| 11011 | |
| 11012 room = scol - col + tabwidth - 1; | |
| 11013 if (room > 0) | |
| 11014 { | |
| 685 | 11015 /* Get buffer name in NameBuff[] */ |
| 11016 get_trans_bufname(cwp->w_buffer); | |
| 819 | 11017 shorten_dir(NameBuff); |
| 680 | 11018 len = vim_strsize(NameBuff); |
| 11019 p = NameBuff; | |
| 11020 if (has_mbyte) | |
| 11021 while (len > room) | |
| 11022 { | |
| 11023 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
11024 MB_PTR_ADV(p); |
| 680 | 11025 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
11026 else if (len > room) |
| 677 | 11027 { |
| 680 | 11028 p += len - room; |
| 11029 len = room; | |
| 677 | 11030 } |
| 699 | 11031 if (len > Columns - col - 1) |
| 11032 len = Columns - col - 1; | |
| 680 | 11033 |
| 835 | 11034 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 11035 col += len; |
| 11036 } | |
| 11037 screen_putchar(' ', 0, col++, attr); | |
| 11038 | |
| 11039 /* Store the tab page number in TabPageIdxs[], so that | |
| 11040 * jump_to_mouse() knows where each one is. */ | |
| 11041 ++tabcount; | |
| 11042 while (scol < col) | |
| 11043 TabPageIdxs[scol++] = tabcount; | |
| 11044 } | |
| 11045 | |
| 11046 if (use_sep_chars) | |
| 11047 c = '_'; | |
| 11048 else | |
| 11049 c = ' '; | |
| 11050 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 11051 |
| 11052 /* Put an "X" for closing the current tab if there are several. */ | |
| 11053 if (first_tabpage->tp_next != NULL) | |
| 11054 { | |
| 11055 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 11056 TabPageIdxs[Columns - 1] = -999; | |
| 11057 } | |
| 11058 } | |
| 834 | 11059 |
| 11060 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 11061 * set. */ | |
| 11062 redraw_tabline = FALSE; | |
| 667 | 11063 } |
| 685 | 11064 |
| 11065 /* | |
| 11066 * Get buffer name for "buf" into NameBuff[]. | |
| 11067 * Takes care of special buffer names and translates special characters. | |
| 11068 */ | |
| 11069 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11070 get_trans_bufname(buf_T *buf) |
| 685 | 11071 { |
| 11072 if (buf_spname(buf) != NULL) | |
| 3839 | 11073 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 11074 else |
| 11075 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 11076 trans_characters(NameBuff, MAXPATHL); | |
| 11077 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11078 |
| 7 | 11079 /* |
| 11080 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 11081 */ | |
| 11082 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
|
11083 fillchar_status(int *attr, win_T *wp) |
| 7 | 11084 { |
| 11085 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
|
11086 |
|
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
|
11087 #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
|
11088 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
|
11089 { |
|
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
|
11090 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
|
11091 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
11092 *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
|
11093 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
|
11094 } |
|
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
|
11095 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
11096 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
11097 *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
|
11098 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
|
11099 } |
|
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
|
11100 } |
|
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
|
11101 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
|
11102 #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
|
11103 if (wp == curwin) |
| 7 | 11104 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
11105 *attr = HL_ATTR(HLF_S); |
| 7 | 11106 fill = fill_stl; |
| 11107 } | |
| 11108 else | |
| 11109 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
11110 *attr = HL_ATTR(HLF_SNC); |
| 7 | 11111 fill = fill_stlnc; |
| 11112 } | |
| 11113 /* Use fill when there is highlighting, and highlighting of current | |
| 11114 * window differs, or the fillchars differ, or this is not the | |
| 11115 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
11116 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
|
11117 || wp != curwin || ONE_WINDOW) |
| 7 | 11118 || (fill_stl != fill_stlnc))) |
| 11119 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
|
11120 if (wp == curwin) |
| 7 | 11121 return '^'; |
| 11122 return '='; | |
| 11123 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11124 |
| 7 | 11125 /* |
| 11126 * Get the character to use in a separator between vertically split windows. | |
| 11127 * Get its attributes in "*attr". | |
| 11128 */ | |
| 11129 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11130 fillchar_vsep(int *attr) |
| 7 | 11131 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
11132 *attr = HL_ATTR(HLF_C); |
| 7 | 11133 if (*attr == 0 && fill_vert == ' ') |
| 11134 return '|'; | |
| 11135 else | |
| 11136 return fill_vert; | |
| 11137 } | |
| 11138 | |
| 11139 /* | |
| 11140 * Return TRUE if redrawing should currently be done. | |
| 11141 */ | |
| 11142 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11143 redrawing(void) |
| 7 | 11144 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11145 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11146 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
|
11147 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11148 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11149 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11150 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11151 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11152 || 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
|
11153 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11154 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 11155 } |
| 11156 | |
| 11157 /* | |
| 11158 * Return TRUE if printing messages should currently be done. | |
| 11159 */ | |
| 11160 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11161 messaging(void) |
| 7 | 11162 { |
| 11163 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 11164 } | |
| 11165 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11166 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11167 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11168 * 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
|
11169 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11170 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11171 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
|
11172 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11173 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11174 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
|
11175 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
|
11176 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11177 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11178 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
|
11179 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
|
11180 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
|
11181 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11182 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
|
11183 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
|
11184 ++item_count; |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
11185 wp->w_winbar_items = ALLOC_CLEAR_MULT(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
|
11186 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11187 /* 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
|
11188 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
|
11189 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
|
11190 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11191 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
|
11192 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
|
11193 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11194 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11195 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11196 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
|
11197 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
|
11198 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11199 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11200 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11201 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
|
11202 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
|
11203 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
|
11204 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11205 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11206 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
|
11207 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
|
11208 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11209 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
|
11210 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11211 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11212 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
|
11213 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
|
11214 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11215 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11216 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
|
11217 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11218 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
|
11219 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11220 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11221 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
|
11222 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11223 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
|
11224 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11225 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11226 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
|
11227 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11228 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
|
11229 (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
|
11230 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11231 #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
|
11232 |
| 7 | 11233 /* |
| 11234 * Show current status info in ruler and various other places | |
| 11235 * If always is FALSE, only show ruler if position has changed. | |
| 11236 */ | |
| 11237 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11238 showruler(int always) |
| 7 | 11239 { |
| 11240 if (!always && !redrawing()) | |
| 11241 return; | |
| 574 | 11242 #ifdef FEAT_INS_EXPAND |
| 11243 if (pum_visible()) | |
| 11244 { | |
| 11245 /* Don't redraw right now, do it later. */ | |
| 11246 curwin->w_redr_status = TRUE; | |
| 11247 return; | |
| 11248 } | |
| 11249 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11250 #if defined(FEAT_STL_OPT) |
| 40 | 11251 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 11252 redraw_custom_statusline(curwin); |
| 7 | 11253 else |
| 11254 #endif | |
| 11255 #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
|
11256 win_redr_ruler(curwin, always, FALSE); |
| 7 | 11257 #endif |
| 11258 | |
| 11259 #ifdef FEAT_TITLE | |
| 11260 if (need_maketitle | |
| 11261 # ifdef FEAT_STL_OPT | |
| 11262 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 11263 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 11264 # endif | |
| 11265 ) | |
| 11266 maketitle(); | |
| 11267 #endif | |
| 1588 | 11268 /* Redraw the tab pages line if needed. */ |
| 11269 if (redraw_tabline) | |
| 11270 draw_tabline(); | |
| 7 | 11271 } |
| 11272 | |
| 11273 #ifdef FEAT_CMDL_INFO | |
| 11274 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
|
11275 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 11276 { |
| 1869 | 11277 #define RULER_BUF_LEN 70 |
| 11278 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 11279 int row; |
| 11280 int fillchar; | |
| 11281 int attr; | |
| 11282 int empty_line = FALSE; | |
| 11283 colnr_T virtcol; | |
| 11284 int i; | |
| 1869 | 11285 size_t len; |
| 7 | 11286 int o; |
| 11287 int this_ru_col; | |
| 11288 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
11289 int width; |
| 7 | 11290 |
| 11291 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 11292 if (!p_ru) | |
| 11293 return; | |
| 11294 | |
| 11295 /* | |
| 11296 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 11297 * after deleting lines, before cursor.lnum is corrected. | |
| 11298 */ | |
| 11299 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 11300 return; | |
| 11301 | |
| 11302 #ifdef FEAT_INS_EXPAND | |
| 11303 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 11304 * the (long) mode message. */ | |
| 11305 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 11306 if (edit_submode != NULL) | |
| 11307 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
|
11308 // 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
|
11309 // 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
|
11310 if (!ignore_pum && pum_visible()) |
| 540 | 11311 return; |
| 7 | 11312 #endif |
| 11313 | |
| 11314 #ifdef FEAT_STL_OPT | |
| 11315 if (*p_ruf) | |
| 11316 { | |
| 680 | 11317 int save_called_emsg = called_emsg; |
| 11318 | |
| 11319 called_emsg = FALSE; | |
| 7 | 11320 win_redr_custom(wp, TRUE); |
| 680 | 11321 if (called_emsg) |
| 11322 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 11323 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 11324 called_emsg |= save_called_emsg; |
| 7 | 11325 return; |
| 11326 } | |
| 11327 #endif | |
| 11328 | |
| 11329 /* | |
| 11330 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 11331 */ | |
| 11332 if (!(State & INSERT) | |
| 11333 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 11334 empty_line = TRUE; | |
| 11335 | |
| 11336 /* | |
| 11337 * Only draw the ruler when something changed. | |
| 11338 */ | |
| 11339 validate_virtcol_win(wp); | |
| 11340 if ( redraw_cmdline | |
| 11341 || always | |
| 11342 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 11343 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 11344 || wp->w_virtcol != wp->w_ru_virtcol | |
| 11345 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 11346 || wp->w_topline != wp->w_ru_topline | |
| 11347 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 11348 #ifdef FEAT_DIFF | |
| 11349 || wp->w_topfill != wp->w_ru_topfill | |
| 11350 #endif | |
| 11351 || empty_line != wp->w_ru_empty) | |
| 11352 { | |
| 11353 cursor_off(); | |
| 11354 if (wp->w_status_height) | |
| 11355 { | |
| 11356 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
|
11357 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
|
11358 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
|
11359 width = wp->w_width; |
| 7 | 11360 } |
| 11361 else | |
| 11362 { | |
| 11363 row = Rows - 1; | |
| 11364 fillchar = ' '; | |
| 11365 attr = 0; | |
| 11366 width = Columns; | |
| 11367 off = 0; | |
| 11368 } | |
| 11369 | |
| 11370 /* In list mode virtcol needs to be recomputed */ | |
| 11371 virtcol = wp->w_virtcol; | |
| 11372 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 11373 { | |
| 11374 wp->w_p_list = FALSE; | |
| 11375 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 11376 wp->w_p_list = TRUE; | |
| 11377 } | |
| 11378 | |
| 11379 /* | |
| 11380 * Some sprintfs return the length, some return a pointer. | |
| 11381 * To avoid portability problems we use strlen() here. | |
| 11382 */ | |
| 1869 | 11383 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11384 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11385 ? 0L | |
| 11386 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11387 len = STRLEN(buffer); |
| 11388 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11389 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11390 (int)virtcol + 1); | |
| 11391 | |
| 11392 /* | |
| 11393 * Add a "50%" if there is room for it. | |
| 11394 * On the last line, don't print in the last column (scrolls the | |
| 11395 * screen up on some terminals). | |
| 11396 */ | |
| 11397 i = (int)STRLEN(buffer); | |
| 1869 | 11398 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11399 o = i + vim_strsize(buffer + i + 1); |
| 11400 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11401 ++o; | |
| 11402 this_ru_col = ru_col - (Columns - width); | |
| 11403 if (this_ru_col < 0) | |
| 11404 this_ru_col = 0; | |
| 11405 /* Never use more than half the window/screen width, leave the other | |
| 11406 * 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
|
11407 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
|
11408 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
|
11409 if (this_ru_col + o < width) |
| 7 | 11410 { |
| 6466 | 11411 /* 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
|
11412 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11413 { |
| 11414 if (has_mbyte) | |
| 11415 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11416 else | |
| 11417 buffer[i++] = fillchar; | |
| 11418 ++o; | |
| 11419 } | |
| 1869 | 11420 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11421 } |
| 11422 /* Truncate at window boundary. */ | |
| 11423 if (has_mbyte) | |
| 11424 { | |
| 11425 o = 0; | |
| 474 | 11426 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11427 { |
| 11428 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
|
11429 if (this_ru_col + o > width) |
| 7 | 11430 { |
| 11431 buffer[i] = NUL; | |
| 11432 break; | |
| 11433 } | |
| 11434 } | |
| 11435 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
11436 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
|
11437 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
|
11438 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11439 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11440 i = redraw_cmdline; |
| 11441 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
|
11442 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
|
11443 (int)(off + width), |
| 7 | 11444 fillchar, fillchar, attr); |
| 11445 /* don't redraw the cmdline because of showing the ruler */ | |
| 11446 redraw_cmdline = i; | |
| 11447 wp->w_ru_cursor = wp->w_cursor; | |
| 11448 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11449 wp->w_ru_empty = empty_line; | |
| 11450 wp->w_ru_topline = wp->w_topline; | |
| 11451 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11452 #ifdef FEAT_DIFF | |
| 11453 wp->w_ru_topfill = wp->w_topfill; | |
| 11454 #endif | |
| 11455 } | |
| 11456 } | |
| 11457 #endif | |
| 13 | 11458 |
| 11459 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11460 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11461 * 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
|
11462 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11463 * Otherwise it depends on 'numberwidth' and the line count. |
| 11464 */ | |
| 11465 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11466 number_width(win_T *wp) |
| 13 | 11467 { |
| 11468 int n; | |
| 11469 linenr_T lnum; | |
| 11470 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11471 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
|
11472 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11473 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11474 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11475 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11476 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
|
11477 |
| 6679 | 11478 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11479 return wp->w_nrwidth_width; |
| 11480 wp->w_nrwidth_line_count = lnum; | |
| 11481 | |
| 11482 n = 0; | |
| 11483 do | |
| 11484 { | |
| 856 | 11485 lnum /= 10; |
| 11486 ++n; | |
| 13 | 11487 } while (lnum > 0); |
| 11488 | |
| 11489 /* 'numberwidth' gives the minimal width plus one */ | |
| 11490 if (n < wp->w_p_nuw - 1) | |
| 11491 n = wp->w_p_nuw - 1; | |
| 11492 | |
| 11493 wp->w_nrwidth_width = n; | |
| 6679 | 11494 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11495 return n; |
| 11496 } | |
| 11497 #endif | |
| 3986 | 11498 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11499 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 11500 /* |
| 11501 * Return the current cursor column. This is the actual position on the | |
| 11502 * screen. First column is 0. | |
| 11503 */ | |
| 11504 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11505 screen_screencol(void) |
| 3986 | 11506 { |
| 11507 return screen_cur_col; | |
| 11508 } | |
| 11509 | |
| 11510 /* | |
| 11511 * Return the current cursor row. This is the actual position on the screen. | |
| 11512 * First row is 0. | |
| 11513 */ | |
| 11514 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11515 screen_screenrow(void) |
| 3986 | 11516 { |
| 11517 return screen_cur_row; | |
| 11518 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11519 #endif |