Mercurial > vim
annotate src/screen.c @ 16888:ec61b6b79865 v8.1.1445
patch 8.1.1445: popup window border highlight not implemented yet
commit https://github.com/vim/vim/commit/790498b509443f96f39431d2bc87b777efbe250f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 1 22:15:29 2019 +0200
patch 8.1.1445: popup window border highlight not implemented yet
Problem: Popup window border highlight not implemented yet.
Solution: Implement the "borderhighlight" option.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 01 Jun 2019 22:30:05 +0200 |
| parents | 2bd51fdcc793 |
| children | 236c182c6300 |
| 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 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
613 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
614 // TODO: avoid redrawing everything when there is a popup window. |
|
16809
5ff14f96f1c9
patch 8.1.1406: popup_hide() and popup_show() not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16796
diff
changeset
|
615 if (popup_any_visible()) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
616 type = NOT_VALID; |
|
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 { | |
| 643 if (W_WINROW(wp) < msg_scrolled) | |
| 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 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
826 // Display popup windows on top of the others. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
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 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 * 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
|
882 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
884 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 { |
|
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
|
886 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
|
887 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
891 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
892 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
893 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
|
894 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
895 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
896 /* 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
|
897 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
898 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
899 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
900 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
|
901 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
902 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
903 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
904 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
905 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
906 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
907 #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
|
908 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
909 * 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
|
910 * 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
|
911 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
912 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
913 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
|
914 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
915 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
|
916 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
917 if (*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
|
918 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
|
919 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
|
920 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
|
921 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
|
922 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
|
923 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
|
924 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
925 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
926 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
|
927 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
928 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
|
929 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
|
930 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
931 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
932 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
933 * 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
|
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 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
936 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
|
937 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
938 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
|
939 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
940 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
|
941 /* 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
|
942 * 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
|
943 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
|
944 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
945 } |
| 7 | 946 #endif |
| 947 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
948 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 949 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
950 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 951 { |
| 952 win_T *wp; | |
| 953 int doit = FALSE; | |
| 954 | |
| 955 # ifdef FEAT_FOLDING | |
| 956 win_foldinfo.fi_level = 0; | |
| 957 # endif | |
| 958 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
959 // 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
|
960 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
|
961 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
962 // check if it resulted in the need to redraw a window |
| 7 | 963 FOR_ALL_WINDOWS(wp) |
| 964 if (wp->w_redr_type != 0) | |
| 965 doit = TRUE; | |
| 966 | |
| 3250 | 967 /* 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
|
968 * 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
|
969 */ |
| 3250 | 970 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
|
971 || 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
|
972 || msg_scrolled |
| 3250 | 973 #ifdef FEAT_GUI |
| 974 || gui.starting | |
| 975 #endif | |
| 976 || starting) | |
| 7 | 977 return; |
| 978 | |
| 979 /* update all windows that need updating */ | |
| 980 update_prepare(); | |
| 981 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
982 FOR_ALL_WINDOWS(wp) |
| 7 | 983 { |
| 984 if (wp->w_redr_type != 0) | |
| 985 win_update(wp); | |
| 986 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
|
987 win_redr_status(wp, FALSE); |
| 7 | 988 } |
| 989 | |
| 990 update_finish(); | |
| 991 } | |
| 992 #endif | |
| 993 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
994 /* |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
995 * 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
|
996 * 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
|
997 */ |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
998 static int |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
999 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
|
1000 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1001 int wcr_attr = 0; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1002 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1003 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
|
1004 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
|
1005 #ifdef FEAT_TEXT_PROP |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1006 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
|
1007 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
|
1008 #endif |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1009 return wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1010 } |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1011 |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1012 #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
|
1013 /* |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1014 * 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
|
1015 */ |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1016 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
|
1017 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
|
1018 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1019 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
|
1020 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
|
1021 return IObuff; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1022 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1023 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1024 static void |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1025 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
|
1026 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1027 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
|
1028 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
|
1029 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
|
1030 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
|
1031 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
|
1032 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
|
1033 int border_attr[4]; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1034 int border_char[8] = {'-', '|', '-', '|', '+', '+', '+', '+', }; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1035 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
|
1036 int row; |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1037 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
|
1038 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1039 // 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
|
1040 // 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
|
1041 // top. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1042 // TODO: don't redraw every popup every time. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1043 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
|
1044 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
|
1045 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1046 // Recompute the position if the text changed. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1047 if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer)) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1048 popup_adjust_position(wp); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1049 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1050 // 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
|
1051 // 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
|
1052 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
|
1053 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
|
1054 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
|
1055 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
|
1056 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1057 // 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
|
1058 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
|
1059 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1060 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
|
1061 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
|
1062 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1063 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
|
1064 + 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
|
1065 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
|
1066 + 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
|
1067 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
|
1068 |
|
16886
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1069 if (enc_utf8) |
|
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1070 { |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1071 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
|
1072 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
|
1073 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
|
1074 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
|
1075 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
|
1076 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
|
1077 } |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1078 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
|
1079 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
|
1080 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
|
1081 |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1082 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
|
1083 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1084 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
|
1085 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
|
1086 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
|
1087 } |
|
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1088 |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1089 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
|
1090 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1091 // top border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1092 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
|
1093 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
|
1094 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
|
1095 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
|
1096 ? 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
|
1097 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
|
1098 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
|
1099 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1100 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
|
1101 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
|
1102 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
|
1103 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1104 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1105 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1106 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
|
1107 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1108 // top padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1109 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
|
1110 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
|
1111 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
|
1112 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
|
1113 ' ', ' ', popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1114 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1115 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1116 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
|
1117 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
|
1118 ++row) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1119 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1120 // left border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1121 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
|
1122 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1123 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
|
1124 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
|
1125 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1126 // left padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1127 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
|
1128 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
|
1129 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
|
1130 // right border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1131 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
|
1132 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1133 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
|
1134 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
|
1135 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
|
1136 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1137 // right padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1138 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
|
1139 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
|
1140 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
|
1141 + 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
|
1142 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1143 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1144 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
|
1145 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1146 // bottom padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1147 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
|
1148 + 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
|
1149 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
|
1150 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
|
1151 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
|
1152 ' ', ' ', popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1153 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1154 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1155 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
|
1156 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1157 // bottom border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1158 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
|
1159 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
|
1160 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
|
1161 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
|
1162 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
|
1163 ? 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
|
1164 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
|
1165 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
|
1166 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1167 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
|
1168 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
|
1169 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
|
1170 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1171 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1172 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1173 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1174 #endif |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1175 |
| 7 | 1176 #if defined(FEAT_GUI) || defined(PROTO) |
| 1177 /* | |
| 1178 * Update a single window, its status line and maybe the command line msg. | |
| 1179 * Used for the GUI scrollbar. | |
| 1180 */ | |
| 1181 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1182 updateWindow(win_T *wp) |
| 7 | 1183 { |
| 2008 | 1184 /* return if already busy updating */ |
| 1185 if (updating_screen) | |
| 1186 return; | |
| 1187 | |
| 7 | 1188 update_prepare(); |
| 1189 | |
| 1190 #ifdef FEAT_CLIPBOARD | |
| 1191 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1192 if (clip_star.available && clip_isautosel_star()) |
| 1193 clip_update_selection(&clip_star); | |
| 1194 if (clip_plus.available && clip_isautosel_plus()) | |
| 1195 clip_update_selection(&clip_plus); | |
| 7 | 1196 #endif |
| 670 | 1197 |
| 7 | 1198 win_update(wp); |
| 670 | 1199 |
| 1200 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1201 if (redraw_tabline) |
| 677 | 1202 draw_tabline(); |
| 670 | 1203 |
| 7 | 1204 if (wp->w_redr_status |
| 1205 # ifdef FEAT_CMDL_INFO | |
| 1206 || p_ru | |
| 1207 # endif | |
| 1208 # ifdef FEAT_STL_OPT | |
| 40 | 1209 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1210 # endif |
| 1211 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1212 win_redr_status(wp, FALSE); |
| 7 | 1213 |
| 1214 update_finish(); | |
| 1215 } | |
| 1216 #endif | |
| 1217 | |
| 1218 /* | |
| 1219 * Update a single window. | |
| 1220 * | |
| 1221 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1222 * screen or scrolling lines). | |
| 1223 * | |
| 1224 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1225 * implies the one below it. | |
| 1226 * NOT_VALID redraw the whole window | |
| 743 | 1227 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1228 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1229 * INVERTED redraw the changed part of the Visual area | |
| 1230 * INVERTED_ALL redraw the whole Visual area | |
| 1231 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1232 * 2. update lines at the top when scrolled down | |
| 1233 * 3. redraw changed text: | |
| 301 | 1234 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1235 * b_mod_top and b_mod_bot. |
| 1236 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1237 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1238 * - continue redrawing when syntax status is invalid. | |
| 1239 * 4. if scrolled up, update lines at the bottom. | |
| 1240 * This results in three areas that may need updating: | |
| 1241 * top: from first row to top_end (when scrolled down) | |
| 1242 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1243 * bot: from bot_start to last row (when scrolled up) | |
| 1244 */ | |
| 1245 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1246 win_update(win_T *wp) |
| 7 | 1247 { |
| 1248 buf_T *buf = wp->w_buffer; | |
| 1249 int type; | |
| 1250 int top_end = 0; /* Below last row of the top area that needs | |
| 1251 updating. 0 when no top area updating. */ | |
| 1252 int mid_start = 999;/* first row of the mid area that needs | |
| 1253 updating. 999 when no mid area updating. */ | |
| 1254 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1255 updating. 0 when no mid area updating. */ | |
| 1256 int bot_start = 999;/* first row of the bot area that needs | |
| 1257 updating. 999 when no bot area updating */ | |
| 1258 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1259 w_topline got smaller a bit */ | |
| 1260 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1261 matchitem_T *cur; /* points to the match list */ |
| 7 | 1262 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1263 #endif | |
| 1264 | |
| 1265 int row; /* current window row to display */ | |
| 1266 linenr_T lnum; /* current buffer lnum to display */ | |
| 1267 int idx; /* current index in w_lines[] */ | |
| 1268 int srow; /* starting row of the current line */ | |
| 1269 | |
| 1270 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1271 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1272 int i; | |
| 1273 long j; | |
| 1274 static int recursive = FALSE; /* being called recursively */ | |
| 1275 int old_botline = wp->w_botline; | |
| 1276 #ifdef FEAT_FOLDING | |
| 1277 long fold_count; | |
| 1278 #endif | |
| 1279 #ifdef FEAT_SYN_HL | |
| 1280 /* remember what happened to the previous line, to know if | |
| 1281 * check_visual_highlight() can be used */ | |
| 1282 #define DID_NONE 1 /* didn't update a line */ | |
| 1283 #define DID_LINE 2 /* updated a normal line */ | |
| 1284 #define DID_FOLD 3 /* updated a folded line */ | |
| 1285 int did_update = DID_NONE; | |
| 1286 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1287 #endif | |
| 1288 linenr_T mod_top = 0; | |
| 1289 linenr_T mod_bot = 0; | |
| 1290 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1291 int save_got_int; | |
| 1292 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1293 #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
|
1294 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
|
1295 #endif |
| 7 | 1296 |
| 1297 type = wp->w_redr_type; | |
| 1298 | |
| 1299 if (type == NOT_VALID) | |
| 1300 { | |
| 1301 wp->w_redr_status = TRUE; | |
| 1302 wp->w_lines_valid = 0; | |
| 1303 } | |
| 1304 | |
| 1305 /* 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
|
1306 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1307 { |
| 1308 wp->w_redr_type = 0; | |
| 1309 return; | |
| 1310 } | |
| 1311 | |
| 1312 /* Window is zero-width: Only need to draw the separator. */ | |
| 1313 if (wp->w_width == 0) | |
| 1314 { | |
| 1315 /* draw the vertical separator right of this window */ | |
| 1316 draw_vsep_win(wp, 0); | |
| 1317 wp->w_redr_type = 0; | |
| 1318 return; | |
| 1319 } | |
| 1320 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1321 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1322 // 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
|
1323 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
|
1324 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1325 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
|
1326 # 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
|
1327 /* 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
|
1328 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
|
1329 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
|
1330 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1331 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
|
1332 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1333 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1334 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1335 |
| 7 | 1336 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1337 init_search_hl(wp); |
| 7 | 1338 #endif |
| 1339 | |
| 13 | 1340 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1341 /* 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
|
1342 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1343 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1344 if (wp->w_nrwidth != i) |
| 13 | 1345 { |
| 1346 type = NOT_VALID; | |
| 677 | 1347 wp->w_nrwidth = i; |
| 13 | 1348 } |
| 1349 else | |
| 1350 #endif | |
| 1351 | |
| 7 | 1352 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1353 { | |
| 1354 /* | |
| 1355 * When there are both inserted/deleted lines and specific lines to be | |
| 1356 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1357 * everything (only happens when redrawing is off for while). | |
| 1358 */ | |
| 1359 type = NOT_VALID; | |
| 1360 } | |
| 1361 else | |
| 1362 { | |
| 1363 /* | |
| 1364 * Set mod_top to the first line that needs displaying because of | |
| 1365 * changes. Set mod_bot to the first line after the changes. | |
| 1366 */ | |
| 1367 mod_top = wp->w_redraw_top; | |
| 1368 if (wp->w_redraw_bot != 0) | |
| 1369 mod_bot = wp->w_redraw_bot + 1; | |
| 1370 else | |
| 1371 mod_bot = 0; | |
| 1372 if (buf->b_mod_set) | |
| 1373 { | |
| 1374 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1375 { | |
| 1376 mod_top = buf->b_mod_top; | |
| 1377 #ifdef FEAT_SYN_HL | |
| 1378 /* Need to redraw lines above the change that may be included | |
| 1379 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1380 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1381 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1382 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1383 if (mod_top < 1) |
| 1384 mod_top = 1; | |
| 1385 } | |
| 1386 #endif | |
| 1387 } | |
| 1388 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1389 mod_bot = buf->b_mod_bot; | |
| 1390 | |
| 1391 #ifdef FEAT_SEARCH_EXTRA | |
| 1392 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1393 * change in one line may make the Search highlighting in a | |
| 1394 * previous line invalid. Simple solution: redraw all visible | |
| 1395 * lines above the change. | |
| 1326 | 1396 * Same for a match pattern. |
| 7 | 1397 */ |
| 699 | 1398 if (search_hl.rm.regprog != NULL |
| 1399 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1400 top_to_mod = TRUE; |
| 699 | 1401 else |
| 1326 | 1402 { |
| 1403 cur = wp->w_match_head; | |
| 1404 while (cur != NULL) | |
| 1405 { | |
| 1406 if (cur->match.regprog != NULL | |
| 1407 && re_multiline(cur->match.regprog)) | |
| 699 | 1408 { |
| 1409 top_to_mod = TRUE; | |
| 1410 break; | |
| 1411 } | |
| 1326 | 1412 cur = cur->next; |
| 1413 } | |
| 1414 } | |
| 7 | 1415 #endif |
| 1416 } | |
| 1417 #ifdef FEAT_FOLDING | |
| 1418 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1419 { | |
| 1420 linenr_T lnumt, lnumb; | |
| 1421 | |
| 1422 /* | |
| 1423 * A change in a line can cause lines above it to become folded or | |
| 1424 * unfolded. Find the top most buffer line that may be affected. | |
| 1425 * If the line was previously folded and displayed, get the first | |
| 1426 * line of that fold. If the line is folded now, get the first | |
| 1427 * folded line. Use the minimum of these two. | |
| 1428 */ | |
| 1429 | |
| 1430 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1431 * the line below it. If there is no valid entry, use w_topline. | |
| 1432 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1433 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1434 lnumt = wp->w_topline; | |
| 1435 lnumb = MAXLNUM; | |
| 1436 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1437 if (wp->w_lines[i].wl_valid) | |
| 1438 { | |
| 1439 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1440 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1441 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1442 { | |
| 1443 lnumb = wp->w_lines[i].wl_lnum; | |
| 1444 /* When there is a fold column it might need updating | |
| 1445 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1446 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1447 ++lnumb; |
| 1448 } | |
| 1449 } | |
| 1450 | |
| 1451 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1452 if (mod_top > lnumt) | |
| 1453 mod_top = lnumt; | |
| 1454 | |
| 1455 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1456 --mod_bot; | |
| 1457 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1458 ++mod_bot; | |
| 1459 if (mod_bot < lnumb) | |
| 1460 mod_bot = lnumb; | |
| 1461 } | |
| 1462 #endif | |
| 1463 | |
| 1464 /* When a change starts above w_topline and the end is below | |
| 1465 * w_topline, start redrawing at w_topline. | |
| 36 | 1466 * If the end of the change is above w_topline: do like no change was |
| 1467 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1468 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1469 { | |
| 1470 if (mod_bot > wp->w_topline) | |
| 1471 mod_top = wp->w_topline; | |
| 1472 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1473 else if (syntax_present(wp)) |
| 7 | 1474 top_end = 1; |
| 1475 #endif | |
| 1476 } | |
| 36 | 1477 |
| 1478 /* When line numbers are displayed need to redraw all lines below | |
| 1479 * inserted/deleted lines. */ | |
| 1480 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1481 mod_bot = MAXLNUM; | |
| 7 | 1482 } |
|
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
|
1483 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
|
1484 wp->w_redraw_bot = 0; |
| 7 | 1485 |
| 1486 /* | |
| 1487 * When only displaying the lines at the top, set top_end. Used when | |
| 1488 * window has scrolled down for msg_scrolled. | |
| 1489 */ | |
| 1490 if (type == REDRAW_TOP) | |
| 1491 { | |
| 1492 j = 0; | |
| 1493 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1494 { | |
| 1495 j += wp->w_lines[i].wl_size; | |
| 1496 if (j >= wp->w_upd_rows) | |
| 1497 { | |
| 1498 top_end = j; | |
| 1499 break; | |
| 1500 } | |
| 1501 } | |
| 1502 if (top_end == 0) | |
| 1503 /* not found (cannot happen?): redraw everything */ | |
| 1504 type = NOT_VALID; | |
| 1505 else | |
| 1506 /* top area defined, the rest is VALID */ | |
| 1507 type = VALID; | |
| 1508 } | |
| 1509 | |
| 1378 | 1510 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1511 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1512 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1513 * called. */ | |
| 1514 if (screen_cleared) | |
| 1515 screen_cleared = MAYBE; | |
| 1516 | |
| 7 | 1517 /* |
| 1518 * If there are no changes on the screen that require a complete redraw, | |
| 1519 * handle three cases: | |
| 1520 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1521 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1522 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1523 * w_lines[] that needs updating. | |
| 1524 */ | |
| 743 | 1525 if ((type == VALID || type == SOME_VALID |
| 1526 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1527 #ifdef FEAT_DIFF |
| 1528 && !wp->w_botfill && !wp->w_old_botfill | |
| 1529 #endif | |
| 1530 ) | |
| 1531 { | |
| 1532 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1533 { | |
| 1534 /* | |
| 1535 * w_topline is the first changed line, the scrolling will be done | |
| 1536 * further down. | |
| 1537 */ | |
| 1538 } | |
| 1539 else if (wp->w_lines[0].wl_valid | |
| 1540 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1541 #ifdef FEAT_DIFF | |
| 1542 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1543 && wp->w_topfill > wp->w_old_topfill) | |
| 1544 #endif | |
| 1545 )) | |
| 1546 { | |
| 1547 /* | |
| 1548 * New topline is above old topline: May scroll down. | |
| 1549 */ | |
| 1550 #ifdef FEAT_FOLDING | |
| 1551 if (hasAnyFolding(wp)) | |
| 1552 { | |
| 1553 linenr_T ln; | |
| 1554 | |
| 1555 /* count the number of lines we are off, counting a sequence | |
| 1556 * of folded lines as one */ | |
| 1557 j = 0; | |
| 1558 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1559 { | |
| 1560 ++j; | |
| 1561 if (j >= wp->w_height - 2) | |
| 1562 break; | |
| 1563 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1564 } | |
| 1565 } | |
| 1566 else | |
| 1567 #endif | |
| 1568 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1569 if (j < wp->w_height - 2) /* not too far off */ | |
| 1570 { | |
| 1571 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1572 #ifdef FEAT_DIFF | |
| 1573 /* insert extra lines for previously invisible filler lines */ | |
| 1574 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1575 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1576 - wp->w_old_topfill; | |
| 1577 #endif | |
| 1578 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1579 { | |
| 1580 /* | |
| 1581 * Try to insert the correct number of lines. | |
| 1582 * If not the last window, delete the lines at the bottom. | |
| 1583 * win_ins_lines may fail when the terminal can't do it. | |
| 1584 */ | |
| 1585 if (i > 0) | |
| 1586 check_for_delay(FALSE); | |
| 1587 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1588 { | |
| 1589 if (wp->w_lines_valid != 0) | |
| 1590 { | |
| 1591 /* Need to update rows that are new, stop at the | |
| 1592 * first one that scrolled down. */ | |
| 1593 top_end = i; | |
| 1594 scrolled_down = TRUE; | |
| 1595 | |
| 1596 /* Move the entries that were scrolled, disable | |
| 1597 * the entries for the lines to be redrawn. */ | |
| 1598 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1599 wp->w_lines_valid = wp->w_height; | |
| 1600 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1601 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1602 while (idx >= 0) | |
| 1603 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1604 } | |
| 1605 } | |
| 1606 else | |
| 1607 mid_start = 0; /* redraw all lines */ | |
| 1608 } | |
| 1609 else | |
| 1610 mid_start = 0; /* redraw all lines */ | |
| 1611 } | |
| 1612 else | |
| 1613 mid_start = 0; /* redraw all lines */ | |
| 1614 } | |
| 1615 else | |
| 1616 { | |
| 1617 /* | |
| 1618 * New topline is at or below old topline: May scroll up. | |
| 1619 * When topline didn't change, find first entry in w_lines[] that | |
| 1620 * needs updating. | |
| 1621 */ | |
| 1622 | |
| 1623 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1624 j = -1; | |
| 1625 row = 0; | |
| 1626 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1627 { | |
| 1628 if (wp->w_lines[i].wl_valid | |
| 1629 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1630 { | |
| 1631 j = i; | |
| 1632 break; | |
| 1633 } | |
| 1634 row += wp->w_lines[i].wl_size; | |
| 1635 } | |
| 1636 if (j == -1) | |
| 1637 { | |
| 1638 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1639 * lines */ | |
| 1640 mid_start = 0; | |
| 1641 } | |
| 1642 else | |
| 1643 { | |
| 1644 /* | |
| 1645 * Try to delete the correct number of lines. | |
| 1646 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1647 */ | |
| 1648 #ifdef FEAT_DIFF | |
| 1649 /* If the topline didn't change, delete old filler lines, | |
| 1650 * otherwise delete filler lines of the new topline... */ | |
| 1651 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1652 row += wp->w_old_topfill; | |
| 1653 else | |
| 1654 row += diff_check_fill(wp, wp->w_topline); | |
| 1655 /* ... but don't delete new filler lines. */ | |
| 1656 row -= wp->w_topfill; | |
| 1657 #endif | |
| 1658 if (row > 0) | |
| 1659 { | |
| 1660 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
|
1661 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
|
1662 == OK) |
| 7 | 1663 bot_start = wp->w_height - row; |
| 1664 else | |
| 1665 mid_start = 0; /* redraw all lines */ | |
| 1666 } | |
| 1667 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1668 { | |
| 1669 /* | |
| 1670 * Skip the lines (below the deleted lines) that are still | |
| 1671 * valid and don't need redrawing. Copy their info | |
| 1672 * upwards, to compensate for the deleted lines. Set | |
| 1673 * bot_start to the first row that needs redrawing. | |
| 1674 */ | |
| 1675 bot_start = 0; | |
| 1676 idx = 0; | |
| 1677 for (;;) | |
| 1678 { | |
| 1679 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1680 /* stop at line that didn't fit, unless it is still | |
| 1681 * valid (no lines deleted) */ | |
| 1682 if (row > 0 && bot_start + row | |
| 1683 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1684 { | |
| 1685 wp->w_lines_valid = idx + 1; | |
| 1686 break; | |
| 1687 } | |
| 1688 bot_start += wp->w_lines[idx++].wl_size; | |
| 1689 | |
| 1690 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1691 if (++j >= wp->w_lines_valid) | |
| 1692 { | |
| 1693 wp->w_lines_valid = idx; | |
| 1694 break; | |
| 1695 } | |
| 1696 } | |
| 1697 #ifdef FEAT_DIFF | |
| 1698 /* Correct the first entry for filler lines at the top | |
| 1699 * when it won't get updated below. */ | |
| 1700 if (wp->w_p_diff && bot_start > 0) | |
| 1701 wp->w_lines[0].wl_size = | |
| 1702 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1703 + wp->w_topfill; | |
| 1704 #endif | |
| 1705 } | |
| 1706 } | |
| 1707 } | |
| 1708 | |
| 1709 /* When starting redraw in the first line, redraw all lines. When | |
| 1710 * there is only one window it's probably faster to clear the screen | |
| 1711 * first. */ | |
| 1712 if (mid_start == 0) | |
| 1713 { | |
| 1714 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1715 if (ONE_WINDOW) |
| 981 | 1716 { |
| 1331 | 1717 /* Clear the screen when it was not done by win_del_lines() or |
| 1718 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1719 * then. */ | |
| 1720 if (screen_cleared != TRUE) | |
| 1721 screenclear(); | |
| 981 | 1722 /* The screen was cleared, redraw the tab pages line. */ |
| 1723 if (redraw_tabline) | |
| 1724 draw_tabline(); | |
| 1725 } | |
| 7 | 1726 } |
| 1331 | 1727 |
| 1728 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1729 * cleared (only happens for the first window) or when screenclear() | |
| 1730 * was called directly above, "must_redraw" will have been set to | |
| 1731 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1732 if (screen_cleared == TRUE) | |
| 1733 must_redraw = 0; | |
| 7 | 1734 } |
| 1735 else | |
| 1736 { | |
| 1737 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1738 mid_start = 0; | |
| 1739 mid_end = wp->w_height; | |
| 1740 } | |
| 1741 | |
| 743 | 1742 if (type == SOME_VALID) |
| 1743 { | |
| 1744 /* SOME_VALID: redraw all lines. */ | |
| 1745 mid_start = 0; | |
| 1746 mid_end = wp->w_height; | |
| 1747 type = NOT_VALID; | |
| 1748 } | |
| 1749 | |
| 7 | 1750 /* check if we are updating or removing the inverted part */ |
| 1751 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1752 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1753 { | |
| 1754 linenr_T from, to; | |
| 1755 | |
| 1756 if (VIsual_active) | |
| 1757 { | |
| 1758 if (VIsual_active | |
| 1759 && (VIsual_mode != wp->w_old_visual_mode | |
| 1760 || type == INVERTED_ALL)) | |
| 1761 { | |
| 1762 /* | |
| 1763 * If the type of Visual selection changed, redraw the whole | |
| 1764 * selection. Also when the ownership of the X selection is | |
| 1765 * gained or lost. | |
| 1766 */ | |
| 1767 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1768 { | |
| 1769 from = curwin->w_cursor.lnum; | |
| 1770 to = VIsual.lnum; | |
| 1771 } | |
| 1772 else | |
| 1773 { | |
| 1774 from = VIsual.lnum; | |
| 1775 to = curwin->w_cursor.lnum; | |
| 1776 } | |
| 1777 /* redraw more when the cursor moved as well */ | |
| 1778 if (wp->w_old_cursor_lnum < from) | |
| 1779 from = wp->w_old_cursor_lnum; | |
| 1780 if (wp->w_old_cursor_lnum > to) | |
| 1781 to = wp->w_old_cursor_lnum; | |
| 1782 if (wp->w_old_visual_lnum < from) | |
| 1783 from = wp->w_old_visual_lnum; | |
| 1784 if (wp->w_old_visual_lnum > to) | |
| 1785 to = wp->w_old_visual_lnum; | |
| 1786 } | |
| 1787 else | |
| 1788 { | |
| 1789 /* | |
| 1790 * Find the line numbers that need to be updated: The lines | |
| 1791 * between the old cursor position and the current cursor | |
| 1792 * position. Also check if the Visual position changed. | |
| 1793 */ | |
| 1794 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1795 { | |
| 1796 from = curwin->w_cursor.lnum; | |
| 1797 to = wp->w_old_cursor_lnum; | |
| 1798 } | |
| 1799 else | |
| 1800 { | |
| 1801 from = wp->w_old_cursor_lnum; | |
| 1802 to = curwin->w_cursor.lnum; | |
| 1803 if (from == 0) /* Visual mode just started */ | |
| 1804 from = to; | |
| 1805 } | |
| 1806 | |
| 422 | 1807 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1808 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1809 { |
| 1810 if (wp->w_old_visual_lnum < from | |
| 1811 && wp->w_old_visual_lnum != 0) | |
| 1812 from = wp->w_old_visual_lnum; | |
| 1813 if (wp->w_old_visual_lnum > to) | |
| 1814 to = wp->w_old_visual_lnum; | |
| 1815 if (VIsual.lnum < from) | |
| 1816 from = VIsual.lnum; | |
| 1817 if (VIsual.lnum > to) | |
| 1818 to = VIsual.lnum; | |
| 1819 } | |
| 1820 } | |
| 1821 | |
| 1822 /* | |
| 1823 * If in block mode and changed column or curwin->w_curswant: | |
| 1824 * update all lines. | |
| 1825 * First compute the actual start and end column. | |
| 1826 */ | |
| 1827 if (VIsual_mode == Ctrl_V) | |
| 1828 { | |
| 6266 | 1829 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1830 #if defined(FEAT_LINEBREAK) |
| 6266 | 1831 int save_ve_flags = ve_flags; |
| 1832 | |
| 1833 if (curwin->w_p_lbr) | |
| 1834 ve_flags = VE_ALL; | |
| 1835 #endif | |
| 7 | 1836 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
|
1837 #if defined(FEAT_LINEBREAK) |
| 6266 | 1838 ve_flags = save_ve_flags; |
| 1839 #endif | |
| 7 | 1840 ++toc; |
| 1841 if (curwin->w_curswant == MAXCOL) | |
| 1842 toc = MAXCOL; | |
| 1843 | |
| 1844 if (fromc != wp->w_old_cursor_fcol | |
| 1845 || toc != wp->w_old_cursor_lcol) | |
| 1846 { | |
| 1847 if (from > VIsual.lnum) | |
| 1848 from = VIsual.lnum; | |
| 1849 if (to < VIsual.lnum) | |
| 1850 to = VIsual.lnum; | |
| 1851 } | |
| 1852 wp->w_old_cursor_fcol = fromc; | |
| 1853 wp->w_old_cursor_lcol = toc; | |
| 1854 } | |
| 1855 } | |
| 1856 else | |
| 1857 { | |
| 1858 /* Use the line numbers of the old Visual area. */ | |
| 1859 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1860 { | |
| 1861 from = wp->w_old_cursor_lnum; | |
| 1862 to = wp->w_old_visual_lnum; | |
| 1863 } | |
| 1864 else | |
| 1865 { | |
| 1866 from = wp->w_old_visual_lnum; | |
| 1867 to = wp->w_old_cursor_lnum; | |
| 1868 } | |
| 1869 } | |
| 1870 | |
| 1871 /* | |
| 1872 * There is no need to update lines above the top of the window. | |
| 1873 */ | |
| 1874 if (from < wp->w_topline) | |
| 1875 from = wp->w_topline; | |
| 1876 | |
| 1877 /* | |
| 1878 * If we know the value of w_botline, use it to restrict the update to | |
| 1879 * the lines that are visible in the window. | |
| 1880 */ | |
| 1881 if (wp->w_valid & VALID_BOTLINE) | |
| 1882 { | |
| 1883 if (from >= wp->w_botline) | |
| 1884 from = wp->w_botline - 1; | |
| 1885 if (to >= wp->w_botline) | |
| 1886 to = wp->w_botline - 1; | |
| 1887 } | |
| 1888 | |
| 1889 /* | |
| 1890 * Find the minimal part to be updated. | |
| 1891 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1892 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1893 * top_end; need to redraw from top_end to the "to" line. | |
| 1894 * A middle mouse click with a Visual selection may change the text | |
| 1895 * above the Visual area and reset wl_valid, do count these for | |
| 1896 * mid_end (in srow). | |
| 1897 */ | |
| 1898 if (mid_start > 0) | |
| 1899 { | |
| 1900 lnum = wp->w_topline; | |
| 1901 idx = 0; | |
| 1902 srow = 0; | |
| 1903 if (scrolled_down) | |
| 1904 mid_start = top_end; | |
| 1905 else | |
| 1906 mid_start = 0; | |
| 1907 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1908 { | |
| 1909 if (wp->w_lines[idx].wl_valid) | |
| 1910 mid_start += wp->w_lines[idx].wl_size; | |
| 1911 else if (!scrolled_down) | |
| 1912 srow += wp->w_lines[idx].wl_size; | |
| 1913 ++idx; | |
| 1914 # ifdef FEAT_FOLDING | |
| 1915 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1916 lnum = wp->w_lines[idx].wl_lnum; | |
| 1917 else | |
| 1918 # endif | |
| 1919 ++lnum; | |
| 1920 } | |
| 1921 srow += mid_start; | |
| 1922 mid_end = wp->w_height; | |
| 1923 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1924 { | |
| 1925 if (wp->w_lines[idx].wl_valid | |
| 1926 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1927 { | |
| 1928 /* Only update until first row of this line */ | |
| 1929 mid_end = srow; | |
| 1930 break; | |
| 1931 } | |
| 1932 srow += wp->w_lines[idx].wl_size; | |
| 1933 } | |
| 1934 } | |
| 1935 } | |
| 1936 | |
| 1937 if (VIsual_active && buf == curwin->w_buffer) | |
| 1938 { | |
| 1939 wp->w_old_visual_mode = VIsual_mode; | |
| 1940 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1941 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1942 wp->w_old_visual_col = VIsual.col; |
| 7 | 1943 wp->w_old_curswant = curwin->w_curswant; |
| 1944 } | |
| 1945 else | |
| 1946 { | |
| 1947 wp->w_old_visual_mode = 0; | |
| 1948 wp->w_old_cursor_lnum = 0; | |
| 1949 wp->w_old_visual_lnum = 0; | |
| 422 | 1950 wp->w_old_visual_col = 0; |
| 7 | 1951 } |
| 1952 | |
| 1953 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1954 /* reset got_int, otherwise regexp won't work */ | |
| 1955 save_got_int = got_int; | |
| 1956 got_int = 0; | |
| 1957 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1958 #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
|
1959 /* 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
|
1960 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
|
1961 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
|
1962 #endif |
| 7 | 1963 #ifdef FEAT_FOLDING |
| 1964 win_foldinfo.fi_level = 0; | |
| 1965 #endif | |
| 1966 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1967 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1968 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1969 * 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
|
1970 * 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
|
1971 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1972 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
|
1973 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
|
1974 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1975 |
| 7 | 1976 /* |
| 1977 * Update all the window rows. | |
| 1978 */ | |
| 1979 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1980 row = 0; | |
| 1981 srow = 0; | |
| 1982 lnum = wp->w_topline; /* first line shown in window */ | |
| 1983 for (;;) | |
| 1984 { | |
| 1985 /* stop updating when reached the end of the window (check for _past_ | |
| 1986 * the end of the window is at the end of the loop) */ | |
| 1987 if (row == wp->w_height) | |
| 1988 { | |
| 1989 didline = TRUE; | |
| 1990 break; | |
| 1991 } | |
| 1992 | |
| 1993 /* stop updating when hit the end of the file */ | |
| 1994 if (lnum > buf->b_ml.ml_line_count) | |
| 1995 { | |
| 1996 eof = TRUE; | |
| 1997 break; | |
| 1998 } | |
| 1999 | |
| 2000 /* Remember the starting row of the line that is going to be dealt | |
| 2001 * with. It is used further down when the line doesn't fit. */ | |
| 2002 srow = row; | |
| 2003 | |
| 2004 /* | |
| 2005 * Update a line when it is in an area that needs updating, when it | |
| 2006 * 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
|
2007 * "bot_start" may be halfway a wrapped line after using |
| 7 | 2008 * win_del_lines(), check if the current line includes it. |
| 2009 * When syntax folding is being used, the saved syntax states will | |
| 2010 * already have been updated, we can't see where the syntax state is | |
| 2011 * the same again, just update until the end of the window. | |
| 2012 */ | |
| 2013 if (row < top_end | |
| 2014 || (row >= mid_start && row < mid_end) | |
| 2015 #ifdef FEAT_SEARCH_EXTRA | |
| 2016 || top_to_mod | |
| 2017 #endif | |
| 2018 || idx >= wp->w_lines_valid | |
| 2019 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 2020 || (mod_top != 0 | |
| 2021 && (lnum == mod_top | |
| 2022 || (lnum >= mod_top | |
| 2023 && (lnum < mod_bot | |
| 2024 #ifdef FEAT_SYN_HL | |
| 2025 || did_update == DID_FOLD | |
| 2026 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2027 && syntax_present(wp) |
| 7 | 2028 && ( |
| 2029 # ifdef FEAT_FOLDING | |
| 2030 (foldmethodIsSyntax(wp) | |
| 2031 && hasAnyFolding(wp)) || | |
| 2032 # endif | |
| 2033 syntax_check_changed(lnum))) | |
| 2034 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
2035 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 2036 /* match in fixed position might need redraw |
| 2037 * if lines were inserted or deleted */ | |
| 2038 || (wp->w_match_head != NULL | |
| 2039 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
2040 #endif |
| 7 | 2041 ))))) |
| 2042 { | |
| 2043 #ifdef FEAT_SEARCH_EXTRA | |
| 2044 if (lnum == mod_top) | |
| 2045 top_to_mod = FALSE; | |
| 2046 #endif | |
| 2047 | |
| 2048 /* | |
| 2049 * When at start of changed lines: May scroll following lines | |
| 2050 * up or down to minimize redrawing. | |
| 2051 * Don't do this when the change continues until the end. | |
| 3318 | 2052 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 2053 */ |
| 2054 if (lnum == mod_top | |
| 2055 && mod_bot != MAXLNUM | |
| 3318 | 2056 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 2057 { |
| 2058 int old_rows = 0; | |
| 2059 int new_rows = 0; | |
| 2060 int xtra_rows; | |
| 2061 linenr_T l; | |
| 2062 | |
| 2063 /* Count the old number of window rows, using w_lines[], which | |
| 2064 * should still contain the sizes for the lines as they are | |
| 2065 * currently displayed. */ | |
| 2066 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 2067 { | |
| 2068 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 2069 * lines are part of the changed area. */ | |
| 2070 if (wp->w_lines[i].wl_valid | |
| 2071 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 2072 break; | |
| 2073 old_rows += wp->w_lines[i].wl_size; | |
| 2074 #ifdef FEAT_FOLDING | |
| 2075 if (wp->w_lines[i].wl_valid | |
| 2076 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 2077 { | |
| 2078 /* Must have found the last valid entry above mod_bot. | |
| 2079 * Add following invalid entries. */ | |
| 2080 ++i; | |
| 2081 while (i < wp->w_lines_valid | |
| 2082 && !wp->w_lines[i].wl_valid) | |
| 2083 old_rows += wp->w_lines[i++].wl_size; | |
| 2084 break; | |
| 2085 } | |
| 2086 #endif | |
| 2087 } | |
| 2088 | |
| 2089 if (i >= wp->w_lines_valid) | |
| 2090 { | |
| 2091 /* We can't find a valid line below the changed lines, | |
| 2092 * need to redraw until the end of the window. | |
| 2093 * Inserting/deleting lines has no use. */ | |
| 2094 bot_start = 0; | |
| 2095 } | |
| 2096 else | |
| 2097 { | |
| 2098 /* Able to count old number of rows: Count new window | |
| 2099 * rows, and may insert/delete lines */ | |
| 2100 j = idx; | |
| 2101 for (l = lnum; l < mod_bot; ++l) | |
| 2102 { | |
| 2103 #ifdef FEAT_FOLDING | |
| 2104 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 2105 ++new_rows; | |
| 2106 else | |
| 2107 #endif | |
| 2108 #ifdef FEAT_DIFF | |
| 2109 if (l == wp->w_topline) | |
| 2110 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 2111 + wp->w_topfill; | |
| 2112 else | |
| 2113 #endif | |
| 2114 new_rows += plines_win(wp, l, TRUE); | |
| 2115 ++j; | |
| 2116 if (new_rows > wp->w_height - row - 2) | |
| 2117 { | |
| 2118 /* it's getting too much, must redraw the rest */ | |
| 2119 new_rows = 9999; | |
| 2120 break; | |
| 2121 } | |
| 2122 } | |
| 2123 xtra_rows = new_rows - old_rows; | |
| 2124 if (xtra_rows < 0) | |
| 2125 { | |
| 2126 /* May scroll text up. If there is not enough | |
| 2127 * remaining text or scrolling fails, must redraw the | |
| 2128 * rest. If scrolling works, must redraw the text | |
| 2129 * below the scrolled text. */ | |
| 2130 if (row - xtra_rows >= wp->w_height - 2) | |
| 2131 mod_bot = MAXLNUM; | |
| 2132 else | |
| 2133 { | |
| 2134 check_for_delay(FALSE); | |
| 2135 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
|
2136 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 2137 mod_bot = MAXLNUM; |
| 2138 else | |
| 2139 bot_start = wp->w_height + xtra_rows; | |
| 2140 } | |
| 2141 } | |
| 2142 else if (xtra_rows > 0) | |
| 2143 { | |
| 2144 /* May scroll text down. If there is not enough | |
| 2145 * remaining text of scrolling fails, must redraw the | |
| 2146 * rest. */ | |
| 2147 if (row + xtra_rows >= wp->w_height - 2) | |
| 2148 mod_bot = MAXLNUM; | |
| 2149 else | |
| 2150 { | |
| 2151 check_for_delay(FALSE); | |
| 2152 if (win_ins_lines(wp, row + old_rows, | |
| 2153 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2154 mod_bot = MAXLNUM; | |
| 2155 else if (top_end > row + old_rows) | |
| 2156 /* Scrolled the part at the top that requires | |
| 2157 * updating down. */ | |
| 2158 top_end += xtra_rows; | |
| 2159 } | |
| 2160 } | |
| 2161 | |
| 2162 /* When not updating the rest, may need to move w_lines[] | |
| 2163 * entries. */ | |
| 2164 if (mod_bot != MAXLNUM && i != j) | |
| 2165 { | |
| 2166 if (j < i) | |
| 2167 { | |
| 2168 int x = row + new_rows; | |
| 2169 | |
| 2170 /* move entries in w_lines[] upwards */ | |
| 2171 for (;;) | |
| 2172 { | |
| 2173 /* stop at last valid entry in w_lines[] */ | |
| 2174 if (i >= wp->w_lines_valid) | |
| 2175 { | |
| 2176 wp->w_lines_valid = j; | |
| 2177 break; | |
| 2178 } | |
| 2179 wp->w_lines[j] = wp->w_lines[i]; | |
| 2180 /* stop at a line that won't fit */ | |
| 2181 if (x + (int)wp->w_lines[j].wl_size | |
| 2182 > wp->w_height) | |
| 2183 { | |
| 2184 wp->w_lines_valid = j + 1; | |
| 2185 break; | |
| 2186 } | |
| 2187 x += wp->w_lines[j++].wl_size; | |
| 2188 ++i; | |
| 2189 } | |
| 2190 if (bot_start > x) | |
| 2191 bot_start = x; | |
| 2192 } | |
| 2193 else /* j > i */ | |
| 2194 { | |
| 2195 /* move entries in w_lines[] downwards */ | |
| 2196 j -= i; | |
| 2197 wp->w_lines_valid += j; | |
| 2198 if (wp->w_lines_valid > wp->w_height) | |
| 2199 wp->w_lines_valid = wp->w_height; | |
| 2200 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2201 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2202 | |
| 2203 /* The w_lines[] entries for inserted lines are | |
| 2204 * now invalid, but wl_size may be used above. | |
| 2205 * Reset to zero. */ | |
| 2206 while (i >= idx) | |
| 2207 { | |
| 2208 wp->w_lines[i].wl_size = 0; | |
| 2209 wp->w_lines[i--].wl_valid = FALSE; | |
| 2210 } | |
| 2211 } | |
| 2212 } | |
| 2213 } | |
| 2214 } | |
| 2215 | |
| 2216 #ifdef FEAT_FOLDING | |
| 2217 /* | |
| 2218 * When lines are folded, display one line for all of them. | |
| 2219 * Otherwise, display normally (can be several display lines when | |
| 2220 * 'wrap' is on). | |
| 2221 */ | |
| 2222 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2223 if (fold_count != 0) | |
| 2224 { | |
| 2225 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2226 ++row; | |
| 2227 --fold_count; | |
| 2228 wp->w_lines[idx].wl_folded = TRUE; | |
| 2229 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2230 # ifdef FEAT_SYN_HL | |
| 2231 did_update = DID_FOLD; | |
| 2232 # endif | |
| 2233 } | |
| 2234 else | |
| 2235 #endif | |
| 2236 if (idx < wp->w_lines_valid | |
| 2237 && wp->w_lines[idx].wl_valid | |
| 2238 && wp->w_lines[idx].wl_lnum == lnum | |
| 2239 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2240 && !(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
|
2241 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2242 && !bt_popup(wp->w_buffer) |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2243 #endif |
| 7 | 2244 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2245 #ifdef FEAT_DIFF | |
| 2246 && diff_check_fill(wp, lnum) == 0 | |
| 2247 #endif | |
| 2248 ) | |
| 2249 { | |
| 2250 /* This line is not going to fit. Don't draw anything here, | |
| 2251 * will draw "@ " lines below. */ | |
| 2252 row = wp->w_height + 1; | |
| 2253 } | |
| 2254 else | |
| 2255 { | |
| 2256 #ifdef FEAT_SEARCH_EXTRA | |
| 2257 prepare_search_hl(wp, lnum); | |
| 2258 #endif | |
| 2259 #ifdef FEAT_SYN_HL | |
| 2260 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2261 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
|
2262 && syntax_present(wp)) |
| 7 | 2263 syntax_end_parsing(syntax_last_parsed + 1); |
| 2264 #endif | |
| 2265 | |
| 2266 /* | |
| 2267 * Display one line. | |
| 2268 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2269 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
|
2270 mod_top == 0, FALSE); |
| 7 | 2271 |
| 2272 #ifdef FEAT_FOLDING | |
| 2273 wp->w_lines[idx].wl_folded = FALSE; | |
| 2274 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2275 #endif | |
| 2276 #ifdef FEAT_SYN_HL | |
| 2277 did_update = DID_LINE; | |
| 2278 syntax_last_parsed = lnum; | |
| 2279 #endif | |
| 2280 } | |
| 2281 | |
| 2282 wp->w_lines[idx].wl_lnum = lnum; | |
| 2283 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
|
2284 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2285 /* 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
|
2286 * 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
|
2287 * 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
|
2288 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2289 { |
| 2290 /* we may need the size of that too long line later on */ | |
| 3318 | 2291 if (dollar_vcol == -1) |
| 7 | 2292 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2293 ++idx; | |
| 2294 break; | |
| 2295 } | |
| 3318 | 2296 if (dollar_vcol == -1) |
| 7 | 2297 wp->w_lines[idx].wl_size = row - srow; |
| 2298 ++idx; | |
| 2299 #ifdef FEAT_FOLDING | |
| 2300 lnum += fold_count + 1; | |
| 2301 #else | |
| 2302 ++lnum; | |
| 2303 #endif | |
| 2304 } | |
| 2305 else | |
| 2306 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2307 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
|
2308 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2309 #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
|
2310 // '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
|
2311 // 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
|
2312 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
|
2313 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
|
2314 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
|
2315 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2316 #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
|
2317 (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
|
2318 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2319 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2320 // This line does not need to be drawn, advance to the next one. |
| 7 | 2321 row += wp->w_lines[idx++].wl_size; |
| 2322 if (row > wp->w_height) /* past end of screen */ | |
| 2323 break; | |
| 2324 #ifdef FEAT_FOLDING | |
| 2325 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2326 #else | |
| 2327 ++lnum; | |
| 2328 #endif | |
| 2329 #ifdef FEAT_SYN_HL | |
| 2330 did_update = DID_NONE; | |
| 2331 #endif | |
| 2332 } | |
| 2333 | |
| 2334 if (lnum > buf->b_ml.ml_line_count) | |
| 2335 { | |
| 2336 eof = TRUE; | |
| 2337 break; | |
| 2338 } | |
| 2339 } | |
| 2340 /* | |
| 2341 * End of loop over all window lines. | |
| 2342 */ | |
| 2343 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2344 #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
|
2345 /* 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
|
2346 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
|
2347 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2348 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
|
2349 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2350 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
|
2351 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
|
2352 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
|
2353 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
|
2354 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
|
2355 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2356 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
|
2357 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2358 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
|
2359 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2360 #endif |
| 7 | 2361 |
| 2362 if (idx > wp->w_lines_valid) | |
| 2363 wp->w_lines_valid = idx; | |
| 2364 | |
| 2365 #ifdef FEAT_SYN_HL | |
| 2366 /* | |
| 2367 * Let the syntax stuff know we stop parsing here. | |
| 2368 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2369 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2370 syntax_end_parsing(syntax_last_parsed + 1); |
| 2371 #endif | |
| 2372 | |
| 2373 /* | |
| 2374 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2375 * line we were working on, then the line didn't fit. | |
| 2376 */ | |
| 2377 wp->w_empty_rows = 0; | |
| 2378 #ifdef FEAT_DIFF | |
| 2379 wp->w_filler_rows = 0; | |
| 2380 #endif | |
| 2381 if (!eof && !didline) | |
| 2382 { | |
| 2383 if (lnum == wp->w_topline) | |
| 2384 { | |
| 2385 /* | |
| 2386 * Single line that does not fit! | |
| 2387 * Don't overwrite it, it can be edited. | |
| 2388 */ | |
| 2389 wp->w_botline = lnum + 1; | |
| 2390 } | |
| 2391 #ifdef FEAT_DIFF | |
| 2392 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2393 { | |
| 2394 /* Window ends in filler lines. */ | |
| 2395 wp->w_botline = lnum; | |
| 2396 wp->w_filler_rows = wp->w_height - srow; | |
| 2397 } | |
| 2398 #endif | |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2399 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2400 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
|
2401 { |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2402 // 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
|
2403 wp->w_botline = lnum; |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2404 } |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2405 #endif |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2406 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
|
2407 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2408 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
|
2409 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2410 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2411 * 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
|
2412 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2413 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
|
2414 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2415 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
|
2416 (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
|
2417 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2418 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2419 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2420 } |
| 7 | 2421 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2422 { | |
| 2423 /* | |
| 2424 * Last line isn't finished: Display "@@@" at the end. | |
| 2425 */ | |
| 2426 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2427 W_WINROW(wp) + wp->w_height, | |
| 2428 (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
|
2429 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2430 set_empty_rows(wp, srow); |
| 2431 wp->w_botline = lnum; | |
| 2432 } | |
| 2433 else | |
| 2434 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2435 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2436 wp->w_botline = lnum; |
| 2437 } | |
| 2438 } | |
| 2439 else | |
| 2440 { | |
| 2441 draw_vsep_win(wp, row); | |
| 2442 if (eof) /* we hit the end of the file */ | |
| 2443 { | |
| 2444 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2445 #ifdef FEAT_DIFF | |
| 2446 j = diff_check_fill(wp, wp->w_botline); | |
| 2447 if (j > 0 && !wp->w_botfill) | |
| 2448 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2449 // Display filler lines at the end of the file. |
| 7 | 2450 if (char2cells(fill_diff) > 1) |
| 2451 i = '-'; | |
| 2452 else | |
| 2453 i = fill_diff; | |
| 2454 if (row + j > wp->w_height) | |
| 2455 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
|
2456 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2457 row += j; |
| 2458 } | |
| 2459 #endif | |
| 2460 } | |
| 3318 | 2461 else if (dollar_vcol == -1) |
| 7 | 2462 wp->w_botline = lnum; |
| 2463 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2464 // 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
|
2465 // 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
|
2466 win_draw_end(wp, |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2467 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2468 bt_popup(wp->w_buffer) ? ' ' : |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2469 #endif |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2470 '~', ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2471 } |
| 2472 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2473 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2474 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2475 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2476 |
| 7 | 2477 /* Reset the type of redrawing required, the window has been updated. */ |
| 2478 wp->w_redr_type = 0; | |
| 2479 #ifdef FEAT_DIFF | |
| 2480 wp->w_old_topfill = wp->w_topfill; | |
| 2481 wp->w_old_botfill = wp->w_botfill; | |
| 2482 #endif | |
| 2483 | |
| 3318 | 2484 if (dollar_vcol == -1) |
| 7 | 2485 { |
| 2486 /* | |
| 2487 * There is a trick with w_botline. If we invalidate it on each | |
| 2488 * change that might modify it, this will cause a lot of expensive | |
| 2489 * calls to plines() in update_topline() each time. Therefore the | |
| 2490 * value of w_botline is often approximated, and this value is used to | |
| 2491 * compute the value of w_topline. If the value of w_botline was | |
| 2492 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2493 * the visible part of the text). If it's not, we need to redraw | |
| 2494 * again. Mostly this just means scrolling up a few lines, so it | |
| 2495 * doesn't look too bad. Only do this for the current window (where | |
| 2496 * changes are relevant). | |
| 2497 */ | |
| 2498 wp->w_valid |= VALID_BOTLINE; | |
| 2499 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2500 { | |
| 2501 recursive = TRUE; | |
| 2502 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2503 update_topline(); /* may invalidate w_botline again */ | |
| 2504 if (must_redraw != 0) | |
| 2505 { | |
| 2506 /* Don't update for changes in buffer again. */ | |
| 2507 i = curbuf->b_mod_set; | |
| 2508 curbuf->b_mod_set = FALSE; | |
| 2509 win_update(curwin); | |
| 2510 must_redraw = 0; | |
| 2511 curbuf->b_mod_set = i; | |
| 2512 } | |
| 2513 recursive = FALSE; | |
| 2514 } | |
| 2515 } | |
| 2516 | |
| 2517 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2518 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2519 if (!got_int) | |
| 2520 got_int = save_got_int; | |
| 2521 #endif | |
| 2522 } | |
| 2523 | |
| 2524 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2525 * 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
|
2526 * 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
|
2527 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2528 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
|
2529 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
|
2530 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
|
2531 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
|
2532 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
|
2533 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
|
2534 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
|
2535 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
|
2536 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
|
2537 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
|
2538 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2539 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
|
2540 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2541 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
|
2542 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
|
2543 #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
|
2544 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
|
2545 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2546 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
|
2547 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
|
2548 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
|
2549 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2550 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2551 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2552 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
|
2553 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
|
2554 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
|
2555 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
|
2556 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2557 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2558 /* |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2559 * 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
|
2560 * 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
|
2561 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2562 */ |
| 2563 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2564 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2565 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2566 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2567 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
|
2568 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2569 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2570 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2571 hlf_T hl) |
| 7 | 2572 { |
| 2573 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
|
2574 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
|
2575 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
|
2576 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2577 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
|
2578 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2579 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
|
2580 { |
| 6553 | 2581 #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
|
2582 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
|
2583 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2584 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
|
2585 // 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
|
2586 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
|
2587 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
|
2588 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2589 #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
|
2590 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
|
2591 // 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
|
2592 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
|
2593 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
|
2594 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2595 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
|
2596 && 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
|
2597 // 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
|
2598 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
|
2599 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
|
2600 } |
| 7 | 2601 |
| 2602 #ifdef FEAT_RIGHTLEFT | |
| 2603 if (wp->w_p_rl) | |
| 2604 { | |
| 2605 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
|
2606 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
|
2607 c2, c2, attr); |
| 7 | 2608 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
|
2609 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
|
2610 c1, c2, attr); |
| 7 | 2611 } |
| 2612 else | |
| 2613 #endif | |
| 2614 { | |
| 2615 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
|
2616 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
|
2617 c1, c2, attr); |
| 7 | 2618 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2619 |
| 7 | 2620 set_empty_rows(wp, row); |
| 2621 } | |
| 2622 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2623 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2624 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2625 * 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
|
2626 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2627 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2628 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
|
2629 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2630 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2631 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2632 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2633 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2634 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2635 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2636 #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
|
2637 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2638 * 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
|
2639 * 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
|
2640 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2641 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2642 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
|
2643 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2644 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
|
2645 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2646 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2647 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2648 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2649 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
|
2650 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2651 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2652 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2653 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2654 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2655 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
|
2656 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
|
2657 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2658 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2659 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2660 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
|
2661 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2662 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2663 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2664 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2665 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2666 /* 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
|
2667 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
|
2668 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2669 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
|
2670 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
|
2671 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
|
2672 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2673 - (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
|
2674 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2675 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2676 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2677 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2678 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2679 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2680 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
|
2681 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
|
2682 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2683 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2684 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2685 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2686 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2687 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2688 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2689 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2690 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2691 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
|
2692 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2693 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2694 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
|
2695 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
|
2696 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2697 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2698 /* 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
|
2699 * 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
|
2700 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
|
2701 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2702 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2703 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2704 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
|
2705 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
|
2706 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2707 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2708 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2709 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
|
2710 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2711 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2712 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2713 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2714 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2715 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
|
2716 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2717 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2718 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2719 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2720 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2721 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2722 /* 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
|
2723 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
|
2724 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
|
2725 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2726 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
|
2727 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
|
2728 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2729 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2730 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2731 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2732 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
|
2733 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2734 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
|
2735 /* 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
|
2736 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
|
2737 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
|
2738 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2739 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
|
2740 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2741 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2742 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2743 } |
|
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 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2746 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2747 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
|
2748 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2749 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
|
2750 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
|
2751 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2752 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2753 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2754 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
|
2755 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
|
2756 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2757 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2758 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
|
2759 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2760 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2761 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2762 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2763 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2764 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2765 |
| 7 | 2766 #ifdef FEAT_FOLDING |
| 2767 /* | |
| 6553 | 2768 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2769 * space is available for window "wp", minus "col". | |
| 2770 */ | |
| 2771 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2772 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2773 { |
| 2774 int fdc = wp->w_p_fdc; | |
| 2775 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
|
2776 int wwidth = wp->w_width; |
| 6553 | 2777 |
| 2778 if (fdc > wwidth - (col + wmw)) | |
| 2779 fdc = wwidth - (col + wmw); | |
| 2780 return fdc; | |
| 2781 } | |
| 2782 | |
| 2783 /* | |
| 7 | 2784 * Display one folded line. |
| 2785 */ | |
| 2786 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2787 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2788 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2789 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2790 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2791 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2792 int row) |
| 7 | 2793 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2794 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2795 pos_T *top, *bot; |
| 2796 linenr_T lnume = lnum + fold_count - 1; | |
| 2797 int len; | |
| 29 | 2798 char_u *text; |
| 7 | 2799 int fdc; |
| 2800 int col; | |
| 2801 int txtcol; | |
| 2802 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2803 int ri; |
| 7 | 2804 |
| 2805 /* Build the fold line: | |
| 2806 * 1. Add the cmdwin_type for the command-line window | |
| 2807 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2808 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2809 * 4. Compose the text |
| 2810 * 5. Add the text | |
| 2811 * 6. set highlighting for the Visual area an other text | |
| 2812 */ | |
| 2813 col = 0; | |
| 2814 | |
| 2815 /* | |
| 2816 * 1. Add the cmdwin_type for the command-line window | |
| 2817 * Ignores 'rightleft', this window is never right-left. | |
| 2818 */ | |
| 2819 #ifdef FEAT_CMDWIN | |
| 2820 if (cmdwin_type != 0 && wp == curwin) | |
| 2821 { | |
| 2822 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
|
2823 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2824 if (enc_utf8) |
| 2825 ScreenLinesUC[off] = 0; | |
| 2826 ++col; | |
| 2827 } | |
| 2828 #endif | |
| 2829 | |
| 2830 /* | |
| 2831 * 2. Add the 'foldcolumn' | |
| 6553 | 2832 * Reduce the width when there is not enough space. |
| 7 | 2833 */ |
| 6553 | 2834 fdc = compute_foldcolumn(wp, col); |
| 7 | 2835 if (fdc > 0) |
| 2836 { | |
| 2837 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2838 #ifdef FEAT_RIGHTLEFT | |
| 2839 if (wp->w_p_rl) | |
| 2840 { | |
| 2841 int i; | |
| 2842 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2843 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
|
2844 HL_ATTR(HLF_FC)); |
| 7 | 2845 /* reverse the fold column */ |
| 2846 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
|
2847 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2848 } |
| 2849 else | |
| 2850 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2851 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2852 col += fdc; |
| 2853 } | |
| 2854 | |
| 2855 #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
|
2856 # 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
|
2857 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2858 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
|
2859 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
|
2860 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
|
2861 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2862 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
|
2863 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
|
2864 } while (0) |
| 7 | 2865 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2866 # 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
|
2867 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2868 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
|
2869 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
|
2870 } while (0) |
| 7 | 2871 #endif |
| 2872 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2873 /* 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
|
2874 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2875 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2876 |
| 2877 #ifdef FEAT_SIGNS | |
| 2878 /* 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
|
2879 if (signcolumn_on(wp)) |
| 7 | 2880 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2881 len = wp->w_width - col; |
| 7 | 2882 if (len > 0) |
| 2883 { | |
| 2884 if (len > 2) | |
| 2885 len = 2; | |
| 2886 # ifdef FEAT_RIGHTLEFT | |
| 2887 if (wp->w_p_rl) | |
| 2888 /* 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
|
2889 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
|
2890 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2891 else |
| 2892 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2893 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2894 col += len; |
| 2895 } | |
| 2896 } | |
| 2897 #endif | |
| 2898 | |
| 2899 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2900 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2901 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2902 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2903 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2904 len = wp->w_width - col; |
| 7 | 2905 if (len > 0) |
| 2906 { | |
| 13 | 2907 int w = number_width(wp); |
| 5905 | 2908 long num; |
| 2909 char *fmt = "%*ld "; | |
| 13 | 2910 |
| 2911 if (len > w + 1) | |
| 2912 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2913 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2914 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
|
2915 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2916 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2917 else |
| 4065 | 2918 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2919 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2920 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
|
2921 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
|
2922 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2923 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2924 * line number */ |
| 4065 | 2925 num = lnum; |
| 2926 fmt = "%-*ld "; | |
| 2927 } | |
| 2928 } | |
| 2929 | |
| 2930 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2931 #ifdef FEAT_RIGHTLEFT |
| 2932 if (wp->w_p_rl) | |
| 2933 /* 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
|
2934 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
|
2935 HL_ATTR(HLF_FL)); |
| 7 | 2936 else |
| 2937 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2938 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2939 col += len; |
| 2940 } | |
| 2941 } | |
| 2942 | |
| 2943 /* | |
| 2944 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2945 */ | |
| 29 | 2946 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2947 |
| 2948 txtcol = col; /* remember where text starts */ | |
| 2949 | |
| 2950 /* | |
| 2951 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2952 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2953 * in columns number-col - window-width. | |
| 2954 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2955 col = text_to_screenline(wp, text, col); |
| 7 | 2956 |
| 2957 /* Fill the rest of the line with the fold filler */ | |
| 2958 #ifdef FEAT_RIGHTLEFT | |
| 2959 if (wp->w_p_rl) | |
| 2960 col -= txtcol; | |
| 2961 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2962 while (col < wp->w_width |
| 7 | 2963 #ifdef FEAT_RIGHTLEFT |
| 2964 - (wp->w_p_rl ? txtcol : 0) | |
| 2965 #endif | |
| 2966 ) | |
| 2967 { | |
| 2968 if (enc_utf8) | |
| 2969 { | |
| 2970 if (fill_fold >= 0x80) | |
| 2971 { | |
| 2972 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2973 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
|
2974 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2975 } |
| 2976 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2977 { |
| 7 | 2978 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2979 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2980 } |
|
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
|
2981 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
|
2982 } |
|
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
|
2983 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
|
2984 ScreenLines[off + col++] = fill_fold; |
| 7 | 2985 } |
| 2986 | |
| 2987 if (text != buf) | |
| 2988 vim_free(text); | |
| 2989 | |
| 2990 /* | |
| 2991 * 6. set highlighting for the Visual area an other text. | |
| 2992 * If all folded lines are in the Visual area, highlight the line. | |
| 2993 */ | |
| 2994 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2995 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2996 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2997 { |
| 2998 /* Visual is after curwin->w_cursor */ | |
| 2999 top = &curwin->w_cursor; | |
| 3000 bot = &VIsual; | |
| 3001 } | |
| 3002 else | |
| 3003 { | |
| 3004 /* Visual is before curwin->w_cursor */ | |
| 3005 top = &VIsual; | |
| 3006 bot = &curwin->w_cursor; | |
| 3007 } | |
| 3008 if (lnum >= top->lnum | |
| 3009 && lnume <= bot->lnum | |
| 3010 && (VIsual_mode != 'v' | |
| 3011 || ((lnum > top->lnum | |
| 3012 || (lnum == top->lnum | |
| 3013 && top->col == 0)) | |
| 3014 && (lnume < bot->lnum | |
| 3015 || (lnume == bot->lnum | |
| 3016 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 3017 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 3018 { |
| 3019 if (VIsual_mode == Ctrl_V) | |
| 3020 { | |
| 3021 /* 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
|
3022 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 3023 { |
| 3040 | 3024 if (wp->w_old_cursor_lcol != MAXCOL |
| 3025 && 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
|
3026 < (colnr_T)wp->w_width) |
| 7 | 3027 len = wp->w_old_cursor_lcol; |
| 3028 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3029 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
|
3030 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 3031 len - (int)wp->w_old_cursor_fcol); |
| 7 | 3032 } |
| 3033 } | |
| 3034 else | |
| 216 | 3035 { |
| 7 | 3036 /* 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
|
3037 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 3038 } |
| 7 | 3039 } |
| 3040 } | |
| 3041 | |
| 743 | 3042 #ifdef FEAT_SYN_HL |
| 6685 | 3043 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 3044 if (wp->w_p_cc_cols) | |
| 3045 { | |
| 3046 int i = 0; | |
| 3047 int j = wp->w_p_cc_cols[i]; | |
| 3048 int old_txtcol = txtcol; | |
| 3049 | |
| 3050 while (j > -1) | |
| 3051 { | |
| 3052 txtcol += j; | |
| 3053 if (wp->w_p_wrap) | |
| 3054 txtcol -= wp->w_skipcol; | |
| 3055 else | |
| 3056 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
|
3057 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 3058 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
|
3059 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 3060 txtcol = old_txtcol; |
| 3061 j = wp->w_p_cc_cols[++i]; | |
| 3062 } | |
| 3063 } | |
| 3064 | |
| 743 | 3065 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 3066 if (wp->w_p_cuc) |
| 3067 { | |
| 3068 txtcol += wp->w_virtcol; | |
| 3069 if (wp->w_p_wrap) | |
| 3070 txtcol -= wp->w_skipcol; | |
| 3071 else | |
| 3072 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
|
3073 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 3074 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
|
3075 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 3076 } |
| 743 | 3077 #endif |
| 7 | 3078 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3079 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
|
3080 (int)wp->w_width, 0); |
| 7 | 3081 |
| 3082 /* | |
| 3083 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 3084 * updated (saves a call to plines() later). | |
| 3085 */ | |
| 3086 if (wp == curwin | |
| 3087 && lnum <= curwin->w_cursor.lnum | |
| 3088 && lnume >= curwin->w_cursor.lnum) | |
| 3089 { | |
| 3090 curwin->w_cline_row = row; | |
| 3091 curwin->w_cline_height = 1; | |
| 3092 curwin->w_cline_folded = TRUE; | |
| 3093 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 3094 } | |
| 3095 } | |
| 3096 | |
| 3097 /* | |
| 3098 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 3099 */ | |
| 3100 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3101 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3102 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3103 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3104 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3105 int attr) |
| 7 | 3106 { |
| 216 | 3107 int i; |
| 3108 | |
| 7 | 3109 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 3110 if (enc_utf8) | |
| 3111 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 3112 for (i = 0; i < len; ++i) |
| 3113 ScreenAttrs[off + i] = attr; | |
| 7 | 3114 } |
| 3115 | |
| 3116 /* | |
| 3117 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 3118 * Only to be called when 'foldcolumn' > 0. |
| 7 | 3119 */ |
| 3120 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3121 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3122 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3123 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3124 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3125 linenr_T lnum) /* current line number */ |
| 7 | 3126 { |
| 3127 int i = 0; | |
| 3128 int level; | |
| 3129 int first_level; | |
| 519 | 3130 int empty; |
| 6553 | 3131 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 3132 |
| 3133 /* Init to all spaces. */ | |
| 6929 | 3134 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 3135 |
| 3136 level = win_foldinfo.fi_level; | |
| 3137 if (level > 0) | |
| 3138 { | |
| 519 | 3139 /* If there is only one column put more info in it. */ |
| 6553 | 3140 empty = (fdc == 1) ? 0 : 1; |
| 519 | 3141 |
| 7 | 3142 /* If the column is too narrow, we start at the lowest level that |
| 3143 * fits and use numbers to indicated the depth. */ | |
| 6553 | 3144 first_level = level - fdc - closed + 1 + empty; |
| 7 | 3145 if (first_level < 1) |
| 3146 first_level = 1; | |
| 3147 | |
| 6553 | 3148 for (i = 0; i + empty < fdc; ++i) |
| 7 | 3149 { |
| 3150 if (win_foldinfo.fi_lnum == lnum | |
| 3151 && first_level + i >= win_foldinfo.fi_low_level) | |
| 3152 p[i] = '-'; | |
| 3153 else if (first_level == 1) | |
| 3154 p[i] = '|'; | |
| 3155 else if (first_level + i <= 9) | |
| 3156 p[i] = '0' + first_level + i; | |
| 3157 else | |
| 3158 p[i] = '>'; | |
| 3159 if (first_level + i == level) | |
| 3160 break; | |
| 3161 } | |
| 3162 } | |
| 3163 if (closed) | |
| 6553 | 3164 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3165 } |
| 3166 #endif /* FEAT_FOLDING */ | |
| 3167 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3168 #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
|
3169 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
|
3170 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
|
3171 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3172 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3173 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
|
3174 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3175 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
|
3176 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
|
3177 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
|
3178 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3179 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
|
3180 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
|
3181 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
|
3182 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
|
3183 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
|
3184 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3185 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
|
3186 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3187 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
|
3188 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3189 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
|
3190 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
|
3191 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
|
3192 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
|
3193 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
|
3194 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3195 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3196 |
| 7 | 3197 /* |
| 3198 * Display line "lnum" of window 'wp' on the screen. | |
| 3199 * Start at row "startrow", stop when "endrow" is reached. | |
| 3200 * wp->w_virtcol needs to be valid. | |
| 3201 * | |
| 3202 * Return the number of last row the line occupies. | |
| 3203 */ | |
| 3204 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3205 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3206 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3207 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3208 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3209 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
|
3210 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
|
3211 int number_only) // only update the number column |
| 7 | 3212 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3213 int col = 0; /* visual column on screen */ |
| 7 | 3214 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3215 int c = 0; /* init for GCC */ | |
| 3216 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3217 #ifdef FEAT_LINEBREAK |
| 3218 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3219 #endif | |
| 7 | 3220 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3221 char_u *line; /* current line */ | |
| 3222 char_u *ptr; /* current position in "line" */ | |
| 3223 int row; /* row in the window, excl w_winrow */ | |
| 3224 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3225 | |
| 3226 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3227 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3228 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3229 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3230 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
|
3231 int c_final = NUL; /* final char, mandatory if set */ |
| 7 | 3232 int extra_attr = 0; /* attributes when n_extra != 0 */ |
| 3233 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3234 displaying lcs_eol at end-of-line */ | |
| 3235 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3236 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3237 | |
| 3238 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3239 int saved_n_extra = 0; | |
| 3240 char_u *saved_p_extra = NULL; | |
| 3241 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
|
3242 int saved_c_final = 0; |
| 7 | 3243 int saved_char_attr = 0; |
| 3244 | |
| 3245 int n_attr = 0; /* chars with special attr */ | |
| 3246 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3247 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3248 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3249 | |
| 3250 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3251 | |
| 3252 int fromcol, tocol; /* start/end of inverting */ | |
| 3253 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3254 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3255 pos_T *top, *bot; | |
| 1813 | 3256 int lnum_in_visual_area = FALSE; |
| 7 | 3257 pos_T pos; |
| 3258 long v; | |
| 3259 | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3260 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
|
3261 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
|
3262 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
|
3263 // 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
|
3264 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
|
3265 // highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3266 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
|
3267 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
|
3268 // 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
|
3269 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
|
3270 int search_attr = 0; // attributes desired by 'hlsearch' |
| 7 | 3271 #ifdef FEAT_SYN_HL |
| 743 | 3272 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3273 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3274 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3275 int save_did_emsg; | |
| 1437 | 3276 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
|
3277 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3278 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3279 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3280 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3281 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3282 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
|
3283 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3284 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3285 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3286 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
|
3287 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
|
3288 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
|
3289 #endif |
| 743 | 3290 #ifdef FEAT_SPELL |
| 221 | 3291 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3292 # define SPWORDLEN 150 |
| 3293 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3294 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3295 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3296 starts */ |
| 221 | 3297 int spell_attr = 0; /* attributes desired by spelling */ |
| 3298 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3299 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3300 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3301 * there are no spell errors */ |
| 386 | 3302 static int cap_col = -1; /* column to check for Cap word */ |
| 3303 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3304 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3305 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3306 int extra_check = 0; // has extra highlighting |
| 7 | 3307 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3308 int mb_l = 1; /* multi-byte byte length */ | |
| 3309 int mb_c = 0; /* decoded multi-byte character */ | |
| 3310 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3311 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3312 #ifdef FEAT_DIFF |
| 3313 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3314 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3315 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3316 int change_start = MAXCOL; /* first col of changed area */ |
| 3317 int change_end = -1; /* last col of changed area */ | |
| 3318 #endif | |
| 3319 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3320 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3321 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
|
3322 chars */ |
| 7 | 3323 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3324 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3325 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3326 # define LINE_ATTR |
| 1536 | 3327 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3328 #endif |
| 3329 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3330 matchitem_T *cur; /* points to the match list */ |
| 3331 match_T *shl; /* points to search_hl or a match */ | |
| 3332 int shl_flag; /* flag to indicate whether search_hl | |
| 3333 has been processed or not */ | |
| 5979 | 3334 int pos_inprogress; /* marks that position match search is |
| 3335 in progress */ | |
| 1326 | 3336 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3337 equals startcol of search_hl or one | |
| 3338 of the matches */ | |
| 7 | 3339 #endif |
| 3340 #ifdef FEAT_ARABIC | |
| 3341 int prev_c = 0; /* previous Arabic character */ | |
| 3342 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3343 #endif | |
| 910 | 3344 #if defined(LINE_ATTR) |
| 867 | 3345 int did_line_attr = 0; |
| 3346 #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
|
3347 #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
|
3348 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3349 #endif |
| 7 | 3350 |
| 3351 /* draw_state: items that are drawn in sequence: */ | |
| 3352 #define WL_START 0 /* nothing done yet */ | |
| 3353 #ifdef FEAT_CMDWIN | |
| 3354 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3355 #else | |
| 3356 # define WL_CMDLINE WL_START | |
| 3357 #endif | |
| 3358 #ifdef FEAT_FOLDING | |
| 3359 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3360 #else | |
| 3361 # define WL_FOLD WL_CMDLINE | |
| 3362 #endif | |
| 3363 #ifdef FEAT_SIGNS | |
| 3364 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3365 #else | |
| 3366 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3367 #endif | |
| 3368 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3369 #ifdef FEAT_LINEBREAK |
| 3370 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3371 #else | |
| 3372 # define WL_BRI WL_NR | |
| 3373 #endif | |
| 7 | 3374 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3375 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3376 #else |
| 5995 | 3377 # define WL_SBR WL_BRI |
| 7 | 3378 #endif |
| 3379 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3380 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3381 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3382 int feedback_col = 0; |
| 3383 int feedback_old_attr = -1; | |
| 3384 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3385 int screen_line_flags = 0; |
| 7 | 3386 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3387 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3388 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
|
3389 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
|
3390 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
|
3391 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
|
3392 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3393 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
|
3394 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3395 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
|
3396 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3397 int match_conc = 0; /* cchar for match functions */ |
| 6520 | 3398 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3399 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3400 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3401 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3402 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3403 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3404 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3405 col -= boguscols; \ |
| 6520 | 3406 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3407 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3408 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3409 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3410 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3411 #endif |
| 7 | 3412 |
| 3413 if (startrow > endrow) /* past the end already! */ | |
| 3414 return startrow; | |
| 3415 | |
| 3416 row = startrow; | |
| 3417 screen_row = row + W_WINROW(wp); | |
| 3418 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3419 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
|
3420 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3421 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3422 * 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
|
3423 * 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
|
3424 */ |
| 7 | 3425 #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
|
3426 extra_check = wp->w_p_lbr; |
| 7 | 3427 #endif |
| 3428 #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
|
3429 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
|
3430 # 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
|
3431 && !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
|
3432 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3433 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3434 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3435 /* 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
|
3436 * 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
|
3437 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
|
3438 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
|
3439 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
|
3440 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
|
3441 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
|
3442 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3443 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3444 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
|
3445 #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
|
3446 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
|
3447 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3448 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3449 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
|
3450 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
|
3451 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3452 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3453 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3454 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3455 /* 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
|
3456 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
|
3457 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
|
3458 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3459 #endif |
| 3460 | |
|
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
|
3461 #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
|
3462 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
|
3463 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3464 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
|
3465 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3466 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
|
3467 } |
|
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
|
3468 #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
|
3469 |
| 743 | 3470 #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
|
3471 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
|
3472 && *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
|
3473 && 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
|
3474 && *(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
|
3475 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3476 /* 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
|
3477 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
|
3478 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
|
3479 |
|
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
|
3480 /* 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
|
3481 * 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
|
3482 * 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
|
3483 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
|
3484 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
|
3485 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3486 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
|
3487 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
|
3488 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3489 |
|
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
|
3490 /* 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
|
3491 * 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
|
3492 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
|
3493 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
|
3494 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
|
3495 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3496 /* 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
|
3497 * 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
|
3498 * 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
|
3499 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
|
3500 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
|
3501 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
|
3502 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
|
3503 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
|
3504 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3505 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3506 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3507 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3508 * 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
|
3509 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3510 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
|
3511 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
|
3512 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
|
3513 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3514 /* 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
|
3515 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
|
3516 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3517 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
|
3518 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
|
3519 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3520 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
|
3521 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3522 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
|
3523 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
|
3524 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3525 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
|
3526 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
|
3527 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3528 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
|
3529 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3530 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
|
3531 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
|
3532 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3533 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3534 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
|
3535 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3536 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3537 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
|
3538 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
|
3539 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3540 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
|
3541 fromcol = 0; |
| 7 | 3542 else |
| 3543 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3544 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
|
3545 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
|
3546 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
|
3547 } |
|
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 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
|
3550 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3551 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
|
3552 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3553 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
|
3554 tocol = MAXCOL; |
| 7 | 3555 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3556 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
|
3557 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
|
3558 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3559 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3560 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
|
3561 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
|
3562 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
|
3563 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3564 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3565 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
|
3566 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3567 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3568 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3569 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3570 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3571 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3572 /* 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
|
3573 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
|
3574 #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
|
3575 && !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
|
3576 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3577 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3578 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
|
3579 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3580 /* 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
|
3581 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
|
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 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3584 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3585 #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
|
3586 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
|
3587 && 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
|
3588 || (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
|
3589 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3590 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
|
3591 #endif |
|
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 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3594 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3595 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3596 * 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
|
3597 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3598 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
|
3599 && 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
|
3600 && 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
|
3601 && 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
|
3602 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3603 if (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
|
3604 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
|
3605 (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
|
3606 else |
|
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 = 0; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3608 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
|
3609 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3610 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
|
3611 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
|
3612 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
|
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 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3615 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
|
3616 /* 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
|
3617 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
|
3618 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
|
3619 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3620 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
|
3621 } |
| 7 | 3622 } |
| 3623 | |
| 3624 #ifdef FEAT_DIFF | |
| 3625 filler_lines = diff_check(wp, lnum); | |
| 3626 if (filler_lines < 0) | |
| 3627 { | |
| 3628 if (filler_lines == -1) | |
| 3629 { | |
| 3630 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3631 diff_hlf = HLF_ADD; /* added line */ | |
| 3632 else if (change_start == 0) | |
| 3633 diff_hlf = HLF_TXD; /* changed text */ | |
| 3634 else | |
| 3635 diff_hlf = HLF_CHD; /* changed line */ | |
| 3636 } | |
| 3637 else | |
| 3638 diff_hlf = HLF_ADD; /* added line */ | |
| 3639 filler_lines = 0; | |
| 3640 area_highlighting = TRUE; | |
| 3641 } | |
| 3642 if (lnum == wp->w_topline) | |
| 3643 filler_lines = wp->w_topfill; | |
| 3644 filler_todo = filler_lines; | |
| 3645 #endif | |
| 3646 | |
| 3647 #ifdef LINE_ATTR | |
| 3648 # ifdef FEAT_SIGNS | |
| 3649 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3650 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3651 if (v != 0) | |
| 3652 line_attr = sign_get_attr((int)v, TRUE); | |
| 3653 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3654 # if defined(FEAT_QUICKFIX) |
| 7 | 3655 /* Highlight the current line in the quickfix window. */ |
| 644 | 3656 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
|
3657 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3658 # endif |
| 3659 if (line_attr != 0) | |
| 3660 area_highlighting = TRUE; | |
| 3661 #endif | |
| 3662 | |
| 3663 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3664 ptr = line; | |
| 3665 | |
| 743 | 3666 #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
|
3667 if (has_spell && !number_only) |
| 348 | 3668 { |
| 386 | 3669 /* For checking first word with a capital skip white space. */ |
| 3670 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
|
3671 cap_col = getwhitecols(line); |
| 386 | 3672 |
| 348 | 3673 /* To be able to spell-check over line boundaries copy the end of the |
| 3674 * current line into nextline[]. Above the start of the next line was | |
| 3675 * copied to nextline[SPWORDLEN]. */ | |
| 3676 if (nextline[SPWORDLEN] == NUL) | |
| 3677 { | |
| 3678 /* No next line or it is empty. */ | |
| 3679 nextlinecol = MAXCOL; | |
| 3680 nextline_idx = 0; | |
| 3681 } | |
| 3682 else | |
| 3683 { | |
| 835 | 3684 v = (long)STRLEN(line); |
| 348 | 3685 if (v < SPWORDLEN) |
| 3686 { | |
| 3687 /* Short line, use it completely and append the start of the | |
| 3688 * next line. */ | |
| 3689 nextlinecol = 0; | |
| 3690 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3691 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3692 nextline_idx = v + 1; |
| 3693 } | |
| 3694 else | |
| 3695 { | |
| 3696 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3697 nextlinecol = v - SPWORDLEN; | |
| 3698 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3699 nextline_idx = SPWORDLEN + 1; | |
| 3700 } | |
| 3701 } | |
| 3702 } | |
| 3703 #endif | |
| 3704 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3705 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3706 { |
|
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
|
3707 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
|
3708 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3709 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3710 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3711 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3712 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
|
3713 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
|
3714 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3715 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3716 } |
| 7 | 3717 } |
| 3718 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3719 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
|
3720 if (wcr_attr != 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3721 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3722 win_attr = wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3723 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3724 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3725 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3726 if (bt_popup(wp->w_buffer)) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3727 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3728 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3729 |
| 7 | 3730 /* |
| 3731 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3732 * first character to be displayed. | |
| 3733 */ | |
| 3734 if (wp->w_p_wrap) | |
| 3735 v = wp->w_skipcol; | |
| 3736 else | |
| 3737 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
|
3738 if (v > 0 && !number_only) |
| 7 | 3739 { |
| 3740 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3741 |
| 7 | 3742 while (vcol < v && *ptr != NUL) |
| 3743 { | |
| 5995 | 3744 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3745 vcol += c; |
| 3746 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3747 MB_PTR_ADV(ptr); |
| 7 | 3748 } |
| 3749 | |
| 1984 | 3750 /* When: |
| 3751 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3752 * - 'colorcolumn' is set, or |
| 1984 | 3753 * - 'virtualedit' is set, or |
| 3754 * - the visual mode is active, | |
| 3755 * the end of the line may be before the start of the displayed part. | |
| 3756 */ | |
| 3757 if (vcol < v && ( | |
| 5735 | 3758 #ifdef FEAT_SYN_HL |
| 3759 wp->w_p_cuc || draw_color_col || | |
| 3760 #endif | |
| 3761 virtual_active() || | |
| 3762 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3763 vcol = v; |
| 3764 | |
| 3765 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3766 * that character but skip the first few screen characters. */ | |
| 3767 if (vcol > v) | |
| 3768 { | |
| 3769 vcol -= c; | |
| 3770 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
|
3771 /* 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
|
3772 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3773 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
|
3774 n_skip = v - vcol; |
| 7 | 3775 } |
| 3776 | |
| 3777 /* | |
| 3778 * Adjust for when the inverted text is before the screen, | |
| 3779 * and when the start of the inverted text is before the screen. | |
| 3780 */ | |
| 3781 if (tocol <= vcol) | |
| 3782 fromcol = 0; | |
| 3783 else if (fromcol >= 0 && fromcol < vcol) | |
| 3784 fromcol = vcol; | |
| 3785 | |
| 3786 #ifdef FEAT_LINEBREAK | |
| 3787 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3788 if (wp->w_p_wrap) | |
| 3789 need_showbreak = TRUE; | |
| 3790 #endif | |
| 743 | 3791 #ifdef FEAT_SPELL |
| 499 | 3792 /* When spell checking a word we need to figure out the start of the |
| 3793 * word and if it's badly spelled or not. */ | |
| 3794 if (has_spell) | |
| 3795 { | |
| 3796 int len; | |
| 1536 | 3797 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3798 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3799 |
| 3800 pos = wp->w_cursor; | |
| 3801 wp->w_cursor.lnum = lnum; | |
| 1536 | 3802 wp->w_cursor.col = linecol; |
| 534 | 3803 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3804 |
| 3805 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3806 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3807 ptr = line + linecol; | |
| 3808 | |
| 530 | 3809 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3810 { |
| 3811 /* no bad word found at line start, don't check until end of a | |
| 3812 * word */ | |
| 534 | 3813 spell_hlf = HLF_COUNT; |
| 3572 | 3814 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3815 } |
| 3816 else | |
| 534 | 3817 { |
| 499 | 3818 /* bad word found, use attributes until end of word */ |
| 3819 word_end = wp->w_cursor.col + len + 1; | |
| 3820 | |
| 534 | 3821 /* Turn index into actual attributes. */ |
| 3822 if (spell_hlf != HLF_COUNT) | |
| 3823 spell_attr = highlight_attr[spell_hlf]; | |
| 3824 } | |
| 499 | 3825 wp->w_cursor = pos; |
| 501 | 3826 |
| 743 | 3827 # ifdef FEAT_SYN_HL |
| 501 | 3828 /* Need to restart syntax highlighting for this line. */ |
| 3829 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3830 syntax_start(wp, lnum); |
| 743 | 3831 # endif |
| 499 | 3832 } |
| 3833 #endif | |
| 7 | 3834 } |
| 3835 | |
| 3836 /* | |
| 3837 * Correct highlighting for cursor that can't be disabled. | |
| 3838 * Avoids having to check this for each character. | |
| 3839 */ | |
| 3840 if (fromcol >= 0) | |
| 3841 { | |
| 3842 if (noinvcur) | |
| 3843 { | |
| 3844 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3845 { | |
| 3846 /* highlighting starts at cursor, let it start just after the | |
| 3847 * cursor */ | |
| 3848 fromcol_prev = fromcol; | |
| 3849 fromcol = -1; | |
| 3850 } | |
| 3851 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3852 /* restart highlighting after the cursor */ | |
| 3853 fromcol_prev = wp->w_virtcol; | |
| 3854 } | |
| 3855 if (fromcol >= tocol) | |
| 3856 fromcol = -1; | |
| 3857 } | |
| 3858 | |
| 3859 #ifdef FEAT_SEARCH_EXTRA | |
| 3860 /* | |
| 1326 | 3861 * Handle highlighting the last used search pattern and matches. |
| 3862 * 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
|
3863 * Not in a popup window. |
| 7 | 3864 */ |
| 1326 | 3865 cur = wp->w_match_head; |
| 3866 shl_flag = FALSE; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3867 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
|
3868 && !(screen_line_flags & SLF_POPUP)) |
| 1326 | 3869 { |
| 3870 if (shl_flag == FALSE) | |
| 3871 { | |
| 3872 shl = &search_hl; | |
| 3873 shl_flag = TRUE; | |
| 3874 } | |
| 3875 else | |
| 3876 shl = &cur->hl; | |
| 36 | 3877 shl->startcol = MAXCOL; |
| 3878 shl->endcol = MAXCOL; | |
| 7 | 3879 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3880 shl->is_addpos = FALSE; |
| 5979 | 3881 v = (long)(ptr - line); |
| 3882 if (cur != NULL) | |
| 3883 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3884 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
|
3885 shl == &search_hl ? NULL : cur); |
| 5979 | 3886 |
| 3887 /* Need to get the line again, a multi-line regexp may have made it | |
| 3888 * invalid. */ | |
| 3889 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3890 ptr = line + v; | |
| 3891 | |
| 3892 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3893 { | |
| 3894 if (shl->lnum == lnum) | |
| 3895 shl->startcol = shl->rm.startpos[0].col; | |
| 3896 else | |
| 3897 shl->startcol = 0; | |
| 3898 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3899 - shl->rm.startpos[0].lnum) | |
| 3900 shl->endcol = shl->rm.endpos[0].col; | |
| 3901 else | |
| 3902 shl->endcol = MAXCOL; | |
| 3903 /* Highlight one character for an empty match. */ | |
| 3904 if (shl->startcol == shl->endcol) | |
| 3905 { | |
| 3906 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3907 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3908 else |
| 5979 | 3909 ++shl->endcol; |
| 3910 } | |
| 3911 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3912 { | |
| 3913 shl->attr_cur = shl->attr; | |
| 3914 search_attr = shl->attr; | |
| 3915 } | |
| 3916 area_highlighting = TRUE; | |
| 7 | 3917 } |
| 1326 | 3918 if (shl != &search_hl && cur != NULL) |
| 3919 cur = cur->next; | |
| 7 | 3920 } |
| 3921 #endif | |
| 3922 | |
| 743 | 3923 #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
|
3924 // 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
|
3925 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
|
3926 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3927 // 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
|
3928 // 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
|
3929 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
|
3930 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3931 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
|
3932 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3933 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
3934 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 3935 } |
| 3936 #endif | |
| 3937 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3938 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3939 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3940 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3941 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3942 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
|
3943 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3944 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3945 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3946 // 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
|
3947 // 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
|
3948 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
|
3949 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3950 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
|
3951 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
|
3952 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3953 // 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
|
3954 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
|
3955 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3956 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3957 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3958 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3959 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3960 |
| 504 | 3961 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3962 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3963 |
| 7 | 3964 #ifdef FEAT_RIGHTLEFT |
| 3965 if (wp->w_p_rl) | |
| 3966 { | |
| 3967 /* Rightleft window: process the text in the normal direction, but put | |
| 3968 * it in current_ScreenLine[] from right to left. Start at the | |
| 3969 * 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
|
3970 col = wp->w_width - 1; |
| 7 | 3971 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3972 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 3973 } |
| 3974 #endif | |
| 3975 | |
| 3976 /* | |
| 3977 * Repeat for the whole displayed line. | |
| 3978 */ | |
| 3979 for (;;) | |
| 3980 { | |
| 6947 | 3981 #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
|
3982 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
|
3983 int did_decrement_ptr = FALSE; |
| 6947 | 3984 #endif |
| 7 | 3985 /* Skip this quickly when working on the text. */ |
| 3986 if (draw_state != WL_LINE) | |
| 3987 { | |
| 3988 #ifdef FEAT_CMDWIN | |
| 3989 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3990 { | |
| 3991 draw_state = WL_CMDLINE; | |
| 3992 if (cmdwin_type != 0 && wp == curwin) | |
| 3993 { | |
| 3994 /* Draw the cmdline character. */ | |
| 3995 n_extra = 1; | |
| 1340 | 3996 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
|
3997 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
|
3998 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_AT)); |
| 7 | 3999 } |
| 4000 } | |
| 4001 #endif | |
| 4002 | |
| 4003 #ifdef FEAT_FOLDING | |
| 4004 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 4005 { | |
| 6553 | 4006 int fdc = compute_foldcolumn(wp, 0); |
| 4007 | |
| 7 | 4008 draw_state = WL_FOLD; |
| 6553 | 4009 if (fdc > 0) |
| 7 | 4010 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4011 /* 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
|
4012 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4013 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4014 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4015 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4016 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4017 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4018 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
|
4019 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4020 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4021 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4022 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
|
4023 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
|
4024 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
|
4025 } |
| 7 | 4026 } |
| 4027 } | |
| 4028 #endif | |
| 4029 | |
| 4030 #ifdef FEAT_SIGNS | |
| 4031 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 4032 { | |
| 4033 draw_state = WL_SIGN; | |
| 4034 /* Show the sign column when there are any signs in this | |
| 4035 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
4036 if (signcolumn_on(wp)) |
| 7 | 4037 { |
| 2661 | 4038 int text_sign; |
| 7 | 4039 # ifdef FEAT_SIGN_ICONS |
| 2661 | 4040 int icon_sign; |
| 7 | 4041 # endif |
| 4042 | |
| 4043 /* Draw two cells with the sign value or blank. */ | |
| 4044 c_extra = ' '; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4045 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
|
4046 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC)); |
| 7 | 4047 n_extra = 2; |
| 4048 | |
| 5921 | 4049 if (row == startrow |
| 4050 #ifdef FEAT_DIFF | |
| 4051 + filler_lines && filler_todo <= 0 | |
| 4052 #endif | |
| 4053 ) | |
| 7 | 4054 { |
| 4055 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 4056 SIGN_TEXT); | |
| 4057 # ifdef FEAT_SIGN_ICONS | |
| 4058 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 4059 SIGN_ICON); | |
| 4060 if (gui.in_use && icon_sign != 0) | |
| 4061 { | |
| 4062 /* Use the image in this position. */ | |
| 4063 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
|
4064 c_final = NUL; |
| 7 | 4065 # ifdef FEAT_NETBEANS_INTG |
| 4066 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
|
4067 { |
| 7 | 4068 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
|
4069 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4070 } |
| 7 | 4071 # endif |
| 4072 char_attr = icon_sign; | |
| 4073 } | |
| 4074 else | |
| 4075 # endif | |
| 4076 if (text_sign != 0) | |
| 4077 { | |
| 4078 p_extra = sign_get_text(text_sign); | |
| 4079 if (p_extra != NULL) | |
| 4080 { | |
| 4081 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
|
4082 c_final = NUL; |
| 835 | 4083 n_extra = (int)STRLEN(p_extra); |
| 7 | 4084 } |
| 4085 char_attr = sign_get_attr(text_sign, FALSE); | |
| 4086 } | |
| 4087 } | |
| 4088 } | |
| 4089 } | |
| 4090 #endif | |
| 4091 | |
| 4092 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 4093 { | |
| 4094 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4095 /* 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
|
4096 * 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
|
4097 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 4098 && (row == startrow |
| 4099 #ifdef FEAT_DIFF | |
| 4100 + filler_lines | |
| 4101 #endif | |
| 4102 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 4103 { | |
| 4104 /* Draw the line number (empty space after wrapping). */ | |
| 4105 if (row == startrow | |
| 4106 #ifdef FEAT_DIFF | |
| 4107 + filler_lines | |
| 4108 #endif | |
| 4109 ) | |
| 4110 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4111 long num; |
| 4065 | 4112 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4113 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4114 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
|
4115 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4116 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4117 else |
| 4065 | 4118 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4119 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 4120 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
|
4121 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 4122 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4123 /* 'number' + 'relativenumber' */ |
| 4065 | 4124 num = lnum; |
| 4125 fmt = "%-*ld "; | |
| 4126 } | |
| 4127 } | |
| 4128 | |
| 4129 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4130 number_width(wp), num); |
| 7 | 4131 if (wp->w_skipcol > 0) |
| 4132 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 4133 *p_extra = '-'; | |
| 4134 #ifdef FEAT_RIGHTLEFT | |
| 4135 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
|
4136 { |
|
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
|
4137 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
|
4138 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
|
4139 |
|
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
|
4140 // 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
|
4141 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
|
4142 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
|
4143 { |
|
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
|
4144 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
|
4145 *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
|
4146 *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
|
4147 } |
|
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
|
4148 } |
| 7 | 4149 #endif |
| 4150 p_extra = extra; | |
| 4151 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
|
4152 c_final = NUL; |
| 7 | 4153 } |
| 4154 else | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4155 { |
| 7 | 4156 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4157 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4158 } |
| 13 | 4159 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
|
4160 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_N)); |
| 743 | 4161 #ifdef FEAT_SYN_HL |
| 4162 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 4163 * the current line differently. |
| 4164 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 4165 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4166 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 4167 && 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
|
4168 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); |
| 743 | 4169 #endif |
| 7 | 4170 } |
| 4171 } | |
| 4172 | |
| 5995 | 4173 #ifdef FEAT_LINEBREAK |
| 4174 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4175 && n_extra == 0 && *p_sbr != NUL) | |
| 4176 /* draw indent after showbreak value */ | |
| 4177 draw_state = WL_BRI; | |
| 4178 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4179 /* After the showbreak, draw the breakindent */ | |
| 4180 draw_state = WL_BRI - 1; | |
| 4181 | |
| 4182 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4183 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4184 { | |
| 4185 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4186 /* 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
|
4187 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
|
4188 && (row != startrow || need_showbreak) |
| 5995 | 4189 # ifdef FEAT_DIFF |
| 4190 && filler_lines == 0 | |
| 6834 | 4191 # endif |
| 5995 | 4192 ) |
| 4193 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4194 char_attr = 0; |
| 6834 | 4195 # ifdef FEAT_DIFF |
| 5995 | 4196 if (diff_hlf != (hlf_T)0) |
| 6106 | 4197 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4198 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4199 # ifdef FEAT_SYN_HL |
| 6106 | 4200 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4201 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
|
4202 HL_ATTR(HLF_CUL)); |
| 6834 | 4203 # endif |
| 6106 | 4204 } |
| 6834 | 4205 # endif |
| 6028 | 4206 p_extra = NULL; |
| 5995 | 4207 c_extra = ' '; |
| 4208 n_extra = get_breakindent_win(wp, | |
| 4209 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4210 /* Correct end of highlighted area for 'breakindent', | |
| 4211 * required when 'linebreak' is also set. */ | |
| 4212 if (tocol == vcol) | |
| 4213 tocol += n_extra; | |
| 4214 } | |
| 4215 } | |
| 4216 #endif | |
| 4217 | |
| 7 | 4218 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4219 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4220 { | |
| 4221 draw_state = WL_SBR; | |
| 4222 # ifdef FEAT_DIFF | |
| 4223 if (filler_todo > 0) | |
| 4224 { | |
| 4225 /* Draw "deleted" diff line(s). */ | |
| 4226 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
|
4227 { |
| 7 | 4228 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4229 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4230 } |
| 7 | 4231 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4232 { |
| 7 | 4233 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
|
4234 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4235 } |
| 7 | 4236 # ifdef FEAT_RIGHTLEFT |
| 4237 if (wp->w_p_rl) | |
| 4238 n_extra = col + 1; | |
| 4239 else | |
| 4240 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4241 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
|
4242 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4243 } |
| 4244 # endif | |
| 4245 # ifdef FEAT_LINEBREAK | |
| 4246 if (*p_sbr != NUL && need_showbreak) | |
| 4247 { | |
| 4248 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4249 p_extra = p_sbr; | |
| 4250 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
|
4251 c_final = NUL; |
| 7 | 4252 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
|
4253 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4254 need_showbreak = FALSE; |
| 6503 | 4255 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4256 /* Correct end of highlighted area for 'showbreak', |
| 4257 * required when 'linebreak' is also set. */ | |
| 4258 if (tocol == vcol) | |
| 4259 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4260 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4261 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4262 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4263 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
|
4264 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4265 #endif |
| 7 | 4266 } |
| 4267 # endif | |
| 4268 } | |
| 4269 #endif | |
| 4270 | |
| 4271 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4272 { | |
| 4273 draw_state = WL_LINE; | |
| 4274 if (saved_n_extra) | |
| 4275 { | |
| 4276 /* Continue item from end of wrapped line. */ | |
| 4277 n_extra = saved_n_extra; | |
| 4278 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
|
4279 c_final = saved_c_final; |
| 7 | 4280 p_extra = saved_p_extra; |
| 4281 char_attr = saved_char_attr; | |
| 4282 } | |
| 4283 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4284 char_attr = win_attr; |
| 7 | 4285 } |
| 4286 } | |
| 4287 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4288 // 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
|
4289 // 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
|
4290 // 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
|
4291 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4292 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4293 #ifdef FEAT_DIFF |
| 4294 && filler_todo <= 0 | |
| 4295 #endif | |
| 4296 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4297 || (number_only && draw_state > WL_NR)) |
| 7 | 4298 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4299 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
|
4300 screen_line_flags); |
| 819 | 4301 /* Pretend we have finished updating the window. Except when |
| 4302 * 'cursorcolumn' is set. */ | |
| 4303 #ifdef FEAT_SYN_HL | |
| 4304 if (wp->w_p_cuc) | |
| 4305 row = wp->w_cline_row + wp->w_cline_height; | |
| 4306 else | |
| 4307 #endif | |
| 4308 row = wp->w_height; | |
| 7 | 4309 break; |
| 4310 } | |
| 4311 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4312 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
|
4313 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4314 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4315 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4316 )) |
| 7 | 4317 { |
| 4318 /* handle Visual or match highlighting in this line */ | |
| 4319 if (vcol == fromcol | |
| 4320 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4321 && (*mb_ptr2cells)(ptr) > 1) | |
| 4322 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4323 && vcol_prev < vcol /* not at margin */ |
| 7 | 4324 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4325 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4326 else if (area_attr != 0 |
| 4327 && (vcol == tocol | |
| 4328 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4329 area_attr = 0; /* stop highlighting */ | |
| 4330 | |
| 4331 #ifdef FEAT_SEARCH_EXTRA | |
| 4332 if (!n_extra) | |
| 4333 { | |
| 4334 /* | |
| 4335 * Check for start/end of search pattern match. | |
| 4336 * After end, check for start/end of next match. | |
| 4337 * When another match, have to check for start again. | |
| 4338 * Watch out for matching an empty string! | |
| 1326 | 4339 * Do this for 'search_hl' and the match list (ordered by |
| 4340 * priority). | |
| 7 | 4341 */ |
| 36 | 4342 v = (long)(ptr - line); |
| 1326 | 4343 cur = wp->w_match_head; |
| 4344 shl_flag = FALSE; | |
| 4345 while (cur != NULL || shl_flag == FALSE) | |
| 4346 { | |
| 4347 if (shl_flag == FALSE | |
| 4348 && ((cur != NULL | |
| 4349 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4350 || cur == NULL)) | |
| 4351 { | |
| 4352 shl = &search_hl; | |
| 4353 shl_flag = TRUE; | |
| 4354 } | |
| 4355 else | |
| 4356 shl = &cur->hl; | |
| 5979 | 4357 if (cur != NULL) |
| 4358 cur->pos.cur = 0; | |
| 4359 pos_inprogress = TRUE; | |
| 4360 while (shl->rm.regprog != NULL | |
| 4361 || (cur != NULL && pos_inprogress)) | |
| 7 | 4362 { |
| 36 | 4363 if (shl->startcol != MAXCOL |
| 4364 && v >= (long)shl->startcol | |
| 4365 && v < (long)shl->endcol) | |
| 7 | 4366 { |
| 6430 | 4367 int tmp_col = v + MB_PTR2LEN(ptr); |
| 4368 | |
| 4369 if (shl->endcol < tmp_col) | |
| 4370 shl->endcol = tmp_col; | |
| 7 | 4371 shl->attr_cur = shl->attr; |
| 6947 | 4372 #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
|
4373 // 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
|
4374 // the match. |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4375 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
|
4376 && 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
|
4377 && 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
|
4378 == cur->hlg_id) |
| 6947 | 4379 { |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4380 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4381 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4382 match_conc = cur->conceal_char; |
| 4383 } | |
| 4384 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4385 has_match_conc = match_conc = 0; |
| 6947 | 4386 #endif |
| 7 | 4387 } |
| 6430 | 4388 else if (v == (long)shl->endcol) |
| 7 | 4389 { |
| 4390 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4391 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
|
4392 shl == &search_hl ? NULL : cur); |
| 5979 | 4393 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4394 ? FALSE : TRUE; |
| 7 | 4395 |
| 4396 /* Need to get the line again, a multi-line regexp | |
| 4397 * may have made it invalid. */ | |
| 4398 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4399 ptr = line + v; | |
| 4400 | |
| 4401 if (shl->lnum == lnum) | |
| 4402 { | |
| 36 | 4403 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4404 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4405 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4406 else |
| 36 | 4407 shl->endcol = MAXCOL; |
| 4408 | |
| 4409 if (shl->startcol == shl->endcol) | |
| 7 | 4410 { |
| 4411 /* highlight empty match, try again after | |
| 4412 * it */ | |
| 4413 if (has_mbyte) | |
| 474 | 4414 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4415 + shl->endcol); |
| 7 | 4416 else |
| 36 | 4417 ++shl->endcol; |
| 7 | 4418 } |
| 4419 | |
| 4420 /* Loop to check if the match starts at the | |
| 4421 * current position */ | |
| 4422 continue; | |
| 4423 } | |
| 4424 } | |
| 4425 break; | |
| 4426 } | |
| 1326 | 4427 if (shl != &search_hl && cur != NULL) |
| 4428 cur = cur->next; | |
| 4429 } | |
| 4430 | |
| 4431 /* Use attributes from match with highest priority among | |
| 4432 * 'search_hl' and the match list. */ | |
| 4433 search_attr = search_hl.attr_cur; | |
| 4434 cur = wp->w_match_head; | |
| 4435 shl_flag = FALSE; | |
| 4436 while (cur != NULL || shl_flag == FALSE) | |
| 4437 { | |
| 4438 if (shl_flag == FALSE | |
| 4439 && ((cur != NULL | |
| 4440 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4441 || cur == NULL)) | |
| 699 | 4442 { |
| 1326 | 4443 shl = &search_hl; |
| 4444 shl_flag = TRUE; | |
| 699 | 4445 } |
| 1326 | 4446 else |
| 4447 shl = &cur->hl; | |
| 4448 if (shl->attr_cur != 0) | |
| 4449 search_attr = shl->attr_cur; | |
| 4450 if (shl != &search_hl && cur != NULL) | |
| 4451 cur = cur->next; | |
| 4452 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4453 /* 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
|
4454 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
|
4455 || (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
|
4456 search_attr = 0; |
| 7 | 4457 } |
| 4458 #endif | |
| 4459 | |
| 4460 #ifdef FEAT_DIFF | |
| 674 | 4461 if (diff_hlf != (hlf_T)0) |
| 7 | 4462 { |
| 1295 | 4463 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4464 && n_extra == 0) | |
| 7 | 4465 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4466 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4467 && n_extra == 0) | |
| 7 | 4468 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
|
4469 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4470 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
|
4471 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4472 } |
| 4473 #endif | |
| 4474 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4475 #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
|
4476 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
|
4477 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4478 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4479 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
|
4480 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4481 // 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
|
4482 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
|
4483 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4484 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
|
4485 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4486 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
|
4487 + 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
|
4488 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4489 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
|
4490 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
|
4491 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
|
4492 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4493 * (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
|
4494 --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
|
4495 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4496 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4497 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4498 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4499 // 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
|
4500 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
|
4501 && 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
|
4502 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
|
4503 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4504 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
|
4505 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
|
4506 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
|
4507 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4508 // 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
|
4509 // 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
|
4510 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
|
4511 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
|
4512 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
|
4513 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
|
4514 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4515 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
|
4516 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4517 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
|
4518 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
|
4519 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
|
4520 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4521 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
|
4522 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4523 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
|
4524 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4525 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
|
4526 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4527 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
|
4528 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
|
4529 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4530 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4531 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4532 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4533 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4534 |
| 674 | 4535 /* Decide which of the highlight attributes to use. */ |
| 4536 attr_pri = TRUE; | |
| 6717 | 4537 #ifdef LINE_ATTR |
| 674 | 4538 if (area_attr != 0) |
| 6717 | 4539 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4540 else if (search_attr != 0) |
| 6717 | 4541 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
|
4542 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4543 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
|
4544 { |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4545 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
|
4546 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
|
4547 } |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4548 # endif |
| 674 | 4549 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4550 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4551 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4552 // 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
|
4553 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4554 char_attr = line_attr; |
| 6717 | 4555 #else |
| 4556 if (area_attr != 0) | |
| 4557 char_attr = area_attr; | |
| 4558 else if (search_attr != 0) | |
| 4559 char_attr = search_attr; | |
| 674 | 4560 #endif |
| 4561 else | |
| 4562 { | |
| 4563 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4564 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4565 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
|
4566 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4567 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
|
4568 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
|
4569 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
|
4570 else |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4571 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
|
4572 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
|
4573 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4574 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4575 #endif |
| 674 | 4576 #ifdef FEAT_SYN_HL |
| 4577 if (has_syntax) | |
| 4578 char_attr = syntax_attr; | |
| 4579 else | |
| 4580 #endif | |
| 4581 char_attr = 0; | |
| 4582 } | |
| 7 | 4583 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4584 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4585 char_attr = win_attr; |
| 7 | 4586 |
| 4587 /* | |
| 4588 * Get the next character to put on the screen. | |
| 4589 */ | |
| 4590 /* | |
| 1340 | 4591 * The "p_extra" points to the extra stuff that is inserted to |
| 4592 * represent special characters (non-printable stuff) and other | |
| 4593 * 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
|
4594 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4595 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4596 * "p_extra[n_extra]". | |
| 7 | 4597 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4598 */ | |
| 4599 if (n_extra > 0) | |
| 4600 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4601 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
|
4602 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4603 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4604 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
|
4605 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4606 { |
| 4607 mb_utf8 = TRUE; | |
| 714 | 4608 u8cc[0] = 0; |
| 819 | 4609 c = 0xc0; |
| 7 | 4610 } |
| 4611 else | |
| 4612 mb_utf8 = FALSE; | |
| 4613 } | |
| 4614 else | |
| 4615 { | |
| 4616 c = *p_extra; | |
| 4617 if (has_mbyte) | |
| 4618 { | |
| 4619 mb_c = c; | |
| 4620 if (enc_utf8) | |
| 4621 { | |
| 4622 /* If the UTF-8 character is more than one byte: | |
| 4623 * 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
|
4624 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4625 mb_utf8 = FALSE; |
| 4626 if (mb_l > n_extra) | |
| 4627 mb_l = 1; | |
| 4628 else if (mb_l > 1) | |
| 4629 { | |
| 714 | 4630 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4631 mb_utf8 = TRUE; |
| 819 | 4632 c = 0xc0; |
| 7 | 4633 } |
| 4634 } | |
| 4635 else | |
| 4636 { | |
| 4637 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4638 mb_l = MB_BYTE2LEN(c); | |
| 4639 if (mb_l >= n_extra) | |
| 4640 mb_l = 1; | |
| 4641 else if (mb_l > 1) | |
| 4642 mb_c = (c << 8) + p_extra[1]; | |
| 4643 } | |
| 504 | 4644 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4645 mb_l = 1; | |
| 4646 | |
| 7 | 4647 /* If a double-width char doesn't fit display a '>' in the |
| 4648 * last column. */ | |
| 504 | 4649 if (( |
| 7 | 4650 # ifdef FEAT_RIGHTLEFT |
| 4651 wp->w_p_rl ? (col <= 0) : | |
| 4652 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4653 (col >= wp->w_width - 1)) |
| 7 | 4654 && (*mb_char2cells)(mb_c) == 2) |
| 4655 { | |
| 4656 c = '>'; | |
| 4657 mb_c = c; | |
| 4658 mb_l = 1; | |
| 4659 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
|
4660 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4661 /* put the pointer back to output the double-width |
| 4662 * character at the start of the next line. */ | |
| 4663 ++n_extra; | |
| 4664 --p_extra; | |
| 4665 } | |
| 4666 else | |
| 4667 { | |
| 4668 n_extra -= mb_l - 1; | |
| 4669 p_extra += mb_l - 1; | |
| 4670 } | |
| 4671 } | |
| 4672 ++p_extra; | |
| 4673 } | |
| 4674 --n_extra; | |
| 4675 } | |
| 4676 else | |
| 4677 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4678 #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
|
4679 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4680 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4681 |
| 6026 | 4682 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
|
4683 VIM_CLEAR(p_extra_free); |
| 7 | 4684 /* |
| 4685 * Get a character from the line itself. | |
| 4686 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4687 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4688 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4689 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4690 #endif |
| 7 | 4691 if (has_mbyte) |
| 4692 { | |
| 4693 mb_c = c; | |
| 4694 if (enc_utf8) | |
| 4695 { | |
| 4696 /* If the UTF-8 character is more than one byte: Decode it | |
| 4697 * 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
|
4698 mb_l = utfc_ptr2len(ptr); |
| 7 | 4699 mb_utf8 = FALSE; |
| 4700 if (mb_l > 1) | |
| 4701 { | |
| 714 | 4702 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4703 /* Overlong encoded ASCII or ASCII with composing char |
| 4704 * is displayed normally, except a NUL. */ | |
| 4705 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
|
4706 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4707 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4708 #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
|
4709 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4710 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4711 } |
| 7 | 4712 mb_utf8 = TRUE; |
| 507 | 4713 |
| 4714 /* At start of the line we can have a composing char. | |
| 4715 * Draw it as a space with a composing char. */ | |
| 4716 if (utf_iscomposing(mb_c)) | |
| 4717 { | |
| 1326 | 4718 int i; |
| 4719 | |
| 714 | 4720 for (i = Screen_mco - 1; i > 0; --i) |
| 4721 u8cc[i] = u8cc[i - 1]; | |
| 4722 u8cc[0] = mb_c; | |
| 507 | 4723 mb_c = ' '; |
| 4724 } | |
| 7 | 4725 } |
| 4726 | |
| 4727 if ((mb_l == 1 && c >= 0x80) | |
| 4728 || (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
|
4729 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4730 { |
| 4731 /* | |
| 4732 * Illegal UTF-8 byte: display as <xx>. | |
| 4733 * Non-BMP character : display as ? or fullwidth ?. | |
| 4734 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4735 transchar_hex(extra, mb_c); |
| 714 | 4736 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4737 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
|
4738 rl_mirror(extra); |
| 714 | 4739 # endif |
| 7 | 4740 p_extra = extra; |
| 4741 c = *p_extra; | |
| 4742 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4743 mb_utf8 = (c >= 0x80); | |
| 4744 n_extra = (int)STRLEN(p_extra); | |
| 4745 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
|
4746 c_final = NUL; |
| 7 | 4747 if (area_attr == 0 && search_attr == 0) |
| 4748 { | |
| 4749 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
|
4750 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4751 saved_attr2 = char_attr; /* save current attr */ |
| 4752 } | |
| 4753 } | |
| 4754 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4755 mb_l = 1; | |
| 4756 #ifdef FEAT_ARABIC | |
| 4757 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4758 { | |
| 4759 /* Do Arabic shaping. */ | |
| 714 | 4760 int pc, pc1, nc; |
| 4761 int pcc[MAX_MCO]; | |
| 7 | 4762 |
| 4763 /* The idea of what is the previous and next | |
| 4764 * character depends on 'rightleft'. */ | |
| 4765 if (wp->w_p_rl) | |
| 4766 { | |
| 4767 pc = prev_c; | |
| 4768 pc1 = prev_c1; | |
| 4769 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4770 prev_c1 = u8cc[0]; |
| 7 | 4771 } |
| 4772 else | |
| 4773 { | |
| 714 | 4774 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4775 nc = prev_c; |
| 714 | 4776 pc1 = pcc[0]; |
| 7 | 4777 } |
| 4778 prev_c = mb_c; | |
| 4779 | |
| 714 | 4780 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4781 } |
| 4782 else | |
| 4783 prev_c = mb_c; | |
| 4784 #endif | |
| 4785 } | |
| 4786 else /* enc_dbcs */ | |
| 4787 { | |
| 4788 mb_l = MB_BYTE2LEN(c); | |
| 4789 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4790 mb_l = 1; | |
| 4791 else if (mb_l > 1) | |
| 4792 { | |
| 4793 /* We assume a second byte below 32 is illegal. | |
| 4794 * Hopefully this is OK for all double-byte encodings! | |
| 4795 */ | |
| 4796 if (ptr[1] >= 32) | |
| 4797 mb_c = (c << 8) + ptr[1]; | |
| 4798 else | |
| 4799 { | |
| 4800 if (ptr[1] == NUL) | |
| 4801 { | |
| 4802 /* head byte at end of line */ | |
| 4803 mb_l = 1; | |
| 4804 transchar_nonprint(extra, c); | |
| 4805 } | |
| 4806 else | |
| 4807 { | |
| 4808 /* illegal tail byte */ | |
| 4809 mb_l = 2; | |
| 4810 STRCPY(extra, "XX"); | |
| 4811 } | |
| 4812 p_extra = extra; | |
| 4813 n_extra = (int)STRLEN(extra) - 1; | |
| 4814 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
|
4815 c_final = NUL; |
| 7 | 4816 c = *p_extra++; |
| 4817 if (area_attr == 0 && search_attr == 0) | |
| 4818 { | |
| 4819 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
|
4820 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4821 saved_attr2 = char_attr; /* save current attr */ |
| 4822 } | |
| 4823 mb_c = c; | |
| 4824 } | |
| 4825 } | |
| 4826 } | |
| 4827 /* If a double-width char doesn't fit display a '>' in the | |
| 4828 * last column; the character is displayed at the start of the | |
| 4829 * next line. */ | |
| 4830 if (( | |
| 4831 # ifdef FEAT_RIGHTLEFT | |
| 4832 wp->w_p_rl ? (col <= 0) : | |
| 4833 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4834 (col >= wp->w_width - 1)) |
| 7 | 4835 && (*mb_char2cells)(mb_c) == 2) |
| 4836 { | |
| 4837 c = '>'; | |
| 4838 mb_c = c; | |
| 4839 mb_utf8 = FALSE; | |
| 4840 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
|
4841 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
|
4842 // 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
|
4843 // displayed at the start of the next line. |
| 7 | 4844 --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
|
4845 #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
|
4846 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
|
4847 #endif |
| 7 | 4848 } |
| 4849 else if (*ptr != NUL) | |
| 4850 ptr += mb_l - 1; | |
| 4851 | |
| 4852 /* 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
|
4853 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4854 * 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
|
4855 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4856 { |
| 4857 n_extra = 1; | |
| 3586 | 4858 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
|
4859 c_final = NUL; |
| 7 | 4860 c = ' '; |
| 4861 if (area_attr == 0 && search_attr == 0) | |
| 4862 { | |
| 4863 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
|
4864 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4865 saved_attr2 = char_attr; /* save current attr */ |
| 4866 } | |
| 4867 mb_c = c; | |
| 4868 mb_utf8 = FALSE; | |
| 4869 mb_l = 1; | |
| 4870 } | |
| 4871 | |
| 4872 } | |
| 4873 ++ptr; | |
| 4874 | |
| 4875 if (extra_check) | |
| 4876 { | |
| 743 | 4877 #ifdef FEAT_SPELL |
| 221 | 4878 int can_spell = TRUE; |
| 743 | 4879 #endif |
| 4880 | |
|
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
|
4881 #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
|
4882 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
|
4883 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4884 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
|
4885 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4886 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
|
4887 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
|
4888 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
|
4889 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
|
4890 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4891 #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
|
4892 |
| 743 | 4893 #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
|
4894 // 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
|
4895 // (double-wide char that doesn't fit). |
| 221 | 4896 v = (long)(ptr - line); |
| 4897 if (has_syntax && v > 0) | |
| 7 | 4898 { |
| 4899 /* Get the syntax attribute for the character. If there | |
| 4900 * is an error, disable syntax highlighting. */ | |
| 4901 save_did_emsg = did_emsg; | |
| 4902 did_emsg = FALSE; | |
| 4903 | |
| 221 | 4904 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4905 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4906 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4907 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4908 NULL, FALSE); |
| 7 | 4909 |
| 4910 if (did_emsg) | |
| 482 | 4911 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4912 wp->w_s->b_syn_error = TRUE; |
| 482 | 4913 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4914 syntax_attr = 0; |
| 482 | 4915 } |
| 7 | 4916 else |
| 4917 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4918 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4919 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4920 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4921 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
|
4922 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4923 #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
|
4924 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
|
4925 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4926 #endif |
| 7 | 4927 |
| 4928 /* Need to get the line again, a multi-line regexp may | |
| 4929 * have made it invalid. */ | |
| 4930 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4931 ptr = line + v; | |
| 4932 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4933 # 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
|
4934 // 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
|
4935 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
|
4936 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4937 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4938 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
|
4939 # 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
|
4940 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
|
4941 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4942 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
|
4943 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
|
4944 else |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4945 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
|
4946 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4947 # 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
|
4948 /* 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
|
4949 * 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
|
4950 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
|
4951 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
|
4952 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
|
4953 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
|
4954 # endif |
| 7 | 4955 } |
| 743 | 4956 #endif |
| 4957 | |
| 4958 #ifdef FEAT_SPELL | |
| 301 | 4959 /* Check spelling (unless at the end of the line). |
| 319 | 4960 * Only do this when there is no syntax highlighting, the |
| 4961 * @Spell cluster is not used or the current syntax item | |
| 4962 * contains the @Spell cluster. */ | |
| 348 | 4963 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4964 { |
| 230 | 4965 spell_attr = 0; |
| 743 | 4966 if (c != 0 && ( |
| 4967 # ifdef FEAT_SYN_HL | |
| 4968 !has_syntax || | |
| 4969 # endif | |
| 4970 can_spell)) | |
| 221 | 4971 { |
| 348 | 4972 char_u *prev_ptr, *p; |
| 4973 int len; | |
| 534 | 4974 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 4975 if (has_mbyte) |
| 4976 { | |
| 4977 prev_ptr = ptr - mb_l; | |
| 4978 v -= mb_l - 1; | |
| 4979 } | |
| 4980 else | |
| 4981 prev_ptr = ptr - 1; | |
| 348 | 4982 |
| 4983 /* Use nextline[] if possible, it has the start of the | |
| 4984 * next line concatenated. */ | |
| 4985 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4986 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4987 else | |
| 4988 p = prev_ptr; | |
| 835 | 4989 cap_col -= (int)(prev_ptr - line); |
| 625 | 4990 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4991 nochange); | |
| 348 | 4992 word_end = v + len; |
| 301 | 4993 |
| 4994 /* In Insert mode only highlight a word that | |
| 4995 * doesn't touch the cursor. */ | |
| 534 | 4996 if (spell_hlf != HLF_COUNT |
| 301 | 4997 && (State & INSERT) != 0 |
| 4998 && wp->w_cursor.lnum == lnum | |
| 4999 && wp->w_cursor.col >= | |
| 5000 (colnr_T)(prev_ptr - line) | |
| 5001 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 5002 { |
| 534 | 5003 spell_hlf = HLF_COUNT; |
| 301 | 5004 spell_redraw_lnum = lnum; |
| 221 | 5005 } |
| 348 | 5006 |
| 534 | 5007 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 5008 && (p - nextline) + len > nextline_idx) |
| 5009 { | |
| 5010 /* Remember that the good word continues at the | |
| 5011 * start of the next line. */ | |
| 5012 checked_lnum = lnum + 1; | |
| 835 | 5013 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 5014 } |
| 386 | 5015 |
| 534 | 5016 /* Turn index into actual attributes. */ |
| 5017 if (spell_hlf != HLF_COUNT) | |
| 5018 spell_attr = highlight_attr[spell_hlf]; | |
| 5019 | |
| 386 | 5020 if (cap_col > 0) |
| 5021 { | |
| 5022 if (p != prev_ptr | |
| 5023 && (p - nextline) + cap_col >= nextline_idx) | |
| 5024 { | |
| 5025 /* Remember that the word in the next line | |
| 5026 * must start with a capital. */ | |
| 5027 capcol_lnum = lnum + 1; | |
| 835 | 5028 cap_col = (int)((p - nextline) + cap_col |
| 5029 - nextline_idx); | |
| 386 | 5030 } |
| 5031 else | |
| 5032 /* Compute the actual column. */ | |
| 835 | 5033 cap_col += (int)(prev_ptr - line); |
| 386 | 5034 } |
| 221 | 5035 } |
| 5036 } | |
| 5037 if (spell_attr != 0) | |
| 348 | 5038 { |
| 674 | 5039 if (!attr_pri) |
| 348 | 5040 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 5041 else | |
| 5042 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 5043 } | |
| 7 | 5044 #endif |
| 5045 #ifdef FEAT_LINEBREAK | |
| 5046 /* | |
| 221 | 5047 * Found last space before word: check for line break. |
| 7 | 5048 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
5049 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
|
5050 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 5051 { |
| 6693 | 5052 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
|
5053 char_u *p = ptr - (mb_off + 1); |
| 6681 | 5054 |
| 5995 | 5055 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 5056 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 5057 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5058 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
|
5059 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
5060 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
|
5061 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
|
5062 # else |
| 6371 | 5063 n_extra = (int)wp->w_buffer->b_p_ts |
| 5064 - 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
|
5065 # endif |
| 6371 | 5066 |
| 6693 | 5067 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
|
5068 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5069 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5070 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5071 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5072 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5073 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5074 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5075 #endif |
| 6026 | 5076 if (!wp->w_p_list) |
| 5077 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5078 } |
| 7 | 5079 } |
| 5080 #endif | |
| 5081 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5082 // '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
|
5083 // 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
|
5084 // 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
|
5085 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
|
5086 && ((((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
|
5087 || (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
|
5088 && ((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
|
5089 || (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
|
5090 && 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
|
5091 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5092 && 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
|
5093 && 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
|
5094 && 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
|
5095 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5096 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
|
5097 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
|
5098 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5099 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
|
5100 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
|
5101 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
|
5102 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5103 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
|
5104 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
|
5105 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5106 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
|
5107 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
|
5108 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5109 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5110 else |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5111 mb_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5112 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5113 |
| 7 | 5114 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 5115 { | |
| 5116 c = lcs_trail; | |
| 674 | 5117 if (!attr_pri) |
| 7 | 5118 { |
| 5119 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
|
5120 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5121 saved_attr2 = char_attr; /* save current attr */ |
| 5122 } | |
| 5123 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
|
5124 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5125 { |
| 5126 mb_utf8 = TRUE; | |
| 714 | 5127 u8cc[0] = 0; |
| 819 | 5128 c = 0xc0; |
| 7 | 5129 } |
| 5130 else | |
| 5131 mb_utf8 = FALSE; | |
| 5132 } | |
| 5133 } | |
| 5134 | |
| 5135 /* | |
| 5136 * Handling of non-printable characters. | |
| 5137 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
5138 if (!vim_isprintc(c)) |
| 7 | 5139 { |
| 5140 /* | |
| 5141 * when getting a character from the file, we may have to | |
| 5142 * turn it into something else on the way to putting it | |
| 5143 * into "ScreenLines". | |
| 5144 */ | |
| 5145 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 5146 { | |
| 6026 | 5147 int tab_len = 0; |
| 6503 | 5148 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 5149 #ifdef FEAT_LINEBREAK | |
| 5150 /* only adjust the tab_len, when at the first column | |
| 5151 * after the showbreak value was drawn */ | |
| 5152 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 5153 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 5154 #endif | |
| 7 | 5155 /* 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
|
5156 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5157 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
|
5158 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
|
5159 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
|
5160 #else |
| 6026 | 5161 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
|
5162 - 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
|
5163 #endif |
| 6503 | 5164 |
| 6026 | 5165 #ifdef FEAT_LINEBREAK |
| 6100 | 5166 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 5167 #endif |
| 5168 /* tab amount depends on current column */ | |
| 5169 n_extra = tab_len; | |
| 5170 #ifdef FEAT_LINEBREAK | |
| 5171 else | |
| 5172 { | |
| 5173 char_u *p; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5174 int len; |
| 6026 | 5175 int i; |
| 5176 int saved_nextra = n_extra; | |
| 5177 | |
| 6172 | 5178 #ifdef FEAT_CONCEAL |
| 6627 | 5179 if (vcol_off > 0) |
| 6172 | 5180 /* there are characters to conceal */ |
| 5181 tab_len += vcol_off; | |
| 6520 | 5182 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 5183 */ | |
| 5184 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 5185 && n_extra > tab_len) | |
| 5186 tab_len += n_extra - tab_len; | |
| 5187 #endif | |
| 5188 | |
| 6026 | 5189 /* if n_extra > 0, it gives the number of chars, to |
| 5190 * use for a tab, else we need to calculate the width | |
| 5191 * for a tab */ | |
| 5192 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 5193 if (n_extra > 0) | |
| 5194 len += n_extra - tab_len; | |
| 5195 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
|
5196 p = alloc(len + 1); |
| 6026 | 5197 vim_memset(p, ' ', len); |
| 5198 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5199 vim_free(p_extra_free); |
| 6026 | 5200 p_extra_free = p; |
| 5201 for (i = 0; i < tab_len; i++) | |
| 5202 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5203 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5204 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5205 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5206 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5207 } |
| 6026 | 5208 mb_char2bytes(lcs_tab2, p); |
| 5209 p += mb_char2len(lcs_tab2); | |
| 5210 n_extra += mb_char2len(lcs_tab2) | |
| 5211 - (saved_nextra > 0 ? 1 : 0); | |
| 5212 } | |
| 5213 p_extra = p_extra_free; | |
| 6172 | 5214 #ifdef FEAT_CONCEAL |
| 5215 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 5216 * macro below, so need to adjust for that here */ | |
| 6627 | 5217 if (vcol_off > 0) |
| 6172 | 5218 n_extra -= vcol_off; |
| 5219 #endif | |
| 6026 | 5220 } |
| 5221 #endif | |
| 3984 | 5222 #ifdef FEAT_CONCEAL |
| 6627 | 5223 { |
| 5224 int vc_saved = vcol_off; | |
| 5225 | |
| 5226 /* Tab alignment should be identical regardless of | |
| 5227 * 'conceallevel' value. So tab compensates of all | |
| 5228 * previous concealed characters, and thus resets | |
| 5229 * vcol_off and boguscols accumulated so far in the | |
| 5230 * line. Note that the tab can be longer than | |
| 5231 * 'tabstop' when there are concealed characters. */ | |
| 5232 FIX_FOR_BOGUSCOLS; | |
| 5233 | |
| 5234 /* Make sure, the highlighting for the tab char will be | |
| 5235 * correctly set further below (effectively reverts the | |
| 5236 * FIX_FOR_BOGSUCOLS macro */ | |
| 5237 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 5238 && lcs_tab1) |
| 6627 | 5239 tab_len += vc_saved; |
| 5240 } | |
| 3984 | 5241 #endif |
| 7 | 5242 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 5243 if (wp->w_p_list) | |
| 5244 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5245 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5246 #ifdef FEAT_LINEBREAK |
| 5247 if (wp->w_p_lbr) | |
| 5248 c_extra = NUL; /* using p_extra from above */ | |
| 5249 else | |
| 5250 #endif | |
| 5251 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
|
5252 c_final = lcs_tab3; |
| 6026 | 5253 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
|
5254 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5255 saved_attr2 = char_attr; /* save current attr */ |
| 5256 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
|
5257 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5258 { |
| 5259 mb_utf8 = TRUE; | |
| 714 | 5260 u8cc[0] = 0; |
| 819 | 5261 c = 0xc0; |
| 7 | 5262 } |
| 5263 } | |
| 5264 else | |
| 5265 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5266 c_final = NUL; |
| 7 | 5267 c_extra = ' '; |
| 5268 c = ' '; | |
| 5269 } | |
| 5270 } | |
| 36 | 5271 else if (c == NUL |
| 6799 | 5272 && (wp->w_p_list |
| 36 | 5273 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5274 && tocol > vcol | |
| 5275 && VIsual_mode != Ctrl_V | |
| 5276 && ( | |
| 5277 # ifdef FEAT_RIGHTLEFT | |
| 5278 wp->w_p_rl ? (col >= 0) : | |
| 5279 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5280 (col < wp->w_width)) |
| 36 | 5281 && !(noinvcur |
| 1850 | 5282 && lnum == wp->w_cursor.lnum |
| 36 | 5283 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5284 && lcs_eol_one > 0) |
| 7 | 5285 { |
| 36 | 5286 /* Display a '$' after the line or highlight an extra |
| 5287 * character if the line break is included. */ | |
| 7 | 5288 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5289 /* For a diff line the highlighting continues after the | |
| 5290 * "$". */ | |
| 5291 if ( | |
| 5292 # ifdef FEAT_DIFF | |
| 534 | 5293 diff_hlf == (hlf_T)0 |
| 7 | 5294 # ifdef LINE_ATTR |
| 5295 && | |
| 5296 # endif | |
| 5297 # endif | |
| 5298 # ifdef LINE_ATTR | |
| 5299 line_attr == 0 | |
| 5300 # endif | |
| 5301 ) | |
| 5302 #endif | |
| 5303 { | |
| 5304 /* In virtualedit, visual selections may extend | |
| 5305 * beyond end of line. */ | |
| 5306 if (area_highlighting && virtual_active() | |
| 5307 && tocol != MAXCOL && vcol < tocol) | |
| 5308 n_extra = 0; | |
| 5309 else | |
| 5310 { | |
| 5311 p_extra = at_end_str; | |
| 5312 n_extra = 1; | |
| 5313 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
|
5314 c_final = NUL; |
| 7 | 5315 } |
| 5316 } | |
| 6799 | 5317 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5318 c = lcs_eol; |
| 5319 else | |
| 5320 c = ' '; | |
| 7 | 5321 lcs_eol_one = -1; |
| 5322 --ptr; /* put it back at the NUL */ | |
| 674 | 5323 if (!attr_pri) |
| 7 | 5324 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5325 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5326 n_attr = 1; |
| 5327 } | |
| 5328 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
|
5329 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5330 { |
| 5331 mb_utf8 = TRUE; | |
| 714 | 5332 u8cc[0] = 0; |
| 819 | 5333 c = 0xc0; |
| 7 | 5334 } |
| 5335 else | |
| 5336 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5337 } | |
| 5338 else if (c != NUL) | |
| 5339 { | |
| 5340 p_extra = transchar(c); | |
| 6064 | 5341 if (n_extra == 0) |
| 5342 n_extra = byte2cells(c) - 1; | |
| 7 | 5343 #ifdef FEAT_RIGHTLEFT |
| 5344 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5345 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5346 #endif | |
| 5347 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
|
5348 c_final = NUL; |
| 6026 | 5349 #ifdef FEAT_LINEBREAK |
| 5350 if (wp->w_p_lbr) | |
| 5351 { | |
| 5352 char_u *p; | |
| 5353 | |
| 5354 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
|
5355 p = alloc(n_extra + 1); |
| 6026 | 5356 vim_memset(p, ' ', n_extra); |
| 5357 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5358 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5359 vim_free(p_extra_free); |
| 6026 | 5360 p_extra_free = p_extra = p; |
| 5361 } | |
| 5362 else | |
| 5363 #endif | |
| 5364 { | |
| 5365 n_extra = byte2cells(c) - 1; | |
| 5366 c = *p_extra++; | |
| 5367 } | |
| 674 | 5368 if (!attr_pri) |
| 7 | 5369 { |
| 5370 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
|
5371 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5372 saved_attr2 = char_attr; /* save current attr */ |
| 5373 } | |
| 5374 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5375 } | |
| 5376 else if (VIsual_active | |
| 5377 && (VIsual_mode == Ctrl_V | |
| 5378 || VIsual_mode == 'v') | |
| 5379 && virtual_active() | |
| 5380 && tocol != MAXCOL | |
| 5381 && vcol < tocol | |
| 5382 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5383 #ifdef FEAT_RIGHTLEFT |
| 7 | 5384 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5385 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5386 (col < wp->w_width))) |
| 7 | 5387 { |
| 5388 c = ' '; | |
| 5389 --ptr; /* put it back at the NUL */ | |
| 5390 } | |
| 910 | 5391 #if defined(LINE_ATTR) |
| 7 | 5392 else if (( |
| 5393 # ifdef FEAT_DIFF | |
| 910 | 5394 diff_hlf != (hlf_T)0 || |
| 7 | 5395 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5396 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5397 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
|
5398 # endif |
| 7 | 5399 line_attr != 0 |
| 5400 ) && ( | |
| 5401 # ifdef FEAT_RIGHTLEFT | |
| 5402 wp->w_p_rl ? (col >= 0) : | |
| 5403 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5404 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5405 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5406 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5407 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5408 < wp->w_width))) |
| 7 | 5409 { |
| 5410 /* Highlight until the right side of the window */ | |
| 5411 c = ' '; | |
| 5412 --ptr; /* put it back at the NUL */ | |
| 867 | 5413 |
| 5414 /* Remember we do the char for line highlighting. */ | |
| 5415 ++did_line_attr; | |
| 5416 | |
| 5417 /* 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
|
5418 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
|
5419 && (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
|
5420 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5421 char_attr = line_attr; |
| 7 | 5422 # ifdef FEAT_DIFF |
| 5423 if (diff_hlf == HLF_TXD) | |
| 5424 { | |
| 5425 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5426 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5427 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5428 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5429 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5430 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
|
5431 HL_ATTR(HLF_CUL)); |
| 6106 | 5432 } |
| 7 | 5433 } |
| 5434 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5435 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5436 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
|
5437 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5438 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
|
5439 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
|
5440 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
|
5441 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
|
5442 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5443 # endif |
| 7 | 5444 } |
| 5445 #endif | |
| 5446 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5447 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5448 #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
|
5449 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
|
5450 && (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
|
5451 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
|
5452 && ((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
|
5453 && !(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
|
5454 && 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
|
5455 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5456 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5457 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5458 && (syn_get_sub_char() != NUL || match_conc |
| 5459 || 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
|
5460 && 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
|
5461 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5462 /* 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
|
5463 * character. */ |
| 6947 | 5464 if (match_conc) |
| 5465 c = match_conc; | |
| 5466 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
|
5467 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5468 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5469 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5470 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5471 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5472 |
|
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
|
5473 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5474 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5475 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5476 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5477 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5478 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
|
5479 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5480 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5481 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5482 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5483 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5484 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5485 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5486 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5487 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5488 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5489 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5490 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5491 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5492 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5493 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5494 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5495 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5496 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5497 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5498 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5499 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5500 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5501 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
|
5502 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
|
5503 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5504 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5505 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5506 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5507 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5508 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5509 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
|
5510 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5511 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5512 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5513 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
|
5514 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5515 } |
|
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
|
5516 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5517 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
|
5518 // 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
|
5519 ++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
|
5520 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5521 #endif // FEAT_CONCEAL |
| 7 | 5522 } |
| 5523 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5524 #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
|
5525 /* 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
|
5526 * 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
|
5527 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
|
5528 && 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
|
5529 && 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
|
5530 && (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
|
5531 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5532 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5533 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
|
5534 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
|
5535 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5536 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5537 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
|
5538 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
|
5539 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
|
5540 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5541 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5542 |
| 7 | 5543 /* Don't override visual selection highlighting. */ |
| 5544 if (n_attr > 0 | |
| 5545 && draw_state == WL_LINE | |
| 674 | 5546 && !attr_pri) |
| 7 | 5547 char_attr = extra_attr; |
| 5548 | |
| 42 | 5549 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5550 /* XIM don't send preedit_start and preedit_end, but they send |
| 5551 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5552 * 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
|
5553 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
|
5554 && xic != NULL |
| 1850 | 5555 && lnum == wp->w_cursor.lnum |
| 7 | 5556 && (State & INSERT) |
| 5557 && !p_imdisable | |
| 5558 && im_is_preediting() | |
| 5559 && draw_state == WL_LINE) | |
| 5560 { | |
| 5561 colnr_T tcol; | |
| 5562 | |
| 5563 if (preedit_end_col == MAXCOL) | |
| 1850 | 5564 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5565 else |
| 5566 tcol = preedit_end_col; | |
| 5567 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5568 { | |
| 5569 if (feedback_old_attr < 0) | |
| 5570 { | |
| 5571 feedback_col = 0; | |
| 5572 feedback_old_attr = char_attr; | |
| 5573 } | |
| 5574 char_attr = im_get_feedback_attr(feedback_col); | |
| 5575 if (char_attr < 0) | |
| 5576 char_attr = feedback_old_attr; | |
| 5577 feedback_col++; | |
| 5578 } | |
| 5579 else if (feedback_old_attr >= 0) | |
| 5580 { | |
| 5581 char_attr = feedback_old_attr; | |
| 5582 feedback_old_attr = -1; | |
| 5583 feedback_col = 0; | |
| 5584 } | |
| 5585 } | |
| 5586 #endif | |
| 5587 /* | |
| 5588 * Handle the case where we are in column 0 but not on the first | |
| 5589 * character of the line and the user wants us to show us a | |
| 5590 * special character (via 'listchars' option "precedes:<char>". | |
| 5591 */ | |
| 5592 if (lcs_prec_todo != NUL | |
| 6276 | 5593 && wp->w_p_list |
| 7 | 5594 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5595 #ifdef FEAT_DIFF | |
| 5596 && filler_todo <= 0 | |
| 5597 #endif | |
| 5598 && draw_state > WL_NR | |
| 5599 && c != NUL) | |
| 5600 { | |
| 5601 c = lcs_prec; | |
| 5602 lcs_prec_todo = NUL; | |
| 3586 | 5603 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5604 { | |
| 5605 /* Double-width character being overwritten by the "precedes" | |
| 5606 * character, need to fill up half the character. */ | |
| 5607 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
|
5608 c_final = NUL; |
| 3586 | 5609 n_extra = 1; |
| 5610 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
|
5611 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5612 } |
| 7 | 5613 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
|
5614 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5615 { |
| 5616 mb_utf8 = TRUE; | |
| 714 | 5617 u8cc[0] = 0; |
| 819 | 5618 c = 0xc0; |
| 7 | 5619 } |
| 5620 else | |
| 5621 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5622 if (!attr_pri) |
| 7 | 5623 { |
| 5624 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
|
5625 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5626 n_attr3 = 1; |
| 5627 } | |
| 5628 } | |
| 5629 | |
| 5630 /* | |
| 867 | 5631 * At end of the text line or just after the last character. |
| 7 | 5632 */ |
| 867 | 5633 if (c == NUL |
| 910 | 5634 #if defined(LINE_ATTR) |
| 867 | 5635 || did_line_attr == 1 |
| 5636 #endif | |
| 5637 ) | |
| 5638 { | |
| 5639 #ifdef FEAT_SEARCH_EXTRA | |
| 5640 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5641 |
| 5642 /* we're not really at that column when skipping some text */ | |
| 1439 | 5643 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5644 ++prevcol; |
| 867 | 5645 #endif |
| 5646 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5647 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5648 * highlight match at end of line. If it's beyond the last |
| 5649 * char on the screen, just overwrite that one (tricky!) Not | |
| 5650 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5651 #ifdef FEAT_SEARCH_EXTRA |
| 5652 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5653 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5654 prevcol_hl_flag = TRUE; |
| 5655 else | |
| 5656 { | |
| 5657 cur = wp->w_match_head; | |
| 5658 while (cur != NULL) | |
| 5659 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5660 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5661 { |
| 5662 prevcol_hl_flag = TRUE; | |
| 5663 break; | |
| 5664 } | |
| 5665 cur = cur->next; | |
| 5666 } | |
| 5667 } | |
| 5668 #endif | |
| 7 | 5669 if (lcs_eol == lcs_eol_one |
| 1850 | 5670 && ((area_attr != 0 && vcol == fromcol |
| 5671 && (VIsual_mode != Ctrl_V | |
| 5672 || lnum == VIsual.lnum | |
| 5673 || lnum == curwin->w_cursor.lnum) | |
| 5674 && c == NUL) | |
| 7 | 5675 #ifdef FEAT_SEARCH_EXTRA |
| 5676 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5677 || (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
|
5678 # 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
|
5679 && !(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
|
5680 && !(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
|
5681 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5682 # 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
|
5683 && 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
|
5684 # endif |
| 910 | 5685 # if defined(LINE_ATTR) |
| 867 | 5686 && did_line_attr <= 1 |
| 5687 # endif | |
| 5688 ) | |
| 7 | 5689 #endif |
| 5690 )) | |
| 5691 { | |
| 5692 int n = 0; | |
| 5693 | |
| 5694 #ifdef FEAT_RIGHTLEFT | |
| 5695 if (wp->w_p_rl) | |
| 5696 { | |
| 5697 if (col < 0) | |
| 5698 n = 1; | |
| 5699 } | |
| 5700 else | |
| 5701 #endif | |
| 5702 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5703 if (col >= wp->w_width) |
| 7 | 5704 n = -1; |
| 5705 } | |
| 5706 if (n != 0) | |
| 5707 { | |
| 5708 /* At the window boundary, highlight the last character | |
| 5709 * instead (better than nothing). */ | |
| 5710 off += n; | |
| 5711 col += n; | |
| 5712 } | |
| 5713 else | |
| 5714 { | |
| 5715 /* Add a blank character to highlight. */ | |
| 5716 ScreenLines[off] = ' '; | |
| 5717 if (enc_utf8) | |
| 5718 ScreenLinesUC[off] = 0; | |
| 5719 } | |
| 5720 #ifdef FEAT_SEARCH_EXTRA | |
| 5721 if (area_attr == 0) | |
| 5722 { | |
| 1326 | 5723 /* Use attributes from match with highest priority among |
| 5724 * 'search_hl' and the match list. */ | |
| 5725 char_attr = search_hl.attr; | |
| 5726 cur = wp->w_match_head; | |
| 5727 shl_flag = FALSE; | |
| 5728 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5729 { |
| 1326 | 5730 if (shl_flag == FALSE |
| 5731 && ((cur != NULL | |
| 5732 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5733 || cur == NULL)) | |
| 699 | 5734 { |
| 1326 | 5735 shl = &search_hl; |
| 5736 shl_flag = TRUE; | |
| 699 | 5737 } |
| 1326 | 5738 else |
| 5739 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5740 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
|
5741 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5742 char_attr = shl->attr; |
| 5743 if (shl != &search_hl && cur != NULL) | |
| 5744 cur = cur->next; | |
| 699 | 5745 } |
| 7 | 5746 } |
| 5747 #endif | |
| 5748 ScreenAttrs[off] = char_attr; | |
| 5749 #ifdef FEAT_RIGHTLEFT | |
| 5750 if (wp->w_p_rl) | |
| 1437 | 5751 { |
| 7 | 5752 --col; |
| 1437 | 5753 --off; |
| 5754 } | |
| 7 | 5755 else |
| 5756 #endif | |
| 1437 | 5757 { |
| 7 | 5758 ++col; |
| 1437 | 5759 ++off; |
| 5760 } | |
| 743 | 5761 ++vcol; |
| 1437 | 5762 #ifdef FEAT_SYN_HL |
| 5763 eol_hl_off = 1; | |
| 5764 #endif | |
| 743 | 5765 } |
| 867 | 5766 } |
| 5767 | |
| 5768 /* | |
| 5769 * At end of the text line. | |
| 5770 */ | |
| 5771 if (c == NUL) | |
| 5772 { | |
| 743 | 5773 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5774 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5775 if (wp->w_p_wrap) |
| 5776 v = wp->w_skipcol; | |
| 5777 else | |
| 5778 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5779 |
| 820 | 5780 /* check if line ends before left margin */ |
| 5781 if (vcol < v + col - win_col_off(wp)) | |
| 5782 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
|
5783 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5784 // 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
|
5785 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5786 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5787 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5788 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5789 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5790 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5791 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
|
5792 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5793 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5794 && (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
|
5795 && (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
|
5796 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
|
5797 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5798 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5799 || win_attr != 0) |
| 743 | 5800 # ifdef FEAT_RIGHTLEFT |
| 5801 && !wp->w_p_rl | |
| 5802 # endif | |
| 5803 ) | |
| 5804 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5805 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5806 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5807 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5808 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5809 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5810 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5811 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5812 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
|
5813 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5814 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5815 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5816 while (col < wp->w_width) |
| 743 | 5817 { |
| 5818 ScreenLines[off] = ' '; | |
| 5819 if (enc_utf8) | |
| 5820 ScreenLinesUC[off] = 0; | |
| 5821 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5822 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5823 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
|
5824 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5825 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5826 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
|
5827 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
|
5828 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
|
5829 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5830 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5831 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5832 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5833 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5834 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5835 |
| 743 | 5836 ++vcol; |
| 5837 } | |
| 5838 } | |
| 5839 #endif | |
| 7 | 5840 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5841 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
|
5842 (int)wp->w_width, screen_line_flags); |
| 7 | 5843 row++; |
| 5844 | |
| 5845 /* | |
| 5846 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5847 * updated (saves a call to plines() later). | |
| 5848 */ | |
| 5849 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5850 { | |
| 5851 curwin->w_cline_row = startrow; | |
| 5852 curwin->w_cline_height = row - startrow; | |
| 5853 #ifdef FEAT_FOLDING | |
| 5854 curwin->w_cline_folded = FALSE; | |
| 5855 #endif | |
| 5856 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5857 } | |
| 5858 | |
| 5859 break; | |
| 5860 } | |
| 5861 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5862 // 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
|
5863 // '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
|
5864 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
|
5865 && wp->w_p_list |
| 7 | 5866 && !wp->w_p_wrap |
| 5867 #ifdef FEAT_DIFF | |
| 5868 && filler_todo <= 0 | |
| 5869 #endif | |
| 5870 && ( | |
| 5871 #ifdef FEAT_RIGHTLEFT | |
| 5872 wp->w_p_rl ? col == 0 : | |
| 5873 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5874 col == wp->w_width - 1) |
| 7 | 5875 && (*ptr != NUL |
| 1555 | 5876 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5877 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5878 { | |
| 5879 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
|
5880 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5881 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
|
5882 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5883 { |
| 5884 mb_utf8 = TRUE; | |
| 714 | 5885 u8cc[0] = 0; |
| 819 | 5886 c = 0xc0; |
| 7 | 5887 } |
| 5888 else | |
| 5889 mb_utf8 = FALSE; | |
| 5890 } | |
| 5891 | |
| 743 | 5892 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5893 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5894 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5895 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
|
5896 |
| 743 | 5897 /* 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
|
5898 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5899 * 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
|
5900 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5901 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
|
5902 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
|
5903 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5904 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5905 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
|
5906 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5907 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5908 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
|
5909 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
|
5910 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5911 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
|
5912 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5913 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
|
5914 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
|
5915 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5916 } |
| 743 | 5917 #endif |
| 5918 | |
| 7 | 5919 /* |
| 5920 * Store character to be displayed. | |
| 5921 * Skip characters that are left of the screen for 'nowrap'. | |
| 5922 */ | |
| 5923 vcol_prev = vcol; | |
| 5924 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5925 { | |
| 5926 /* | |
| 5927 * Store the character. | |
| 5928 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5929 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5930 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5931 { | |
| 5932 /* A double-wide character is: put first halve in left cell. */ | |
| 5933 --off; | |
| 5934 --col; | |
| 5935 } | |
| 5936 #endif | |
| 5937 ScreenLines[off] = c; | |
| 5938 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5939 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5940 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5941 ScreenLines[off] = 0x8e; |
| 7 | 5942 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5943 } |
| 7 | 5944 else if (enc_utf8) |
| 5945 { | |
| 5946 if (mb_utf8) | |
| 5947 { | |
| 1326 | 5948 int i; |
| 5949 | |
| 7 | 5950 ScreenLinesUC[off] = mb_c; |
| 819 | 5951 if ((c & 0xff) == 0) |
| 5952 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5953 for (i = 0; i < Screen_mco; ++i) |
| 5954 { | |
| 5955 ScreenLinesC[i][off] = u8cc[i]; | |
| 5956 if (u8cc[i] == 0) | |
| 5957 break; | |
| 5958 } | |
| 7 | 5959 } |
| 5960 else | |
| 5961 ScreenLinesUC[off] = 0; | |
| 5962 } | |
| 5963 if (multi_attr) | |
| 5964 { | |
| 5965 ScreenAttrs[off] = multi_attr; | |
| 5966 multi_attr = 0; | |
| 5967 } | |
| 5968 else | |
| 5969 ScreenAttrs[off] = char_attr; | |
| 5970 | |
| 5971 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5972 { | |
| 5973 /* Need to fill two screen columns. */ | |
| 5974 ++off; | |
| 5975 ++col; | |
| 5976 if (enc_utf8) | |
| 5977 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5978 ScreenLines[off] = 0; | |
| 5979 else | |
| 5980 /* DBCS: Put second byte in the second screen char. */ | |
| 5981 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5982 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5983 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5984 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5985 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5986 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5987 ++vcol; |
| 7 | 5988 /* When "tocol" is halfway a character, set it to the end of |
| 5989 * the character, otherwise highlighting won't stop. */ | |
| 5990 if (tocol == vcol) | |
| 5991 ++tocol; | |
| 5992 #ifdef FEAT_RIGHTLEFT | |
| 5993 if (wp->w_p_rl) | |
| 5994 { | |
| 5995 /* now it's time to backup one cell */ | |
| 5996 --off; | |
| 5997 --col; | |
| 5998 } | |
| 5999 #endif | |
| 6000 } | |
| 6001 #ifdef FEAT_RIGHTLEFT | |
| 6002 if (wp->w_p_rl) | |
| 6003 { | |
| 6004 --off; | |
| 6005 --col; | |
| 6006 } | |
| 6007 else | |
| 6008 #endif | |
| 6009 { | |
| 6010 ++off; | |
| 6011 ++col; | |
| 6012 } | |
| 6013 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6014 #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
|
6015 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
|
6016 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6017 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6018 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6019 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6020 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6021 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6022 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6023 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6024 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6025 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6026 * 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
|
6027 * 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
|
6028 * 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
|
6029 * 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
|
6030 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6031 * 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
|
6032 * 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
|
6033 * 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
|
6034 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6035 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6036 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6037 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6038 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6039 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6040 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6041 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6042 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6043 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6044 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6045 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6046 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6047 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6048 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6049 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6050 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6051 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6052 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6053 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6054 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6055 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6056 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
|
6057 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6058 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6059 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6060 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6061 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6062 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6063 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6064 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6065 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6066 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6067 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6068 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6069 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6070 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6071 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6072 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6073 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6074 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6075 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6076 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6077 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6078 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6079 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6080 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6081 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6082 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6083 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6084 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6085 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6086 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6087 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6088 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6089 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6090 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6091 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6092 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6093 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6094 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6095 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6096 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6097 #endif /* FEAT_CONCEAL */ |
| 7 | 6098 else |
| 6099 --n_skip; | |
| 6100 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
6101 /* 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
|
6102 * column. */ |
| 1849 | 6103 if (draw_state > WL_NR |
| 7 | 6104 #ifdef FEAT_DIFF |
| 6105 && filler_todo <= 0 | |
| 6106 #endif | |
| 6107 ) | |
| 6108 ++vcol; | |
| 6109 | |
| 743 | 6110 #ifdef FEAT_SYN_HL |
| 6111 if (vcol_save_attr >= 0) | |
| 6112 char_attr = vcol_save_attr; | |
| 6113 #endif | |
| 6114 | |
| 7 | 6115 /* restore attributes after "predeces" in 'listchars' */ |
| 6116 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 6117 char_attr = saved_attr3; | |
| 6118 | |
| 6119 /* restore attributes after last 'listchars' or 'number' char */ | |
| 6120 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 6121 char_attr = saved_attr2; | |
| 6122 | |
| 6123 /* | |
| 6124 * At end of screen line and there is more to come: Display the line | |
| 1378 | 6125 * so far. If there is no more to display it is caught above. |
| 7 | 6126 */ |
| 6127 if (( | |
| 6128 #ifdef FEAT_RIGHTLEFT | |
| 6129 wp->w_p_rl ? (col < 0) : | |
| 6130 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6131 (col >= wp->w_width)) |
| 7 | 6132 && (*ptr != NUL |
| 6133 #ifdef FEAT_DIFF | |
| 6134 || filler_todo > 0 | |
| 6135 #endif | |
| 2724 | 6136 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 6137 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 6138 ) | |
| 6139 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6140 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6141 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
|
6142 (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
|
6143 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6144 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6145 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
|
6146 (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
|
6147 #endif |
| 7 | 6148 ++row; |
| 6149 ++screen_row; | |
| 6150 | |
| 6151 /* When not wrapping and finished diff lines, or when displayed | |
| 6152 * '$' and highlighting until last column, break here. */ | |
| 6153 if ((!wp->w_p_wrap | |
| 6154 #ifdef FEAT_DIFF | |
| 6155 && filler_todo <= 0 | |
| 6156 #endif | |
| 6157 ) || lcs_eol_one == -1) | |
| 6158 break; | |
| 6159 | |
| 6160 /* When the window is too narrow draw all "@" lines. */ | |
| 6161 if (draw_state != WL_LINE | |
| 6162 #ifdef FEAT_DIFF | |
| 6163 && filler_todo <= 0 | |
| 6164 #endif | |
| 6165 ) | |
| 6166 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
6167 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 6168 draw_vsep_win(wp, row); |
| 6169 row = endrow; | |
| 6170 } | |
| 6171 | |
| 6172 /* When line got too long for screen break here. */ | |
| 6173 if (row == endrow) | |
| 6174 { | |
| 6175 ++row; | |
| 6176 break; | |
| 6177 } | |
| 6178 | |
| 6179 if (screen_cur_row == screen_row - 1 | |
| 6180 #ifdef FEAT_DIFF | |
| 6181 && filler_todo <= 0 | |
| 6182 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6183 && wp->w_width == Columns) |
| 7 | 6184 { |
| 6185 /* Remember that the line wraps, used for modeless copy. */ | |
| 6186 LineWraps[screen_row - 1] = TRUE; | |
| 6187 | |
| 6188 /* | |
| 6189 * Special trick to make copy/paste of wrapped lines work with | |
| 6190 * xterm/screen: write an extra character beyond the end of | |
| 6191 * the line. This will work with all terminal types | |
| 6192 * (regardless of the xn,am settings). | |
| 6193 * Only do this on a fast tty. | |
| 6194 * Only do this if the cursor is on the current line | |
| 6195 * (something has been written in it). | |
| 6196 * Don't do this for the GUI. | |
| 6197 * Don't do this for double-width characters. | |
| 6198 * Don't do this for a window not at the right screen border. | |
| 6199 */ | |
| 6200 if (p_tf | |
| 6201 #ifdef FEAT_GUI | |
| 6202 && !gui.in_use | |
| 6203 #endif | |
| 6204 && !(has_mbyte | |
| 1378 | 6205 && ((*mb_off2cells)(LineOffset[screen_row], |
| 6206 LineOffset[screen_row] + screen_Columns) | |
| 6207 == 2 | |
| 7 | 6208 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 6209 + (int)Columns - 2, |
| 6210 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6211 == 2))) |
| 7 | 6212 { |
| 6213 /* First make sure we are at the end of the screen line, | |
| 6214 * then output the same character again to let the | |
| 6215 * terminal know about the wrap. If the terminal doesn't | |
| 6216 * 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
|
6217 if (screen_cur_col != wp->w_width) |
| 7 | 6218 screen_char(LineOffset[screen_row - 1] |
| 6219 + (unsigned)Columns - 1, | |
| 6220 screen_row - 1, (int)(Columns - 1)); | |
| 6221 | |
| 6222 /* When there is a multi-byte character, just output a | |
| 6223 * space to keep it simple. */ | |
| 148 | 6224 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 6225 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 6226 out_char(' '); |
| 6227 else | |
| 6228 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 6229 + (Columns - 1)]); | |
| 6230 /* force a redraw of the first char on the next line */ | |
| 6231 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 6232 screen_start(); /* don't know where cursor is now */ | |
| 6233 } | |
| 6234 } | |
| 6235 | |
| 6236 col = 0; | |
| 6237 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6238 #ifdef FEAT_RIGHTLEFT | |
| 6239 if (wp->w_p_rl) | |
| 6240 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6241 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 6242 off += col; |
| 6243 } | |
| 6244 #endif | |
| 6245 | |
| 6246 /* reset the drawing state for the start of a wrapped line */ | |
| 6247 draw_state = WL_START; | |
| 6248 saved_n_extra = n_extra; | |
| 6249 saved_p_extra = p_extra; | |
| 6250 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
|
6251 saved_c_final = c_final; |
| 7 | 6252 saved_char_attr = char_attr; |
| 6253 n_extra = 0; | |
| 6254 lcs_prec_todo = lcs_prec; | |
| 6255 #ifdef FEAT_LINEBREAK | |
| 6256 # ifdef FEAT_DIFF | |
| 6257 if (filler_todo <= 0) | |
| 6258 # endif | |
| 6259 need_showbreak = TRUE; | |
| 6260 #endif | |
| 6261 #ifdef FEAT_DIFF | |
| 6262 --filler_todo; | |
| 6263 /* When the filler lines are actually below the last line of the | |
| 6264 * file, don't draw the line itself, break here. */ | |
| 6265 if (filler_todo == 0 && wp->w_botfill) | |
| 6266 break; | |
| 6267 #endif | |
| 6268 } | |
| 6269 | |
| 6270 } /* for every character in the line */ | |
| 6271 | |
| 743 | 6272 #ifdef FEAT_SPELL |
| 386 | 6273 /* After an empty line check first word for capital. */ |
| 6274 if (*skipwhite(line) == NUL) | |
| 6275 { | |
| 6276 capcol_lnum = lnum + 1; | |
| 6277 cap_col = 0; | |
| 6278 } | |
| 6279 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6280 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6281 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6282 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6283 #endif |
| 386 | 6284 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6285 vim_free(p_extra_free); |
| 7 | 6286 return row; |
| 6287 } | |
| 6288 | |
| 714 | 6289 /* |
| 6290 * 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
|
6291 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6292 */ |
| 6293 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6294 comp_char_differs(int off_from, int off_to) |
| 714 | 6295 { |
| 6296 int i; | |
| 6297 | |
| 6298 for (i = 0; i < Screen_mco; ++i) | |
| 6299 { | |
| 6300 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6301 return TRUE; | |
| 6302 if (ScreenLinesC[i][off_from] == 0) | |
| 6303 break; | |
| 6304 } | |
| 6305 return FALSE; | |
| 6306 } | |
| 6307 | |
| 7 | 6308 /* |
| 6309 * Check whether the given character needs redrawing: | |
| 6310 * - the (first byte of the) character is different | |
| 6311 * - the attributes are different | |
| 6312 * - the character is multi-byte and the next byte is different | |
| 1616 | 6313 * - the character is two cells wide and the second cell differs. |
| 7 | 6314 */ |
| 6315 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6316 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6317 { |
| 6318 if (cols > 0 | |
| 6319 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6320 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6321 || (enc_dbcs != 0 | |
| 6322 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6323 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6324 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6325 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6326 != ScreenLines[off_to + 1]))) | |
| 6327 || (enc_utf8 | |
| 6328 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6329 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6330 && comp_char_differs(off_from, off_to)) |
| 3759 | 6331 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6332 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6333 != ScreenLines[off_to + 1]))))) |
| 7 | 6334 return TRUE; |
| 6335 return FALSE; | |
| 6336 } | |
| 6337 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6338 #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
|
6339 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6340 * 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
|
6341 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6342 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6343 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
|
6344 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6345 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
|
6346 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6347 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6348 |
| 7 | 6349 /* |
| 6350 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6351 * have actually changed. Handle insert/delete character. | |
| 6352 * "coloff" gives the first column on the screen for this line. | |
| 6353 * "endcol" gives the columns where valid characters are. | |
| 6354 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6355 * 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
|
6356 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6357 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6358 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6359 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6360 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6361 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6362 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6363 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6364 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6365 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6366 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
|
6367 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6368 int flags UNUSED) |
| 7 | 6369 { |
| 6370 unsigned off_from; | |
| 6371 unsigned off_to; | |
| 1378 | 6372 unsigned max_off_from; |
| 6373 unsigned max_off_to; | |
| 7 | 6374 int col = 0; |
| 6375 int hl; | |
| 6376 int force = FALSE; /* force update rest of the line */ | |
| 6377 int redraw_this /* bool: does character need redraw? */ | |
| 6378 #ifdef FEAT_GUI | |
| 6379 = TRUE /* For GUI when while-loop empty */ | |
| 6380 #endif | |
| 6381 ; | |
| 6382 int redraw_next; /* redraw_this for next character */ | |
| 6383 int clear_next = FALSE; | |
| 6384 int char_cells; /* 1: normal char */ | |
| 6385 /* 2: occupies two display cells */ | |
| 6386 # define CHAR_CELLS char_cells | |
| 6387 | |
| 3413 | 6388 /* Check for illegal row and col, just in case. */ |
| 6389 if (row >= Rows) | |
| 6390 row = Rows - 1; | |
| 6391 if (endcol > Columns) | |
| 6392 endcol = Columns; | |
| 6393 | |
| 7 | 6394 # ifdef FEAT_CLIPBOARD |
| 6395 clip_may_clear_selection(row, row); | |
| 6396 # endif | |
| 6397 | |
| 6398 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6399 off_to = LineOffset[row] + coloff; | |
| 1378 | 6400 max_off_from = off_from + screen_Columns; |
| 6401 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6402 |
| 6403 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6404 if (flags & SLF_RIGHTLEFT) |
| 7 | 6405 { |
| 6406 /* Clear rest first, because it's left of the text. */ | |
| 6407 if (clear_width > 0) | |
| 6408 { | |
| 6409 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6410 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6411 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6412 { |
| 6413 ++off_to; | |
| 6414 ++col; | |
| 6415 } | |
| 6416 if (col <= endcol) | |
| 6417 screen_fill(row, row + 1, col + coloff, | |
| 6418 endcol + coloff + 1, ' ', ' ', 0); | |
| 6419 } | |
| 6420 col = endcol + 1; | |
| 6421 off_to = LineOffset[row] + col + coloff; | |
| 6422 off_from += col; | |
| 6423 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6424 } | |
| 6425 #endif /* FEAT_RIGHTLEFT */ | |
| 6426 | |
| 6427 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6428 | |
| 6429 while (col < endcol) | |
| 6430 { | |
| 6431 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6432 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6433 else |
| 6434 char_cells = 1; | |
| 6435 | |
| 6436 redraw_this = redraw_next; | |
| 6437 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6438 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6439 | |
| 6440 #ifdef FEAT_GUI | |
| 6441 /* If the next character was bold, then redraw the current character to | |
| 6442 * remove any pixels that might have spilt over into us. This only | |
| 6443 * happens in the GUI. | |
| 6444 */ | |
| 6445 if (redraw_next && gui.in_use) | |
| 6446 { | |
| 6447 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6448 if (hl > HL_ALL) |
| 6449 hl = syn_attr2attr(hl); | |
| 6450 if (hl & HL_BOLD) | |
| 7 | 6451 redraw_this = TRUE; |
| 6452 } | |
| 6453 #endif | |
| 6454 | |
| 6455 if (redraw_this) | |
| 6456 { | |
| 6457 /* | |
| 6458 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6459 * Attributes for characters are stored at the position where the | |
| 6460 * cursor is when writing the highlighting code. The | |
| 6461 * start-highlighting code must be written with the cursor on the | |
| 6462 * first highlighted character. The stop-highlighting code must | |
| 6463 * be written with the cursor just after the last highlighted | |
| 6464 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6465 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6466 * to clear the rest of the line, and force redrawing it |
| 6467 * completely. | |
| 6468 */ | |
| 6469 if ( p_wiv | |
| 6470 && !force | |
| 6471 #ifdef FEAT_GUI | |
| 6472 && !gui.in_use | |
| 6473 #endif | |
| 6474 && ScreenAttrs[off_to] != 0 | |
| 6475 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6476 { | |
| 6477 /* | |
| 6478 * Need to remove highlighting attributes here. | |
| 6479 */ | |
| 6480 windgoto(row, col + coloff); | |
| 6481 out_str(T_CE); /* clear rest of this screen line */ | |
| 6482 screen_start(); /* don't know where cursor is now */ | |
| 6483 force = TRUE; /* force redraw of rest of the line */ | |
| 6484 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6485 | |
| 6486 /* | |
| 6487 * If the previous character was highlighted, need to stop | |
| 6488 * highlighting at this character. | |
| 6489 */ | |
| 6490 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6491 { | |
| 6492 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6493 term_windgoto(row, col + coloff); | |
| 6494 screen_stop_highlight(); | |
| 6495 } | |
| 6496 else | |
| 6497 screen_attr = 0; /* highlighting has stopped */ | |
| 6498 } | |
| 6499 if (enc_dbcs != 0) | |
| 6500 { | |
| 6501 /* Check if overwriting a double-byte with a single-byte or | |
| 6502 * the other way around requires another character to be | |
| 6503 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6504 * ScreenLinesUC[] is sufficient. */ | |
| 6505 if (char_cells == 1 | |
| 6506 && col + 1 < endcol | |
| 1378 | 6507 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6508 { |
| 6509 /* Writing a single-cell character over a double-cell | |
| 6510 * character: need to redraw the next cell. */ | |
| 6511 ScreenLines[off_to + 1] = 0; | |
| 6512 redraw_next = TRUE; | |
| 6513 } | |
| 6514 else if (char_cells == 2 | |
| 6515 && col + 2 < endcol | |
| 1378 | 6516 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6517 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6518 { |
| 6519 /* Writing the second half of a double-cell character over | |
| 6520 * a double-cell character: need to redraw the second | |
| 6521 * cell. */ | |
| 6522 ScreenLines[off_to + 2] = 0; | |
| 6523 redraw_next = TRUE; | |
| 6524 } | |
| 6525 | |
| 6526 if (enc_dbcs == DBCS_JPNU) | |
| 6527 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6528 } | |
| 6529 /* When writing a single-width character over a double-width | |
| 6530 * character and at the end of the redrawn text, need to clear out | |
| 6531 * the right halve of the old character. | |
| 6532 * Also required when writing the right halve of a double-width | |
| 6533 * char over the left halve of an existing one. */ | |
| 6534 if (has_mbyte && col + char_cells == endcol | |
| 6535 && ((char_cells == 1 | |
| 1378 | 6536 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6537 || (char_cells == 2 |
| 1378 | 6538 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6539 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6540 clear_next = TRUE; |
| 6541 | |
| 6542 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6543 if (enc_utf8) | |
| 6544 { | |
| 6545 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6546 if (ScreenLinesUC[off_from] != 0) | |
| 6547 { | |
| 714 | 6548 int i; |
| 6549 | |
| 6550 for (i = 0; i < Screen_mco; ++i) | |
| 6551 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6552 } |
| 6553 } | |
| 6554 if (char_cells == 2) | |
| 6555 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6556 | |
| 6557 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6558 /* The bold trick makes a single column of pixels appear in the |
| 6559 * next character. When a bold character is removed, the next | |
| 7 | 6560 * character should be redrawn too. This happens for our own GUI |
| 6561 * and for some xterms. */ | |
| 6562 if ( | |
| 6563 # ifdef FEAT_GUI | |
| 6564 gui.in_use | |
| 6565 # endif | |
| 6566 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6567 || | |
| 6568 # endif | |
| 6569 # ifdef UNIX | |
| 6570 term_is_xterm | |
| 6571 # endif | |
| 6572 ) | |
| 6573 { | |
| 6574 hl = ScreenAttrs[off_to]; | |
| 743 | 6575 if (hl > HL_ALL) |
| 6576 hl = syn_attr2attr(hl); | |
| 6577 if (hl & HL_BOLD) | |
| 7 | 6578 redraw_next = TRUE; |
| 6579 } | |
| 6580 #endif | |
| 6581 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6582 |
| 819 | 6583 /* For simplicity set the attributes of second half of a |
| 6584 * double-wide character equal to the first half. */ | |
| 6585 if (char_cells == 2) | |
| 6586 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6587 | |
| 7 | 6588 if (enc_dbcs != 0 && char_cells == 2) |
| 6589 screen_char_2(off_to, row, col + coloff); | |
| 6590 else | |
| 6591 screen_char(off_to, row, col + coloff); | |
| 6592 } | |
| 6593 else if ( p_wiv | |
| 6594 #ifdef FEAT_GUI | |
| 6595 && !gui.in_use | |
| 6596 #endif | |
| 6597 && col + coloff > 0) | |
| 6598 { | |
| 6599 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6600 { | |
| 6601 /* | |
| 6602 * Don't output stop-highlight when moving the cursor, it will | |
| 6603 * stop the highlighting when it should continue. | |
| 6604 */ | |
| 6605 screen_attr = 0; | |
| 6606 } | |
| 6607 else if (screen_attr != 0) | |
| 6608 screen_stop_highlight(); | |
| 6609 } | |
| 6610 | |
| 6611 off_to += CHAR_CELLS; | |
| 6612 off_from += CHAR_CELLS; | |
| 6613 col += CHAR_CELLS; | |
| 6614 } | |
| 6615 | |
| 6616 if (clear_next) | |
| 6617 { | |
| 6618 /* Clear the second half of a double-wide character of which the left | |
| 6619 * half was overwritten with a single-wide character. */ | |
| 6620 ScreenLines[off_to] = ' '; | |
| 6621 if (enc_utf8) | |
| 6622 ScreenLinesUC[off_to] = 0; | |
| 6623 screen_char(off_to, row, col + coloff); | |
| 6624 } | |
| 6625 | |
| 6626 if (clear_width > 0 | |
| 6627 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6628 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6629 #endif |
| 6630 ) | |
| 6631 { | |
| 6632 #ifdef FEAT_GUI | |
| 6633 int startCol = col; | |
| 6634 #endif | |
| 6635 | |
| 6636 /* blank out the rest of the line */ | |
| 6637 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6638 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6639 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6640 { |
| 6641 ++off_to; | |
| 6642 ++col; | |
| 6643 } | |
| 6644 if (col < clear_width) | |
| 6645 { | |
| 6646 #ifdef FEAT_GUI | |
| 6647 /* | |
| 6648 * In the GUI, clearing the rest of the line may leave pixels | |
| 6649 * behind if the first character cleared was bold. Some bold | |
| 6650 * fonts spill over the left. In this case we redraw the previous | |
| 6651 * character too. If we didn't skip any blanks above, then we | |
| 6652 * only redraw if the character wasn't already redrawn anyway. | |
| 6653 */ | |
| 996 | 6654 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6655 { |
| 6656 hl = ScreenAttrs[off_to]; | |
| 6657 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6658 { |
| 6659 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6660 |
| 996 | 6661 if (enc_utf8) |
| 6662 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6663 * that its width is 2. */ | |
| 6664 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6665 else if (enc_dbcs != 0) | |
| 6666 { | |
| 6667 /* find previous character by counting from first | |
| 6668 * column and get its width. */ | |
| 6669 unsigned off = LineOffset[row]; | |
| 1378 | 6670 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6671 |
| 6672 while (off < off_to) | |
| 6673 { | |
| 1378 | 6674 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6675 off += prev_cells; |
| 6676 } | |
| 6677 } | |
| 6678 | |
| 6679 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6680 screen_char_2(off_to - prev_cells, row, | |
| 6681 col + coloff - prev_cells); | |
| 6682 else | |
| 6683 screen_char(off_to - prev_cells, row, | |
| 6684 col + coloff - prev_cells); | |
| 6685 } | |
| 7 | 6686 } |
| 6687 #endif | |
| 6688 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6689 ' ', ' ', 0); | |
| 6690 off_to += clear_width - col; | |
| 6691 col = clear_width; | |
| 6692 } | |
| 6693 } | |
| 6694 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6695 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6696 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6697 && !(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
|
6698 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6699 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6700 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6701 // For a window that has a right neighbor, draw the separator char |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6702 // right of the window contents. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6703 if (coloff + col < Columns) |
| 7 | 6704 { |
| 6705 int c; | |
| 6706 | |
| 6707 c = fillchar_vsep(&hl); | |
| 6477 | 6708 if (ScreenLines[off_to] != (schar_T)c |
| 714 | 6709 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6710 != (c >= 0x80 ? c : 0)) | |
| 7 | 6711 || ScreenAttrs[off_to] != hl) |
| 6712 { | |
| 6713 ScreenLines[off_to] = c; | |
| 6714 ScreenAttrs[off_to] = hl; | |
| 6715 if (enc_utf8) | |
| 6716 { | |
| 6717 if (c >= 0x80) | |
| 6718 { | |
| 6719 ScreenLinesUC[off_to] = c; | |
| 714 | 6720 ScreenLinesC[0][off_to] = 0; |
| 7 | 6721 } |
| 6722 else | |
| 6723 ScreenLinesUC[off_to] = 0; | |
| 6724 } | |
| 6725 screen_char(off_to, row, col + coloff); | |
| 6726 } | |
| 6727 } | |
| 6728 else | |
| 6729 LineWraps[row] = FALSE; | |
| 6730 } | |
| 6731 } | |
| 6732 | |
| 474 | 6733 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6734 /* |
| 474 | 6735 * Mirror text "str" for right-left displaying. |
| 6736 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6737 */ |
| 474 | 6738 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6739 rl_mirror(char_u *str) |
| 7 | 6740 { |
| 6741 char_u *p1, *p2; | |
| 6742 int t; | |
| 6743 | |
| 6744 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6745 { | |
| 6746 t = *p1; | |
| 6747 *p1 = *p2; | |
| 6748 *p2 = t; | |
| 6749 } | |
| 6750 } | |
| 6751 #endif | |
| 6752 | |
| 6753 /* | |
| 6754 * mark all status lines for redraw; used after first :cd | |
| 6755 */ | |
| 6756 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6757 status_redraw_all(void) |
| 7 | 6758 { |
| 6759 win_T *wp; | |
| 6760 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6761 FOR_ALL_WINDOWS(wp) |
| 7 | 6762 if (wp->w_status_height) |
| 6763 { | |
| 6764 wp->w_redr_status = TRUE; | |
| 6765 redraw_later(VALID); | |
| 6766 } | |
| 6767 } | |
| 6768 | |
| 6769 /* | |
| 6770 * mark all status lines of the current buffer for redraw | |
| 6771 */ | |
| 6772 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6773 status_redraw_curbuf(void) |
| 7 | 6774 { |
| 6775 win_T *wp; | |
| 6776 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6777 FOR_ALL_WINDOWS(wp) |
| 7 | 6778 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6779 { | |
| 6780 wp->w_redr_status = TRUE; | |
| 6781 redraw_later(VALID); | |
| 6782 } | |
| 6783 } | |
| 6784 | |
| 6785 /* | |
| 6786 * Redraw all status lines that need to be redrawn. | |
| 6787 */ | |
| 6788 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6789 redraw_statuslines(void) |
| 7 | 6790 { |
| 6791 win_T *wp; | |
| 6792 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6793 FOR_ALL_WINDOWS(wp) |
| 7 | 6794 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
|
6795 win_redr_status(wp, FALSE); |
| 673 | 6796 if (redraw_tabline) |
| 677 | 6797 draw_tabline(); |
| 7 | 6798 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6799 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6800 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6801 /* |
| 6802 * Redraw all status lines at the bottom of frame "frp". | |
| 6803 */ | |
| 6804 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6805 win_redraw_last_status(frame_T *frp) |
| 7 | 6806 { |
| 6807 if (frp->fr_layout == FR_LEAF) | |
| 6808 frp->fr_win->w_redr_status = TRUE; | |
| 6809 else if (frp->fr_layout == FR_ROW) | |
| 6810 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6811 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6812 win_redraw_last_status(frp); |
| 6813 } | |
| 6814 else /* frp->fr_layout == FR_COL */ | |
| 6815 { | |
| 6816 frp = frp->fr_child; | |
| 6817 while (frp->fr_next != NULL) | |
| 6818 frp = frp->fr_next; | |
| 6819 win_redraw_last_status(frp); | |
| 6820 } | |
| 6821 } | |
| 6822 #endif | |
| 6823 | |
| 6824 /* | |
| 6825 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6826 */ | |
| 6827 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6828 draw_vsep_win(win_T *wp, int row) |
| 7 | 6829 { |
| 6830 int hl; | |
| 6831 int c; | |
| 6832 | |
| 6833 if (wp->w_vsep_width) | |
| 6834 { | |
| 6835 /* draw the vertical separator right of this window */ | |
| 6836 c = fillchar_vsep(&hl); | |
| 6837 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6838 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6839 c, ' ', hl); | |
| 6840 } | |
| 6841 } | |
| 6842 | |
| 6843 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6844 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6845 |
| 6846 /* | |
| 1378 | 6847 * Get the length of an item as it will be shown in the status line. |
| 7 | 6848 */ |
| 6849 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6850 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6851 { |
| 6852 int len = 0; | |
| 6853 | |
| 6854 #ifdef FEAT_MENU | |
| 6855 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6856 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6857 | |
| 6858 /* Check for menu separators - replace with '|'. */ | |
| 6859 if (emenu && menu_is_separator(s)) | |
| 6860 return 1; | |
| 6861 #endif | |
| 6862 | |
| 6863 while (*s != NUL) | |
| 6864 { | |
| 1685 | 6865 s += skip_status_match_char(xp, s); |
| 42 | 6866 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6867 MB_PTR_ADV(s); |
| 7 | 6868 } |
| 6869 | |
| 6870 return len; | |
| 6871 } | |
| 6872 | |
| 6873 /* | |
| 1685 | 6874 * Return the number of characters that should be skipped in a status match. |
| 277 | 6875 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6876 */ | |
| 6877 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6878 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6879 { |
| 1685 | 6880 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6881 #ifdef FEAT_MENU |
| 6882 || ((xp->xp_context == EXPAND_MENUS | |
| 6883 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6884 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6885 #endif | |
| 1685 | 6886 ) |
| 6887 { | |
| 6888 #ifndef BACKSLASH_IN_FILENAME | |
| 6889 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6890 return 2; | |
| 6891 #endif | |
| 6892 return 1; | |
| 6893 } | |
| 6894 return 0; | |
| 277 | 6895 } |
| 6896 | |
| 6897 /* | |
| 7 | 6898 * Show wildchar matches in the status line. |
| 6899 * Show at least the "match" item. | |
| 6900 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6901 * | |
| 6902 * If inversion is possible we use it. Else '=' characters are used. | |
| 6903 */ | |
| 6904 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6905 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6906 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6907 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6908 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6909 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6910 int showtail) |
| 7 | 6911 { |
| 6912 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6913 int row; | |
| 6914 char_u *buf; | |
| 6915 int len; | |
| 1378 | 6916 int clen; /* length in screen cells */ |
| 7 | 6917 int fillchar; |
| 6918 int attr; | |
| 6919 int i; | |
| 6920 int highlight = TRUE; | |
| 6921 char_u *selstart = NULL; | |
| 6922 int selstart_col = 0; | |
| 6923 char_u *selend = NULL; | |
| 6924 static int first_match = 0; | |
| 6925 int add_left = FALSE; | |
| 6926 char_u *s; | |
| 6927 #ifdef FEAT_MENU | |
| 6928 int emenu; | |
| 6929 #endif | |
| 6930 int l; | |
| 6931 | |
| 6932 if (matches == NULL) /* interrupted completion? */ | |
| 6933 return; | |
| 6934 | |
| 39 | 6935 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
|
6936 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 6937 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
|
6938 buf = alloc(Columns + 1); |
| 7 | 6939 if (buf == NULL) |
| 6940 return; | |
| 6941 | |
| 6942 if (match == -1) /* don't show match but original text */ | |
| 6943 { | |
| 6944 match = 0; | |
| 6945 highlight = FALSE; | |
| 6946 } | |
| 6947 /* count 1 for the ending ">" */ | |
| 6948 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6949 if (match == 0) | |
| 6950 first_match = 0; | |
| 6951 else if (match < first_match) | |
| 6952 { | |
| 6953 /* jumping left, as far as we can go */ | |
| 6954 first_match = match; | |
| 6955 add_left = TRUE; | |
| 6956 } | |
| 6957 else | |
| 6958 { | |
| 6959 /* check if match fits on the screen */ | |
| 6960 for (i = first_match; i < match; ++i) | |
| 6961 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6962 if (first_match > 0) | |
| 6963 clen += 2; | |
| 6964 /* jumping right, put match at the left */ | |
| 6965 if ((long)clen > Columns) | |
| 6966 { | |
| 6967 first_match = match; | |
| 6968 /* if showing the last match, we can add some on the left */ | |
| 6969 clen = 2; | |
| 6970 for (i = match; i < num_matches; ++i) | |
| 6971 { | |
| 6972 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6973 if ((long)clen >= Columns) | |
| 6974 break; | |
| 6975 } | |
| 6976 if (i == num_matches) | |
| 6977 add_left = TRUE; | |
| 6978 } | |
| 6979 } | |
| 6980 if (add_left) | |
| 6981 while (first_match > 0) | |
| 6982 { | |
| 6983 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6984 if ((long)clen >= Columns) | |
| 6985 break; | |
| 6986 --first_match; | |
| 6987 } | |
| 6988 | |
|
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
|
6989 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6990 |
| 6991 if (first_match == 0) | |
| 6992 { | |
| 6993 *buf = NUL; | |
| 6994 len = 0; | |
| 6995 } | |
| 6996 else | |
| 6997 { | |
| 6998 STRCPY(buf, "< "); | |
| 6999 len = 2; | |
| 7000 } | |
| 7001 clen = len; | |
| 7002 | |
| 7003 i = first_match; | |
| 7004 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 7005 { | |
| 7006 if (i == match) | |
| 7007 { | |
| 7008 selstart = buf + len; | |
| 7009 selstart_col = clen; | |
| 7010 } | |
| 7011 | |
| 7012 s = L_MATCH(i); | |
| 7013 /* Check for menu separators - replace with '|' */ | |
| 7014 #ifdef FEAT_MENU | |
| 7015 emenu = (xp->xp_context == EXPAND_MENUS | |
| 7016 || xp->xp_context == EXPAND_MENUNAMES); | |
| 7017 if (emenu && menu_is_separator(s)) | |
| 7018 { | |
| 7019 STRCPY(buf + len, transchar('|')); | |
| 7020 l = (int)STRLEN(buf + len); | |
| 7021 len += l; | |
| 7022 clen += l; | |
| 7023 } | |
| 7024 else | |
| 7025 #endif | |
| 7026 for ( ; *s != NUL; ++s) | |
| 7027 { | |
| 1685 | 7028 s += skip_status_match_char(xp, s); |
| 7 | 7029 clen += ptr2cells(s); |
| 474 | 7030 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 7031 { |
| 7032 STRNCPY(buf + len, s, l); | |
| 7033 s += l - 1; | |
| 7034 len += l; | |
| 7035 } | |
| 7036 else | |
| 7037 { | |
| 7038 STRCPY(buf + len, transchar_byte(*s)); | |
| 7039 len += (int)STRLEN(buf + len); | |
| 7040 } | |
| 7041 } | |
| 7042 if (i == match) | |
| 7043 selend = buf + len; | |
| 7044 | |
| 7045 *(buf + len++) = ' '; | |
| 7046 *(buf + len++) = ' '; | |
| 7047 clen += 2; | |
| 7048 if (++i == num_matches) | |
| 7049 break; | |
| 7050 } | |
| 7051 | |
| 7052 if (i != num_matches) | |
| 7053 { | |
| 7054 *(buf + len++) = '>'; | |
| 7055 ++clen; | |
| 7056 } | |
| 7057 | |
| 7058 buf[len] = NUL; | |
| 7059 | |
| 7060 row = cmdline_row - 1; | |
| 7061 if (row >= 0) | |
| 7062 { | |
| 7063 if (wild_menu_showing == 0) | |
| 7064 { | |
| 7065 if (msg_scrolled > 0) | |
| 7066 { | |
| 7067 /* Put the wildmenu just above the command line. If there is | |
| 7068 * no room, scroll the screen one line up. */ | |
| 7069 if (cmdline_row == Rows - 1) | |
| 7070 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
7071 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 7072 ++msg_scrolled; |
| 7073 } | |
| 7074 else | |
| 7075 { | |
| 7076 ++cmdline_row; | |
| 7077 ++row; | |
| 7078 } | |
| 7079 wild_menu_showing = WM_SCROLLED; | |
| 7080 } | |
| 7081 else | |
| 7082 { | |
| 7083 /* Create status line if needed by setting 'laststatus' to 2. | |
| 7084 * Set 'winminheight' to zero to avoid that the window is | |
| 7085 * resized. */ | |
| 7086 if (lastwin->w_status_height == 0) | |
| 7087 { | |
| 7088 save_p_ls = p_ls; | |
| 7089 save_p_wmh = p_wmh; | |
| 7090 p_ls = 2; | |
| 7091 p_wmh = 0; | |
| 7092 last_status(FALSE); | |
| 7093 } | |
| 7094 wild_menu_showing = WM_SHOWN; | |
| 7095 } | |
| 7096 } | |
| 7097 | |
| 7098 screen_puts(buf, row, 0, attr); | |
| 7099 if (selstart != NULL && highlight) | |
| 7100 { | |
| 7101 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7102 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 7103 } |
| 7104 | |
| 7105 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 7106 } | |
| 7107 | |
| 7108 win_redraw_last_status(topframe); | |
| 7109 vim_free(buf); | |
| 7110 } | |
| 7111 #endif | |
| 7112 | |
| 7113 /* | |
| 7114 * Redraw the status line of window wp. | |
| 7115 * | |
| 7116 * 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
|
7117 * 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
|
7118 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7119 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7120 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
7121 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 7122 { |
| 7123 int row; | |
| 7124 char_u *p; | |
| 7125 int len; | |
| 7126 int fillchar; | |
| 7127 int attr; | |
| 7128 int this_ru_col; | |
| 1910 | 7129 static int busy = FALSE; |
| 7130 | |
| 7131 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 7132 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 7133 if (busy) | |
| 7134 return; | |
| 7135 busy = TRUE; | |
| 7 | 7136 |
| 7137 wp->w_redr_status = FALSE; | |
| 7138 if (wp->w_status_height == 0) | |
| 7139 { | |
| 7140 /* no status line, can only be last window */ | |
| 7141 redraw_cmdline = TRUE; | |
| 7142 } | |
| 540 | 7143 else if (!redrawing() |
| 7144 #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
|
7145 // 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
|
7146 // 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
|
7147 || (!ignore_pum && pum_visible()) |
| 540 | 7148 #endif |
| 7149 ) | |
| 7 | 7150 { |
| 7151 /* Don't redraw right now, do it later. */ | |
| 7152 wp->w_redr_status = TRUE; | |
| 7153 } | |
| 7154 #ifdef FEAT_STL_OPT | |
| 40 | 7155 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 7156 { |
| 7157 /* redraw custom status line */ | |
| 1983 | 7158 redraw_custom_statusline(wp); |
| 7 | 7159 } |
| 7160 #endif | |
| 7161 else | |
| 7162 { | |
|
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
|
7163 fillchar = fillchar_status(&attr, wp); |
| 7 | 7164 |
| 685 | 7165 get_trans_bufname(wp->w_buffer); |
| 7 | 7166 p = NameBuff; |
| 7167 len = (int)STRLEN(p); | |
| 7168 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7169 if (bt_help(wp->w_buffer) |
| 7 | 7170 #ifdef FEAT_QUICKFIX |
| 7171 || wp->w_p_pvw | |
| 7172 #endif | |
| 7173 || bufIsChanged(wp->w_buffer) | |
| 7174 || wp->w_buffer->b_p_ro) | |
| 7175 *(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
|
7176 if (bt_help(wp->w_buffer)) |
| 7 | 7177 { |
| 809 | 7178 STRCPY(p + len, _("[Help]")); |
| 7 | 7179 len += (int)STRLEN(p + len); |
| 7180 } | |
| 7181 #ifdef FEAT_QUICKFIX | |
| 7182 if (wp->w_p_pvw) | |
| 7183 { | |
| 7184 STRCPY(p + len, _("[Preview]")); | |
| 7185 len += (int)STRLEN(p + len); | |
| 7186 } | |
| 7187 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7188 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
|
7189 #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
|
7190 && !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
|
7191 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7192 ) |
| 7 | 7193 { |
| 7194 STRCPY(p + len, "[+]"); | |
| 7195 len += 3; | |
| 7196 } | |
| 7197 if (wp->w_buffer->b_p_ro) | |
| 7198 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
7199 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
|
7200 len += (int)STRLEN(p + len); |
| 7 | 7201 } |
| 7202 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7203 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
|
7204 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
|
7205 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 7206 if (this_ru_col <= 1) |
| 7207 { | |
| 7208 p = (char_u *)"<"; /* No room for file name! */ | |
| 7209 len = 1; | |
| 7210 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7211 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7212 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7213 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7214 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7215 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7216 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7217 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7218 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7219 * 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
|
7220 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
|
7221 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7222 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7223 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7224 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7225 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7226 p = p + i - 1; |
| 7 | 7227 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7228 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7229 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7230 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7231 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7232 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7233 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7234 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7235 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7236 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7237 } |
| 7 | 7238 |
| 7239 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
|
7240 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
|
7241 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
|
7242 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 7243 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7244 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 7245 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 7246 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
|
7247 - 1 + wp->w_wincol), attr); |
| 7 | 7248 |
| 7249 #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
|
7250 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 7251 #endif |
| 7252 } | |
| 7253 | |
| 7254 /* | |
| 7255 * May need to draw the character below the vertical separator. | |
| 7256 */ | |
| 7257 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7258 { | |
| 7259 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
|
7260 fillchar = fillchar_status(&attr, wp); |
| 7 | 7261 else |
| 7262 fillchar = fillchar_vsep(&attr); | |
| 7263 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7264 attr); | |
| 7265 } | |
| 1910 | 7266 busy = FALSE; |
| 7 | 7267 } |
| 7268 | |
| 680 | 7269 #ifdef FEAT_STL_OPT |
| 7270 /* | |
| 7271 * Redraw the status line according to 'statusline' and take care of any | |
| 7272 * errors encountered. | |
| 7273 */ | |
| 7274 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7275 redraw_custom_statusline(win_T *wp) |
| 680 | 7276 { |
| 1983 | 7277 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7278 int saved_did_emsg = did_emsg; |
| 1983 | 7279 |
| 7280 /* When called recursively return. This can happen when the statusline | |
| 7281 * contains an expression that triggers a redraw. */ | |
| 7282 if (entered) | |
| 7283 return; | |
| 7284 entered = TRUE; | |
| 680 | 7285 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7286 did_emsg = FALSE; |
| 680 | 7287 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7288 if (did_emsg) |
| 1983 | 7289 { |
| 7290 /* When there is an error disable the statusline, otherwise the | |
| 7291 * display is messed up with errors and a redraw triggers the problem | |
| 7292 * again and again. */ | |
| 680 | 7293 set_string_option_direct((char_u *)"statusline", -1, |
| 7294 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7295 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7296 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7297 did_emsg |= saved_did_emsg; |
| 1983 | 7298 entered = FALSE; |
| 680 | 7299 } |
| 7300 #endif | |
| 7301 | |
| 7 | 7302 /* |
| 7303 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7304 * line of the window right of it. If not, then it's a vertical separator. | |
| 7305 * Only call if (wp->w_vsep_width != 0). | |
| 7306 */ | |
| 7307 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7308 stl_connected(win_T *wp) |
| 7 | 7309 { |
| 7310 frame_T *fr; | |
| 7311 | |
| 7312 fr = wp->w_frame; | |
| 7313 while (fr->fr_parent != NULL) | |
| 7314 { | |
| 7315 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7316 { | |
| 7317 if (fr->fr_next != NULL) | |
| 7318 break; | |
| 7319 } | |
| 7320 else | |
| 7321 { | |
| 7322 if (fr->fr_next != NULL) | |
| 7323 return TRUE; | |
| 7324 } | |
| 7325 fr = fr->fr_parent; | |
| 7326 } | |
| 7327 return FALSE; | |
| 7328 } | |
| 7329 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7330 |
| 7 | 7331 /* |
| 7332 * Get the value to show for the language mappings, active 'keymap'. | |
| 7333 */ | |
| 7334 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7335 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7336 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7337 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
|
7338 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
|
7339 int len) /* length of buffer */ |
| 7 | 7340 { |
| 7341 char_u *p; | |
| 7342 | |
| 7343 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7344 return FALSE; | |
| 7345 | |
| 7346 { | |
| 7347 #ifdef FEAT_EVAL | |
| 7348 buf_T *old_curbuf = curbuf; | |
| 7349 win_T *old_curwin = curwin; | |
| 7350 char_u *s; | |
| 7351 | |
| 7352 curbuf = wp->w_buffer; | |
| 7353 curwin = wp; | |
| 7354 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7355 ++emsg_skip; | |
| 714 | 7356 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7357 --emsg_skip; |
| 7358 curbuf = old_curbuf; | |
| 7359 curwin = old_curwin; | |
| 7360 if (p == NULL || *p == NUL) | |
| 7361 #endif | |
| 7362 { | |
| 7363 #ifdef FEAT_KEYMAP | |
| 7364 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7365 p = wp->w_buffer->b_p_keymap; | |
| 7366 else | |
| 7367 #endif | |
| 7368 p = (char_u *)"lang"; | |
| 7369 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7370 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7371 buf[0] = NUL; |
| 7372 #ifdef FEAT_EVAL | |
| 7373 vim_free(s); | |
| 7374 #endif | |
| 7375 } | |
| 7376 return buf[0] != NUL; | |
| 7377 } | |
| 7378 | |
| 7379 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7380 /* | |
| 677 | 7381 * Redraw the status line or ruler of window "wp". |
| 7382 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7383 */ |
| 7384 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7385 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7386 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7387 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7388 { |
| 5539 | 7389 static int entered = FALSE; |
| 7 | 7390 int attr; |
| 7391 int curattr; | |
| 7392 int row; | |
| 7393 int col = 0; | |
| 7394 int maxwidth; | |
| 7395 int width; | |
| 7396 int n; | |
| 7397 int len; | |
| 7398 int fillchar; | |
| 7399 char_u buf[MAXPATHL]; | |
| 1983 | 7400 char_u *stl; |
| 7 | 7401 char_u *p; |
| 681 | 7402 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7403 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7404 int use_sandbox = FALSE; |
| 2693 | 7405 win_T *ewp; |
| 7406 int p_crb_save; | |
| 7 | 7407 |
| 5539 | 7408 /* There is a tiny chance that this gets called recursively: When |
| 7409 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7410 * Avoid trouble by not allowing recursion. */ | |
| 7411 if (entered) | |
| 7412 return; | |
| 7413 entered = TRUE; | |
| 7414 | |
| 7 | 7415 /* setup environment for the task at hand */ |
| 677 | 7416 if (wp == NULL) |
| 7417 { | |
| 7418 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7419 stl = p_tal; |
| 677 | 7420 row = 0; |
| 707 | 7421 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7422 attr = HL_ATTR(HLF_TPF); |
| 677 | 7423 maxwidth = Columns; |
| 7424 # ifdef FEAT_EVAL | |
| 681 | 7425 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7426 # endif |
| 7427 } | |
| 40 | 7428 else |
| 677 | 7429 { |
| 7430 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
|
7431 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
|
7432 maxwidth = wp->w_width; |
| 677 | 7433 |
| 7434 if (draw_ruler) | |
| 7435 { | |
| 1983 | 7436 stl = p_ruf; |
| 677 | 7437 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7438 if (*stl == '%') |
| 7439 { | |
| 7440 if (*++stl == '-') | |
| 7441 stl++; | |
| 7442 if (atoi((char *)stl)) | |
| 7443 while (VIM_ISDIGIT(*stl)) | |
| 7444 stl++; | |
| 7445 if (*stl++ != '(') | |
| 7446 stl = p_ruf; | |
| 677 | 7447 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7448 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
|
7449 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
|
7450 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
|
7451 maxwidth = wp->w_width - col; |
| 677 | 7452 if (!wp->w_status_height) |
| 7453 { | |
| 7454 row = Rows - 1; | |
| 7455 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7456 fillchar = ' '; | |
| 7457 attr = 0; | |
| 7458 } | |
| 7459 | |
| 7460 # ifdef FEAT_EVAL | |
| 681 | 7461 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7462 # endif |
| 7463 } | |
| 7464 else | |
| 7465 { | |
| 7466 if (*wp->w_p_stl != NUL) | |
| 1983 | 7467 stl = wp->w_p_stl; |
| 677 | 7468 else |
| 1983 | 7469 stl = p_stl; |
| 677 | 7470 # ifdef FEAT_EVAL |
| 681 | 7471 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7472 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7473 # endif |
| 7474 } | |
| 7475 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7476 col += wp->w_wincol; |
| 677 | 7477 } |
| 7478 | |
| 7 | 7479 if (maxwidth <= 0) |
| 5539 | 7480 goto theend; |
| 677 | 7481 |
| 2693 | 7482 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7483 * the cursor away and back. */ | |
| 7484 ewp = wp == NULL ? curwin : wp; | |
| 7485 p_crb_save = ewp->w_p_crb; | |
| 7486 ewp->w_p_crb = FALSE; | |
| 7487 | |
| 1983 | 7488 /* Make a copy, because the statusline may include a function call that |
| 7489 * might change the option value and free the memory. */ | |
| 7490 stl = vim_strsave(stl); | |
| 2693 | 7491 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7492 stl, use_sandbox, |
| 681 | 7493 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7494 vim_free(stl); |
| 2693 | 7495 ewp->w_p_crb = p_crb_save; |
| 2661 | 7496 |
| 7497 /* Make all characters printable. */ | |
| 7498 p = transstr(buf); | |
| 7499 if (p != NULL) | |
| 7500 { | |
| 7501 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7502 vim_free(p); | |
| 7503 } | |
| 7504 | |
| 7505 /* fill up with "fillchar" */ | |
| 835 | 7506 len = (int)STRLEN(buf); |
| 1883 | 7507 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7508 { |
| 7509 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7510 ++width; | |
| 7511 } | |
| 7512 buf[len] = NUL; | |
| 7513 | |
| 681 | 7514 /* |
| 7515 * Draw each snippet with the specified highlighting. | |
| 7516 */ | |
| 7 | 7517 curattr = attr; |
| 7518 p = buf; | |
| 681 | 7519 for (n = 0; hltab[n].start != NULL; n++) |
| 7520 { | |
| 7521 len = (int)(hltab[n].start - p); | |
| 7 | 7522 screen_puts_len(p, len, row, col, curattr); |
| 7523 col += vim_strnsize(p, len); | |
| 681 | 7524 p = hltab[n].start; |
| 7525 | |
| 7526 if (hltab[n].userhl == 0) | |
| 7 | 7527 curattr = attr; |
| 681 | 7528 else if (hltab[n].userhl < 0) |
| 7529 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
|
7530 #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
|
7531 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
|
7532 && 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
|
7533 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
|
7534 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
|
7535 && 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
|
7536 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
|
7537 #endif |
| 680 | 7538 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7539 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7540 else |
| 681 | 7541 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7542 } |
| 7543 screen_puts(p, row, col, curattr); | |
| 681 | 7544 |
| 7545 if (wp == NULL) | |
| 7546 { | |
| 7547 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7548 col = 0; | |
| 7549 len = 0; | |
| 7550 p = buf; | |
| 7551 fillchar = 0; | |
| 7552 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7553 { | |
| 7554 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7555 while (col < len) | |
| 7556 TabPageIdxs[col++] = fillchar; | |
| 7557 p = tabtab[n].start; | |
| 7558 fillchar = tabtab[n].userhl; | |
| 7559 } | |
| 7560 while (col < Columns) | |
| 7561 TabPageIdxs[col++] = fillchar; | |
| 7562 } | |
| 5539 | 7563 |
| 7564 theend: | |
| 7565 entered = FALSE; | |
| 7 | 7566 } |
| 7567 | |
| 7568 #endif /* FEAT_STL_OPT */ | |
| 7569 | |
| 7570 /* | |
| 7571 * Output a single character directly to the screen and update ScreenLines. | |
| 7572 */ | |
| 7573 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7574 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7575 { |
| 3549 | 7576 char_u buf[MB_MAXBYTES + 1]; |
| 7577 | |
| 7578 if (has_mbyte) | |
| 7579 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7580 else | |
| 7581 { | |
| 7582 buf[0] = c; | |
| 7583 buf[1] = NUL; | |
| 7584 } | |
| 7 | 7585 screen_puts(buf, row, col, attr); |
| 7586 } | |
| 7587 | |
| 7588 /* | |
| 7589 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7590 * Also return its attribute in *attrp; | |
| 7591 */ | |
| 7592 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7593 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7594 { |
| 7595 unsigned off; | |
| 7596 | |
| 7597 /* safety check */ | |
| 7598 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7599 { | |
| 7600 off = LineOffset[row] + col; | |
| 7601 *attrp = ScreenAttrs[off]; | |
| 7602 bytes[0] = ScreenLines[off]; | |
| 7603 bytes[1] = NUL; | |
| 7604 | |
| 7605 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7606 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7607 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7608 { | |
| 7609 bytes[0] = ScreenLines[off]; | |
| 7610 bytes[1] = ScreenLines2[off]; | |
| 7611 bytes[2] = NUL; | |
| 7612 } | |
| 7613 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7614 { | |
| 7615 bytes[1] = ScreenLines[off + 1]; | |
| 7616 bytes[2] = NUL; | |
| 7617 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7618 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7619 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7620 |
| 714 | 7621 /* |
| 7622 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7623 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7624 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7625 */ |
| 7626 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7627 screen_comp_differs(int off, int *u8cc) |
| 714 | 7628 { |
| 7629 int i; | |
| 7630 | |
| 7631 for (i = 0; i < Screen_mco; ++i) | |
| 7632 { | |
| 7633 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7634 return TRUE; | |
| 7635 if (u8cc[i] == 0) | |
| 7636 break; | |
| 7637 } | |
| 7638 return FALSE; | |
| 7639 } | |
| 7640 | |
| 7 | 7641 /* |
| 7642 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7643 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7644 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7645 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7646 */ | |
| 7647 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7648 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7649 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7650 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7651 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7652 int attr) |
| 7 | 7653 { |
| 7654 screen_puts_len(text, -1, row, col, attr); | |
| 7655 } | |
| 7656 | |
| 7657 /* | |
| 7658 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7659 * a NUL. | |
| 7660 */ | |
| 7661 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7662 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7663 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7664 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7665 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7666 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7667 int attr) |
| 7 | 7668 { |
| 7669 unsigned off; | |
| 7670 char_u *ptr = text; | |
| 5923 | 7671 int len = textlen; |
| 7 | 7672 int c; |
| 1378 | 7673 unsigned max_off; |
| 7 | 7674 int mbyte_blen = 1; |
| 7675 int mbyte_cells = 1; | |
| 7676 int u8c = 0; | |
| 714 | 7677 int u8cc[MAX_MCO]; |
| 7 | 7678 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7679 #ifdef FEAT_ARABIC |
| 7 | 7680 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7681 int pc, nc, nc1; |
| 7682 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7683 #endif |
| 1843 | 7684 int force_redraw_this; |
| 7685 int force_redraw_next = FALSE; | |
| 7686 int need_redraw; | |
| 7 | 7687 |
| 7688 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7689 return; | |
| 1843 | 7690 off = LineOffset[row] + col; |
| 7 | 7691 |
| 1668 | 7692 /* When drawing over the right halve of a double-wide char clear out the |
| 7693 * left halve. Only needed in a terminal. */ | |
| 1685 | 7694 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
|
7695 #ifdef FEAT_GUI |
| 1668 | 7696 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7697 #endif |
| 1668 | 7698 && mb_fix_col(col, row) != col) |
| 1843 | 7699 { |
| 7700 ScreenLines[off - 1] = ' '; | |
| 7701 ScreenAttrs[off - 1] = 0; | |
| 7702 if (enc_utf8) | |
| 7703 { | |
| 7704 ScreenLinesUC[off - 1] = 0; | |
| 7705 ScreenLinesC[0][off - 1] = 0; | |
| 7706 } | |
| 7707 /* redraw the previous cell, make it empty */ | |
| 7708 screen_char(off - 1, row, col - 1); | |
| 7709 /* force the cell at "col" to be redrawn */ | |
| 7710 force_redraw_next = TRUE; | |
| 7711 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7712 |
| 1378 | 7713 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7714 while (col < screen_Columns |
| 7715 && (len < 0 || (int)(ptr - text) < len) | |
| 7716 && *ptr != NUL) | |
| 7 | 7717 { |
| 7718 c = *ptr; | |
| 7719 /* check if this is the first byte of a multibyte */ | |
| 7720 if (has_mbyte) | |
| 7721 { | |
| 7722 if (enc_utf8 && len > 0) | |
| 474 | 7723 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7724 else |
| 474 | 7725 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7726 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7727 mbyte_cells = 1; | |
| 7728 else if (enc_dbcs != 0) | |
| 7729 mbyte_cells = mbyte_blen; | |
| 7730 else /* enc_utf8 */ | |
| 7731 { | |
| 7732 if (len >= 0) | |
| 714 | 7733 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7734 (int)((text + len) - ptr)); |
| 7735 else | |
| 714 | 7736 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7737 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7738 #ifdef FEAT_ARABIC |
| 7 | 7739 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7740 { | |
| 7741 /* Do Arabic shaping. */ | |
| 7742 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7743 { | |
| 7744 /* Past end of string to be displayed. */ | |
| 7745 nc = NUL; | |
| 7746 nc1 = NUL; | |
| 7747 } | |
| 7748 else | |
| 714 | 7749 { |
| 1994 | 7750 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7751 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7752 nc1 = pcc[0]; |
| 7753 } | |
| 7 | 7754 pc = prev_c; |
| 7755 prev_c = u8c; | |
| 714 | 7756 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7757 } |
| 7758 else | |
| 7759 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7760 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7761 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7762 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7763 /* 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
|
7764 * 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
|
7765 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7766 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7767 } |
| 7 | 7768 } |
| 7769 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7770 |
| 1843 | 7771 force_redraw_this = force_redraw_next; |
| 7772 force_redraw_next = FALSE; | |
| 7773 | |
| 7774 need_redraw = ScreenLines[off] != c | |
| 7 | 7775 || (mbyte_cells == 2 |
| 7776 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7777 || (enc_dbcs == DBCS_JPNU | |
| 7778 && c == 0x8e | |
| 7779 && ScreenLines2[off] != ptr[1]) | |
| 7780 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7781 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7782 (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
|
7783 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7784 && screen_comp_differs(off, u8cc)))) |
| 7 | 7785 || ScreenAttrs[off] != attr |
| 1843 | 7786 || exmode_active; |
| 7787 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7788 if (need_redraw || force_redraw_this) |
| 7 | 7789 { |
| 7790 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7791 /* The bold trick makes a single row of pixels appear in the next | |
| 7792 * character. When a bold character is removed, the next | |
| 7793 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7794 * and for some xterms. */ |
| 7795 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7796 # ifdef FEAT_GUI |
| 7797 gui.in_use | |
| 7798 # endif | |
| 7799 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7800 || | |
| 7801 # endif | |
| 7802 # ifdef UNIX | |
| 7803 term_is_xterm | |
| 7804 # endif | |
| 1843 | 7805 )) |
| 7806 { | |
| 7807 int n = ScreenAttrs[off]; | |
| 7808 | |
| 7809 if (n > HL_ALL) | |
| 7810 n = syn_attr2attr(n); | |
| 7811 if (n & HL_BOLD) | |
| 7812 force_redraw_next = TRUE; | |
| 7 | 7813 } |
| 7814 #endif | |
| 7815 /* When at the end of the text and overwriting a two-cell | |
| 7816 * character with a one-cell character, need to clear the next | |
| 7817 * cell. Also when overwriting the left halve of a two-cell char | |
| 7818 * with the right halve of a two-cell char. Do this only once | |
| 7819 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7820 if (clear_next_cell) | |
| 7821 clear_next_cell = FALSE; | |
| 7822 else if (has_mbyte | |
| 7823 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7824 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7825 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7826 || (mbyte_cells == 2 |
| 1378 | 7827 && (*mb_off2cells)(off, max_off) == 1 |
| 7828 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7829 clear_next_cell = TRUE; |
| 7830 | |
| 7831 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7832 * it confuses mb_off2cells(). */ | |
| 7833 if (enc_dbcs | |
| 1378 | 7834 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7835 || (mbyte_cells == 2 |
| 1378 | 7836 && (*mb_off2cells)(off, max_off) == 1 |
| 7837 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7838 ScreenLines[off + mbyte_blen] = 0; |
| 7839 ScreenLines[off] = c; | |
| 7840 ScreenAttrs[off] = attr; | |
| 7841 if (enc_utf8) | |
| 7842 { | |
| 714 | 7843 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7844 ScreenLinesUC[off] = 0; |
| 7845 else | |
| 7846 { | |
| 714 | 7847 int i; |
| 7848 | |
| 7 | 7849 ScreenLinesUC[off] = u8c; |
| 714 | 7850 for (i = 0; i < Screen_mco; ++i) |
| 7851 { | |
| 7852 ScreenLinesC[i][off] = u8cc[i]; | |
| 7853 if (u8cc[i] == 0) | |
| 7854 break; | |
| 7855 } | |
| 7 | 7856 } |
| 7857 if (mbyte_cells == 2) | |
| 7858 { | |
| 7859 ScreenLines[off + 1] = 0; | |
| 7860 ScreenAttrs[off + 1] = attr; | |
| 7861 } | |
| 7862 screen_char(off, row, col); | |
| 7863 } | |
| 7864 else if (mbyte_cells == 2) | |
| 7865 { | |
| 7866 ScreenLines[off + 1] = ptr[1]; | |
| 7867 ScreenAttrs[off + 1] = attr; | |
| 7868 screen_char_2(off, row, col); | |
| 7869 } | |
| 7870 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7871 { | |
| 7872 ScreenLines2[off] = ptr[1]; | |
| 7873 screen_char(off, row, col); | |
| 7874 } | |
| 7875 else | |
| 7876 screen_char(off, row, col); | |
| 7877 } | |
| 7878 if (has_mbyte) | |
| 7879 { | |
| 7880 off += mbyte_cells; | |
| 7881 col += mbyte_cells; | |
| 7882 ptr += mbyte_blen; | |
| 7883 if (clear_next_cell) | |
| 5923 | 7884 { |
| 7885 /* This only happens at the end, display one space next. */ | |
| 7 | 7886 ptr = (char_u *)" "; |
| 5923 | 7887 len = -1; |
| 7888 } | |
| 7 | 7889 } |
| 7890 else | |
| 7891 { | |
| 7892 ++off; | |
| 7893 ++col; | |
| 7894 ++ptr; | |
| 7895 } | |
| 7896 } | |
| 1843 | 7897 |
| 7898 /* If we detected the next character needs to be redrawn, but the text | |
| 7899 * doesn't extend up to there, update the character here. */ | |
| 7900 if (force_redraw_next && col < screen_Columns) | |
| 7901 { | |
| 7902 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7903 screen_char_2(off, row, col); | |
| 7904 else | |
| 7905 screen_char(off, row, col); | |
| 7906 } | |
| 7 | 7907 } |
| 7908 | |
| 7909 #ifdef FEAT_SEARCH_EXTRA | |
| 7910 /* | |
| 1326 | 7911 * Prepare for 'hlsearch' highlighting. |
| 7 | 7912 */ |
| 7913 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7914 start_search_hl(void) |
| 7 | 7915 { |
| 7916 if (p_hls && !no_hlsearch) | |
| 7917 { | |
| 7918 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
|
7919 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7920 # ifdef FEAT_RELTIME |
| 7921 /* Set the time limit to 'redrawtime'. */ | |
| 7922 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7923 # endif | |
| 7 | 7924 } |
| 7925 } | |
| 7926 | |
| 7927 /* | |
| 1326 | 7928 * Clean up for 'hlsearch' highlighting. |
| 7 | 7929 */ |
| 7930 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7931 end_search_hl(void) |
| 7 | 7932 { |
| 7933 if (search_hl.rm.regprog != NULL) | |
| 7934 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7935 vim_regfree(search_hl.rm.regprog); |
| 7 | 7936 search_hl.rm.regprog = NULL; |
| 7937 } | |
| 7938 } | |
| 7939 | |
| 7940 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7941 * 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
|
7942 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7943 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7944 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
|
7945 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7946 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7947 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7948 /* 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
|
7949 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7950 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7951 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7952 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7953 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7954 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7955 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7956 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7957 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
|
7958 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
|
7959 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7960 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7961 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7962 /* 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
|
7963 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
|
7964 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7965 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7966 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7967 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
|
7968 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7969 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7970 /* 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
|
7971 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7972 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7973 /* |
| 7 | 7974 * Advance to the match in window "wp" line "lnum" or past it. |
| 7975 */ | |
| 7976 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7977 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7978 { |
| 1326 | 7979 matchitem_T *cur; /* points to the match list */ |
| 7980 match_T *shl; /* points to search_hl or a match */ | |
| 7981 int shl_flag; /* flag to indicate whether search_hl | |
| 7982 has been processed or not */ | |
| 5979 | 7983 int pos_inprogress; /* marks that position match search is |
| 7984 in progress */ | |
| 7 | 7985 int n; |
| 7986 | |
| 7987 /* | |
| 7988 * When using a multi-line pattern, start searching at the top | |
| 7989 * of the window or just after a closed fold. | |
| 1326 | 7990 * Do this both for search_hl and the match list. |
| 7 | 7991 */ |
| 1326 | 7992 cur = wp->w_match_head; |
| 7993 shl_flag = FALSE; | |
| 7994 while (cur != NULL || shl_flag == FALSE) | |
| 7995 { | |
| 7996 if (shl_flag == FALSE) | |
| 7997 { | |
| 7998 shl = &search_hl; | |
| 7999 shl_flag = TRUE; | |
| 8000 } | |
| 8001 else | |
| 8002 shl = &cur->hl; | |
| 7 | 8003 if (shl->rm.regprog != NULL |
| 8004 && shl->lnum == 0 | |
| 8005 && re_multiline(shl->rm.regprog)) | |
| 8006 { | |
| 8007 if (shl->first_lnum == 0) | |
| 8008 { | |
| 8009 # ifdef FEAT_FOLDING | |
| 8010 for (shl->first_lnum = lnum; | |
| 8011 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 8012 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 8013 NULL, NULL, TRUE, NULL)) | |
| 8014 break; | |
| 8015 # else | |
| 8016 shl->first_lnum = wp->w_topline; | |
| 8017 # endif | |
| 8018 } | |
| 5979 | 8019 if (cur != NULL) |
| 8020 cur->pos.cur = 0; | |
| 8021 pos_inprogress = TRUE; | |
| 7 | 8022 n = 0; |
| 5979 | 8023 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 8024 || (cur != NULL && pos_inprogress))) | |
| 8025 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
8026 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
|
8027 shl == &search_hl ? NULL : cur); |
| 5979 | 8028 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 8029 ? FALSE : TRUE; | |
| 7 | 8030 if (shl->lnum != 0) |
| 8031 { | |
| 8032 shl->first_lnum = shl->lnum | |
| 8033 + shl->rm.endpos[0].lnum | |
| 8034 - shl->rm.startpos[0].lnum; | |
| 8035 n = shl->rm.endpos[0].col; | |
| 8036 } | |
| 8037 else | |
| 8038 { | |
| 8039 ++shl->first_lnum; | |
| 8040 n = 0; | |
| 8041 } | |
| 8042 } | |
| 8043 } | |
| 1326 | 8044 if (shl != &search_hl && cur != NULL) |
| 8045 cur = cur->next; | |
| 7 | 8046 } |
| 8047 } | |
| 8048 | |
| 8049 /* | |
| 1326 | 8050 * Search for a next 'hlsearch' or match. |
| 7 | 8051 * Uses shl->buf. |
| 8052 * Sets shl->lnum and shl->rm contents. | |
| 8053 * Note: Assumes a previous match is always before "lnum", unless | |
| 8054 * shl->lnum is zero. | |
| 8055 * Careful: Any pointers for buffer lines will become invalid. | |
| 8056 */ | |
| 8057 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8058 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8059 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8060 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
|
8061 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8062 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
|
8063 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 8064 { |
| 8065 linenr_T l; | |
| 8066 colnr_T matchcol; | |
| 8067 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
|
8068 int save_called_emsg = called_emsg; |
| 7 | 8069 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8070 // 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
|
8071 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
|
8072 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8073 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
|
8074 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8075 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8076 |
| 7 | 8077 if (shl->lnum != 0) |
| 8078 { | |
| 8079 /* Check for three situations: | |
| 8080 * 1. If the "lnum" is below a previous match, start a new search. | |
| 8081 * 2. If the previous match includes "mincol", use it. | |
| 8082 * 3. Continue after the previous match. | |
| 8083 */ | |
| 8084 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 8085 if (lnum > l) | |
| 8086 shl->lnum = 0; | |
| 8087 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 8088 return; | |
| 8089 } | |
| 8090 | |
| 8091 /* | |
| 8092 * Repeat searching for a match until one is found that includes "mincol" | |
| 8093 * or none is found in this line. | |
| 8094 */ | |
| 8095 called_emsg = FALSE; | |
| 8096 for (;;) | |
| 8097 { | |
| 1521 | 8098 #ifdef FEAT_RELTIME |
| 8099 /* Stop searching after passing the time limit. */ | |
| 8100 if (profile_passed_limit(&(shl->tm))) | |
| 8101 { | |
| 8102 shl->lnum = 0; /* no match found in time */ | |
| 8103 break; | |
| 8104 } | |
| 8105 #endif | |
| 7 | 8106 /* Three situations: |
| 8107 * 1. No useful previous match: search from start of line. | |
| 8108 * 2. Not Vi compatible or empty match: continue at next character. | |
| 8109 * Break the loop if this is beyond the end of the line. | |
| 8110 * 3. Vi compatible searching: continue at end of previous match. | |
| 8111 */ | |
| 8112 if (shl->lnum == 0) | |
| 8113 matchcol = 0; | |
| 8114 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 8115 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 8116 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 8117 { | |
| 688 | 8118 char_u *ml; |
| 685 | 8119 |
| 8120 matchcol = shl->rm.startpos[0].col; | |
| 688 | 8121 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 8122 if (*ml == NUL) |
| 8123 { | |
| 8124 ++matchcol; | |
| 7 | 8125 shl->lnum = 0; |
| 8126 break; | |
| 8127 } | |
| 685 | 8128 if (has_mbyte) |
| 8129 matchcol += mb_ptr2len(ml); | |
| 8130 else | |
| 8131 ++matchcol; | |
| 7 | 8132 } |
| 8133 else | |
| 8134 matchcol = shl->rm.endpos[0].col; | |
| 8135 | |
| 8136 shl->lnum = lnum; | |
| 5979 | 8137 if (shl->rm.regprog != NULL) |
| 8138 { | |
| 6394 | 8139 /* Remember whether shl->rm is using a copy of the regprog in |
| 8140 * cur->match. */ | |
| 8141 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 8142 && shl == &cur->hl | |
| 8143 && 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
|
8144 int timed_out = FALSE; |
| 6394 | 8145 |
| 5979 | 8146 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 8147 matchcol, | |
| 1521 | 8148 #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
|
8149 &(shl->tm), &timed_out |
| 1521 | 8150 #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
|
8151 NULL, NULL |
| 5979 | 8152 #endif |
| 8153 ); | |
| 6394 | 8154 /* Copy the regprog, in case it got freed and recompiled. */ |
| 8155 if (regprog_is_copy) | |
| 8156 cur->match.regprog = cur->hl.rm.regprog; | |
| 8157 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8158 if (called_emsg || got_int || timed_out) |
| 5979 | 8159 { |
| 8160 /* Error while handling regexp: stop using this regexp. */ | |
| 8161 if (shl == &search_hl) | |
| 8162 { | |
| 8163 /* don't free regprog in the match list, it's a copy */ | |
| 8164 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
|
8165 set_no_hlsearch(TRUE); |
| 5979 | 8166 } |
| 8167 shl->rm.regprog = NULL; | |
| 8168 shl->lnum = 0; | |
| 8169 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 8170 message */ | |
| 8171 break; | |
| 8172 } | |
| 8173 } | |
| 8174 else if (cur != NULL) | |
| 8175 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 8176 else |
| 8177 nmatched = 0; | |
| 7 | 8178 if (nmatched == 0) |
| 8179 { | |
| 8180 shl->lnum = 0; /* no match found */ | |
| 8181 break; | |
| 8182 } | |
| 8183 if (shl->rm.startpos[0].lnum > 0 | |
| 8184 || shl->rm.startpos[0].col >= mincol | |
| 8185 || nmatched > 1 | |
| 8186 || shl->rm.endpos[0].col > mincol) | |
| 8187 { | |
| 8188 shl->lnum += shl->rm.startpos[0].lnum; | |
| 8189 break; /* useful match found */ | |
| 8190 } | |
| 8191 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8192 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8193 // 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
|
8194 called_emsg = save_called_emsg; |
| 7 | 8195 } |
| 8196 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8197 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8198 * 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
|
8199 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8200 */ |
| 5979 | 8201 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8202 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8203 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
|
8204 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8205 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8206 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 8207 { |
| 8208 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8209 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8210 |
| 5979 | 8211 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 8212 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8213 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8214 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8215 if (pos->lnum == 0) |
| 5979 | 8216 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8217 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8218 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8219 if (pos->lnum == lnum) |
| 5979 | 8220 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8221 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8222 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8223 /* 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
|
8224 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8225 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
|
8226 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8227 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8228 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8229 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8230 posmatch->pos[found] = tmp; |
| 5979 | 8231 } |
| 8232 } | |
| 8233 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8234 found = i; |
| 5979 | 8235 } |
| 8236 } | |
| 8237 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8238 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8239 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8240 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
|
8241 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8242 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
|
8243 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8244 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8245 shl->lnum = lnum; |
| 5979 | 8246 shl->rm.startpos[0].lnum = 0; |
| 8247 shl->rm.startpos[0].col = start; | |
| 8248 shl->rm.endpos[0].lnum = 0; | |
| 8249 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
|
8250 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8251 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8252 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8253 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8254 return 0; |
| 5979 | 8255 } |
| 5985 | 8256 #endif |
| 5979 | 8257 |
| 7 | 8258 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8259 screen_start_highlight(int attr) |
| 7 | 8260 { |
| 8261 attrentry_T *aep = NULL; | |
| 8262 | |
| 8263 screen_attr = attr; | |
| 8264 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
8265 #ifdef MSWIN |
| 7 | 8266 && termcap_active |
| 8267 #endif | |
| 8268 ) | |
| 8269 { | |
| 8270 #ifdef FEAT_GUI | |
| 8271 if (gui.in_use) | |
| 8272 { | |
| 8273 char buf[20]; | |
| 8274 | |
| 681 | 8275 /* The GUI handles this internally. */ |
| 8276 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8277 OUT_STR(buf); |
| 8278 } | |
| 8279 else | |
| 8280 #endif | |
| 8281 { | |
| 8282 if (attr > HL_ALL) /* special HL attr. */ | |
| 8283 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8284 if (IS_CTERM) |
| 7 | 8285 aep = syn_cterm_attr2entry(attr); |
| 8286 else | |
| 8287 aep = syn_term_attr2entry(attr); | |
| 8288 if (aep == NULL) /* did ":syntax clear" */ | |
| 8289 attr = 0; | |
| 8290 else | |
| 8291 attr = aep->ae_attr; | |
| 8292 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8293 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8294 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
|
8295 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
|
8296 #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
|
8297 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
|
8298 ? 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
|
8299 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8300 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8301 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8302 /* If the Normal FG color has BOLD attribute and the new HL |
| 8303 * has a FG color defined, clear BOLD. */ | |
| 8304 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
|
8305 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8306 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
|
8307 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
|
8308 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
|
8309 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
|
8310 || ((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
|
8311 && *T_US != NUL) |
| 7 | 8312 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
|
8313 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8314 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
|
8315 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8316 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
|
8317 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
|
8318 out_str(T_STS); |
| 7 | 8319 |
| 8320 /* | |
| 8321 * Output the color or start string after bold etc., in case the | |
| 8322 * bold etc. override the color setting. | |
| 8323 */ | |
| 8324 if (aep != NULL) | |
| 8325 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8326 #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
|
8327 /* 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
|
8328 * 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
|
8329 * 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
|
8330 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
|
8331 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8332 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
|
8333 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
|
8334 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8335 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8336 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8337 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
|
8338 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8339 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
|
8340 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
|
8341 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8342 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8343 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
|
8344 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8345 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
|
8346 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8347 } |
| 8348 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8349 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8350 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
|
8351 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8352 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
|
8353 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
|
8354 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8355 |
|
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
|
8356 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
|
8357 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8358 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
|
8359 out_str(aep->ae_u.term.start); |
| 7 | 8360 } |
| 8361 } | |
| 8362 } | |
| 8363 } | |
| 8364 } | |
| 8365 | |
| 8366 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8367 screen_stop_highlight(void) |
| 7 | 8368 { |
| 8369 int do_ME = FALSE; /* output T_ME code */ | |
| 8370 | |
| 8371 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
|
8372 #ifdef MSWIN |
| 7 | 8373 && termcap_active |
| 8374 #endif | |
| 8375 ) | |
| 8376 { | |
| 8377 #ifdef FEAT_GUI | |
| 8378 if (gui.in_use) | |
| 8379 { | |
| 8380 char buf[20]; | |
| 8381 | |
| 8382 /* use internal GUI code */ | |
| 8383 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8384 OUT_STR(buf); | |
| 8385 } | |
| 8386 else | |
| 8387 #endif | |
| 8388 { | |
| 8389 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8390 { | |
| 8391 attrentry_T *aep; | |
| 8392 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8393 if (IS_CTERM) |
| 7 | 8394 { |
| 8395 /* | |
| 8396 * Assume that t_me restores the original colors! | |
| 8397 */ | |
| 8398 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
|
8399 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8400 #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
|
8401 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
|
8402 ? 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
|
8403 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8404 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8405 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
|
8406 #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
|
8407 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
|
8408 ? 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
|
8409 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8410 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8411 aep->ae_u.cterm.bg_color))) |
| 7 | 8412 do_ME = TRUE; |
| 8413 } | |
| 8414 else | |
| 8415 { | |
| 8416 aep = syn_term_attr2entry(screen_attr); | |
| 8417 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8418 { | |
| 8419 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8420 do_ME = TRUE; | |
| 8421 else | |
| 8422 out_str(aep->ae_u.term.stop); | |
| 8423 } | |
| 8424 } | |
| 8425 if (aep == NULL) /* did ":syntax clear" */ | |
| 8426 screen_attr = 0; | |
| 8427 else | |
| 8428 screen_attr = aep->ae_attr; | |
| 8429 } | |
| 8430 | |
| 8431 /* | |
| 8432 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8433 * same sequence several times. | |
| 8434 */ | |
| 8435 if (screen_attr & HL_STANDOUT) | |
| 8436 { | |
| 8437 if (STRCMP(T_SE, T_ME) == 0) | |
| 8438 do_ME = TRUE; | |
| 8439 else | |
| 8440 out_str(T_SE); | |
| 8441 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8442 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
|
8443 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8444 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
|
8445 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8446 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8447 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
|
8448 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8449 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
|
8450 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8451 { |
| 8452 if (STRCMP(T_UE, T_ME) == 0) | |
| 8453 do_ME = TRUE; | |
| 8454 else | |
| 8455 out_str(T_UE); | |
| 8456 } | |
| 8457 if (screen_attr & HL_ITALIC) | |
| 8458 { | |
| 8459 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8460 do_ME = TRUE; | |
| 8461 else | |
| 8462 out_str(T_CZR); | |
| 8463 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8464 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8465 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8466 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
|
8467 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8468 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8469 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8470 } |
| 7 | 8471 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8472 out_str(T_ME); | |
| 8473 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8474 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8475 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8476 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8477 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
|
8478 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
|
8479 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
|
8480 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
|
8481 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8482 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8483 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8484 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8485 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8486 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8487 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8488 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8489 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
|
8490 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8491 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
|
8492 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8493 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8494 } |
| 7 | 8495 } |
| 8496 } | |
| 8497 } | |
| 8498 screen_attr = 0; | |
| 8499 } | |
| 8500 | |
| 8501 /* | |
| 8502 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8503 * The machine specific code may override this again. | |
| 8504 */ | |
| 8505 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8506 reset_cterm_colors(void) |
| 7 | 8507 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8508 if (IS_CTERM) |
| 7 | 8509 { |
| 8510 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8511 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8512 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
|
8513 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8514 : (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
|
8515 #else |
| 7 | 8516 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
|
8517 #endif |
| 7 | 8518 { |
| 8519 out_str(T_OP); | |
| 8520 screen_attr = -1; | |
| 8521 } | |
| 8522 if (cterm_normal_fg_bold) | |
| 8523 { | |
| 8524 out_str(T_ME); | |
| 8525 screen_attr = -1; | |
| 8526 } | |
| 8527 } | |
| 8528 } | |
| 8529 | |
| 8530 /* | |
| 8531 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8532 * using the attributes from ScreenAttrs["off"]. | |
| 8533 */ | |
| 8534 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8535 screen_char(unsigned off, int row, int col) |
| 7 | 8536 { |
| 8537 int attr; | |
| 8538 | |
| 8539 /* Check for illegal values, just in case (could happen just after | |
| 8540 * resizing). */ | |
| 8541 if (row >= screen_Rows || col >= screen_Columns) | |
| 8542 return; | |
| 8543 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8544 #ifdef FEAT_INS_EXPAND |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8545 if (pum_under_menu(row, col)) |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8546 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8547 #endif |
| 6602 | 8548 /* Outputting a character in the last cell on the screen may scroll the |
| 8549 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8550 * mark the character invalid (update it when scrolled up). */ | |
| 8551 if (*T_XN == NUL | |
| 8552 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8553 #ifdef FEAT_RIGHTLEFT |
| 8554 /* account for first command-line character in rightleft mode */ | |
| 8555 && !cmdmsg_rl | |
| 8556 #endif | |
| 8557 ) | |
| 8558 { | |
| 8559 ScreenAttrs[off] = (sattr_T)-1; | |
| 8560 return; | |
| 8561 } | |
| 8562 | |
| 8563 /* | |
| 8564 * Stop highlighting first, so it's easier to move the cursor. | |
| 8565 */ | |
| 8566 if (screen_char_attr != 0) | |
| 8567 attr = screen_char_attr; | |
| 8568 else | |
| 8569 attr = ScreenAttrs[off]; | |
| 8570 if (screen_attr != attr) | |
| 8571 screen_stop_highlight(); | |
| 8572 | |
| 8573 windgoto(row, col); | |
| 8574 | |
| 8575 if (screen_attr != attr) | |
| 8576 screen_start_highlight(attr); | |
| 8577 | |
| 8578 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8579 { | |
| 8580 char_u buf[MB_MAXBYTES + 1]; | |
| 8581 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8582 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
|
8583 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8584 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8585 #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
|
8586 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8587 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8588 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8589 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8590 /* 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
|
8591 * 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
|
8592 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
|
8593 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
|
8594 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8595 /* 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
|
8596 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8597 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
|
8598 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8599 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8600 ++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
|
8601 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8602 /* 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
|
8603 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
|
8604 out_str(buf); |
| 7 | 8605 } |
| 8606 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8607 { |
| 7 | 8608 out_flush_check(); |
| 8609 out_char(ScreenLines[off]); | |
| 8610 /* double-byte character in single-width cell */ | |
| 8611 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8612 out_char(ScreenLines2[off]); | |
| 8613 } | |
| 8614 | |
| 8615 screen_cur_col++; | |
| 8616 } | |
| 8617 | |
| 8618 /* | |
| 8619 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8620 * on the screen at position 'row' and 'col'. | |
| 8621 * The attributes of the first byte is used for all. This is required to | |
| 8622 * output the two bytes of a double-byte character with nothing in between. | |
| 8623 */ | |
| 8624 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8625 screen_char_2(unsigned off, int row, int col) |
| 7 | 8626 { |
| 8627 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8628 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8629 return; | |
| 8630 | |
| 8631 /* Outputting the last character on the screen may scrollup the screen. | |
| 8632 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8633 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8634 { | |
| 8635 ScreenAttrs[off] = (sattr_T)-1; | |
| 8636 return; | |
| 8637 } | |
| 8638 | |
| 8639 /* Output the first byte normally (positions the cursor), then write the | |
| 8640 * second byte directly. */ | |
| 8641 screen_char(off, row, col); | |
| 8642 out_char(ScreenLines[off + 1]); | |
| 8643 ++screen_cur_col; | |
| 8644 } | |
| 8645 | |
| 8646 /* | |
| 8647 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8648 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8649 */ | |
| 8650 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8651 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8652 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8653 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8654 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8655 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8656 int invert) |
| 7 | 8657 { |
| 8658 int r, c; | |
| 8659 int off; | |
| 1378 | 8660 int max_off; |
| 7 | 8661 |
| 534 | 8662 /* Can't use ScreenLines unless initialized */ |
| 8663 if (ScreenLines == NULL) | |
| 8664 return; | |
| 8665 | |
| 7 | 8666 if (invert) |
| 8667 screen_char_attr = HL_INVERSE; | |
| 8668 for (r = row; r < row + height; ++r) | |
| 8669 { | |
| 8670 off = LineOffset[r]; | |
| 1378 | 8671 max_off = off + screen_Columns; |
| 7 | 8672 for (c = col; c < col + width; ++c) |
| 8673 { | |
| 1378 | 8674 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8675 { |
| 8676 screen_char_2(off + c, r, c); | |
| 8677 ++c; | |
| 8678 } | |
| 8679 else | |
| 8680 { | |
| 8681 screen_char(off + c, r, c); | |
| 1378 | 8682 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8683 ++c; |
| 8684 } | |
| 8685 } | |
| 8686 } | |
| 8687 screen_char_attr = 0; | |
| 8688 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8689 |
| 7 | 8690 /* |
| 8691 * Redraw the characters for a vertically split window. | |
| 8692 */ | |
| 8693 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8694 redraw_block(int row, int end, win_T *wp) |
| 7 | 8695 { |
| 8696 int col; | |
| 8697 int width; | |
| 8698 | |
| 8699 # ifdef FEAT_CLIPBOARD | |
| 8700 clip_may_clear_selection(row, end - 1); | |
| 8701 # endif | |
| 8702 | |
| 8703 if (wp == NULL) | |
| 8704 { | |
| 8705 col = 0; | |
| 8706 width = Columns; | |
| 8707 } | |
| 8708 else | |
| 8709 { | |
| 8710 col = wp->w_wincol; | |
| 8711 width = wp->w_width; | |
| 8712 } | |
| 8713 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8714 } | |
| 8715 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8716 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8717 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
|
8718 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8719 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8720 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8721 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8722 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8723 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8724 |
| 7 | 8725 /* |
| 8726 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8727 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8728 * Use attributes 'attr'. | |
| 8729 */ | |
| 8730 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8731 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8732 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8733 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8734 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8735 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8736 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8737 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8738 int attr) |
| 7 | 8739 { |
| 8740 int row; | |
| 8741 int col; | |
| 8742 int off; | |
| 8743 int end_off; | |
| 8744 int did_delete; | |
| 8745 int c; | |
| 8746 int norm_term; | |
| 8747 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8748 int force_next = FALSE; | |
| 8749 #endif | |
| 8750 | |
| 8751 if (end_row > screen_Rows) /* safety check */ | |
| 8752 end_row = screen_Rows; | |
| 8753 if (end_col > screen_Columns) /* safety check */ | |
| 8754 end_col = screen_Columns; | |
| 8755 if (ScreenLines == NULL | |
| 8756 || start_row >= end_row | |
| 8757 || start_col >= end_col) /* nothing to do */ | |
| 8758 return; | |
| 8759 | |
| 8760 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8761 norm_term = ( | |
| 8762 #ifdef FEAT_GUI | |
| 8763 !gui.in_use && | |
| 8764 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8765 !IS_CTERM); |
| 7 | 8766 for (row = start_row; row < end_row; ++row) |
| 8767 { | |
| 1668 | 8768 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8769 #ifdef FEAT_GUI |
| 1668 | 8770 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8771 #endif |
| 1668 | 8772 ) |
| 8773 { | |
| 8774 /* When drawing over the right halve of a double-wide char clear | |
| 8775 * out the left halve. When drawing over the left halve of a | |
| 8776 * double wide-char clear out the right halve. Only needed in a | |
| 8777 * terminal. */ | |
| 1685 | 8778 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8779 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8780 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8781 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8782 } |
| 7 | 8783 /* |
| 8784 * Try to use delete-line termcap code, when no attributes or in a | |
| 8785 * "normal" terminal, where a bold/italic space is just a | |
| 8786 * space. | |
| 8787 */ | |
| 8788 did_delete = FALSE; | |
| 8789 if (c2 == ' ' | |
| 8790 && end_col == Columns | |
| 8791 && can_clear(T_CE) | |
| 8792 && (attr == 0 | |
| 8793 || (norm_term | |
| 8794 && attr <= HL_ALL | |
| 8795 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8796 { | |
| 8797 /* | |
| 8798 * check if we really need to clear something | |
| 8799 */ | |
| 8800 col = start_col; | |
| 8801 if (c1 != ' ') /* don't clear first char */ | |
| 8802 ++col; | |
| 8803 | |
| 8804 off = LineOffset[row] + col; | |
| 8805 end_off = LineOffset[row] + end_col; | |
| 8806 | |
| 8807 /* skip blanks (used often, keep it fast!) */ | |
| 8808 if (enc_utf8) | |
| 8809 while (off < end_off && ScreenLines[off] == ' ' | |
| 8810 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8811 ++off; | |
| 8812 else | |
| 8813 while (off < end_off && ScreenLines[off] == ' ' | |
| 8814 && ScreenAttrs[off] == 0) | |
| 8815 ++off; | |
| 8816 if (off < end_off) /* something to be cleared */ | |
| 8817 { | |
| 8818 col = off - LineOffset[row]; | |
| 8819 screen_stop_highlight(); | |
| 8820 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8821 out_str(T_CE); | |
| 8822 screen_start(); /* don't know where cursor is now */ | |
| 8823 col = end_col - col; | |
| 8824 while (col--) /* clear chars in ScreenLines */ | |
| 8825 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8826 space_to_screenline(off, 0); |
| 7 | 8827 ++off; |
| 8828 } | |
| 8829 } | |
| 8830 did_delete = TRUE; /* the chars are cleared now */ | |
| 8831 } | |
| 8832 | |
| 8833 off = LineOffset[row] + start_col; | |
| 8834 c = c1; | |
| 8835 for (col = start_col; col < end_col; ++col) | |
| 8836 { | |
| 8837 if (ScreenLines[off] != c | |
| 714 | 8838 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8839 != (c >= 0x80 ? c : 0)) | |
| 7 | 8840 || ScreenAttrs[off] != attr |
| 8841 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8842 || force_next | |
| 8843 #endif | |
| 8844 ) | |
| 8845 { | |
| 8846 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8847 /* The bold trick may make a single row of pixels appear in | |
| 8848 * the next character. When a bold character is removed, the | |
| 8849 * next character should be redrawn too. This happens for our | |
| 8850 * own GUI and for some xterms. */ | |
| 8851 if ( | |
| 8852 # ifdef FEAT_GUI | |
| 8853 gui.in_use | |
| 8854 # endif | |
| 8855 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8856 || | |
| 8857 # endif | |
| 8858 # ifdef UNIX | |
| 8859 term_is_xterm | |
| 8860 # endif | |
| 8861 ) | |
| 8862 { | |
| 8863 if (ScreenLines[off] != ' ' | |
| 8864 && (ScreenAttrs[off] > HL_ALL | |
| 8865 || ScreenAttrs[off] & HL_BOLD)) | |
| 8866 force_next = TRUE; | |
| 8867 else | |
| 8868 force_next = FALSE; | |
| 8869 } | |
| 8870 #endif | |
| 8871 ScreenLines[off] = c; | |
| 8872 if (enc_utf8) | |
| 8873 { | |
| 8874 if (c >= 0x80) | |
| 8875 { | |
| 8876 ScreenLinesUC[off] = c; | |
| 714 | 8877 ScreenLinesC[0][off] = 0; |
| 7 | 8878 } |
| 8879 else | |
| 8880 ScreenLinesUC[off] = 0; | |
| 8881 } | |
| 8882 ScreenAttrs[off] = attr; | |
| 8883 if (!did_delete || c != ' ') | |
| 8884 screen_char(off, row, col); | |
| 8885 } | |
| 8886 ++off; | |
| 8887 if (col == start_col) | |
| 8888 { | |
| 8889 if (did_delete) | |
| 8890 break; | |
| 8891 c = c2; | |
| 8892 } | |
| 8893 } | |
| 8894 if (end_col == Columns) | |
| 8895 LineWraps[row] = FALSE; | |
| 8896 if (row == Rows - 1) /* overwritten the command line */ | |
| 8897 { | |
| 8898 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
|
8899 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
|
8900 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8901 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8902 if (start_col == 0) |
| 8903 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8904 } |
| 8905 } | |
| 8906 } | |
| 8907 | |
| 8908 /* | |
| 8909 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8910 * screen or the command line. | |
| 8911 */ | |
| 8912 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8913 check_for_delay(int check_msg_scroll) |
| 7 | 8914 { |
| 8915 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8916 && !did_wait_return | |
| 8917 && emsg_silent == 0) | |
| 8918 { | |
| 8919 out_flush(); | |
| 8920 ui_delay(1000L, TRUE); | |
| 8921 emsg_on_display = FALSE; | |
| 8922 if (check_msg_scroll) | |
| 8923 msg_scroll = FALSE; | |
| 8924 } | |
| 8925 } | |
| 8926 | |
| 8927 /* | |
|
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
|
8928 * 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
|
8929 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8930 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
|
8931 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
|
8932 { |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8933 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
|
8934 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8935 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
|
8936 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
|
8937 } |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8938 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8939 /* |
| 7 | 8940 * screen_valid - allocate screen buffers if size changed |
| 3263 | 8941 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8942 * Returns TRUE if there is a valid screen to write to. |
| 8943 * Returns FALSE when starting up and screen not initialized yet. | |
| 8944 */ | |
| 8945 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8946 screen_valid(int doclear) |
| 7 | 8947 { |
| 3263 | 8948 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8949 return (ScreenLines != NULL); |
| 8950 } | |
| 8951 | |
| 8952 /* | |
| 8953 * Resize the shell to Rows and Columns. | |
| 8954 * Allocate ScreenLines[] and associated items. | |
| 8955 * | |
| 8956 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8957 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8958 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8959 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8960 * final size of the shell is needed. | |
| 8961 */ | |
| 8962 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8963 screenalloc(int doclear) |
| 7 | 8964 { |
| 8965 int new_row, old_row; | |
| 8966 #ifdef FEAT_GUI | |
| 8967 int old_Rows; | |
| 8968 #endif | |
| 8969 win_T *wp; | |
| 8970 int outofmem = FALSE; | |
| 8971 int len; | |
| 8972 schar_T *new_ScreenLines; | |
| 8973 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8974 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8975 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8976 int i; |
| 7 | 8977 sattr_T *new_ScreenAttrs; |
| 8978 unsigned *new_LineOffset; | |
| 8979 char_u *new_LineWraps; | |
| 681 | 8980 short *new_TabPageIdxs; |
| 671 | 8981 tabpage_T *tp; |
| 7 | 8982 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8983 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8984 int retry_count = 0; |
| 8985 | |
| 8986 retry: | |
| 7 | 8987 /* |
| 8988 * Allocation of the screen buffers is done only when the size changes and | |
| 8989 * when Rows and Columns have been set and we have started doing full | |
| 8990 * screen stuff. | |
| 8991 */ | |
| 8992 if ((ScreenLines != NULL | |
| 8993 && Rows == screen_Rows | |
| 8994 && Columns == screen_Columns | |
| 8995 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8996 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8997 && p_mco == Screen_mco) |
| 7 | 8998 || Rows == 0 |
| 8999 || Columns == 0 | |
| 9000 || (!full_screen && ScreenLines == NULL)) | |
| 9001 return; | |
| 9002 | |
| 9003 /* | |
| 9004 * It's possible that we produce an out-of-memory message below, which | |
| 9005 * will cause this function to be called again. To break the loop, just | |
| 9006 * return here. | |
| 9007 */ | |
| 9008 if (entered) | |
| 9009 return; | |
| 9010 entered = TRUE; | |
| 9011 | |
| 911 | 9012 /* |
| 9013 * Note that the window sizes are updated before reallocating the arrays, | |
| 9014 * thus we must not redraw here! | |
| 9015 */ | |
| 9016 ++RedrawingDisabled; | |
| 9017 | |
| 7 | 9018 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 9019 | |
| 9020 comp_col(); /* recompute columns for shown command and ruler */ | |
| 9021 | |
| 9022 /* | |
| 9023 * We're changing the size of the screen. | |
| 9024 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 9025 * - Move lines from the old arrays into the new arrays, clear extra | |
| 9026 * lines (unless the screen is going to be cleared). | |
| 9027 * - Free the old arrays. | |
| 9028 * | |
| 9029 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 9030 * Continuing with the old ScreenLines may result in a crash, because the | |
| 9031 * size is wrong. | |
| 9032 */ | |
| 671 | 9033 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9034 win_free_lsize(wp); |
| 1946 | 9035 if (aucmd_win != NULL) |
| 9036 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
|
9037 #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
|
9038 // 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
|
9039 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
|
9040 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
|
9041 // 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
|
9042 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
|
9043 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
|
9044 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
|
9045 #endif |
| 7 | 9046 |
|
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
|
9047 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
|
9048 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 9049 if (enc_utf8) |
| 9050 { | |
|
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
|
9051 new_ScreenLinesUC = LALLOC_MULT(u8char_T, (Rows + 1) * Columns); |
| 714 | 9052 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
|
9053 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
|
9054 (Rows + 1) * Columns); |
| 7 | 9055 } |
| 9056 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
|
9057 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
|
9058 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
|
9059 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
|
9060 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
|
9061 new_TabPageIdxs = LALLOC_MULT(short, Columns); |
| 7 | 9062 |
| 677 | 9063 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9064 { |
| 9065 if (win_alloc_lines(wp) == FAIL) | |
| 9066 { | |
| 9067 outofmem = TRUE; | |
| 1819 | 9068 goto give_up; |
| 9069 } | |
| 9070 } | |
| 1946 | 9071 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 9072 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 9073 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
|
9074 #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
|
9075 // 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
|
9076 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
|
9077 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
|
9078 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9079 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
|
9080 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
|
9081 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9082 // 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
|
9083 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
|
9084 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
|
9085 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
|
9086 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9087 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
|
9088 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
|
9089 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9090 #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
|
9091 |
| 1819 | 9092 give_up: |
| 7 | 9093 |
| 714 | 9094 for (i = 0; i < p_mco; ++i) |
| 9095 if (new_ScreenLinesC[i] == NULL) | |
| 9096 break; | |
| 7 | 9097 if (new_ScreenLines == NULL |
| 714 | 9098 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 9099 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 9100 || new_ScreenAttrs == NULL | |
| 9101 || new_LineOffset == NULL | |
| 9102 || new_LineWraps == NULL | |
| 671 | 9103 || new_TabPageIdxs == NULL |
| 7 | 9104 || outofmem) |
| 9105 { | |
| 944 | 9106 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 9107 { |
| 9108 /* guess the size */ | |
| 9109 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 9110 | |
| 9111 /* Remember we did this to avoid getting outofmem messages over | |
| 9112 * and over again. */ | |
| 944 | 9113 done_outofmem_msg = TRUE; |
| 534 | 9114 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9115 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9116 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 9117 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
|
9118 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
|
9119 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9120 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9121 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9122 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9123 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 9124 } |
| 9125 else | |
| 9126 { | |
| 944 | 9127 done_outofmem_msg = FALSE; |
| 534 | 9128 |
| 7 | 9129 for (new_row = 0; new_row < Rows; ++new_row) |
| 9130 { | |
| 9131 new_LineOffset[new_row] = new_row * Columns; | |
| 9132 new_LineWraps[new_row] = FALSE; | |
| 9133 | |
| 9134 /* | |
| 9135 * If the screen is not going to be cleared, copy as much as | |
| 9136 * possible from the old screen to the new one and clear the rest | |
| 9137 * (used when resizing the window at the "--more--" prompt or when | |
| 9138 * executing an external command, for the GUI). | |
| 9139 */ | |
| 3263 | 9140 if (!doclear) |
| 7 | 9141 { |
| 9142 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 9143 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 9144 if (enc_utf8) | |
| 9145 { | |
| 9146 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 9147 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 9148 for (i = 0; i < p_mco; ++i) |
| 9149 (void)vim_memset(new_ScreenLinesC[i] | |
| 9150 + new_row * Columns, | |
| 7 | 9151 0, (size_t)Columns * sizeof(u8char_T)); |
| 9152 } | |
| 9153 if (enc_dbcs == DBCS_JPNU) | |
| 9154 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 9155 0, (size_t)Columns * sizeof(schar_T)); | |
| 9156 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 9157 0, (size_t)Columns * sizeof(sattr_T)); | |
| 9158 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 9159 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 9160 { |
| 9161 if (screen_Columns < Columns) | |
| 9162 len = screen_Columns; | |
| 9163 else | |
| 9164 len = Columns; | |
| 571 | 9165 /* When switching to utf-8 don't copy characters, they |
| 714 | 9166 * may be invalid now. Also when p_mco changes. */ |
| 9167 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 9168 && p_mco == Screen_mco) | |
| 26 | 9169 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 9170 ScreenLines + LineOffset[old_row], | |
| 9171 (size_t)len * sizeof(schar_T)); | |
| 714 | 9172 if (enc_utf8 && ScreenLinesUC != NULL |
| 9173 && p_mco == Screen_mco) | |
| 7 | 9174 { |
| 9175 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 9176 ScreenLinesUC + LineOffset[old_row], | |
| 9177 (size_t)len * sizeof(u8char_T)); | |
| 714 | 9178 for (i = 0; i < p_mco; ++i) |
| 9179 mch_memmove(new_ScreenLinesC[i] | |
| 9180 + new_LineOffset[new_row], | |
| 9181 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 9182 (size_t)len * sizeof(u8char_T)); |
| 9183 } | |
| 9184 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 9185 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 9186 ScreenLines2 + LineOffset[old_row], | |
| 9187 (size_t)len * sizeof(schar_T)); | |
| 9188 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 9189 ScreenAttrs + LineOffset[old_row], | |
| 9190 (size_t)len * sizeof(sattr_T)); | |
| 9191 } | |
| 9192 } | |
| 9193 } | |
| 9194 /* Use the last line of the screen for the current line. */ | |
| 9195 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 9196 } | |
| 9197 | |
| 356 | 9198 free_screenlines(); |
| 9199 | |
| 7 | 9200 ScreenLines = new_ScreenLines; |
| 9201 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 9202 for (i = 0; i < p_mco; ++i) |
| 9203 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 9204 Screen_mco = p_mco; | |
| 7 | 9205 ScreenLines2 = new_ScreenLines2; |
| 9206 ScreenAttrs = new_ScreenAttrs; | |
| 9207 LineOffset = new_LineOffset; | |
| 9208 LineWraps = new_LineWraps; | |
| 671 | 9209 TabPageIdxs = new_TabPageIdxs; |
| 7 | 9210 |
| 9211 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9212 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9213 #ifdef FEAT_GUI | |
| 9214 old_Rows = screen_Rows; | |
| 9215 #endif | |
| 9216 screen_Rows = Rows; | |
| 9217 screen_Columns = Columns; | |
| 9218 | |
| 9219 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9220 if (doclear) |
| 7 | 9221 screenclear2(); |
| 9222 #ifdef FEAT_GUI | |
| 9223 else if (gui.in_use | |
| 9224 && !gui.starting | |
| 9225 && ScreenLines != NULL | |
| 9226 && old_Rows != Rows) | |
| 9227 { | |
| 9228 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9229 /* | |
| 9230 * Adjust the position of the cursor, for when executing an external | |
| 9231 * command. | |
| 9232 */ | |
| 9233 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9234 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9235 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9236 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9237 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9238 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9239 } | |
| 9240 #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
|
9241 clear_TabPageIdxs(); |
| 7 | 9242 |
| 9243 entered = FALSE; | |
| 911 | 9244 --RedrawingDisabled; |
| 766 | 9245 |
| 1824 | 9246 /* |
| 9247 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9248 * in case applying autocommands always changes Rows or Columns. | |
| 9249 */ | |
| 9250 if (starting == 0 && ++retry_count <= 3) | |
| 9251 { | |
| 766 | 9252 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9253 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9254 * jump back to check if we need to allocate the screen again. */ | |
| 9255 goto retry; | |
| 9256 } | |
| 7 | 9257 } |
| 9258 | |
| 9259 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9260 free_screenlines(void) |
| 356 | 9261 { |
| 714 | 9262 int i; |
| 9263 | |
| 356 | 9264 vim_free(ScreenLinesUC); |
| 714 | 9265 for (i = 0; i < Screen_mco; ++i) |
| 9266 vim_free(ScreenLinesC[i]); | |
| 356 | 9267 vim_free(ScreenLines2); |
| 714 | 9268 vim_free(ScreenLines); |
| 356 | 9269 vim_free(ScreenAttrs); |
| 9270 vim_free(LineOffset); | |
| 9271 vim_free(LineWraps); | |
| 671 | 9272 vim_free(TabPageIdxs); |
| 356 | 9273 } |
| 9274 | |
| 9275 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9276 screenclear(void) |
| 7 | 9277 { |
| 9278 check_for_delay(FALSE); | |
| 9279 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9280 screenclear2(); /* clear the screen */ | |
| 9281 } | |
| 9282 | |
| 9283 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9284 screenclear2(void) |
| 7 | 9285 { |
| 9286 int i; | |
| 9287 | |
| 9288 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9289 #ifdef FEAT_GUI | |
| 9290 || (gui.in_use && gui.starting) | |
| 9291 #endif | |
| 9292 ) | |
| 9293 return; | |
| 9294 | |
| 9295 #ifdef FEAT_GUI | |
| 9296 if (!gui.in_use) | |
| 9297 #endif | |
| 9298 screen_attr = -1; /* force setting the Normal colors */ | |
| 9299 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9300 | |
| 9301 #ifdef FEAT_CLIPBOARD | |
| 9302 /* disable selection without redrawing it */ | |
| 9303 clip_scroll_selection(9999); | |
| 9304 #endif | |
| 9305 | |
| 9306 /* blank out ScreenLines */ | |
| 9307 for (i = 0; i < Rows; ++i) | |
| 9308 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9309 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9310 LineWraps[i] = FALSE; |
| 9311 } | |
| 9312 | |
| 9313 if (can_clear(T_CL)) | |
| 9314 { | |
| 9315 out_str(T_CL); /* clear the display */ | |
| 9316 clear_cmdline = FALSE; | |
| 644 | 9317 mode_displayed = FALSE; |
| 7 | 9318 } |
| 9319 else | |
| 9320 { | |
| 9321 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9322 for (i = 0; i < Rows; ++i) | |
| 9323 lineinvalid(LineOffset[i], (int)Columns); | |
| 9324 clear_cmdline = TRUE; | |
| 9325 } | |
| 9326 | |
| 9327 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9328 | |
| 9329 win_rest_invalid(firstwin); | |
| 9330 redraw_cmdline = TRUE; | |
| 673 | 9331 redraw_tabline = TRUE; |
| 7 | 9332 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9333 must_redraw = NOT_VALID; | |
| 9334 compute_cmdrow(); | |
| 9335 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9336 msg_col = 0; | |
| 9337 screen_start(); /* don't know where cursor is now */ | |
| 9338 msg_scrolled = 0; /* can't scroll back */ | |
| 9339 msg_didany = FALSE; | |
| 9340 msg_didout = FALSE; | |
| 9341 } | |
| 9342 | |
| 9343 /* | |
| 9344 * Clear one line in ScreenLines. | |
| 9345 */ | |
| 9346 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9347 lineclear(unsigned off, int width, int attr) |
| 7 | 9348 { |
| 9349 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9350 if (enc_utf8) | |
| 9351 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9352 (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
|
9353 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9354 } |
| 9355 | |
| 9356 /* | |
| 9357 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9358 * invalid value. | |
| 9359 */ | |
| 9360 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9361 lineinvalid(unsigned off, int width) |
| 7 | 9362 { |
| 9363 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9364 } | |
| 9365 | |
| 9366 /* | |
| 9367 * Copy part of a Screenline for vertically split window "wp". | |
| 9368 */ | |
| 9369 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9370 linecopy(int to, int from, win_T *wp) |
| 7 | 9371 { |
| 9372 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9373 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9374 | |
| 9375 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9376 wp->w_width * sizeof(schar_T)); | |
| 9377 if (enc_utf8) | |
| 9378 { | |
| 714 | 9379 int i; |
| 9380 | |
| 7 | 9381 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9382 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9383 for (i = 0; i < p_mco; ++i) |
| 9384 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9385 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9386 } |
| 9387 if (enc_dbcs == DBCS_JPNU) | |
| 9388 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9389 wp->w_width * sizeof(schar_T)); | |
| 9390 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9391 wp->w_width * sizeof(sattr_T)); | |
| 9392 } | |
| 9393 | |
| 9394 /* | |
| 9395 * Return TRUE if clearing with term string "p" would work. | |
| 9396 * It can't work when the string is empty or it won't set the right background. | |
| 9397 */ | |
| 9398 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9399 can_clear(char_u *p) |
| 7 | 9400 { |
| 9401 return (*p != NUL && (t_colors <= 1 | |
| 9402 #ifdef FEAT_GUI | |
| 9403 || gui.in_use | |
| 9404 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9405 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9406 || (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
|
9407 || (!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
|
9408 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9409 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9410 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9411 || *T_UT != NUL)); |
| 7 | 9412 } |
| 9413 | |
| 9414 /* | |
| 9415 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9416 * something directly to the screen (shell commands) or a terminal control | |
| 9417 * code. | |
| 9418 */ | |
| 9419 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9420 screen_start(void) |
| 7 | 9421 { |
| 9422 screen_cur_row = screen_cur_col = 9999; | |
| 9423 } | |
| 9424 | |
| 9425 /* | |
| 9426 * Move the cursor to position "row","col" in the screen. | |
| 9427 * This tries to find the most efficient way to move, minimizing the number of | |
| 9428 * characters sent to the terminal. | |
| 9429 */ | |
| 9430 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9431 windgoto(int row, int col) |
| 7 | 9432 { |
| 205 | 9433 sattr_T *p; |
| 7 | 9434 int i; |
| 9435 int plan; | |
| 9436 int cost; | |
| 9437 int wouldbe_col; | |
| 9438 int noinvcurs; | |
| 9439 char_u *bs; | |
| 9440 int goto_cost; | |
| 9441 int attr; | |
| 9442 | |
| 1213 | 9443 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9444 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9445 | |
| 9446 #define PLAN_LE 1 | |
| 9447 #define PLAN_CR 2 | |
| 9448 #define PLAN_NL 3 | |
| 9449 #define PLAN_WRITE 4 | |
| 9450 /* Can't use ScreenLines unless initialized */ | |
| 9451 if (ScreenLines == NULL) | |
| 9452 return; | |
| 9453 | |
| 9454 if (col != screen_cur_col || row != screen_cur_row) | |
| 9455 { | |
| 9456 /* Check for valid position. */ | |
| 9457 if (row < 0) /* window without text lines? */ | |
| 9458 row = 0; | |
| 9459 if (row >= screen_Rows) | |
| 9460 row = screen_Rows - 1; | |
| 9461 if (col >= screen_Columns) | |
| 9462 col = screen_Columns - 1; | |
| 9463 | |
| 9464 /* check if no cursor movement is allowed in highlight mode */ | |
| 9465 if (screen_attr && *T_MS == NUL) | |
| 9466 noinvcurs = HIGHL_COST; | |
| 9467 else | |
| 9468 noinvcurs = 0; | |
| 9469 goto_cost = GOTO_COST + noinvcurs; | |
| 9470 | |
| 9471 /* | |
| 9472 * Plan how to do the positioning: | |
| 9473 * 1. Use CR to move it to column 0, same row. | |
| 9474 * 2. Use T_LE to move it a few columns to the left. | |
| 9475 * 3. Use NL to move a few lines down, column 0. | |
| 9476 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9477 * | |
| 9478 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9479 * position is unknown then (some terminals wrap, some don't ) | |
| 9480 * | |
| 1213 | 9481 * First check if the highlighting attributes allow us to write |
| 7 | 9482 * characters to move the cursor to the right. |
| 9483 */ | |
| 9484 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9485 { | |
| 9486 /* | |
| 9487 * If the cursor is in the same row, bigger col, we can use CR | |
| 9488 * or T_LE. | |
| 9489 */ | |
| 9490 bs = NULL; /* init for GCC */ | |
| 9491 attr = screen_attr; | |
| 9492 if (row == screen_cur_row && col < screen_cur_col) | |
| 9493 { | |
| 9494 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9495 if (*T_LE) | |
| 9496 bs = T_LE; /* "cursor left" */ | |
| 9497 else | |
| 9498 bs = T_BC; /* "backspace character (old) */ | |
| 9499 if (*bs) | |
| 9500 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9501 else | |
| 9502 cost = 999; | |
| 9503 if (col + 1 < cost) /* using CR is less characters */ | |
| 9504 { | |
| 9505 plan = PLAN_CR; | |
| 9506 wouldbe_col = 0; | |
| 9507 cost = 1; /* CR is just one character */ | |
| 9508 } | |
| 9509 else | |
| 9510 { | |
| 9511 plan = PLAN_LE; | |
| 9512 wouldbe_col = col; | |
| 9513 } | |
| 9514 if (noinvcurs) /* will stop highlighting */ | |
| 9515 { | |
| 9516 cost += noinvcurs; | |
| 9517 attr = 0; | |
| 9518 } | |
| 9519 } | |
| 9520 | |
| 9521 /* | |
| 9522 * If the cursor is above where we want to be, we can use CR LF. | |
| 9523 */ | |
| 9524 else if (row > screen_cur_row) | |
| 9525 { | |
| 9526 plan = PLAN_NL; | |
| 9527 wouldbe_col = 0; | |
| 9528 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9529 if (noinvcurs) /* will stop highlighting */ | |
| 9530 { | |
| 9531 cost += noinvcurs; | |
| 9532 attr = 0; | |
| 9533 } | |
| 9534 } | |
| 9535 | |
| 9536 /* | |
| 9537 * If the cursor is in the same row, smaller col, just use write. | |
| 9538 */ | |
| 9539 else | |
| 9540 { | |
| 9541 plan = PLAN_WRITE; | |
| 9542 wouldbe_col = screen_cur_col; | |
| 9543 cost = 0; | |
| 9544 } | |
| 9545 | |
| 9546 /* | |
| 9547 * Check if any characters that need to be written have the | |
| 9548 * correct attributes. Also avoid UTF-8 characters. | |
| 9549 */ | |
| 9550 i = col - wouldbe_col; | |
| 9551 if (i > 0) | |
| 9552 cost += i; | |
| 9553 if (cost < goto_cost && i > 0) | |
| 9554 { | |
| 9555 /* | |
| 9556 * Check if the attributes are correct without additionally | |
| 9557 * stopping highlighting. | |
| 9558 */ | |
| 9559 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9560 while (i && *p++ == attr) | |
| 9561 --i; | |
| 9562 if (i != 0) | |
| 9563 { | |
| 9564 /* | |
| 9565 * Try if it works when highlighting is stopped here. | |
| 9566 */ | |
| 9567 if (*--p == 0) | |
| 9568 { | |
| 9569 cost += noinvcurs; | |
| 9570 while (i && *p++ == 0) | |
| 9571 --i; | |
| 9572 } | |
| 9573 if (i != 0) | |
| 9574 cost = 999; /* different attributes, don't do it */ | |
| 9575 } | |
| 9576 if (enc_utf8) | |
| 9577 { | |
| 9578 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9579 for (i = wouldbe_col; i < col; ++i) | |
| 9580 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9581 { | |
| 9582 cost = 999; | |
| 9583 break; | |
| 9584 } | |
| 9585 } | |
| 9586 } | |
| 9587 | |
| 9588 /* | |
| 9589 * We can do it without term_windgoto()! | |
| 9590 */ | |
| 9591 if (cost < goto_cost) | |
| 9592 { | |
| 9593 if (plan == PLAN_LE) | |
| 9594 { | |
| 9595 if (noinvcurs) | |
| 9596 screen_stop_highlight(); | |
| 9597 while (screen_cur_col > col) | |
| 9598 { | |
| 9599 out_str(bs); | |
| 9600 --screen_cur_col; | |
| 9601 } | |
| 9602 } | |
| 9603 else if (plan == PLAN_CR) | |
| 9604 { | |
| 9605 if (noinvcurs) | |
| 9606 screen_stop_highlight(); | |
| 9607 out_char('\r'); | |
| 9608 screen_cur_col = 0; | |
| 9609 } | |
| 9610 else if (plan == PLAN_NL) | |
| 9611 { | |
| 9612 if (noinvcurs) | |
| 9613 screen_stop_highlight(); | |
| 9614 while (screen_cur_row < row) | |
| 9615 { | |
| 9616 out_char('\n'); | |
| 9617 ++screen_cur_row; | |
| 9618 } | |
| 9619 screen_cur_col = 0; | |
| 9620 } | |
| 9621 | |
| 9622 i = col - screen_cur_col; | |
| 9623 if (i > 0) | |
| 9624 { | |
| 9625 /* | |
| 9626 * Use cursor-right if it's one character only. Avoids | |
| 9627 * removing a line of pixels from the last bold char, when | |
| 9628 * using the bold trick in the GUI. | |
| 9629 */ | |
| 9630 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9631 { | |
| 9632 while (i-- > 0) | |
| 9633 out_char(*T_ND); | |
| 9634 } | |
| 9635 else | |
| 9636 { | |
| 9637 int off; | |
| 9638 | |
| 9639 off = LineOffset[row] + screen_cur_col; | |
| 9640 while (i-- > 0) | |
| 9641 { | |
| 9642 if (ScreenAttrs[off] != screen_attr) | |
| 9643 screen_stop_highlight(); | |
| 9644 out_flush_check(); | |
| 9645 out_char(ScreenLines[off]); | |
| 9646 if (enc_dbcs == DBCS_JPNU | |
| 9647 && ScreenLines[off] == 0x8e) | |
| 9648 out_char(ScreenLines2[off]); | |
| 9649 ++off; | |
| 9650 } | |
| 9651 } | |
| 9652 } | |
| 9653 } | |
| 9654 } | |
| 9655 else | |
| 9656 cost = 999; | |
| 9657 | |
| 9658 if (cost >= goto_cost) | |
| 9659 { | |
| 9660 if (noinvcurs) | |
| 9661 screen_stop_highlight(); | |
| 5995 | 9662 if (row == screen_cur_row && (col > screen_cur_col) |
| 9663 && *T_CRI != NUL) | |
| 7 | 9664 term_cursor_right(col - screen_cur_col); |
| 9665 else | |
| 9666 term_windgoto(row, col); | |
| 9667 } | |
| 9668 screen_cur_row = row; | |
| 9669 screen_cur_col = col; | |
| 9670 } | |
| 9671 } | |
| 9672 | |
| 9673 /* | |
| 9674 * Set cursor to its position in the current window. | |
| 9675 */ | |
| 9676 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9677 setcursor(void) |
| 7 | 9678 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9679 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
|
9680 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9681 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9682 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9683 * 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
|
9684 * 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
|
9685 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9686 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9687 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
|
9688 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9689 if (force || redrawing()) |
| 7 | 9690 { |
| 9691 validate_cursor(); | |
| 9692 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
|
9693 curwin->w_wincol + ( |
| 7 | 9694 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9695 /* With 'rightleft' set and the cursor on a double-wide |
| 9696 * 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
|
9697 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
|
9698 - ((has_mbyte |
| 1545 | 9699 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9700 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9701 #endif |
| 9702 curwin->w_wcol)); | |
| 9703 } | |
| 9704 } | |
| 9705 | |
| 9706 | |
| 9707 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9708 * 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
|
9709 * 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
|
9710 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9711 * scrolling. |
| 9712 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9713 */ | |
| 9714 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9715 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9716 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9717 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9718 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9719 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9720 int mayclear) |
| 7 | 9721 { |
| 9722 int did_delete; | |
| 9723 int nextrow; | |
| 9724 int lastrow; | |
| 9725 int retval; | |
| 9726 | |
| 9727 if (invalid) | |
| 9728 wp->w_lines_valid = 0; | |
| 9729 | |
| 9730 if (wp->w_height < 5) | |
| 9731 return FAIL; | |
| 9732 | |
| 9733 if (line_count > wp->w_height - row) | |
| 9734 line_count = wp->w_height - row; | |
| 9735 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9736 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9737 if (retval != MAYBE) |
| 9738 return retval; | |
| 9739 | |
| 9740 /* | |
| 9741 * If there is a next window or a status line, we first try to delete the | |
| 9742 * lines at the bottom to avoid messing what is after the window. | |
| 9743 * If this fails and there are following windows, don't do anything to avoid | |
| 9744 * messing up those windows, better just redraw. | |
| 9745 */ | |
| 9746 did_delete = FALSE; | |
| 9747 if (wp->w_next != NULL || wp->w_status_height) | |
| 9748 { | |
| 9749 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
|
9750 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9751 did_delete = TRUE; |
| 9752 else if (wp->w_next) | |
| 9753 return FAIL; | |
| 9754 } | |
| 9755 /* | |
| 9756 * if no lines deleted, blank the lines that will end up below the window | |
| 9757 */ | |
| 9758 if (!did_delete) | |
| 9759 { | |
| 9760 wp->w_redr_status = TRUE; | |
| 9761 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
|
9762 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9763 lastrow = nextrow + line_count; |
| 9764 if (lastrow > Rows) | |
| 9765 lastrow = Rows; | |
| 9766 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
|
9767 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9768 ' ', ' ', 0); |
| 9769 } | |
| 9770 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9771 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9772 == FAIL) |
| 9773 { | |
| 9774 /* deletion will have messed up other windows */ | |
| 9775 if (did_delete) | |
| 9776 { | |
| 9777 wp->w_redr_status = TRUE; | |
| 9778 win_rest_invalid(W_NEXT(wp)); | |
| 9779 } | |
| 9780 return FAIL; | |
| 9781 } | |
| 9782 | |
| 9783 return OK; | |
| 9784 } | |
| 9785 | |
| 9786 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9787 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9788 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9789 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9790 * scrolling | |
| 9791 * Return OK for success, FAIL if the lines are not deleted. | |
| 9792 */ | |
| 9793 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9794 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9795 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9796 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9797 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9798 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9799 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9800 int clear_attr) /* for clearing lines */ |
| 7 | 9801 { |
| 9802 int retval; | |
| 9803 | |
| 9804 if (invalid) | |
| 9805 wp->w_lines_valid = 0; | |
| 9806 | |
| 9807 if (line_count > wp->w_height - row) | |
| 9808 line_count = wp->w_height - row; | |
| 9809 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9810 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9811 if (retval != MAYBE) |
| 9812 return retval; | |
| 9813 | |
| 9814 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
|
9815 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9816 return FAIL; |
| 9817 | |
| 9818 /* | |
| 9819 * If there are windows or status lines below, try to put them at the | |
| 9820 * correct place. If we can't do that, they have to be redrawn. | |
| 9821 */ | |
| 9822 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9823 { | |
| 9824 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
|
9825 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9826 { |
| 9827 wp->w_redr_status = TRUE; | |
| 9828 win_rest_invalid(wp->w_next); | |
| 9829 } | |
| 9830 } | |
| 9831 /* | |
| 9832 * If this is the last window and there is no status line, redraw the | |
| 9833 * command line later. | |
| 9834 */ | |
| 9835 else | |
| 9836 redraw_cmdline = TRUE; | |
| 9837 return OK; | |
| 9838 } | |
| 9839 | |
| 9840 /* | |
| 9841 * Common code for win_ins_lines() and win_del_lines(). | |
| 9842 * Returns OK or FAIL when the work has been done. | |
| 9843 * Returns MAYBE when not finished yet. | |
| 9844 */ | |
| 9845 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9846 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9847 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9848 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9849 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9850 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9851 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9852 int clear_attr) |
| 7 | 9853 { |
| 9854 int retval; | |
| 9855 | |
| 9856 if (!redrawing() || line_count <= 0) | |
| 9857 return FAIL; | |
| 9858 | |
|
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
|
9859 /* When inserting lines would result in loss of command output, just redraw |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9860 * the lines. */ |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9861 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
|
9862 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
|
9863 |
| 7 | 9864 /* 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
|
9865 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9866 { |
|
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
|
9867 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
|
9868 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9869 return FAIL; |
| 9870 } | |
| 9871 | |
| 9872 /* | |
| 9873 * Delete all remaining lines | |
| 9874 */ | |
| 9875 if (row + line_count >= wp->w_height) | |
| 9876 { | |
| 9877 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
|
9878 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9879 ' ', ' ', 0); |
| 9880 return OK; | |
| 9881 } | |
| 9882 | |
| 9883 /* | |
|
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
|
9884 * When scrolling, the message on the command line should be cleared, |
| 7 | 9885 * 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
|
9886 * Don't do this when avoiding to insert lines. |
| 7 | 9887 */ |
|
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
|
9888 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
|
9889 clear_cmdline = TRUE; |
| 7 | 9890 |
| 9891 /* | |
| 9892 * If the terminal can set a scroll region, use that. | |
| 9893 * Always do this in a vertically split window. This will redraw from | |
| 9894 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9895 * win_line(). | |
| 9896 * 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
|
9897 * 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
|
9898 * scroll-up . |
| 7 | 9899 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9900 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
|
9901 { |
| 7 | 9902 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9903 scroll_region_set(wp, row); | |
| 9904 if (del) | |
| 9905 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
|
9906 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9907 else |
| 9908 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
|
9909 wp->w_height - row, clear_attr, wp); |
| 7 | 9910 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9911 scroll_region_reset(); | |
| 9912 return retval; | |
| 9913 } | |
| 9914 | |
| 9915 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9916 return FAIL; | |
| 9917 | |
| 9918 return MAYBE; | |
| 9919 } | |
| 9920 | |
| 9921 /* | |
| 9922 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9923 */ | |
| 9924 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9925 win_rest_invalid(win_T *wp) |
| 7 | 9926 { |
| 9927 while (wp != NULL) | |
| 9928 { | |
| 9929 redraw_win_later(wp, NOT_VALID); | |
| 9930 wp->w_redr_status = TRUE; | |
| 9931 wp = wp->w_next; | |
| 9932 } | |
| 9933 redraw_cmdline = TRUE; | |
| 9934 } | |
| 9935 | |
| 9936 /* | |
| 9937 * The rest of the routines in this file perform screen manipulations. The | |
| 9938 * given operation is performed physically on the screen. The corresponding | |
| 9939 * change is also made to the internal screen image. In this way, the editor | |
| 9940 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9941 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9942 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9943 * screen changes, and in the meantime, everything still works. | |
| 9944 */ | |
| 9945 | |
| 9946 /* | |
| 9947 * types for inserting or deleting lines | |
| 9948 */ | |
| 9949 #define USE_T_CAL 1 | |
| 9950 #define USE_T_CDL 2 | |
| 9951 #define USE_T_AL 3 | |
| 9952 #define USE_T_CE 4 | |
| 9953 #define USE_T_DL 5 | |
| 9954 #define USE_T_SR 6 | |
| 9955 #define USE_NL 7 | |
| 9956 #define USE_T_CD 8 | |
| 9957 #define USE_REDRAW 9 | |
| 9958 | |
| 9959 /* | |
| 9960 * insert lines on the screen and update ScreenLines[] | |
| 9961 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9962 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9963 * 'row' and 'end' are relative to the start of the region. | |
| 9964 * | |
| 9965 * return FAIL for failure, OK for success. | |
| 9966 */ | |
| 446 | 9967 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9968 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9969 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9970 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9971 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9972 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9973 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9974 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9975 { |
| 9976 int i; | |
| 9977 int j; | |
| 9978 unsigned temp; | |
| 9979 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9980 int cursor_col = 0; |
| 7 | 9981 int type; |
| 9982 int result_empty; | |
| 9983 int can_ce = can_clear(T_CE); | |
| 9984 | |
| 9985 /* | |
| 9986 * FAIL if | |
| 9987 * - there is no valid screen | |
| 9988 * - the screen has to be redrawn completely | |
| 9989 * - the line count is less than one | |
| 9990 * - 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
|
9991 * - redrawing for a callback and there is a modeless selection |
| 7 | 9992 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9993 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9994 #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
|
9995 || (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
|
9996 && 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
|
9997 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9998 ) |
| 7 | 9999 return FAIL; |
| 10000 | |
| 10001 /* | |
| 10002 * There are seven ways to insert lines: | |
| 10003 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10004 * characters from ScreenLines[]. | |
| 10005 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 10006 * the insert is just empty lines | |
| 10007 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 10008 * present or line_count > 1. It looks better if we do all the inserts | |
| 10009 * at once. | |
| 10010 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 10011 * insert is just empty lines and T_CE is not present or line_count > | |
| 10012 * 1. | |
| 10013 * 4. Use T_AL (insert line) if it exists. | |
| 10014 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 10015 * just empty lines. | |
| 10016 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 10017 * just empty lines. | |
| 10018 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 10019 * the 'da' flag is not set or we have clear line capability. | |
| 10020 * 8. redraw the characters from ScreenLines[]. | |
| 10021 * | |
| 10022 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 10023 * the scrollbar for the window. It does have insert line, use that if it | |
| 10024 * exists. | |
| 10025 */ | |
| 10026 result_empty = (row + line_count >= end); | |
| 10027 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10028 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
|
10029 else if (can_clear(T_CD) && result_empty) |
| 7 | 10030 type = USE_T_CD; |
| 10031 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 10032 type = USE_T_CAL; | |
| 10033 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 10034 type = USE_T_CDL; | |
| 10035 else if (*T_AL != NUL) | |
| 10036 type = USE_T_AL; | |
| 10037 else if (can_ce && result_empty) | |
| 10038 type = USE_T_CE; | |
| 10039 else if (*T_DL != NUL && result_empty) | |
| 10040 type = USE_T_DL; | |
| 10041 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 10042 type = USE_T_SR; | |
| 10043 else | |
| 10044 return FAIL; | |
| 10045 | |
| 10046 /* | |
| 10047 * For clearing the lines screen_del_lines() is used. This will also take | |
| 10048 * care of t_db if necessary. | |
| 10049 */ | |
| 10050 if (type == USE_T_CD || type == USE_T_CDL || | |
| 10051 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
|
10052 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 10053 |
| 10054 /* | |
| 10055 * If text is retained below the screen, first clear or delete as many | |
| 10056 * lines at the bottom of the window as are about to be inserted so that | |
| 10057 * the deleted lines won't later surface during a screen_del_lines. | |
| 10058 */ | |
| 10059 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
|
10060 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 10061 |
| 10062 #ifdef FEAT_CLIPBOARD | |
| 10063 /* Remove a modeless selection when inserting lines halfway the screen | |
| 10064 * 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
|
10065 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10066 clip_clear_selection(&clip_star); |
| 7 | 10067 else |
| 10068 clip_scroll_selection(-line_count); | |
| 10069 #endif | |
| 10070 | |
| 10071 #ifdef FEAT_GUI | |
| 10072 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10073 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10074 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 10075 #endif |
| 10076 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10077 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
|
10078 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
|
10079 |
| 7 | 10080 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10081 cursor_row = row; | |
| 10082 else | |
| 10083 cursor_row = row + off; | |
| 10084 | |
| 10085 /* | |
| 10086 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 10087 * Clear the inserted lines in ScreenLines[]. | |
| 10088 */ | |
| 10089 row += off; | |
| 10090 end += off; | |
| 10091 for (i = 0; i < line_count; ++i) | |
| 10092 { | |
| 10093 if (wp != NULL && wp->w_width != Columns) | |
| 10094 { | |
| 10095 /* need to copy part of a line */ | |
| 10096 j = end - 1 - i; | |
| 10097 while ((j -= line_count) >= row) | |
| 10098 linecopy(j + line_count, j, wp); | |
| 10099 j += line_count; | |
| 10100 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
|
10101 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
|
10102 clear_attr); |
| 7 | 10103 else |
| 10104 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10105 LineWraps[j] = FALSE; | |
| 10106 } | |
| 10107 else | |
| 10108 { | |
| 10109 j = end - 1 - i; | |
| 10110 temp = LineOffset[j]; | |
| 10111 while ((j -= line_count) >= row) | |
| 10112 { | |
| 10113 LineOffset[j + line_count] = LineOffset[j]; | |
| 10114 LineWraps[j + line_count] = LineWraps[j]; | |
| 10115 } | |
| 10116 LineOffset[j + line_count] = temp; | |
| 10117 LineWraps[j + line_count] = FALSE; | |
| 10118 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
|
10119 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10120 else |
| 10121 lineinvalid(temp, (int)Columns); | |
| 10122 } | |
| 10123 } | |
| 10124 | |
| 10125 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10126 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
|
10127 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
|
10128 screen_start_highlight(clear_attr); |
| 7 | 10129 |
| 10130 /* redraw the characters */ | |
| 10131 if (type == USE_REDRAW) | |
| 10132 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
|
10133 else if (type == USE_T_CAL) |
| 7 | 10134 { |
| 10135 term_append_lines(line_count); | |
| 10136 screen_start(); /* don't know where cursor is now */ | |
| 10137 } | |
| 10138 else | |
| 10139 { | |
| 10140 for (i = 0; i < line_count; i++) | |
| 10141 { | |
| 10142 if (type == USE_T_AL) | |
| 10143 { | |
| 10144 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
|
10145 windgoto(cursor_row, cursor_col); |
| 7 | 10146 out_str(T_AL); |
| 10147 } | |
| 10148 else /* type == USE_T_SR */ | |
| 10149 out_str(T_SR); | |
| 10150 screen_start(); /* don't know where cursor is now */ | |
| 10151 } | |
| 10152 } | |
| 10153 | |
| 10154 /* | |
| 10155 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 10156 * have been scrolled down into the region. | |
| 10157 */ | |
| 10158 if (type == USE_T_SR && *T_DA) | |
| 10159 { | |
| 10160 for (i = 0; i < line_count; ++i) | |
| 10161 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10162 windgoto(off + i, cursor_col); |
| 7 | 10163 out_str(T_CE); |
| 10164 screen_start(); /* don't know where cursor is now */ | |
| 10165 } | |
| 10166 } | |
| 10167 | |
| 10168 #ifdef FEAT_GUI | |
| 10169 gui_can_update_cursor(); | |
| 10170 if (gui.in_use) | |
| 10171 out_flush(); /* always flush after a scroll */ | |
| 10172 #endif | |
| 10173 return OK; | |
| 10174 } | |
| 10175 | |
| 10176 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10177 * 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
|
10178 * "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
|
10179 * 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
|
10180 * "row" and "end" are relative to the start of the region. |
| 7 | 10181 * |
| 10182 * Return OK for success, FAIL if the lines are not deleted. | |
| 10183 */ | |
| 10184 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10185 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10186 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10187 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10188 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10189 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10190 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
|
10191 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
|
10192 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10193 { |
| 10194 int j; | |
| 10195 int i; | |
| 10196 unsigned temp; | |
| 10197 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10198 int cursor_col = 0; |
| 7 | 10199 int cursor_end; |
| 10200 int result_empty; /* result is empty until end of region */ | |
| 10201 int can_delete; /* deleting line codes can be used */ | |
| 10202 int type; | |
| 10203 | |
| 10204 /* | |
| 10205 * FAIL if | |
| 10206 * - there is no valid screen | |
| 10207 * - the screen has to be redrawn completely | |
| 10208 * - the line count is less than one | |
| 10209 * - 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
|
10210 * - redrawing for a callback and there is a modeless selection |
| 7 | 10211 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10212 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
|
10213 || (!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
|
10214 #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
|
10215 || (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
|
10216 && 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
|
10217 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10218 ) |
| 7 | 10219 return FAIL; |
| 10220 | |
| 10221 /* | |
| 10222 * Check if the rest of the current region will become empty. | |
| 10223 */ | |
| 10224 result_empty = row + line_count >= end; | |
| 10225 | |
| 10226 /* | |
| 10227 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10228 * available. | |
| 10229 */ | |
| 10230 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10231 | |
| 10232 /* | |
| 10233 * There are six ways to delete lines: | |
| 10234 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10235 * characters from ScreenLines[]. | |
| 10236 * 1. Use T_CD if it exists and the result is empty. | |
| 10237 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10238 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10239 * none of the other ways work. | |
| 10240 * 4. Use T_CE (erase line) if the result is empty. | |
| 10241 * 5. Use T_DL (delete line) if it exists. | |
| 10242 * 6. redraw the characters from ScreenLines[]. | |
| 10243 */ | |
| 10244 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10245 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
|
10246 else if (can_clear(T_CD) && result_empty) |
| 7 | 10247 type = USE_T_CD; |
| 10248 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10249 /* | |
| 10250 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10251 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10252 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10253 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10254 * the trick... | |
| 10255 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10256 * (Olaf Seibert) | |
| 10257 */ | |
| 10258 else if (row == 0 && T_DB == empty_option | |
| 10259 && (line_count == 1 || *T_CDL == NUL)) | |
| 10260 #else | |
| 10261 else if (row == 0 && ( | |
| 10262 #ifndef AMIGA | |
| 10263 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10264 * up, so use delete-line command */ | |
| 10265 line_count == 1 || | |
| 10266 #endif | |
| 10267 *T_CDL == NUL)) | |
| 10268 #endif | |
| 10269 type = USE_NL; | |
| 10270 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10271 type = USE_T_CDL; | |
| 10272 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
|
10273 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10274 type = USE_T_CE; |
| 10275 else if (*T_DL != NUL && can_delete) | |
| 10276 type = USE_T_DL; | |
| 10277 else if (*T_CDL != NUL && can_delete) | |
| 10278 type = USE_T_CDL; | |
| 10279 else | |
| 10280 return FAIL; | |
| 10281 | |
| 10282 #ifdef FEAT_CLIPBOARD | |
| 10283 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10284 * 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
|
10285 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10286 clip_clear_selection(&clip_star); |
| 7 | 10287 else |
| 10288 clip_scroll_selection(line_count); | |
| 10289 #endif | |
| 10290 | |
| 10291 #ifdef FEAT_GUI | |
| 10292 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10293 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10294 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
|
10295 && gui.cursor_row < end + off); |
| 7 | 10296 #endif |
| 10297 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10298 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
|
10299 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
|
10300 |
| 7 | 10301 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10302 { | |
| 10303 cursor_row = row; | |
| 10304 cursor_end = end; | |
| 10305 } | |
| 10306 else | |
| 10307 { | |
| 10308 cursor_row = row + off; | |
| 10309 cursor_end = end + off; | |
| 10310 } | |
| 10311 | |
| 10312 /* | |
| 10313 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10314 * Clear the inserted lines in ScreenLines[]. | |
| 10315 */ | |
| 10316 row += off; | |
| 10317 end += off; | |
| 10318 for (i = 0; i < line_count; ++i) | |
| 10319 { | |
| 10320 if (wp != NULL && wp->w_width != Columns) | |
| 10321 { | |
| 10322 /* need to copy part of a line */ | |
| 10323 j = row + i; | |
| 10324 while ((j += line_count) <= end - 1) | |
| 10325 linecopy(j - line_count, j, wp); | |
| 10326 j -= line_count; | |
| 10327 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
|
10328 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
|
10329 clear_attr); |
| 7 | 10330 else |
| 10331 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10332 LineWraps[j] = FALSE; | |
| 10333 } | |
| 10334 else | |
| 10335 { | |
| 10336 /* whole width, moving the line pointers is faster */ | |
| 10337 j = row + i; | |
| 10338 temp = LineOffset[j]; | |
| 10339 while ((j += line_count) <= end - 1) | |
| 10340 { | |
| 10341 LineOffset[j - line_count] = LineOffset[j]; | |
| 10342 LineWraps[j - line_count] = LineWraps[j]; | |
| 10343 } | |
| 10344 LineOffset[j - line_count] = temp; | |
| 10345 LineWraps[j - line_count] = FALSE; | |
| 10346 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
|
10347 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10348 else |
| 10349 lineinvalid(temp, (int)Columns); | |
| 10350 } | |
| 10351 } | |
| 10352 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10353 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
|
10354 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10355 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
|
10356 screen_start_highlight(clear_attr); |
| 7 | 10357 |
| 10358 /* redraw the characters */ | |
| 10359 if (type == USE_REDRAW) | |
| 10360 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
|
10361 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10362 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10363 windgoto(cursor_row, cursor_col); |
| 7 | 10364 out_str(T_CD); |
| 10365 screen_start(); /* don't know where cursor is now */ | |
| 10366 } | |
| 10367 else if (type == USE_T_CDL) | |
| 10368 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10369 windgoto(cursor_row, cursor_col); |
| 7 | 10370 term_delete_lines(line_count); |
| 10371 screen_start(); /* don't know where cursor is now */ | |
| 10372 } | |
| 10373 /* | |
| 10374 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10375 * the whole screen (scroll region) up by outputting newlines on the | |
| 10376 * last line. | |
| 10377 */ | |
| 10378 else if (type == USE_NL) | |
| 10379 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10380 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10381 for (i = line_count; --i >= 0; ) |
| 10382 out_char('\n'); /* cursor will remain on same line */ | |
| 10383 } | |
| 10384 else | |
| 10385 { | |
| 10386 for (i = line_count; --i >= 0; ) | |
| 10387 { | |
| 10388 if (type == USE_T_DL) | |
| 10389 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10390 windgoto(cursor_row, cursor_col); |
| 7 | 10391 out_str(T_DL); /* delete a line */ |
| 10392 } | |
| 10393 else /* type == USE_T_CE */ | |
| 10394 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10395 windgoto(cursor_row + i, cursor_col); |
| 7 | 10396 out_str(T_CE); /* erase a line */ |
| 10397 } | |
| 10398 screen_start(); /* don't know where cursor is now */ | |
| 10399 } | |
| 10400 } | |
| 10401 | |
| 10402 /* | |
| 10403 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10404 * scrolled up at the bottom of the region. | |
| 10405 */ | |
| 10406 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10407 { | |
| 10408 for (i = line_count; i > 0; --i) | |
| 10409 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10410 windgoto(cursor_end - i, cursor_col); |
| 7 | 10411 out_str(T_CE); /* erase a line */ |
| 10412 screen_start(); /* don't know where cursor is now */ | |
| 10413 } | |
| 10414 } | |
| 10415 | |
| 10416 #ifdef FEAT_GUI | |
| 10417 gui_can_update_cursor(); | |
| 10418 if (gui.in_use) | |
| 10419 out_flush(); /* always flush after a scroll */ | |
| 10420 #endif | |
| 10421 | |
| 10422 return OK; | |
| 10423 } | |
| 10424 | |
| 10425 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10426 * 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
|
10427 * 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
|
10428 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10429 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10430 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10431 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10432 // 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
|
10433 // 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
|
10434 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10435 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10436 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10437 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10438 { |
|
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
|
10439 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
|
10440 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10441 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10442 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10443 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10444 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10445 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10446 * Show the current mode and ruler. |
| 7 | 10447 * |
| 10448 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10449 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10450 * 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
|
10451 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 10452 * Return the length of the message (0 if no message). |
| 10453 */ | |
| 10454 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10455 showmode(void) |
| 7 | 10456 { |
| 10457 int need_clear; | |
| 10458 int length = 0; | |
| 10459 int do_mode; | |
| 10460 int attr; | |
| 10461 int nwr_save; | |
| 10462 #ifdef FEAT_INS_EXPAND | |
| 10463 int sub_attr; | |
| 10464 #endif | |
| 10465 | |
| 642 | 10466 do_mode = ((p_smd && msg_silent == 0) |
| 10467 && ((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
|
10468 || restart_edit != NUL |
| 5735 | 10469 || 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
|
10470 if (do_mode || reg_recording != 0) |
| 7 | 10471 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10472 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10473 return 0; // show mode later |
| 7 | 10474 |
| 10475 nwr_save = need_wait_return; | |
| 10476 | |
| 10477 /* wait a bit before overwriting an important message */ | |
| 10478 check_for_delay(FALSE); | |
| 10479 | |
| 10480 /* if the cmdline is more than one line high, erase top lines */ | |
| 10481 need_clear = clear_cmdline; | |
| 10482 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10483 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10484 | |
| 10485 /* Position on the last line in the window, column 0 */ | |
| 10486 msg_pos_mode(); | |
| 10487 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10488 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10489 if (do_mode) |
| 10490 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10491 msg_puts_attr("--", attr); |
| 7 | 10492 #if defined(FEAT_XIM) |
| 2520 | 10493 if ( |
| 10494 # ifdef FEAT_GUI_GTK | |
| 10495 preedit_get_status() | |
| 1668 | 10496 # else |
| 10497 im_get_status() | |
| 2520 | 10498 # endif |
| 1668 | 10499 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10500 # 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
|
10501 msg_puts_attr(" IM", attr); |
| 7 | 10502 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10503 msg_puts_attr(" XIM", attr); |
| 7 | 10504 # endif |
| 10505 #endif | |
| 10506 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10507 if (gui.in_use) | |
| 10508 { | |
| 10509 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10510 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10511 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10512 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10513 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
|
10514 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10515 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
|
10516 } |
| 7 | 10517 } |
| 10518 #endif | |
| 10519 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10520 /* CTRL-X in Insert mode */ |
| 10521 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10522 { |
| 10523 /* These messages can get long, avoid a wrap in a narrow | |
| 10524 * window. Prefer showing edit_submode_extra. */ | |
| 10525 length = (Rows - msg_row) * Columns - 3; | |
| 10526 if (edit_submode_extra != NULL) | |
| 10527 length -= vim_strsize(edit_submode_extra); | |
| 10528 if (length > 0) | |
| 10529 { | |
| 10530 if (edit_submode_pre != NULL) | |
| 10531 length -= vim_strsize(edit_submode_pre); | |
| 10532 if (length - vim_strsize(edit_submode) > 0) | |
| 10533 { | |
| 10534 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
|
10535 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
|
10536 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10537 } |
| 10538 if (edit_submode_extra != NULL) | |
| 10539 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10540 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10541 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
|
10542 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10543 else |
| 10544 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10545 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10546 } |
| 10547 } | |
| 10548 } | |
| 10549 else | |
| 10550 #endif | |
| 10551 { | |
| 10552 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
|
10553 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10554 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
|
10555 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10556 else if (State & INSERT) |
| 10557 { | |
| 10558 #ifdef FEAT_RIGHTLEFT | |
| 10559 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10560 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
|
10561 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10562 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10563 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10564 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
|
10565 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10566 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
|
10567 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10568 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
|
10569 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10570 #ifdef FEAT_RIGHTLEFT |
| 10571 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10572 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10573 #endif |
| 10574 #ifdef FEAT_KEYMAP | |
| 10575 if (State & LANGMAP) | |
| 10576 { | |
| 10577 # ifdef FEAT_ARABIC | |
| 10578 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
|
10579 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10580 else |
| 10581 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10582 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
|
10583 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10584 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10585 } |
| 10586 #endif | |
| 10587 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
|
10588 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10589 |
| 10590 if (VIsual_active) | |
| 10591 { | |
| 10592 char *p; | |
| 10593 | |
| 10594 /* Don't concatenate separate words to avoid translation | |
| 10595 * problems. */ | |
| 10596 switch ((VIsual_select ? 4 : 0) | |
| 10597 + (VIsual_mode == Ctrl_V) * 2 | |
| 10598 + (VIsual_mode == 'V')) | |
| 10599 { | |
| 10600 case 0: p = N_(" VISUAL"); break; | |
| 10601 case 1: p = N_(" VISUAL LINE"); break; | |
| 10602 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10603 case 4: p = N_(" SELECT"); break; | |
| 10604 case 5: p = N_(" SELECT LINE"); break; | |
| 10605 default: p = N_(" SELECT BLOCK"); break; | |
| 10606 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10607 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
|
10608 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10609 msg_puts_attr(" --", attr); |
| 7 | 10610 } |
| 644 | 10611 |
| 7 | 10612 need_clear = TRUE; |
| 10613 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10614 if (reg_recording != 0 |
| 7 | 10615 #ifdef FEAT_INS_EXPAND |
| 10616 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10617 #endif | |
| 10618 ) | |
| 10619 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10620 recording_mode(attr); |
| 7 | 10621 need_clear = TRUE; |
| 10622 } | |
| 644 | 10623 |
| 10624 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
|
10625 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10626 msg_clr_eos(); |
| 10627 msg_didout = FALSE; /* overwrite this message */ | |
| 10628 length = msg_col; | |
| 10629 msg_col = 0; | |
| 10630 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10631 } | |
| 10632 else if (clear_cmdline && msg_silent == 0) | |
| 10633 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10634 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
|
10635 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
|
10636 { |
|
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
|
10637 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
|
10638 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
|
10639 } |
| 7 | 10640 |
| 10641 #ifdef FEAT_CMDL_INFO | |
| 10642 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10643 if (VIsual_active) | |
| 10644 clear_showcmd(); | |
| 10645 | |
| 10646 /* If the last window has no status line, the ruler is after the mode | |
| 10647 * 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
|
10648 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
|
10649 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10650 #endif |
| 10651 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
|
10652 redraw_mode = FALSE; |
| 7 | 10653 clear_cmdline = FALSE; |
| 10654 | |
| 10655 return length; | |
| 10656 } | |
| 10657 | |
| 10658 /* | |
| 10659 * Position for a mode message. | |
| 10660 */ | |
| 10661 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10662 msg_pos_mode(void) |
| 7 | 10663 { |
| 10664 msg_col = 0; | |
| 10665 msg_row = Rows - 1; | |
| 10666 } | |
| 10667 | |
| 10668 /* | |
| 10669 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10670 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10671 * Caller should check "mode_displayed". |
| 7 | 10672 */ |
| 10673 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10674 unshowmode(int force) |
| 7 | 10675 { |
| 10676 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10677 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10678 */ |
| 10679 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10680 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10681 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10682 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10683 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10684 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10685 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10686 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10687 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10688 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10689 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10690 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10691 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
|
10692 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
|
10693 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10694 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
|
10695 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
|
10696 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
|
10697 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10698 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10699 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10700 msg_row = save_msg_row; |
| 7 | 10701 } |
| 10702 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10703 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10704 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10705 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10706 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10707 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10708 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10709 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10710 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10711 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
|
10712 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10713 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10714 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10715 |
| 667 | 10716 /* |
| 10717 * Draw the tab pages line at the top of the Vim window. | |
| 10718 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10719 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10720 draw_tabline(void) |
| 667 | 10721 { |
| 10722 int tabcount = 0; | |
| 10723 tabpage_T *tp; | |
| 10724 int tabwidth; | |
| 10725 int col = 0; | |
| 673 | 10726 int scol = 0; |
| 667 | 10727 int attr; |
| 10728 win_T *wp; | |
| 671 | 10729 win_T *cwp; |
| 10730 int wincount; | |
| 10731 int modified; | |
| 667 | 10732 int c; |
| 10733 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10734 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
|
10735 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
|
10736 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10737 char_u *p; |
| 677 | 10738 int room; |
| 10739 int use_sep_chars = (t_colors < 8 | |
| 10740 #ifdef FEAT_GUI | |
| 10741 && !gui.in_use | |
| 10742 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10743 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10744 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10745 #endif |
| 677 | 10746 ); |
| 673 | 10747 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10748 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10749 return; |
| 673 | 10750 redraw_tabline = FALSE; |
| 667 | 10751 |
| 685 | 10752 #ifdef FEAT_GUI_TABLINE |
| 798 | 10753 /* Take care of a GUI tabline. */ |
| 685 | 10754 if (gui_use_tabline()) |
| 10755 { | |
| 10756 gui_update_tabline(); | |
| 10757 return; | |
| 10758 } | |
| 10759 #endif | |
| 10760 | |
| 10761 if (tabline_height() < 1) | |
| 667 | 10762 return; |
| 10763 | |
| 677 | 10764 #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
|
10765 clear_TabPageIdxs(); |
| 681 | 10766 |
| 677 | 10767 /* Use the 'tabline' option if it's set. */ |
| 10768 if (*p_tal != NUL) | |
| 10769 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10770 int saved_did_emsg = did_emsg; |
| 680 | 10771 |
| 10772 /* Check for an error. If there is one we would loop in redrawing the | |
| 10773 * 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
|
10774 did_emsg = FALSE; |
| 677 | 10775 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10776 if (did_emsg) |
| 680 | 10777 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10778 (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
|
10779 did_emsg |= saved_did_emsg; |
| 680 | 10780 } |
| 10781 else | |
| 10782 #endif | |
| 10783 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10784 FOR_ALL_TABPAGES(tp) |
| 680 | 10785 ++tabcount; |
| 10786 | |
| 10787 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10788 if (tabwidth < 6) | |
| 10789 tabwidth = 6; | |
| 10790 | |
| 10791 attr = attr_nosel; | |
| 10792 tabcount = 0; | |
| 699 | 10793 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10794 tp = tp->tp_next) | |
| 680 | 10795 { |
| 10796 scol = col; | |
| 10797 | |
| 10798 if (tp->tp_topframe == topframe) | |
| 10799 attr = attr_sel; | |
| 10800 if (use_sep_chars && col > 0) | |
| 10801 screen_putchar('|', 0, col++, attr); | |
| 10802 | |
| 10803 if (tp->tp_topframe != topframe) | |
| 10804 attr = attr_nosel; | |
| 10805 | |
| 10806 screen_putchar(' ', 0, col++, attr); | |
| 10807 | |
| 10808 if (tp == curtab) | |
| 10809 { | |
| 10810 cwp = curwin; | |
| 10811 wp = firstwin; | |
| 10812 } | |
| 10813 else | |
| 10814 { | |
| 10815 cwp = tp->tp_curwin; | |
| 10816 wp = tp->tp_firstwin; | |
| 10817 } | |
| 10818 | |
| 10819 modified = FALSE; | |
| 10820 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10821 if (bufIsChanged(wp->w_buffer)) | |
| 10822 modified = TRUE; | |
| 10823 if (modified || wincount > 1) | |
| 10824 { | |
| 10825 if (wincount > 1) | |
| 10826 { | |
| 10827 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10828 len = (int)STRLEN(NameBuff); |
| 699 | 10829 if (col + len >= Columns - 3) |
| 10830 break; | |
| 680 | 10831 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10832 #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
|
10833 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10834 #else |
| 6106 | 10835 attr |
| 680 | 10836 #endif |
| 10837 ); | |
| 10838 col += len; | |
| 10839 } | |
| 10840 if (modified) | |
| 10841 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10842 screen_putchar(' ', 0, col++, attr); | |
| 10843 } | |
| 10844 | |
| 10845 room = scol - col + tabwidth - 1; | |
| 10846 if (room > 0) | |
| 10847 { | |
| 685 | 10848 /* Get buffer name in NameBuff[] */ |
| 10849 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10850 shorten_dir(NameBuff); |
| 680 | 10851 len = vim_strsize(NameBuff); |
| 10852 p = NameBuff; | |
| 10853 if (has_mbyte) | |
| 10854 while (len > room) | |
| 10855 { | |
| 10856 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10857 MB_PTR_ADV(p); |
| 680 | 10858 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10859 else if (len > room) |
| 677 | 10860 { |
| 680 | 10861 p += len - room; |
| 10862 len = room; | |
| 677 | 10863 } |
| 699 | 10864 if (len > Columns - col - 1) |
| 10865 len = Columns - col - 1; | |
| 680 | 10866 |
| 835 | 10867 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10868 col += len; |
| 10869 } | |
| 10870 screen_putchar(' ', 0, col++, attr); | |
| 10871 | |
| 10872 /* Store the tab page number in TabPageIdxs[], so that | |
| 10873 * jump_to_mouse() knows where each one is. */ | |
| 10874 ++tabcount; | |
| 10875 while (scol < col) | |
| 10876 TabPageIdxs[scol++] = tabcount; | |
| 10877 } | |
| 10878 | |
| 10879 if (use_sep_chars) | |
| 10880 c = '_'; | |
| 10881 else | |
| 10882 c = ' '; | |
| 10883 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10884 |
| 10885 /* Put an "X" for closing the current tab if there are several. */ | |
| 10886 if (first_tabpage->tp_next != NULL) | |
| 10887 { | |
| 10888 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10889 TabPageIdxs[Columns - 1] = -999; | |
| 10890 } | |
| 10891 } | |
| 834 | 10892 |
| 10893 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10894 * set. */ | |
| 10895 redraw_tabline = FALSE; | |
| 667 | 10896 } |
| 685 | 10897 |
| 10898 /* | |
| 10899 * Get buffer name for "buf" into NameBuff[]. | |
| 10900 * Takes care of special buffer names and translates special characters. | |
| 10901 */ | |
| 10902 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10903 get_trans_bufname(buf_T *buf) |
| 685 | 10904 { |
| 10905 if (buf_spname(buf) != NULL) | |
| 3839 | 10906 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10907 else |
| 10908 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10909 trans_characters(NameBuff, MAXPATHL); | |
| 10910 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10911 |
| 7 | 10912 /* |
| 10913 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10914 */ | |
| 10915 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
|
10916 fillchar_status(int *attr, win_T *wp) |
| 7 | 10917 { |
| 10918 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
|
10919 |
|
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
|
10920 #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
|
10921 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
|
10922 { |
|
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
|
10923 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
|
10924 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10925 *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
|
10926 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
|
10927 } |
|
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
|
10928 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10929 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10930 *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
|
10931 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
|
10932 } |
|
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
|
10933 } |
|
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
|
10934 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
|
10935 #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
|
10936 if (wp == curwin) |
| 7 | 10937 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10938 *attr = HL_ATTR(HLF_S); |
| 7 | 10939 fill = fill_stl; |
| 10940 } | |
| 10941 else | |
| 10942 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10943 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10944 fill = fill_stlnc; |
| 10945 } | |
| 10946 /* Use fill when there is highlighting, and highlighting of current | |
| 10947 * window differs, or the fillchars differ, or this is not the | |
| 10948 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10949 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
|
10950 || wp != curwin || ONE_WINDOW) |
| 7 | 10951 || (fill_stl != fill_stlnc))) |
| 10952 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
|
10953 if (wp == curwin) |
| 7 | 10954 return '^'; |
| 10955 return '='; | |
| 10956 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10957 |
| 7 | 10958 /* |
| 10959 * Get the character to use in a separator between vertically split windows. | |
| 10960 * Get its attributes in "*attr". | |
| 10961 */ | |
| 10962 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10963 fillchar_vsep(int *attr) |
| 7 | 10964 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10965 *attr = HL_ATTR(HLF_C); |
| 7 | 10966 if (*attr == 0 && fill_vert == ' ') |
| 10967 return '|'; | |
| 10968 else | |
| 10969 return fill_vert; | |
| 10970 } | |
| 10971 | |
| 10972 /* | |
| 10973 * Return TRUE if redrawing should currently be done. | |
| 10974 */ | |
| 10975 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10976 redrawing(void) |
| 7 | 10977 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10978 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10979 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
|
10980 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10981 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10982 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10983 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10984 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10985 || 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
|
10986 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10987 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10988 } |
| 10989 | |
| 10990 /* | |
| 10991 * Return TRUE if printing messages should currently be done. | |
| 10992 */ | |
| 10993 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10994 messaging(void) |
| 7 | 10995 { |
| 10996 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10997 } | |
| 10998 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10999 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11000 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11001 * 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
|
11002 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11003 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11004 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
|
11005 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11006 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11007 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
|
11008 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
|
11009 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11010 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11011 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
|
11012 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
|
11013 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
|
11014 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11015 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
|
11016 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
|
11017 ++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
|
11018 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
|
11019 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11020 /* 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
|
11021 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
|
11022 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
|
11023 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11024 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
|
11025 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
|
11026 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11027 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11028 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11029 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
|
11030 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
|
11031 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11032 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11033 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11034 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
|
11035 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
|
11036 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
|
11037 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11038 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11039 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
|
11040 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
|
11041 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11042 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
|
11043 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11044 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11045 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
|
11046 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
|
11047 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11048 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11049 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
|
11050 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11051 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
|
11052 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11053 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11054 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
|
11055 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11056 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
|
11057 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11058 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11059 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
|
11060 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11061 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
|
11062 (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
|
11063 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11064 #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
|
11065 |
| 7 | 11066 /* |
| 11067 * Show current status info in ruler and various other places | |
| 11068 * If always is FALSE, only show ruler if position has changed. | |
| 11069 */ | |
| 11070 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11071 showruler(int always) |
| 7 | 11072 { |
| 11073 if (!always && !redrawing()) | |
| 11074 return; | |
| 574 | 11075 #ifdef FEAT_INS_EXPAND |
| 11076 if (pum_visible()) | |
| 11077 { | |
| 11078 /* Don't redraw right now, do it later. */ | |
| 11079 curwin->w_redr_status = TRUE; | |
| 11080 return; | |
| 11081 } | |
| 11082 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11083 #if defined(FEAT_STL_OPT) |
| 40 | 11084 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 11085 redraw_custom_statusline(curwin); |
| 7 | 11086 else |
| 11087 #endif | |
| 11088 #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
|
11089 win_redr_ruler(curwin, always, FALSE); |
| 7 | 11090 #endif |
| 11091 | |
| 11092 #ifdef FEAT_TITLE | |
| 11093 if (need_maketitle | |
| 11094 # ifdef FEAT_STL_OPT | |
| 11095 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 11096 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 11097 # endif | |
| 11098 ) | |
| 11099 maketitle(); | |
| 11100 #endif | |
| 1588 | 11101 /* Redraw the tab pages line if needed. */ |
| 11102 if (redraw_tabline) | |
| 11103 draw_tabline(); | |
| 7 | 11104 } |
| 11105 | |
| 11106 #ifdef FEAT_CMDL_INFO | |
| 11107 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
|
11108 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 11109 { |
| 1869 | 11110 #define RULER_BUF_LEN 70 |
| 11111 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 11112 int row; |
| 11113 int fillchar; | |
| 11114 int attr; | |
| 11115 int empty_line = FALSE; | |
| 11116 colnr_T virtcol; | |
| 11117 int i; | |
| 1869 | 11118 size_t len; |
| 7 | 11119 int o; |
| 11120 int this_ru_col; | |
| 11121 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
11122 int width; |
| 7 | 11123 |
| 11124 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 11125 if (!p_ru) | |
| 11126 return; | |
| 11127 | |
| 11128 /* | |
| 11129 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 11130 * after deleting lines, before cursor.lnum is corrected. | |
| 11131 */ | |
| 11132 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 11133 return; | |
| 11134 | |
| 11135 #ifdef FEAT_INS_EXPAND | |
| 11136 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 11137 * the (long) mode message. */ | |
| 11138 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 11139 if (edit_submode != NULL) | |
| 11140 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
|
11141 // 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
|
11142 // 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
|
11143 if (!ignore_pum && pum_visible()) |
| 540 | 11144 return; |
| 7 | 11145 #endif |
| 11146 | |
| 11147 #ifdef FEAT_STL_OPT | |
| 11148 if (*p_ruf) | |
| 11149 { | |
| 680 | 11150 int save_called_emsg = called_emsg; |
| 11151 | |
| 11152 called_emsg = FALSE; | |
| 7 | 11153 win_redr_custom(wp, TRUE); |
| 680 | 11154 if (called_emsg) |
| 11155 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 11156 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 11157 called_emsg |= save_called_emsg; |
| 7 | 11158 return; |
| 11159 } | |
| 11160 #endif | |
| 11161 | |
| 11162 /* | |
| 11163 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 11164 */ | |
| 11165 if (!(State & INSERT) | |
| 11166 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 11167 empty_line = TRUE; | |
| 11168 | |
| 11169 /* | |
| 11170 * Only draw the ruler when something changed. | |
| 11171 */ | |
| 11172 validate_virtcol_win(wp); | |
| 11173 if ( redraw_cmdline | |
| 11174 || always | |
| 11175 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 11176 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 11177 || wp->w_virtcol != wp->w_ru_virtcol | |
| 11178 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 11179 || wp->w_topline != wp->w_ru_topline | |
| 11180 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 11181 #ifdef FEAT_DIFF | |
| 11182 || wp->w_topfill != wp->w_ru_topfill | |
| 11183 #endif | |
| 11184 || empty_line != wp->w_ru_empty) | |
| 11185 { | |
| 11186 cursor_off(); | |
| 11187 if (wp->w_status_height) | |
| 11188 { | |
| 11189 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
|
11190 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
|
11191 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
|
11192 width = wp->w_width; |
| 7 | 11193 } |
| 11194 else | |
| 11195 { | |
| 11196 row = Rows - 1; | |
| 11197 fillchar = ' '; | |
| 11198 attr = 0; | |
| 11199 width = Columns; | |
| 11200 off = 0; | |
| 11201 } | |
| 11202 | |
| 11203 /* In list mode virtcol needs to be recomputed */ | |
| 11204 virtcol = wp->w_virtcol; | |
| 11205 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 11206 { | |
| 11207 wp->w_p_list = FALSE; | |
| 11208 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 11209 wp->w_p_list = TRUE; | |
| 11210 } | |
| 11211 | |
| 11212 /* | |
| 11213 * Some sprintfs return the length, some return a pointer. | |
| 11214 * To avoid portability problems we use strlen() here. | |
| 11215 */ | |
| 1869 | 11216 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11217 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11218 ? 0L | |
| 11219 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11220 len = STRLEN(buffer); |
| 11221 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11222 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11223 (int)virtcol + 1); | |
| 11224 | |
| 11225 /* | |
| 11226 * Add a "50%" if there is room for it. | |
| 11227 * On the last line, don't print in the last column (scrolls the | |
| 11228 * screen up on some terminals). | |
| 11229 */ | |
| 11230 i = (int)STRLEN(buffer); | |
| 1869 | 11231 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11232 o = i + vim_strsize(buffer + i + 1); |
| 11233 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11234 ++o; | |
| 11235 this_ru_col = ru_col - (Columns - width); | |
| 11236 if (this_ru_col < 0) | |
| 11237 this_ru_col = 0; | |
| 11238 /* Never use more than half the window/screen width, leave the other | |
| 11239 * 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
|
11240 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
|
11241 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
|
11242 if (this_ru_col + o < width) |
| 7 | 11243 { |
| 6466 | 11244 /* 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
|
11245 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11246 { |
| 11247 if (has_mbyte) | |
| 11248 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11249 else | |
| 11250 buffer[i++] = fillchar; | |
| 11251 ++o; | |
| 11252 } | |
| 1869 | 11253 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11254 } |
| 11255 /* Truncate at window boundary. */ | |
| 11256 if (has_mbyte) | |
| 11257 { | |
| 11258 o = 0; | |
| 474 | 11259 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11260 { |
| 11261 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
|
11262 if (this_ru_col + o > width) |
| 7 | 11263 { |
| 11264 buffer[i] = NUL; | |
| 11265 break; | |
| 11266 } | |
| 11267 } | |
| 11268 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
11269 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
|
11270 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
|
11271 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11272 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11273 i = redraw_cmdline; |
| 11274 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
|
11275 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
|
11276 (int)(off + width), |
| 7 | 11277 fillchar, fillchar, attr); |
| 11278 /* don't redraw the cmdline because of showing the ruler */ | |
| 11279 redraw_cmdline = i; | |
| 11280 wp->w_ru_cursor = wp->w_cursor; | |
| 11281 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11282 wp->w_ru_empty = empty_line; | |
| 11283 wp->w_ru_topline = wp->w_topline; | |
| 11284 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11285 #ifdef FEAT_DIFF | |
| 11286 wp->w_ru_topfill = wp->w_topfill; | |
| 11287 #endif | |
| 11288 } | |
| 11289 } | |
| 11290 #endif | |
| 13 | 11291 |
| 11292 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11293 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11294 * 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
|
11295 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11296 * Otherwise it depends on 'numberwidth' and the line count. |
| 11297 */ | |
| 11298 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11299 number_width(win_T *wp) |
| 13 | 11300 { |
| 11301 int n; | |
| 11302 linenr_T lnum; | |
| 11303 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11304 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
|
11305 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11306 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11307 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11308 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11309 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
|
11310 |
| 6679 | 11311 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11312 return wp->w_nrwidth_width; |
| 11313 wp->w_nrwidth_line_count = lnum; | |
| 11314 | |
| 11315 n = 0; | |
| 11316 do | |
| 11317 { | |
| 856 | 11318 lnum /= 10; |
| 11319 ++n; | |
| 13 | 11320 } while (lnum > 0); |
| 11321 | |
| 11322 /* 'numberwidth' gives the minimal width plus one */ | |
| 11323 if (n < wp->w_p_nuw - 1) | |
| 11324 n = wp->w_p_nuw - 1; | |
| 11325 | |
| 11326 wp->w_nrwidth_width = n; | |
| 6679 | 11327 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11328 return n; |
| 11329 } | |
| 11330 #endif | |
| 3986 | 11331 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11332 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 11333 /* |
| 11334 * Return the current cursor column. This is the actual position on the | |
| 11335 * screen. First column is 0. | |
| 11336 */ | |
| 11337 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11338 screen_screencol(void) |
| 3986 | 11339 { |
| 11340 return screen_cur_col; | |
| 11341 } | |
| 11342 | |
| 11343 /* | |
| 11344 * Return the current cursor row. This is the actual position on the screen. | |
| 11345 * First row is 0. | |
| 11346 */ | |
| 11347 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11348 screen_screenrow(void) |
| 3986 | 11349 { |
| 11350 return screen_cur_row; | |
| 11351 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11352 #endif |