Mercurial > vim
annotate src/screen.c @ 16782:fc58fee685e2 v8.1.1393
patch 8.1.1393: unnecessary type casts
commit https://github.com/vim/vim/commit/51e14387f120392b74b84408cafec33942337a05
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat May 25 20:21:28 2019 +0200
patch 8.1.1393: unnecessary type casts
Problem: Unnecessary type casts.
Solution: Remove type casts from alloc() and lalloc() calls. (Mike Williams)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 25 May 2019 20:30:06 +0200 |
| parents | eda4d65f232c |
| children | f7268ec2c889 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9992
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * screen.c: code for displaying on the screen | |
| 12 * | |
| 13 * Output to the screen (console, terminal emulator or GUI window) is minimized | |
| 14 * by remembering what is already on the screen, and only updating the parts | |
| 15 * that changed. | |
| 16 * | |
| 17 * ScreenLines[off] Contains a copy of the whole screen, as it is currently | |
| 18 * displayed (excluding text written by external commands). | |
| 19 * ScreenAttrs[off] Contains the associated attributes. | |
| 20 * LineOffset[row] Contains the offset into ScreenLines*[] and ScreenAttrs[] | |
| 21 * for each line. | |
| 22 * LineWraps[row] Flag for each line whether it wraps to the next line. | |
| 23 * | |
| 24 * For double-byte characters, two consecutive bytes in ScreenLines[] can form | |
| 25 * one character which occupies two display cells. | |
| 26 * For UTF-8 a multi-byte character is converted to Unicode and stored in | |
| 27 * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
28 * character without composing chars ScreenLinesUC[] will be 0 and |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
29 * ScreenLinesC[][] is not used. When the character occupies two display |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
30 * cells the next byte in ScreenLines[] is 0. |
| 714 | 31 * ScreenLinesC[][] contain up to 'maxcombine' composing characters |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
32 * (drawn on top of the first character). There is 0 after the last one used. |
| 7 | 33 * ScreenLines2[] is only used for euc-jp to store the second byte if the |
| 34 * first byte is 0x8e (single-width character). | |
| 35 * | |
| 36 * The screen_*() functions write to the screen and handle updating | |
| 37 * ScreenLines[]. | |
| 38 * | |
| 39 * update_screen() is the function that updates all windows and status lines. | |
| 40 * It is called form the main loop when must_redraw is non-zero. It may be | |
| 1213 | 41 * called from other places when an immediate screen update is needed. |
| 7 | 42 * |
| 43 * The part of the buffer that is displayed in a window is set with: | |
| 44 * - w_topline (first buffer line in window) | |
| 5946 | 45 * - w_topfill (filler lines above the first line) |
| 7 | 46 * - w_leftcol (leftmost window cell in window), |
| 47 * - w_skipcol (skipped window cells of first line) | |
| 48 * | |
| 49 * Commands that only move the cursor around in a window, do not need to take | |
| 50 * action to update the display. The main loop will check if w_topline is | |
| 51 * valid and update it (scroll the window) when needed. | |
| 52 * | |
| 53 * Commands that scroll a window change w_topline and must call | |
| 54 * check_cursor() to move the cursor into the visible part of the window, and | |
| 55 * call redraw_later(VALID) to have the window displayed by update_screen() | |
| 56 * later. | |
| 57 * | |
| 58 * Commands that change text in the buffer must call changed_bytes() or | |
| 59 * changed_lines() to mark the area that changed and will require updating | |
| 60 * later. The main loop will call update_screen(), which will update each | |
| 61 * window that shows the changed buffer. This assumes text above the change | |
| 62 * can remain displayed as it is. Text after the change may need updating for | |
| 63 * scrolling, folding and syntax highlighting. | |
| 64 * | |
| 65 * Commands that change how a window is displayed (e.g., setting 'list') or | |
| 66 * invalidate the contents of a window in another way (e.g., change fold | |
| 67 * settings), must call redraw_later(NOT_VALID) to have the whole window | |
| 68 * redisplayed by update_screen() later. | |
| 69 * | |
| 70 * Commands that change how a buffer is displayed (e.g., setting 'tabstop') | |
| 71 * must call redraw_curbuf_later(NOT_VALID) to have all the windows for the | |
| 72 * buffer redisplayed by update_screen() later. | |
| 73 * | |
| 743 | 74 * Commands that change highlighting and possibly cause a scroll too must call |
| 75 * redraw_later(SOME_VALID) to update the whole window but still use scrolling | |
| 76 * to avoid redrawing everything. But the length of displayed lines must not | |
| 77 * change, use NOT_VALID then. | |
| 78 * | |
| 7 | 79 * Commands that move the window position must call redraw_later(NOT_VALID). |
| 80 * TODO: should minimize redrawing by scrolling when possible. | |
| 81 * | |
| 82 * Commands that change everything (e.g., resizing the screen) must call | |
| 83 * redraw_all_later(NOT_VALID) or redraw_all_later(CLEAR). | |
| 84 * | |
| 85 * Things that are handled indirectly: | |
| 86 * - When messages scroll the screen up, msg_scrolled will be set and | |
| 87 * update_screen() called to redraw. | |
| 88 */ | |
| 89 | |
| 90 #include "vim.h" | |
| 91 | |
| 3586 | 92 #define MB_FILLER_CHAR '<' /* character used when a double-width character |
| 93 * doesn't fit. */ | |
| 94 | |
| 7 | 95 /* |
| 96 * The attributes that are actually active for writing to the screen. | |
| 97 */ | |
| 98 static int screen_attr = 0; | |
| 99 | |
| 100 /* | |
| 101 * Positioning the cursor is reduced by remembering the last position. | |
| 102 * Mostly used by windgoto() and screen_char(). | |
| 103 */ | |
| 104 static int screen_cur_row, screen_cur_col; /* last known cursor position */ | |
| 105 | |
| 106 #ifdef FEAT_SEARCH_EXTRA | |
| 107 static match_T search_hl; /* used for 'hlsearch' highlight matching */ | |
| 108 #endif | |
| 109 | |
| 110 #ifdef FEAT_FOLDING | |
| 111 static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */ | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
112 static int compute_foldcolumn(win_T *wp, int col); |
| 7 | 113 #endif |
| 114 | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
115 /* Flag that is set when drawing for a callback, not from the main command |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
116 * loop. */ |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
117 static int redrawing_for_callback = 0; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
118 |
| 7 | 119 /* |
| 120 * Buffer for one screen line (characters and attributes). | |
| 121 */ | |
| 122 static schar_T *current_ScreenLine; | |
| 123 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
124 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
125 static void update_popups(void); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
126 #endif |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
127 static void win_update(win_T *wp); |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
128 static void win_redr_status(win_T *wp, int ignore_pum); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
129 static void win_draw_end(win_T *wp, int c1, int c2, int draw_margin, int row, int endrow, hlf_T hl); |
| 7 | 130 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
131 static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T lnum, int row); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
132 static void fill_foldcolumn(char_u *p, win_T *wp, int closed, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
133 static void copy_text_attr(int off, char_u *buf, int len, int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
134 #endif |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
135 static int win_line(win_T *, linenr_T, int, int, int nochange, int number_only); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
136 static void draw_vsep_win(win_T *wp, int row); |
| 680 | 137 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
138 static void redraw_custom_statusline(win_T *wp); |
| 680 | 139 #endif |
| 7 | 140 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 141 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
142 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
143 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 static void init_search_hl(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
145 static void prepare_search_hl(win_T *wp, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
146 static void next_search_hl(win_T *win, match_T *shl, linenr_T lnum, colnr_T mincol, matchitem_T *cur); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
147 static int next_search_hl_pos(match_T *shl, linenr_T lnum, posmatch_T *pos, colnr_T mincol); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
148 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
149 static void screen_char(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
150 static void screen_char_2(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
151 static void screenclear2(void); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
152 static void lineclear(unsigned off, int width, int attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
153 static void lineinvalid(unsigned off, int width); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
154 static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del, int clear_attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
155 static void win_rest_invalid(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
157 static void recording_mode(int attr); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
158 static int fillchar_status(int *attr, win_T *wp); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
159 static int fillchar_vsep(int *attr); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
160 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
161 static void redraw_win_toolbar(win_T *wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
162 #endif |
| 7 | 163 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
164 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 165 #endif |
| 166 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
167 static void win_redr_ruler(win_T *wp, int always, int ignore_pum); |
| 7 | 168 #endif |
| 169 | |
| 170 /* Ugly global: overrule attribute used by screen_char() */ | |
| 171 static int screen_char_attr = 0; | |
| 172 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
173 #if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
174 /* Can limit syntax highlight time to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
175 # define SYN_TIME_LIMIT 1 |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
176 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
177 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
178 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
179 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
180 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
181 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
182 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
183 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
184 // flags for screen_line() |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
185 #define SLF_RIGHTLEFT 1 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
186 #define SLF_POPUP 2 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
187 |
| 7 | 188 /* |
| 189 * Redraw the current window later, with update_screen(type). | |
| 190 * Set must_redraw only if not already set to a higher value. | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
191 * E.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. |
| 7 | 192 */ |
| 193 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
194 redraw_later(int type) |
| 7 | 195 { |
| 196 redraw_win_later(curwin, type); | |
| 197 } | |
| 198 | |
| 199 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
200 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
201 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
202 int type) |
| 7 | 203 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
204 if (!exiting && wp->w_redr_type < type) |
| 7 | 205 { |
| 206 wp->w_redr_type = type; | |
| 207 if (type >= NOT_VALID) | |
| 208 wp->w_lines_valid = 0; | |
| 209 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 210 must_redraw = type; | |
| 211 } | |
| 212 } | |
| 213 | |
| 214 /* | |
| 215 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 216 * after executing a shell command that messes up the screen. | |
| 217 */ | |
| 218 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
219 redraw_later_clear(void) |
| 7 | 220 { |
| 221 redraw_all_later(CLEAR); | |
| 826 | 222 #ifdef FEAT_GUI |
| 223 if (gui.in_use) | |
| 224 /* Use a code that will reset gui.highlight_mask in | |
| 225 * gui_stop_highlight(). */ | |
| 226 screen_attr = HL_ALL + 1; | |
| 227 else | |
| 228 #endif | |
| 229 /* Use attributes that is very unlikely to appear in text. */ | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
230 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 231 } |
| 232 | |
| 233 /* | |
| 234 * Mark all windows to be redrawn later. | |
| 235 */ | |
| 236 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
237 redraw_all_later(int type) |
| 7 | 238 { |
| 239 win_T *wp; | |
| 240 | |
| 241 FOR_ALL_WINDOWS(wp) | |
| 242 redraw_win_later(wp, type); | |
|
15384
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
243 // This may be needed when switching tabs. |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
244 if (must_redraw < type) |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
245 must_redraw = type; |
| 7 | 246 } |
| 247 | |
| 248 /* | |
| 301 | 249 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 250 */ |
| 251 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
252 redraw_curbuf_later(int type) |
| 7 | 253 { |
| 254 redraw_buf_later(curbuf, type); | |
| 255 } | |
| 256 | |
| 257 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
258 redraw_buf_later(buf_T *buf, int type) |
| 7 | 259 { |
| 260 win_T *wp; | |
| 261 | |
| 262 FOR_ALL_WINDOWS(wp) | |
| 263 { | |
| 264 if (wp->w_buffer == buf) | |
| 265 redraw_win_later(wp, type); | |
| 266 } | |
| 267 } | |
| 268 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
269 #if defined(FEAT_SIGNS) || defined(PROTO) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
270 void |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
271 redraw_buf_line_later(buf_T *buf, linenr_T lnum) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
272 { |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
273 win_T *wp; |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
274 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
275 FOR_ALL_WINDOWS(wp) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
276 if (wp->w_buffer == buf && lnum >= wp->w_topline |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
277 && lnum < wp->w_botline) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
278 redrawWinline(wp, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
279 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
280 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
281 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
282 #if defined(FEAT_JOB_CHANNEL) || defined(PROTO) |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
283 void |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
284 redraw_buf_and_status_later(buf_T *buf, int type) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
285 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
286 win_T *wp; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
287 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
288 #ifdef FEAT_WILDMENU |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
289 if (wild_menu_showing != 0) |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
290 /* Don't redraw while the command line completion is displayed, it |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
291 * would disappear. */ |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
292 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
293 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
294 FOR_ALL_WINDOWS(wp) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
295 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
296 if (wp->w_buffer == buf) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
297 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
298 redraw_win_later(wp, type); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
299 wp->w_redr_status = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
300 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
301 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
302 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
303 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
304 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
305 #if defined(FEAT_TERMRESPONSE) || defined(PROTO) |
| 7 | 306 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 * Redraw as soon as possible. When the command line is not scrolled redraw |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 * right away and restore what was on the command line. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
309 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
311 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
312 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
313 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 int rows; |
| 6959 | 315 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
318 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
319 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
320 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
321 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 u8char_T *screenlineC[MAX_MCO]; /* copy from ScreenLinesC[][] */ |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
323 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 redraw_later(type); |
| 6959 | 326 if (msg_scrolled || (State != NORMAL && State != NORMAL_BUSY) || exiting) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
327 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
328 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
329 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 330 rows = screen_Rows - cmdline_row; |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16778
diff
changeset
|
331 screenline = (schar_T *)lalloc(rows * cols * sizeof(schar_T), FALSE); |
|
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16778
diff
changeset
|
332 screenattr = (sattr_T *)lalloc(rows * cols * sizeof(sattr_T), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 screenlineUC = (u8char_T *)lalloc( |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16778
diff
changeset
|
338 rows * cols * sizeof(u8char_T), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
342 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 screenlineC[i] = (u8char_T *)lalloc( |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16778
diff
changeset
|
344 rows * cols * sizeof(u8char_T), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 { |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16778
diff
changeset
|
351 screenline2 = (schar_T *)lalloc(rows * cols * sizeof(schar_T), FALSE); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 /* Save the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
359 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 { |
| 6959 | 361 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
362 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 363 (size_t)cols * sizeof(schar_T)); |
| 364 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 366 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
367 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 { |
| 6959 | 369 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 371 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 for (i = 0; i < p_mco; ++i) |
| 6959 | 373 mch_memmove(screenlineC[i] + r * cols, |
| 374 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 375 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
376 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 378 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 380 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
383 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
387 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
388 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 /* Restore the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
392 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
393 mch_memmove(current_ScreenLine, |
| 6959 | 394 screenline + r * cols, |
| 395 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
396 mch_memmove(ScreenAttrs + off, |
| 6959 | 397 screenattr + r * cols, |
| 398 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
400 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
401 mch_memmove(ScreenLinesUC + off, |
| 6959 | 402 screenlineUC + r * cols, |
| 403 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
405 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 406 screenlineC[i] + r * cols, |
| 407 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
408 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
409 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
410 mch_memmove(ScreenLines2 + off, |
| 6959 | 411 screenline2 + r * cols, |
| 412 (size_t)cols * sizeof(schar_T)); | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
413 screen_line(cmdline_row + r, 0, cols, cols, 0); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
414 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
415 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
428 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
429 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
430 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
431 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
432 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
433 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
434 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
435 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
436 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
437 #endif |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
438 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
439 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
440 * Invoked after an asynchronous callback is called. |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
441 * If an echo command was used the cursor needs to be put back where |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
442 * it belongs. If highlighting was changed a redraw is needed. |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
443 * If "call_update_screen" is FALSE don't call update_screen() when at the |
|
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
444 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
445 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
446 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
447 redraw_after_callback(int call_update_screen) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
448 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
449 ++redrawing_for_callback; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
450 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
451 if (State == HITRETURN || State == ASKMORE) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
452 ; // do nothing |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
453 else if (State & CMDLINE) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
454 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
455 // Don't redraw when in prompt_for_number(). |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
456 if (cmdline_row > 0) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
457 { |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
458 // Redrawing only works when the screen didn't scroll. Don't clear |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
459 // wildmenu entries. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
460 if (msg_scrolled == 0 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
461 #ifdef FEAT_WILDMENU |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
462 && wild_menu_showing == 0 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
463 #endif |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
464 && call_update_screen) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
465 update_screen(0); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
466 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
467 // Redraw in the same position, so that the user can continue |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
468 // editing the command. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
469 redrawcmdline_ex(FALSE); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
470 } |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
471 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
472 else if (State & (NORMAL | INSERT | TERMINAL)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
473 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
474 // keep the command line if possible |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
475 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
476 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
477 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
478 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
479 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
480 if (gui.in_use && !gui_mch_is_blink_off()) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
481 // Don't update the cursor when it is blinking and off to avoid |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
482 // flicker. |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
483 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
484 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
485 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
486 out_flush(); |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
487 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
488 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
489 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
490 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
491 /* |
| 7 | 492 * Changed something in the current window, at buffer line "lnum", that |
| 493 * requires that line and possibly other lines to be redrawn. | |
| 494 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 495 * Used to remove the "$" from a change command. | |
| 496 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 497 * may become invalid and the whole window will have to be redrawn. | |
| 498 */ | |
| 499 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
500 redrawWinline( |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
501 win_T *wp, |
|
15400
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
502 linenr_T lnum) |
|
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
503 { |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
504 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
505 wp->w_redraw_top = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
506 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
507 wp->w_redraw_bot = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
508 redraw_win_later(wp, VALID); |
| 7 | 509 } |
| 510 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
511 void |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
512 reset_updating_screen(int may_resize_shell UNUSED) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
513 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
514 updating_screen = FALSE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
515 #ifdef FEAT_GUI |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
516 if (may_resize_shell) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
517 gui_may_resize_shell(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
518 #endif |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
519 #ifdef FEAT_TERMINAL |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
520 term_check_channel_closed_recently(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
521 #endif |
|
14428
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
522 |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
523 #ifdef HAVE_DROP_FILE |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
524 // If handle_drop() was called while updating_screen was TRUE need to |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
525 // handle the drop now. |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
526 handle_any_postponed_drop(); |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
527 #endif |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
528 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
529 |
| 7 | 530 /* |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
531 * Update all windows that are editing the current buffer. |
| 7 | 532 */ |
| 533 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
534 update_curbuf(int type) |
| 7 | 535 { |
| 536 redraw_curbuf_later(type); | |
| 537 update_screen(type); | |
| 538 } | |
| 539 | |
| 540 /* | |
| 541 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 542 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
543 * Return OK when the screen was updated, FAIL if it was not done. |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
544 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
545 int |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
546 update_screen(int type_arg) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
547 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
548 int type = type_arg; |
| 7 | 549 win_T *wp; |
| 550 static int did_intro = FALSE; | |
| 551 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 552 int did_one; | |
| 553 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
554 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
555 int did_undraw = FALSE; |
|
16405
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
556 int gui_cursor_col = 0; |
|
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
557 int gui_cursor_row = 0; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
558 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
559 int no_update = FALSE; |
| 7 | 560 |
| 2008 | 561 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 562 if (!screen_valid(TRUE)) |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
563 return FAIL; |
| 7 | 564 |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
565 if (type == VALID_NO_UPDATE) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
566 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
567 no_update = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
568 type = 0; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
569 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
570 |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
571 #ifdef FEAT_EVAL |
|
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
572 { |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
573 buf_T *buf; |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
574 |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
575 // Before updating the screen, notify any listeners of changed text. |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
576 FOR_ALL_BUFFERS(buf) |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
577 invoke_listeners(buf); |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
578 } |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
579 #endif |
|
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
580 |
| 7 | 581 if (must_redraw) |
| 582 { | |
| 583 if (type < must_redraw) /* use maximal type */ | |
| 584 type = must_redraw; | |
| 1331 | 585 |
| 586 /* must_redraw is reset here, so that when we run into some weird | |
| 587 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 588 * scrolling), or update_topline() in win_update() will cause a | |
| 589 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 590 must_redraw = 0; |
| 591 } | |
| 592 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
593 /* May need to update w_lines[]. */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
594 if (curwin->w_lines_valid == 0 && type < NOT_VALID |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
595 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
596 && !term_do_update_window(curwin) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
597 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
598 ) |
| 7 | 599 type = NOT_VALID; |
| 600 | |
| 2008 | 601 /* Postpone the redrawing when it's not needed and when being called |
| 602 * recursively. */ | |
| 603 if (!redrawing() || updating_screen) | |
| 7 | 604 { |
| 605 redraw_later(type); /* remember type for next time */ | |
| 606 must_redraw = type; | |
| 607 if (type > INVERTED_ALL) | |
| 608 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
609 return FAIL; |
| 7 | 610 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
611 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
612 // TODO: avoid redrawing everything when there is a popup window. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
613 if (first_popupwin != NULL || first_tab_popupwin != NULL) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
614 type = NOT_VALID; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
615 #endif |
| 7 | 616 |
| 617 updating_screen = TRUE; | |
| 618 #ifdef FEAT_SYN_HL | |
| 619 ++display_tick; /* let syntax code know we're in a next round of | |
| 620 * display updating */ | |
| 621 #endif | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
622 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
623 ++no_win_do_lines_ins; |
| 7 | 624 |
| 625 /* | |
| 626 * if the screen was scrolled up when displaying a message, scroll it down | |
| 627 */ | |
| 628 if (msg_scrolled) | |
| 629 { | |
| 630 clear_cmdline = TRUE; | |
| 631 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 632 type = CLEAR; | |
| 633 else if (type != CLEAR) | |
| 634 { | |
| 635 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
636 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, 0, NULL) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
637 == FAIL) |
| 7 | 638 type = CLEAR; |
| 639 FOR_ALL_WINDOWS(wp) | |
| 640 { | |
| 641 if (W_WINROW(wp) < msg_scrolled) | |
| 642 { | |
| 643 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 644 && wp->w_redr_type < REDRAW_TOP | |
| 645 && wp->w_lines_valid > 0 | |
| 646 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 647 { | |
| 648 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 649 wp->w_redr_type = REDRAW_TOP; | |
| 650 } | |
| 651 else | |
| 652 { | |
| 653 wp->w_redr_type = NOT_VALID; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
654 if (W_WINROW(wp) + wp->w_height + wp->w_status_height |
|
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
655 <= msg_scrolled) |
| 7 | 656 wp->w_redr_status = TRUE; |
| 657 } | |
| 658 } | |
| 659 } | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
660 if (!no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
661 redraw_cmdline = TRUE; |
| 673 | 662 redraw_tabline = TRUE; |
| 7 | 663 } |
| 664 msg_scrolled = 0; | |
| 665 need_wait_return = FALSE; | |
| 666 } | |
| 667 | |
| 668 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 669 compute_cmdrow(); | |
| 670 | |
| 671 /* Check for changed highlighting */ | |
| 672 if (need_highlight_changed) | |
| 673 highlight_changed(); | |
| 674 | |
| 675 if (type == CLEAR) /* first clear screen */ | |
| 676 { | |
| 677 screenclear(); /* will reset clear_cmdline */ | |
| 678 type = NOT_VALID; | |
|
11607
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
679 /* must_redraw may be set indirectly, avoid another redraw later */ |
|
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
680 must_redraw = 0; |
| 7 | 681 } |
| 682 | |
| 683 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 684 check_for_delay(FALSE); | |
| 685 | |
| 13 | 686 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
687 /* Force redraw when width of 'number' or 'relativenumber' column |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
688 * changes. */ |
| 13 | 689 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
690 && curwin->w_nrwidth != ((curwin->w_p_nu || curwin->w_p_rnu) |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
691 ? number_width(curwin) : 0)) |
| 13 | 692 curwin->w_redr_type = NOT_VALID; |
| 693 #endif | |
| 694 | |
| 7 | 695 /* |
| 696 * Only start redrawing if there is really something to do. | |
| 697 */ | |
| 698 if (type == INVERTED) | |
| 699 update_curswant(); | |
| 700 if (curwin->w_redr_type < type | |
| 701 && !((type == VALID | |
| 702 && curwin->w_lines[0].wl_valid | |
| 703 #ifdef FEAT_DIFF | |
| 704 && curwin->w_topfill == curwin->w_old_topfill | |
| 705 && curwin->w_botfill == curwin->w_old_botfill | |
| 706 #endif | |
| 707 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 708 || (type == INVERTED | |
| 1043 | 709 && VIsual_active |
| 7 | 710 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 711 && curwin->w_old_visual_mode == VIsual_mode | |
| 712 && (curwin->w_valid & VALID_VIRTCOL) | |
| 713 && curwin->w_old_curswant == curwin->w_curswant) | |
| 714 )) | |
| 715 curwin->w_redr_type = type; | |
| 716 | |
| 849 | 717 /* Redraw the tab pages line if needed. */ |
| 718 if (redraw_tabline || type >= NOT_VALID) | |
| 719 draw_tabline(); | |
| 720 | |
| 7 | 721 #ifdef FEAT_SYN_HL |
| 722 /* | |
| 723 * Correct stored syntax highlighting info for changes in each displayed | |
| 724 * buffer. Each buffer must only be done once. | |
| 725 */ | |
| 726 FOR_ALL_WINDOWS(wp) | |
| 727 { | |
| 728 if (wp->w_buffer->b_mod_set) | |
| 729 { | |
| 730 win_T *wwp; | |
| 731 | |
| 732 /* Check if we already did this buffer. */ | |
| 733 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 734 if (wwp->w_buffer == wp->w_buffer) | |
| 735 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
736 if (wwp == wp && syntax_present(wp)) |
| 7 | 737 syn_stack_apply_changes(wp->w_buffer); |
| 738 } | |
| 739 } | |
| 740 #endif | |
| 741 | |
| 742 /* | |
| 743 * Go from top to bottom through the windows, redrawing the ones that need | |
| 744 * it. | |
| 745 */ | |
| 746 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 747 did_one = FALSE; | |
| 748 #endif | |
| 749 #ifdef FEAT_SEARCH_EXTRA | |
| 750 search_hl.rm.regprog = NULL; | |
| 751 #endif | |
| 752 FOR_ALL_WINDOWS(wp) | |
| 753 { | |
| 754 if (wp->w_redr_type != 0) | |
| 755 { | |
| 756 cursor_off(); | |
| 757 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 758 if (!did_one) | |
| 759 { | |
| 760 did_one = TRUE; | |
| 761 # ifdef FEAT_SEARCH_EXTRA | |
| 762 start_search_hl(); | |
| 763 # endif | |
| 764 # ifdef FEAT_CLIPBOARD | |
| 765 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 766 if (clip_star.available && clip_isautosel_star()) |
| 767 clip_update_selection(&clip_star); | |
| 768 if (clip_plus.available && clip_isautosel_plus()) | |
| 769 clip_update_selection(&clip_plus); | |
| 7 | 770 # endif |
| 771 #ifdef FEAT_GUI | |
| 772 /* Remove the cursor before starting to do anything, because | |
| 773 * scrolling may make it difficult to redraw the text under | |
| 774 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
775 if (gui.in_use && wp == curwin) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
776 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
777 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
778 gui_cursor_row = gui.cursor_row; |
| 7 | 779 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
780 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
781 } |
| 7 | 782 #endif |
| 783 } | |
| 784 #endif | |
| 785 win_update(wp); | |
| 786 } | |
| 787 | |
| 788 /* redraw status line after the window to minimize cursor movement */ | |
| 789 if (wp->w_redr_status) | |
| 790 { | |
| 791 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
792 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 793 } |
| 794 } | |
| 795 #if defined(FEAT_SEARCH_EXTRA) | |
| 796 end_search_hl(); | |
| 797 #endif | |
| 4107 | 798 #ifdef FEAT_INS_EXPAND |
| 799 /* May need to redraw the popup menu. */ | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
800 pum_may_redraw(); |
| 4107 | 801 #endif |
| 7 | 802 |
| 803 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 804 * than going through all buffers (there could be many buffers). */ | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
805 FOR_ALL_WINDOWS(wp) |
| 7 | 806 wp->w_buffer->b_mod_set = FALSE; |
| 807 | |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
808 reset_updating_screen(TRUE); |
| 7 | 809 |
| 810 /* Clear or redraw the command line. Done last, because scrolling may | |
| 811 * mess up the command line. */ | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
812 if (clear_cmdline || redraw_cmdline || redraw_mode) |
| 7 | 813 showmode(); |
| 814 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
815 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
816 --no_win_do_lines_ins; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
817 |
| 7 | 818 /* May put up an introductory message when not editing a file */ |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
819 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
820 maybe_intro_message(); |
| 7 | 821 did_intro = TRUE; |
| 822 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
823 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
824 // Display popup windows on top of the others. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
825 update_popups(); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
826 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
827 |
| 7 | 828 #ifdef FEAT_GUI |
| 829 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 830 * done. */ | |
| 831 if (gui.in_use) | |
| 832 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
833 if (did_undraw && !gui_mch_is_blink_off()) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
834 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
835 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
836 out_flush(); /* required before updating the cursor */ |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
837 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
838 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
839 /* Put the GUI position where the cursor was, gui_update_cursor() |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
840 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
841 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
842 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
843 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 844 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
845 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
846 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
847 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
848 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
849 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
850 out_flush(); |
| 7 | 851 gui_update_scrollbars(FALSE); |
| 852 } | |
| 853 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
854 return OK; |
| 7 | 855 } |
| 856 | |
|
15947
4aaf68cbed32
patch 8.1.0979: compiler warning for unused functions
Bram Moolenaar <Bram@vim.org>
parents:
15939
diff
changeset
|
857 #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_GUI) |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 * Prepare for updating one or more windows. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
860 * Caller must check for "updating_screen" already set to avoid recursiveness. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 /* Remove the cursor before starting to do anything, because scrolling may |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 * make it difficult to redraw the text under it. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 * Finish updating one or more windows. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 { |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
884 if (redraw_cmdline || redraw_mode) |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
887 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
891 reset_updating_screen(TRUE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
892 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
893 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
894 /* Redraw the cursor and update the scrollbars when all screen updating is |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
895 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
896 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
897 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
898 out_flush_cursor(FALSE, FALSE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
899 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
900 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
901 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
902 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
903 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
904 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
905 #if defined(FEAT_CONCEAL) || defined(PROTO) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
906 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
907 * Return TRUE if the cursor line in window "wp" may be concealed, according |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
908 * to the 'concealcursor' option. |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
909 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
910 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
911 conceal_cursor_line(win_T *wp) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
912 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
913 int c; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
914 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
915 if (*wp->w_p_cocu == NUL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
916 return FALSE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
917 if (get_real_state() & VISUAL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
918 c = 'v'; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
919 else if (State & INSERT) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
920 c = 'i'; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
921 else if (State & NORMAL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
922 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
923 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
924 c = 'c'; |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
925 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
926 return FALSE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
927 return vim_strchr(wp->w_p_cocu, c) != NULL; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
928 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
929 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
930 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
931 * Check if the cursor line needs to be redrawn because of 'concealcursor'. |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
932 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
933 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
934 conceal_check_cursor_line(void) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
935 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
936 if (curwin->w_p_cole > 0 && conceal_cursor_line(curwin)) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
937 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
938 need_cursor_line_redraw = TRUE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
939 /* Need to recompute cursor column, e.g., when starting Visual mode |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
940 * without concealing. */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
941 curs_columns(TRUE); |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
942 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
943 } |
| 7 | 944 #endif |
| 945 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
946 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 947 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
948 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 949 { |
| 950 win_T *wp; | |
| 951 int doit = FALSE; | |
| 952 | |
| 953 # ifdef FEAT_FOLDING | |
| 954 win_foldinfo.fi_level = 0; | |
| 955 # endif | |
| 956 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
957 // update/delete a specific sign |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
958 redraw_buf_line_later(buf, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
959 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
960 // check if it resulted in the need to redraw a window |
| 7 | 961 FOR_ALL_WINDOWS(wp) |
| 962 if (wp->w_redr_type != 0) | |
| 963 doit = TRUE; | |
| 964 | |
| 3250 | 965 /* Return when there is nothing to do, screen updating is already |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
966 * happening (recursive call), messages on the screen or still starting up. |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
967 */ |
| 3250 | 968 if (!doit || updating_screen |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
969 || State == ASKMORE || State == HITRETURN |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
970 || msg_scrolled |
| 3250 | 971 #ifdef FEAT_GUI |
| 972 || gui.starting | |
| 973 #endif | |
| 974 || starting) | |
| 7 | 975 return; |
| 976 | |
| 977 /* update all windows that need updating */ | |
| 978 update_prepare(); | |
| 979 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
980 FOR_ALL_WINDOWS(wp) |
| 7 | 981 { |
| 982 if (wp->w_redr_type != 0) | |
| 983 win_update(wp); | |
| 984 if (wp->w_redr_status) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
985 win_redr_status(wp, FALSE); |
| 7 | 986 } |
| 987 | |
| 988 update_finish(); | |
| 989 } | |
| 990 #endif | |
| 991 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
992 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
993 static void |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
994 update_popups(void) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
995 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
996 win_T *wp; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
997 win_T *lowest_wp; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
998 int lowest_zindex; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
999 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1000 // Reset all the VALID_POPUP flags. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1001 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1002 wp->w_valid &= ~VALID_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1003 for (wp = first_tab_popupwin; wp != NULL; wp = wp->w_next) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1004 wp->w_valid &= ~VALID_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1005 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1006 // TODO: don't redraw every popup every time. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1007 for (;;) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1008 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1009 // Find the window with the lowest zindex that hasn't been updated yet, |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1010 // so that the window with a higher zindex is drawn later, thus goes on |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1011 // top. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1012 lowest_zindex = INT_MAX; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1013 lowest_wp = NULL; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1014 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1015 if ((wp->w_valid & VALID_POPUP) == 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1016 && wp->w_zindex < lowest_zindex) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1017 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1018 lowest_zindex = wp->w_zindex; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1019 lowest_wp = wp; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1020 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1021 for (wp = first_tab_popupwin; wp != NULL; wp = wp->w_next) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1022 if ((wp->w_valid & VALID_POPUP) == 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1023 && wp->w_zindex < lowest_zindex) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1024 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1025 lowest_zindex = wp->w_zindex; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1026 lowest_wp = wp; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1027 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1028 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1029 if (lowest_wp == NULL) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1030 break; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1031 win_update(lowest_wp); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1032 lowest_wp->w_valid |= VALID_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1033 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1034 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1035 #endif |
| 7 | 1036 |
| 1037 #if defined(FEAT_GUI) || defined(PROTO) | |
| 1038 /* | |
| 1039 * Update a single window, its status line and maybe the command line msg. | |
| 1040 * Used for the GUI scrollbar. | |
| 1041 */ | |
| 1042 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1043 updateWindow(win_T *wp) |
| 7 | 1044 { |
| 2008 | 1045 /* return if already busy updating */ |
| 1046 if (updating_screen) | |
| 1047 return; | |
| 1048 | |
| 7 | 1049 update_prepare(); |
| 1050 | |
| 1051 #ifdef FEAT_CLIPBOARD | |
| 1052 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1053 if (clip_star.available && clip_isautosel_star()) |
| 1054 clip_update_selection(&clip_star); | |
| 1055 if (clip_plus.available && clip_isautosel_plus()) | |
| 1056 clip_update_selection(&clip_plus); | |
| 7 | 1057 #endif |
| 670 | 1058 |
| 7 | 1059 win_update(wp); |
| 670 | 1060 |
| 1061 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1062 if (redraw_tabline) |
| 677 | 1063 draw_tabline(); |
| 670 | 1064 |
| 7 | 1065 if (wp->w_redr_status |
| 1066 # ifdef FEAT_CMDL_INFO | |
| 1067 || p_ru | |
| 1068 # endif | |
| 1069 # ifdef FEAT_STL_OPT | |
| 40 | 1070 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1071 # endif |
| 1072 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1073 win_redr_status(wp, FALSE); |
| 7 | 1074 |
| 1075 update_finish(); | |
| 1076 } | |
| 1077 #endif | |
| 1078 | |
| 1079 /* | |
| 1080 * Update a single window. | |
| 1081 * | |
| 1082 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1083 * screen or scrolling lines). | |
| 1084 * | |
| 1085 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1086 * implies the one below it. | |
| 1087 * NOT_VALID redraw the whole window | |
| 743 | 1088 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1089 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1090 * INVERTED redraw the changed part of the Visual area | |
| 1091 * INVERTED_ALL redraw the whole Visual area | |
| 1092 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1093 * 2. update lines at the top when scrolled down | |
| 1094 * 3. redraw changed text: | |
| 301 | 1095 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1096 * b_mod_top and b_mod_bot. |
| 1097 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1098 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1099 * - continue redrawing when syntax status is invalid. | |
| 1100 * 4. if scrolled up, update lines at the bottom. | |
| 1101 * This results in three areas that may need updating: | |
| 1102 * top: from first row to top_end (when scrolled down) | |
| 1103 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1104 * bot: from bot_start to last row (when scrolled up) | |
| 1105 */ | |
| 1106 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1107 win_update(win_T *wp) |
| 7 | 1108 { |
| 1109 buf_T *buf = wp->w_buffer; | |
| 1110 int type; | |
| 1111 int top_end = 0; /* Below last row of the top area that needs | |
| 1112 updating. 0 when no top area updating. */ | |
| 1113 int mid_start = 999;/* first row of the mid area that needs | |
| 1114 updating. 999 when no mid area updating. */ | |
| 1115 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1116 updating. 0 when no mid area updating. */ | |
| 1117 int bot_start = 999;/* first row of the bot area that needs | |
| 1118 updating. 999 when no bot area updating */ | |
| 1119 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1120 w_topline got smaller a bit */ | |
| 1121 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1122 matchitem_T *cur; /* points to the match list */ |
| 7 | 1123 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1124 #endif | |
| 1125 | |
| 1126 int row; /* current window row to display */ | |
| 1127 linenr_T lnum; /* current buffer lnum to display */ | |
| 1128 int idx; /* current index in w_lines[] */ | |
| 1129 int srow; /* starting row of the current line */ | |
| 1130 | |
| 1131 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1132 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1133 int i; | |
| 1134 long j; | |
| 1135 static int recursive = FALSE; /* being called recursively */ | |
| 1136 int old_botline = wp->w_botline; | |
| 1137 #ifdef FEAT_FOLDING | |
| 1138 long fold_count; | |
| 1139 #endif | |
| 1140 #ifdef FEAT_SYN_HL | |
| 1141 /* remember what happened to the previous line, to know if | |
| 1142 * check_visual_highlight() can be used */ | |
| 1143 #define DID_NONE 1 /* didn't update a line */ | |
| 1144 #define DID_LINE 2 /* updated a normal line */ | |
| 1145 #define DID_FOLD 3 /* updated a folded line */ | |
| 1146 int did_update = DID_NONE; | |
| 1147 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1148 #endif | |
| 1149 linenr_T mod_top = 0; | |
| 1150 linenr_T mod_bot = 0; | |
| 1151 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1152 int save_got_int; | |
| 1153 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1154 #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
|
1155 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
|
1156 #endif |
| 7 | 1157 |
| 1158 type = wp->w_redr_type; | |
| 1159 | |
| 1160 if (type == NOT_VALID) | |
| 1161 { | |
| 1162 wp->w_redr_status = TRUE; | |
| 1163 wp->w_lines_valid = 0; | |
| 1164 } | |
| 1165 | |
| 1166 /* 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
|
1167 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1168 { |
| 1169 wp->w_redr_type = 0; | |
| 1170 return; | |
| 1171 } | |
| 1172 | |
| 1173 /* Window is zero-width: Only need to draw the separator. */ | |
| 1174 if (wp->w_width == 0) | |
| 1175 { | |
| 1176 /* draw the vertical separator right of this window */ | |
| 1177 draw_vsep_win(wp, 0); | |
| 1178 wp->w_redr_type = 0; | |
| 1179 return; | |
| 1180 } | |
| 1181 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1182 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1183 // 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
|
1184 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
|
1185 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1186 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
|
1187 # 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
|
1188 /* 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
|
1189 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
|
1190 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
|
1191 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1192 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
|
1193 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1194 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1195 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1196 |
| 7 | 1197 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1198 init_search_hl(wp); |
| 7 | 1199 #endif |
| 1200 | |
| 13 | 1201 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1202 /* 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
|
1203 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1204 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1205 if (wp->w_nrwidth != i) |
| 13 | 1206 { |
| 1207 type = NOT_VALID; | |
| 677 | 1208 wp->w_nrwidth = i; |
| 13 | 1209 } |
| 1210 else | |
| 1211 #endif | |
| 1212 | |
| 7 | 1213 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1214 { | |
| 1215 /* | |
| 1216 * When there are both inserted/deleted lines and specific lines to be | |
| 1217 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1218 * everything (only happens when redrawing is off for while). | |
| 1219 */ | |
| 1220 type = NOT_VALID; | |
| 1221 } | |
| 1222 else | |
| 1223 { | |
| 1224 /* | |
| 1225 * Set mod_top to the first line that needs displaying because of | |
| 1226 * changes. Set mod_bot to the first line after the changes. | |
| 1227 */ | |
| 1228 mod_top = wp->w_redraw_top; | |
| 1229 if (wp->w_redraw_bot != 0) | |
| 1230 mod_bot = wp->w_redraw_bot + 1; | |
| 1231 else | |
| 1232 mod_bot = 0; | |
| 1233 if (buf->b_mod_set) | |
| 1234 { | |
| 1235 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1236 { | |
| 1237 mod_top = buf->b_mod_top; | |
| 1238 #ifdef FEAT_SYN_HL | |
| 1239 /* Need to redraw lines above the change that may be included | |
| 1240 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1241 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1242 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1243 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1244 if (mod_top < 1) |
| 1245 mod_top = 1; | |
| 1246 } | |
| 1247 #endif | |
| 1248 } | |
| 1249 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1250 mod_bot = buf->b_mod_bot; | |
| 1251 | |
| 1252 #ifdef FEAT_SEARCH_EXTRA | |
| 1253 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1254 * change in one line may make the Search highlighting in a | |
| 1255 * previous line invalid. Simple solution: redraw all visible | |
| 1256 * lines above the change. | |
| 1326 | 1257 * Same for a match pattern. |
| 7 | 1258 */ |
| 699 | 1259 if (search_hl.rm.regprog != NULL |
| 1260 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1261 top_to_mod = TRUE; |
| 699 | 1262 else |
| 1326 | 1263 { |
| 1264 cur = wp->w_match_head; | |
| 1265 while (cur != NULL) | |
| 1266 { | |
| 1267 if (cur->match.regprog != NULL | |
| 1268 && re_multiline(cur->match.regprog)) | |
| 699 | 1269 { |
| 1270 top_to_mod = TRUE; | |
| 1271 break; | |
| 1272 } | |
| 1326 | 1273 cur = cur->next; |
| 1274 } | |
| 1275 } | |
| 7 | 1276 #endif |
| 1277 } | |
| 1278 #ifdef FEAT_FOLDING | |
| 1279 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1280 { | |
| 1281 linenr_T lnumt, lnumb; | |
| 1282 | |
| 1283 /* | |
| 1284 * A change in a line can cause lines above it to become folded or | |
| 1285 * unfolded. Find the top most buffer line that may be affected. | |
| 1286 * If the line was previously folded and displayed, get the first | |
| 1287 * line of that fold. If the line is folded now, get the first | |
| 1288 * folded line. Use the minimum of these two. | |
| 1289 */ | |
| 1290 | |
| 1291 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1292 * the line below it. If there is no valid entry, use w_topline. | |
| 1293 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1294 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1295 lnumt = wp->w_topline; | |
| 1296 lnumb = MAXLNUM; | |
| 1297 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1298 if (wp->w_lines[i].wl_valid) | |
| 1299 { | |
| 1300 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1301 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1302 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1303 { | |
| 1304 lnumb = wp->w_lines[i].wl_lnum; | |
| 1305 /* When there is a fold column it might need updating | |
| 1306 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1307 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1308 ++lnumb; |
| 1309 } | |
| 1310 } | |
| 1311 | |
| 1312 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1313 if (mod_top > lnumt) | |
| 1314 mod_top = lnumt; | |
| 1315 | |
| 1316 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1317 --mod_bot; | |
| 1318 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1319 ++mod_bot; | |
| 1320 if (mod_bot < lnumb) | |
| 1321 mod_bot = lnumb; | |
| 1322 } | |
| 1323 #endif | |
| 1324 | |
| 1325 /* When a change starts above w_topline and the end is below | |
| 1326 * w_topline, start redrawing at w_topline. | |
| 36 | 1327 * If the end of the change is above w_topline: do like no change was |
| 1328 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1329 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1330 { | |
| 1331 if (mod_bot > wp->w_topline) | |
| 1332 mod_top = wp->w_topline; | |
| 1333 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1334 else if (syntax_present(wp)) |
| 7 | 1335 top_end = 1; |
| 1336 #endif | |
| 1337 } | |
| 36 | 1338 |
| 1339 /* When line numbers are displayed need to redraw all lines below | |
| 1340 * inserted/deleted lines. */ | |
| 1341 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1342 mod_bot = MAXLNUM; | |
| 7 | 1343 } |
|
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
|
1344 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
|
1345 wp->w_redraw_bot = 0; |
| 7 | 1346 |
| 1347 /* | |
| 1348 * When only displaying the lines at the top, set top_end. Used when | |
| 1349 * window has scrolled down for msg_scrolled. | |
| 1350 */ | |
| 1351 if (type == REDRAW_TOP) | |
| 1352 { | |
| 1353 j = 0; | |
| 1354 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1355 { | |
| 1356 j += wp->w_lines[i].wl_size; | |
| 1357 if (j >= wp->w_upd_rows) | |
| 1358 { | |
| 1359 top_end = j; | |
| 1360 break; | |
| 1361 } | |
| 1362 } | |
| 1363 if (top_end == 0) | |
| 1364 /* not found (cannot happen?): redraw everything */ | |
| 1365 type = NOT_VALID; | |
| 1366 else | |
| 1367 /* top area defined, the rest is VALID */ | |
| 1368 type = VALID; | |
| 1369 } | |
| 1370 | |
| 1378 | 1371 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1372 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1373 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1374 * called. */ | |
| 1375 if (screen_cleared) | |
| 1376 screen_cleared = MAYBE; | |
| 1377 | |
| 7 | 1378 /* |
| 1379 * If there are no changes on the screen that require a complete redraw, | |
| 1380 * handle three cases: | |
| 1381 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1382 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1383 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1384 * w_lines[] that needs updating. | |
| 1385 */ | |
| 743 | 1386 if ((type == VALID || type == SOME_VALID |
| 1387 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1388 #ifdef FEAT_DIFF |
| 1389 && !wp->w_botfill && !wp->w_old_botfill | |
| 1390 #endif | |
| 1391 ) | |
| 1392 { | |
| 1393 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1394 { | |
| 1395 /* | |
| 1396 * w_topline is the first changed line, the scrolling will be done | |
| 1397 * further down. | |
| 1398 */ | |
| 1399 } | |
| 1400 else if (wp->w_lines[0].wl_valid | |
| 1401 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1402 #ifdef FEAT_DIFF | |
| 1403 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1404 && wp->w_topfill > wp->w_old_topfill) | |
| 1405 #endif | |
| 1406 )) | |
| 1407 { | |
| 1408 /* | |
| 1409 * New topline is above old topline: May scroll down. | |
| 1410 */ | |
| 1411 #ifdef FEAT_FOLDING | |
| 1412 if (hasAnyFolding(wp)) | |
| 1413 { | |
| 1414 linenr_T ln; | |
| 1415 | |
| 1416 /* count the number of lines we are off, counting a sequence | |
| 1417 * of folded lines as one */ | |
| 1418 j = 0; | |
| 1419 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1420 { | |
| 1421 ++j; | |
| 1422 if (j >= wp->w_height - 2) | |
| 1423 break; | |
| 1424 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1425 } | |
| 1426 } | |
| 1427 else | |
| 1428 #endif | |
| 1429 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1430 if (j < wp->w_height - 2) /* not too far off */ | |
| 1431 { | |
| 1432 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1433 #ifdef FEAT_DIFF | |
| 1434 /* insert extra lines for previously invisible filler lines */ | |
| 1435 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1436 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1437 - wp->w_old_topfill; | |
| 1438 #endif | |
| 1439 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1440 { | |
| 1441 /* | |
| 1442 * Try to insert the correct number of lines. | |
| 1443 * If not the last window, delete the lines at the bottom. | |
| 1444 * win_ins_lines may fail when the terminal can't do it. | |
| 1445 */ | |
| 1446 if (i > 0) | |
| 1447 check_for_delay(FALSE); | |
| 1448 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1449 { | |
| 1450 if (wp->w_lines_valid != 0) | |
| 1451 { | |
| 1452 /* Need to update rows that are new, stop at the | |
| 1453 * first one that scrolled down. */ | |
| 1454 top_end = i; | |
| 1455 scrolled_down = TRUE; | |
| 1456 | |
| 1457 /* Move the entries that were scrolled, disable | |
| 1458 * the entries for the lines to be redrawn. */ | |
| 1459 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1460 wp->w_lines_valid = wp->w_height; | |
| 1461 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1462 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1463 while (idx >= 0) | |
| 1464 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1465 } | |
| 1466 } | |
| 1467 else | |
| 1468 mid_start = 0; /* redraw all lines */ | |
| 1469 } | |
| 1470 else | |
| 1471 mid_start = 0; /* redraw all lines */ | |
| 1472 } | |
| 1473 else | |
| 1474 mid_start = 0; /* redraw all lines */ | |
| 1475 } | |
| 1476 else | |
| 1477 { | |
| 1478 /* | |
| 1479 * New topline is at or below old topline: May scroll up. | |
| 1480 * When topline didn't change, find first entry in w_lines[] that | |
| 1481 * needs updating. | |
| 1482 */ | |
| 1483 | |
| 1484 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1485 j = -1; | |
| 1486 row = 0; | |
| 1487 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1488 { | |
| 1489 if (wp->w_lines[i].wl_valid | |
| 1490 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1491 { | |
| 1492 j = i; | |
| 1493 break; | |
| 1494 } | |
| 1495 row += wp->w_lines[i].wl_size; | |
| 1496 } | |
| 1497 if (j == -1) | |
| 1498 { | |
| 1499 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1500 * lines */ | |
| 1501 mid_start = 0; | |
| 1502 } | |
| 1503 else | |
| 1504 { | |
| 1505 /* | |
| 1506 * Try to delete the correct number of lines. | |
| 1507 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1508 */ | |
| 1509 #ifdef FEAT_DIFF | |
| 1510 /* If the topline didn't change, delete old filler lines, | |
| 1511 * otherwise delete filler lines of the new topline... */ | |
| 1512 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1513 row += wp->w_old_topfill; | |
| 1514 else | |
| 1515 row += diff_check_fill(wp, wp->w_topline); | |
| 1516 /* ... but don't delete new filler lines. */ | |
| 1517 row -= wp->w_topfill; | |
| 1518 #endif | |
| 1519 if (row > 0) | |
| 1520 { | |
| 1521 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
|
1522 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
|
1523 == OK) |
| 7 | 1524 bot_start = wp->w_height - row; |
| 1525 else | |
| 1526 mid_start = 0; /* redraw all lines */ | |
| 1527 } | |
| 1528 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1529 { | |
| 1530 /* | |
| 1531 * Skip the lines (below the deleted lines) that are still | |
| 1532 * valid and don't need redrawing. Copy their info | |
| 1533 * upwards, to compensate for the deleted lines. Set | |
| 1534 * bot_start to the first row that needs redrawing. | |
| 1535 */ | |
| 1536 bot_start = 0; | |
| 1537 idx = 0; | |
| 1538 for (;;) | |
| 1539 { | |
| 1540 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1541 /* stop at line that didn't fit, unless it is still | |
| 1542 * valid (no lines deleted) */ | |
| 1543 if (row > 0 && bot_start + row | |
| 1544 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1545 { | |
| 1546 wp->w_lines_valid = idx + 1; | |
| 1547 break; | |
| 1548 } | |
| 1549 bot_start += wp->w_lines[idx++].wl_size; | |
| 1550 | |
| 1551 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1552 if (++j >= wp->w_lines_valid) | |
| 1553 { | |
| 1554 wp->w_lines_valid = idx; | |
| 1555 break; | |
| 1556 } | |
| 1557 } | |
| 1558 #ifdef FEAT_DIFF | |
| 1559 /* Correct the first entry for filler lines at the top | |
| 1560 * when it won't get updated below. */ | |
| 1561 if (wp->w_p_diff && bot_start > 0) | |
| 1562 wp->w_lines[0].wl_size = | |
| 1563 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1564 + wp->w_topfill; | |
| 1565 #endif | |
| 1566 } | |
| 1567 } | |
| 1568 } | |
| 1569 | |
| 1570 /* When starting redraw in the first line, redraw all lines. When | |
| 1571 * there is only one window it's probably faster to clear the screen | |
| 1572 * first. */ | |
| 1573 if (mid_start == 0) | |
| 1574 { | |
| 1575 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1576 if (ONE_WINDOW) |
| 981 | 1577 { |
| 1331 | 1578 /* Clear the screen when it was not done by win_del_lines() or |
| 1579 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1580 * then. */ | |
| 1581 if (screen_cleared != TRUE) | |
| 1582 screenclear(); | |
| 981 | 1583 /* The screen was cleared, redraw the tab pages line. */ |
| 1584 if (redraw_tabline) | |
| 1585 draw_tabline(); | |
| 1586 } | |
| 7 | 1587 } |
| 1331 | 1588 |
| 1589 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1590 * cleared (only happens for the first window) or when screenclear() | |
| 1591 * was called directly above, "must_redraw" will have been set to | |
| 1592 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1593 if (screen_cleared == TRUE) | |
| 1594 must_redraw = 0; | |
| 7 | 1595 } |
| 1596 else | |
| 1597 { | |
| 1598 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1599 mid_start = 0; | |
| 1600 mid_end = wp->w_height; | |
| 1601 } | |
| 1602 | |
| 743 | 1603 if (type == SOME_VALID) |
| 1604 { | |
| 1605 /* SOME_VALID: redraw all lines. */ | |
| 1606 mid_start = 0; | |
| 1607 mid_end = wp->w_height; | |
| 1608 type = NOT_VALID; | |
| 1609 } | |
| 1610 | |
| 7 | 1611 /* check if we are updating or removing the inverted part */ |
| 1612 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1613 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1614 { | |
| 1615 linenr_T from, to; | |
| 1616 | |
| 1617 if (VIsual_active) | |
| 1618 { | |
| 1619 if (VIsual_active | |
| 1620 && (VIsual_mode != wp->w_old_visual_mode | |
| 1621 || type == INVERTED_ALL)) | |
| 1622 { | |
| 1623 /* | |
| 1624 * If the type of Visual selection changed, redraw the whole | |
| 1625 * selection. Also when the ownership of the X selection is | |
| 1626 * gained or lost. | |
| 1627 */ | |
| 1628 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1629 { | |
| 1630 from = curwin->w_cursor.lnum; | |
| 1631 to = VIsual.lnum; | |
| 1632 } | |
| 1633 else | |
| 1634 { | |
| 1635 from = VIsual.lnum; | |
| 1636 to = curwin->w_cursor.lnum; | |
| 1637 } | |
| 1638 /* redraw more when the cursor moved as well */ | |
| 1639 if (wp->w_old_cursor_lnum < from) | |
| 1640 from = wp->w_old_cursor_lnum; | |
| 1641 if (wp->w_old_cursor_lnum > to) | |
| 1642 to = wp->w_old_cursor_lnum; | |
| 1643 if (wp->w_old_visual_lnum < from) | |
| 1644 from = wp->w_old_visual_lnum; | |
| 1645 if (wp->w_old_visual_lnum > to) | |
| 1646 to = wp->w_old_visual_lnum; | |
| 1647 } | |
| 1648 else | |
| 1649 { | |
| 1650 /* | |
| 1651 * Find the line numbers that need to be updated: The lines | |
| 1652 * between the old cursor position and the current cursor | |
| 1653 * position. Also check if the Visual position changed. | |
| 1654 */ | |
| 1655 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1656 { | |
| 1657 from = curwin->w_cursor.lnum; | |
| 1658 to = wp->w_old_cursor_lnum; | |
| 1659 } | |
| 1660 else | |
| 1661 { | |
| 1662 from = wp->w_old_cursor_lnum; | |
| 1663 to = curwin->w_cursor.lnum; | |
| 1664 if (from == 0) /* Visual mode just started */ | |
| 1665 from = to; | |
| 1666 } | |
| 1667 | |
| 422 | 1668 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1669 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1670 { |
| 1671 if (wp->w_old_visual_lnum < from | |
| 1672 && wp->w_old_visual_lnum != 0) | |
| 1673 from = wp->w_old_visual_lnum; | |
| 1674 if (wp->w_old_visual_lnum > to) | |
| 1675 to = wp->w_old_visual_lnum; | |
| 1676 if (VIsual.lnum < from) | |
| 1677 from = VIsual.lnum; | |
| 1678 if (VIsual.lnum > to) | |
| 1679 to = VIsual.lnum; | |
| 1680 } | |
| 1681 } | |
| 1682 | |
| 1683 /* | |
| 1684 * If in block mode and changed column or curwin->w_curswant: | |
| 1685 * update all lines. | |
| 1686 * First compute the actual start and end column. | |
| 1687 */ | |
| 1688 if (VIsual_mode == Ctrl_V) | |
| 1689 { | |
| 6266 | 1690 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1691 #if defined(FEAT_LINEBREAK) |
| 6266 | 1692 int save_ve_flags = ve_flags; |
| 1693 | |
| 1694 if (curwin->w_p_lbr) | |
| 1695 ve_flags = VE_ALL; | |
| 1696 #endif | |
| 7 | 1697 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
|
1698 #if defined(FEAT_LINEBREAK) |
| 6266 | 1699 ve_flags = save_ve_flags; |
| 1700 #endif | |
| 7 | 1701 ++toc; |
| 1702 if (curwin->w_curswant == MAXCOL) | |
| 1703 toc = MAXCOL; | |
| 1704 | |
| 1705 if (fromc != wp->w_old_cursor_fcol | |
| 1706 || toc != wp->w_old_cursor_lcol) | |
| 1707 { | |
| 1708 if (from > VIsual.lnum) | |
| 1709 from = VIsual.lnum; | |
| 1710 if (to < VIsual.lnum) | |
| 1711 to = VIsual.lnum; | |
| 1712 } | |
| 1713 wp->w_old_cursor_fcol = fromc; | |
| 1714 wp->w_old_cursor_lcol = toc; | |
| 1715 } | |
| 1716 } | |
| 1717 else | |
| 1718 { | |
| 1719 /* Use the line numbers of the old Visual area. */ | |
| 1720 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1721 { | |
| 1722 from = wp->w_old_cursor_lnum; | |
| 1723 to = wp->w_old_visual_lnum; | |
| 1724 } | |
| 1725 else | |
| 1726 { | |
| 1727 from = wp->w_old_visual_lnum; | |
| 1728 to = wp->w_old_cursor_lnum; | |
| 1729 } | |
| 1730 } | |
| 1731 | |
| 1732 /* | |
| 1733 * There is no need to update lines above the top of the window. | |
| 1734 */ | |
| 1735 if (from < wp->w_topline) | |
| 1736 from = wp->w_topline; | |
| 1737 | |
| 1738 /* | |
| 1739 * If we know the value of w_botline, use it to restrict the update to | |
| 1740 * the lines that are visible in the window. | |
| 1741 */ | |
| 1742 if (wp->w_valid & VALID_BOTLINE) | |
| 1743 { | |
| 1744 if (from >= wp->w_botline) | |
| 1745 from = wp->w_botline - 1; | |
| 1746 if (to >= wp->w_botline) | |
| 1747 to = wp->w_botline - 1; | |
| 1748 } | |
| 1749 | |
| 1750 /* | |
| 1751 * Find the minimal part to be updated. | |
| 1752 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1753 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1754 * top_end; need to redraw from top_end to the "to" line. | |
| 1755 * A middle mouse click with a Visual selection may change the text | |
| 1756 * above the Visual area and reset wl_valid, do count these for | |
| 1757 * mid_end (in srow). | |
| 1758 */ | |
| 1759 if (mid_start > 0) | |
| 1760 { | |
| 1761 lnum = wp->w_topline; | |
| 1762 idx = 0; | |
| 1763 srow = 0; | |
| 1764 if (scrolled_down) | |
| 1765 mid_start = top_end; | |
| 1766 else | |
| 1767 mid_start = 0; | |
| 1768 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1769 { | |
| 1770 if (wp->w_lines[idx].wl_valid) | |
| 1771 mid_start += wp->w_lines[idx].wl_size; | |
| 1772 else if (!scrolled_down) | |
| 1773 srow += wp->w_lines[idx].wl_size; | |
| 1774 ++idx; | |
| 1775 # ifdef FEAT_FOLDING | |
| 1776 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1777 lnum = wp->w_lines[idx].wl_lnum; | |
| 1778 else | |
| 1779 # endif | |
| 1780 ++lnum; | |
| 1781 } | |
| 1782 srow += mid_start; | |
| 1783 mid_end = wp->w_height; | |
| 1784 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1785 { | |
| 1786 if (wp->w_lines[idx].wl_valid | |
| 1787 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1788 { | |
| 1789 /* Only update until first row of this line */ | |
| 1790 mid_end = srow; | |
| 1791 break; | |
| 1792 } | |
| 1793 srow += wp->w_lines[idx].wl_size; | |
| 1794 } | |
| 1795 } | |
| 1796 } | |
| 1797 | |
| 1798 if (VIsual_active && buf == curwin->w_buffer) | |
| 1799 { | |
| 1800 wp->w_old_visual_mode = VIsual_mode; | |
| 1801 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1802 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1803 wp->w_old_visual_col = VIsual.col; |
| 7 | 1804 wp->w_old_curswant = curwin->w_curswant; |
| 1805 } | |
| 1806 else | |
| 1807 { | |
| 1808 wp->w_old_visual_mode = 0; | |
| 1809 wp->w_old_cursor_lnum = 0; | |
| 1810 wp->w_old_visual_lnum = 0; | |
| 422 | 1811 wp->w_old_visual_col = 0; |
| 7 | 1812 } |
| 1813 | |
| 1814 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1815 /* reset got_int, otherwise regexp won't work */ | |
| 1816 save_got_int = got_int; | |
| 1817 got_int = 0; | |
| 1818 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1819 #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
|
1820 /* 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
|
1821 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
|
1822 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
|
1823 #endif |
| 7 | 1824 #ifdef FEAT_FOLDING |
| 1825 win_foldinfo.fi_level = 0; | |
| 1826 #endif | |
| 1827 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1828 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1829 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1830 * 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
|
1831 * 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
|
1832 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1833 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
|
1834 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
|
1835 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1836 |
| 7 | 1837 /* |
| 1838 * Update all the window rows. | |
| 1839 */ | |
| 1840 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1841 row = 0; | |
| 1842 srow = 0; | |
| 1843 lnum = wp->w_topline; /* first line shown in window */ | |
| 1844 for (;;) | |
| 1845 { | |
| 1846 /* stop updating when reached the end of the window (check for _past_ | |
| 1847 * the end of the window is at the end of the loop) */ | |
| 1848 if (row == wp->w_height) | |
| 1849 { | |
| 1850 didline = TRUE; | |
| 1851 break; | |
| 1852 } | |
| 1853 | |
| 1854 /* stop updating when hit the end of the file */ | |
| 1855 if (lnum > buf->b_ml.ml_line_count) | |
| 1856 { | |
| 1857 eof = TRUE; | |
| 1858 break; | |
| 1859 } | |
| 1860 | |
| 1861 /* Remember the starting row of the line that is going to be dealt | |
| 1862 * with. It is used further down when the line doesn't fit. */ | |
| 1863 srow = row; | |
| 1864 | |
| 1865 /* | |
| 1866 * Update a line when it is in an area that needs updating, when it | |
| 1867 * 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
|
1868 * "bot_start" may be halfway a wrapped line after using |
| 7 | 1869 * win_del_lines(), check if the current line includes it. |
| 1870 * When syntax folding is being used, the saved syntax states will | |
| 1871 * already have been updated, we can't see where the syntax state is | |
| 1872 * the same again, just update until the end of the window. | |
| 1873 */ | |
| 1874 if (row < top_end | |
| 1875 || (row >= mid_start && row < mid_end) | |
| 1876 #ifdef FEAT_SEARCH_EXTRA | |
| 1877 || top_to_mod | |
| 1878 #endif | |
| 1879 || idx >= wp->w_lines_valid | |
| 1880 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1881 || (mod_top != 0 | |
| 1882 && (lnum == mod_top | |
| 1883 || (lnum >= mod_top | |
| 1884 && (lnum < mod_bot | |
| 1885 #ifdef FEAT_SYN_HL | |
| 1886 || did_update == DID_FOLD | |
| 1887 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1888 && syntax_present(wp) |
| 7 | 1889 && ( |
| 1890 # ifdef FEAT_FOLDING | |
| 1891 (foldmethodIsSyntax(wp) | |
| 1892 && hasAnyFolding(wp)) || | |
| 1893 # endif | |
| 1894 syntax_check_changed(lnum))) | |
| 1895 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1896 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1897 /* match in fixed position might need redraw |
| 1898 * if lines were inserted or deleted */ | |
| 1899 || (wp->w_match_head != NULL | |
| 1900 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1901 #endif |
| 7 | 1902 ))))) |
| 1903 { | |
| 1904 #ifdef FEAT_SEARCH_EXTRA | |
| 1905 if (lnum == mod_top) | |
| 1906 top_to_mod = FALSE; | |
| 1907 #endif | |
| 1908 | |
| 1909 /* | |
| 1910 * When at start of changed lines: May scroll following lines | |
| 1911 * up or down to minimize redrawing. | |
| 1912 * Don't do this when the change continues until the end. | |
| 3318 | 1913 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1914 */ |
| 1915 if (lnum == mod_top | |
| 1916 && mod_bot != MAXLNUM | |
| 3318 | 1917 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1918 { |
| 1919 int old_rows = 0; | |
| 1920 int new_rows = 0; | |
| 1921 int xtra_rows; | |
| 1922 linenr_T l; | |
| 1923 | |
| 1924 /* Count the old number of window rows, using w_lines[], which | |
| 1925 * should still contain the sizes for the lines as they are | |
| 1926 * currently displayed. */ | |
| 1927 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1928 { | |
| 1929 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1930 * lines are part of the changed area. */ | |
| 1931 if (wp->w_lines[i].wl_valid | |
| 1932 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1933 break; | |
| 1934 old_rows += wp->w_lines[i].wl_size; | |
| 1935 #ifdef FEAT_FOLDING | |
| 1936 if (wp->w_lines[i].wl_valid | |
| 1937 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1938 { | |
| 1939 /* Must have found the last valid entry above mod_bot. | |
| 1940 * Add following invalid entries. */ | |
| 1941 ++i; | |
| 1942 while (i < wp->w_lines_valid | |
| 1943 && !wp->w_lines[i].wl_valid) | |
| 1944 old_rows += wp->w_lines[i++].wl_size; | |
| 1945 break; | |
| 1946 } | |
| 1947 #endif | |
| 1948 } | |
| 1949 | |
| 1950 if (i >= wp->w_lines_valid) | |
| 1951 { | |
| 1952 /* We can't find a valid line below the changed lines, | |
| 1953 * need to redraw until the end of the window. | |
| 1954 * Inserting/deleting lines has no use. */ | |
| 1955 bot_start = 0; | |
| 1956 } | |
| 1957 else | |
| 1958 { | |
| 1959 /* Able to count old number of rows: Count new window | |
| 1960 * rows, and may insert/delete lines */ | |
| 1961 j = idx; | |
| 1962 for (l = lnum; l < mod_bot; ++l) | |
| 1963 { | |
| 1964 #ifdef FEAT_FOLDING | |
| 1965 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1966 ++new_rows; | |
| 1967 else | |
| 1968 #endif | |
| 1969 #ifdef FEAT_DIFF | |
| 1970 if (l == wp->w_topline) | |
| 1971 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1972 + wp->w_topfill; | |
| 1973 else | |
| 1974 #endif | |
| 1975 new_rows += plines_win(wp, l, TRUE); | |
| 1976 ++j; | |
| 1977 if (new_rows > wp->w_height - row - 2) | |
| 1978 { | |
| 1979 /* it's getting too much, must redraw the rest */ | |
| 1980 new_rows = 9999; | |
| 1981 break; | |
| 1982 } | |
| 1983 } | |
| 1984 xtra_rows = new_rows - old_rows; | |
| 1985 if (xtra_rows < 0) | |
| 1986 { | |
| 1987 /* May scroll text up. If there is not enough | |
| 1988 * remaining text or scrolling fails, must redraw the | |
| 1989 * rest. If scrolling works, must redraw the text | |
| 1990 * below the scrolled text. */ | |
| 1991 if (row - xtra_rows >= wp->w_height - 2) | |
| 1992 mod_bot = MAXLNUM; | |
| 1993 else | |
| 1994 { | |
| 1995 check_for_delay(FALSE); | |
| 1996 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
|
1997 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1998 mod_bot = MAXLNUM; |
| 1999 else | |
| 2000 bot_start = wp->w_height + xtra_rows; | |
| 2001 } | |
| 2002 } | |
| 2003 else if (xtra_rows > 0) | |
| 2004 { | |
| 2005 /* May scroll text down. If there is not enough | |
| 2006 * remaining text of scrolling fails, must redraw the | |
| 2007 * rest. */ | |
| 2008 if (row + xtra_rows >= wp->w_height - 2) | |
| 2009 mod_bot = MAXLNUM; | |
| 2010 else | |
| 2011 { | |
| 2012 check_for_delay(FALSE); | |
| 2013 if (win_ins_lines(wp, row + old_rows, | |
| 2014 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2015 mod_bot = MAXLNUM; | |
| 2016 else if (top_end > row + old_rows) | |
| 2017 /* Scrolled the part at the top that requires | |
| 2018 * updating down. */ | |
| 2019 top_end += xtra_rows; | |
| 2020 } | |
| 2021 } | |
| 2022 | |
| 2023 /* When not updating the rest, may need to move w_lines[] | |
| 2024 * entries. */ | |
| 2025 if (mod_bot != MAXLNUM && i != j) | |
| 2026 { | |
| 2027 if (j < i) | |
| 2028 { | |
| 2029 int x = row + new_rows; | |
| 2030 | |
| 2031 /* move entries in w_lines[] upwards */ | |
| 2032 for (;;) | |
| 2033 { | |
| 2034 /* stop at last valid entry in w_lines[] */ | |
| 2035 if (i >= wp->w_lines_valid) | |
| 2036 { | |
| 2037 wp->w_lines_valid = j; | |
| 2038 break; | |
| 2039 } | |
| 2040 wp->w_lines[j] = wp->w_lines[i]; | |
| 2041 /* stop at a line that won't fit */ | |
| 2042 if (x + (int)wp->w_lines[j].wl_size | |
| 2043 > wp->w_height) | |
| 2044 { | |
| 2045 wp->w_lines_valid = j + 1; | |
| 2046 break; | |
| 2047 } | |
| 2048 x += wp->w_lines[j++].wl_size; | |
| 2049 ++i; | |
| 2050 } | |
| 2051 if (bot_start > x) | |
| 2052 bot_start = x; | |
| 2053 } | |
| 2054 else /* j > i */ | |
| 2055 { | |
| 2056 /* move entries in w_lines[] downwards */ | |
| 2057 j -= i; | |
| 2058 wp->w_lines_valid += j; | |
| 2059 if (wp->w_lines_valid > wp->w_height) | |
| 2060 wp->w_lines_valid = wp->w_height; | |
| 2061 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2062 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2063 | |
| 2064 /* The w_lines[] entries for inserted lines are | |
| 2065 * now invalid, but wl_size may be used above. | |
| 2066 * Reset to zero. */ | |
| 2067 while (i >= idx) | |
| 2068 { | |
| 2069 wp->w_lines[i].wl_size = 0; | |
| 2070 wp->w_lines[i--].wl_valid = FALSE; | |
| 2071 } | |
| 2072 } | |
| 2073 } | |
| 2074 } | |
| 2075 } | |
| 2076 | |
| 2077 #ifdef FEAT_FOLDING | |
| 2078 /* | |
| 2079 * When lines are folded, display one line for all of them. | |
| 2080 * Otherwise, display normally (can be several display lines when | |
| 2081 * 'wrap' is on). | |
| 2082 */ | |
| 2083 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2084 if (fold_count != 0) | |
| 2085 { | |
| 2086 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2087 ++row; | |
| 2088 --fold_count; | |
| 2089 wp->w_lines[idx].wl_folded = TRUE; | |
| 2090 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2091 # ifdef FEAT_SYN_HL | |
| 2092 did_update = DID_FOLD; | |
| 2093 # endif | |
| 2094 } | |
| 2095 else | |
| 2096 #endif | |
| 2097 if (idx < wp->w_lines_valid | |
| 2098 && wp->w_lines[idx].wl_valid | |
| 2099 && wp->w_lines[idx].wl_lnum == lnum | |
| 2100 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2101 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
| 7 | 2102 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2103 #ifdef FEAT_DIFF | |
| 2104 && diff_check_fill(wp, lnum) == 0 | |
| 2105 #endif | |
| 2106 ) | |
| 2107 { | |
| 2108 /* This line is not going to fit. Don't draw anything here, | |
| 2109 * will draw "@ " lines below. */ | |
| 2110 row = wp->w_height + 1; | |
| 2111 } | |
| 2112 else | |
| 2113 { | |
| 2114 #ifdef FEAT_SEARCH_EXTRA | |
| 2115 prepare_search_hl(wp, lnum); | |
| 2116 #endif | |
| 2117 #ifdef FEAT_SYN_HL | |
| 2118 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2119 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
|
2120 && syntax_present(wp)) |
| 7 | 2121 syntax_end_parsing(syntax_last_parsed + 1); |
| 2122 #endif | |
| 2123 | |
| 2124 /* | |
| 2125 * Display one line. | |
| 2126 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2127 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
|
2128 mod_top == 0, FALSE); |
| 7 | 2129 |
| 2130 #ifdef FEAT_FOLDING | |
| 2131 wp->w_lines[idx].wl_folded = FALSE; | |
| 2132 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2133 #endif | |
| 2134 #ifdef FEAT_SYN_HL | |
| 2135 did_update = DID_LINE; | |
| 2136 syntax_last_parsed = lnum; | |
| 2137 #endif | |
| 2138 } | |
| 2139 | |
| 2140 wp->w_lines[idx].wl_lnum = lnum; | |
| 2141 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
|
2142 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2143 /* 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
|
2144 * 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
|
2145 * 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
|
2146 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2147 { |
| 2148 /* we may need the size of that too long line later on */ | |
| 3318 | 2149 if (dollar_vcol == -1) |
| 7 | 2150 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2151 ++idx; | |
| 2152 break; | |
| 2153 } | |
| 3318 | 2154 if (dollar_vcol == -1) |
| 7 | 2155 wp->w_lines[idx].wl_size = row - srow; |
| 2156 ++idx; | |
| 2157 #ifdef FEAT_FOLDING | |
| 2158 lnum += fold_count + 1; | |
| 2159 #else | |
| 2160 ++lnum; | |
| 2161 #endif | |
| 2162 } | |
| 2163 else | |
| 2164 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2165 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
|
2166 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2167 #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
|
2168 // '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
|
2169 // 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
|
2170 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
|
2171 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
|
2172 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
|
2173 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2174 #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
|
2175 (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
|
2176 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2177 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2178 // This line does not need to be drawn, advance to the next one. |
| 7 | 2179 row += wp->w_lines[idx++].wl_size; |
| 2180 if (row > wp->w_height) /* past end of screen */ | |
| 2181 break; | |
| 2182 #ifdef FEAT_FOLDING | |
| 2183 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2184 #else | |
| 2185 ++lnum; | |
| 2186 #endif | |
| 2187 #ifdef FEAT_SYN_HL | |
| 2188 did_update = DID_NONE; | |
| 2189 #endif | |
| 2190 } | |
| 2191 | |
| 2192 if (lnum > buf->b_ml.ml_line_count) | |
| 2193 { | |
| 2194 eof = TRUE; | |
| 2195 break; | |
| 2196 } | |
| 2197 } | |
| 2198 /* | |
| 2199 * End of loop over all window lines. | |
| 2200 */ | |
| 2201 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2202 #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
|
2203 /* 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
|
2204 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
|
2205 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2206 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
|
2207 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2208 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
|
2209 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
|
2210 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
|
2211 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
|
2212 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
|
2213 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2214 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
|
2215 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2216 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
|
2217 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2218 #endif |
| 7 | 2219 |
| 2220 if (idx > wp->w_lines_valid) | |
| 2221 wp->w_lines_valid = idx; | |
| 2222 | |
| 2223 #ifdef FEAT_SYN_HL | |
| 2224 /* | |
| 2225 * Let the syntax stuff know we stop parsing here. | |
| 2226 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2227 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2228 syntax_end_parsing(syntax_last_parsed + 1); |
| 2229 #endif | |
| 2230 | |
| 2231 /* | |
| 2232 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2233 * line we were working on, then the line didn't fit. | |
| 2234 */ | |
| 2235 wp->w_empty_rows = 0; | |
| 2236 #ifdef FEAT_DIFF | |
| 2237 wp->w_filler_rows = 0; | |
| 2238 #endif | |
| 2239 if (!eof && !didline) | |
| 2240 { | |
| 2241 if (lnum == wp->w_topline) | |
| 2242 { | |
| 2243 /* | |
| 2244 * Single line that does not fit! | |
| 2245 * Don't overwrite it, it can be edited. | |
| 2246 */ | |
| 2247 wp->w_botline = lnum + 1; | |
| 2248 } | |
| 2249 #ifdef FEAT_DIFF | |
| 2250 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2251 { | |
| 2252 /* Window ends in filler lines. */ | |
| 2253 wp->w_botline = lnum; | |
| 2254 wp->w_filler_rows = wp->w_height - srow; | |
| 2255 } | |
| 2256 #endif | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2257 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
|
2258 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2259 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
|
2260 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2261 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2262 * 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
|
2263 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2264 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
|
2265 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2266 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
|
2267 (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
|
2268 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2269 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2270 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2271 } |
| 7 | 2272 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2273 { | |
| 2274 /* | |
| 2275 * Last line isn't finished: Display "@@@" at the end. | |
| 2276 */ | |
| 2277 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2278 W_WINROW(wp) + wp->w_height, | |
| 2279 (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
|
2280 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2281 set_empty_rows(wp, srow); |
| 2282 wp->w_botline = lnum; | |
| 2283 } | |
| 2284 else | |
| 2285 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2286 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2287 wp->w_botline = lnum; |
| 2288 } | |
| 2289 } | |
| 2290 else | |
| 2291 { | |
| 2292 draw_vsep_win(wp, row); | |
| 2293 if (eof) /* we hit the end of the file */ | |
| 2294 { | |
| 2295 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2296 #ifdef FEAT_DIFF | |
| 2297 j = diff_check_fill(wp, wp->w_botline); | |
| 2298 if (j > 0 && !wp->w_botfill) | |
| 2299 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2300 // Display filler lines at the end of the file. |
| 7 | 2301 if (char2cells(fill_diff) > 1) |
| 2302 i = '-'; | |
| 2303 else | |
| 2304 i = fill_diff; | |
| 2305 if (row + j > wp->w_height) | |
| 2306 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
|
2307 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2308 row += j; |
| 2309 } | |
| 2310 #endif | |
| 2311 } | |
| 3318 | 2312 else if (dollar_vcol == -1) |
| 7 | 2313 wp->w_botline = lnum; |
| 2314 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2315 // 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
|
2316 // put '~'s on rows that aren't part of the file. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2317 win_draw_end(wp, '~', ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2318 } |
| 2319 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2320 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2321 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2322 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2323 |
| 7 | 2324 /* Reset the type of redrawing required, the window has been updated. */ |
| 2325 wp->w_redr_type = 0; | |
| 2326 #ifdef FEAT_DIFF | |
| 2327 wp->w_old_topfill = wp->w_topfill; | |
| 2328 wp->w_old_botfill = wp->w_botfill; | |
| 2329 #endif | |
| 2330 | |
| 3318 | 2331 if (dollar_vcol == -1) |
| 7 | 2332 { |
| 2333 /* | |
| 2334 * There is a trick with w_botline. If we invalidate it on each | |
| 2335 * change that might modify it, this will cause a lot of expensive | |
| 2336 * calls to plines() in update_topline() each time. Therefore the | |
| 2337 * value of w_botline is often approximated, and this value is used to | |
| 2338 * compute the value of w_topline. If the value of w_botline was | |
| 2339 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2340 * the visible part of the text). If it's not, we need to redraw | |
| 2341 * again. Mostly this just means scrolling up a few lines, so it | |
| 2342 * doesn't look too bad. Only do this for the current window (where | |
| 2343 * changes are relevant). | |
| 2344 */ | |
| 2345 wp->w_valid |= VALID_BOTLINE; | |
| 2346 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2347 { | |
| 2348 recursive = TRUE; | |
| 2349 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2350 update_topline(); /* may invalidate w_botline again */ | |
| 2351 if (must_redraw != 0) | |
| 2352 { | |
| 2353 /* Don't update for changes in buffer again. */ | |
| 2354 i = curbuf->b_mod_set; | |
| 2355 curbuf->b_mod_set = FALSE; | |
| 2356 win_update(curwin); | |
| 2357 must_redraw = 0; | |
| 2358 curbuf->b_mod_set = i; | |
| 2359 } | |
| 2360 recursive = FALSE; | |
| 2361 } | |
| 2362 } | |
| 2363 | |
| 2364 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2365 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2366 if (!got_int) | |
| 2367 got_int = save_got_int; | |
| 2368 #endif | |
| 2369 } | |
| 2370 | |
| 2371 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2372 * 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
|
2373 * 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
|
2374 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2375 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
|
2376 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
|
2377 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
|
2378 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
|
2379 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
|
2380 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
|
2381 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
|
2382 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
|
2383 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
|
2384 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
|
2385 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2386 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
|
2387 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2388 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
|
2389 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
|
2390 #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
|
2391 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
|
2392 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2393 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
|
2394 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
|
2395 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
|
2396 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2397 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2398 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2399 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
|
2400 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
|
2401 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
|
2402 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
|
2403 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2404 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2405 /* |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2406 * 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
|
2407 * 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
|
2408 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2409 */ |
| 2410 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2411 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2412 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2413 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2414 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
|
2415 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2416 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2417 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2418 hlf_T hl) |
| 7 | 2419 { |
| 2420 int n = 0; | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2421 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2422 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
|
2423 { |
| 6553 | 2424 #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
|
2425 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
|
2426 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2427 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
|
2428 // 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
|
2429 n = screen_fill_end(wp, ' ', ' ', n, fdc, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2430 row, endrow, HL_ATTR(HLF_FC)); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2431 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2432 #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
|
2433 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
|
2434 // 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
|
2435 n = screen_fill_end(wp, ' ', ' ', n, 2, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2436 row, endrow, HL_ATTR(HLF_SC)); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2437 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2438 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
|
2439 && 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
|
2440 // 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
|
2441 n = screen_fill_end(wp, ' ', ' ', n, number_width(wp) + 1, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2442 row, endrow, HL_ATTR(HLF_N)); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2443 } |
| 7 | 2444 |
| 2445 #ifdef FEAT_RIGHTLEFT | |
| 2446 if (wp->w_p_rl) | |
| 2447 { | |
| 2448 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
|
2449 wp->w_wincol, W_ENDCOL(wp) - 1 - n, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2450 c2, c2, HL_ATTR(hl)); |
| 7 | 2451 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
|
2452 W_ENDCOL(wp) - 1 - n, W_ENDCOL(wp) - n, |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2453 c1, c2, HL_ATTR(hl)); |
| 7 | 2454 } |
| 2455 else | |
| 2456 #endif | |
| 2457 { | |
| 2458 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
|
2459 wp->w_wincol + n, (int)W_ENDCOL(wp), |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2460 c1, c2, HL_ATTR(hl)); |
| 7 | 2461 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2462 |
| 7 | 2463 set_empty_rows(wp, row); |
| 2464 } | |
| 2465 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2466 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2467 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2468 * Advance **color_cols and return TRUE when there are columns to draw. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2469 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2470 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2471 advance_color_col(int vcol, int **color_cols) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2472 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2473 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2474 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2475 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2476 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2477 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2478 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2479 #if defined(FEAT_MENU) || defined(FEAT_FOLDING) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2480 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2481 * Copy "text" to ScreenLines using "attr". |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2482 * Returns the next screen column. |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2483 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2484 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2485 text_to_screenline(win_T *wp, char_u *text, int col) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2486 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2487 int off = (int)(current_ScreenLine - ScreenLines); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2488 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2489 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2490 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2491 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2492 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
|
2493 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2494 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2495 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2497 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2498 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
|
2499 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
|
2500 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2502 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2503 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
|
2504 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2505 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2508 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2509 /* 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
|
2510 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
|
2511 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2512 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
|
2513 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
|
2514 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
|
2515 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 - (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
|
2517 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2518 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2519 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2520 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2522 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 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
|
2524 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
|
2525 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2526 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2528 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2529 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2530 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2531 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2532 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2533 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 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
|
2535 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2537 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
|
2538 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
|
2539 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2540 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 /* 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
|
2542 * 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
|
2543 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
|
2544 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2545 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2546 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 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
|
2548 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
|
2549 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2550 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 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
|
2553 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2554 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2555 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2557 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2558 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
|
2559 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2560 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2561 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2562 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2563 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2564 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2565 /* 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
|
2566 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
|
2567 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
|
2568 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2569 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
|
2570 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
|
2571 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2573 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2574 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2575 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
|
2576 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 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
|
2578 /* 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
|
2579 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
|
2580 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
|
2581 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2582 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
|
2583 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2584 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2585 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2586 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2587 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2588 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2589 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2590 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
|
2591 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2592 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
|
2593 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
|
2594 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2595 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2596 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2597 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
|
2598 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
|
2599 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2600 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2601 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
|
2602 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2603 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2604 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2605 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2606 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2607 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2608 |
| 7 | 2609 #ifdef FEAT_FOLDING |
| 2610 /* | |
| 6553 | 2611 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2612 * space is available for window "wp", minus "col". | |
| 2613 */ | |
| 2614 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2615 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2616 { |
| 2617 int fdc = wp->w_p_fdc; | |
| 2618 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
|
2619 int wwidth = wp->w_width; |
| 6553 | 2620 |
| 2621 if (fdc > wwidth - (col + wmw)) | |
| 2622 fdc = wwidth - (col + wmw); | |
| 2623 return fdc; | |
| 2624 } | |
| 2625 | |
| 2626 /* | |
| 7 | 2627 * Display one folded line. |
| 2628 */ | |
| 2629 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2630 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2631 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2632 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2633 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2634 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2635 int row) |
| 7 | 2636 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2637 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2638 pos_T *top, *bot; |
| 2639 linenr_T lnume = lnum + fold_count - 1; | |
| 2640 int len; | |
| 29 | 2641 char_u *text; |
| 7 | 2642 int fdc; |
| 2643 int col; | |
| 2644 int txtcol; | |
| 2645 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2646 int ri; |
| 7 | 2647 |
| 2648 /* Build the fold line: | |
| 2649 * 1. Add the cmdwin_type for the command-line window | |
| 2650 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2651 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2652 * 4. Compose the text |
| 2653 * 5. Add the text | |
| 2654 * 6. set highlighting for the Visual area an other text | |
| 2655 */ | |
| 2656 col = 0; | |
| 2657 | |
| 2658 /* | |
| 2659 * 1. Add the cmdwin_type for the command-line window | |
| 2660 * Ignores 'rightleft', this window is never right-left. | |
| 2661 */ | |
| 2662 #ifdef FEAT_CMDWIN | |
| 2663 if (cmdwin_type != 0 && wp == curwin) | |
| 2664 { | |
| 2665 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
|
2666 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2667 if (enc_utf8) |
| 2668 ScreenLinesUC[off] = 0; | |
| 2669 ++col; | |
| 2670 } | |
| 2671 #endif | |
| 2672 | |
| 2673 /* | |
| 2674 * 2. Add the 'foldcolumn' | |
| 6553 | 2675 * Reduce the width when there is not enough space. |
| 7 | 2676 */ |
| 6553 | 2677 fdc = compute_foldcolumn(wp, col); |
| 7 | 2678 if (fdc > 0) |
| 2679 { | |
| 2680 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2681 #ifdef FEAT_RIGHTLEFT | |
| 2682 if (wp->w_p_rl) | |
| 2683 { | |
| 2684 int i; | |
| 2685 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2686 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
|
2687 HL_ATTR(HLF_FC)); |
| 7 | 2688 /* reverse the fold column */ |
| 2689 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
|
2690 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2691 } |
| 2692 else | |
| 2693 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2694 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2695 col += fdc; |
| 2696 } | |
| 2697 | |
| 2698 #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
|
2699 # 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
|
2700 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2701 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
|
2702 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
|
2703 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
|
2704 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2705 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
|
2706 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
|
2707 } while (0) |
| 7 | 2708 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2709 # 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
|
2710 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2711 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2712 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2713 } while (0) |
| 7 | 2714 #endif |
| 2715 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2716 /* 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
|
2717 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2718 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2719 |
| 2720 #ifdef FEAT_SIGNS | |
| 2721 /* 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
|
2722 if (signcolumn_on(wp)) |
| 7 | 2723 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2724 len = wp->w_width - col; |
| 7 | 2725 if (len > 0) |
| 2726 { | |
| 2727 if (len > 2) | |
| 2728 len = 2; | |
| 2729 # ifdef FEAT_RIGHTLEFT | |
| 2730 if (wp->w_p_rl) | |
| 2731 /* 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
|
2732 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
|
2733 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2734 else |
| 2735 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2736 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2737 col += len; |
| 2738 } | |
| 2739 } | |
| 2740 #endif | |
| 2741 | |
| 2742 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2743 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2744 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2745 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2746 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2747 len = wp->w_width - col; |
| 7 | 2748 if (len > 0) |
| 2749 { | |
| 13 | 2750 int w = number_width(wp); |
| 5905 | 2751 long num; |
| 2752 char *fmt = "%*ld "; | |
| 13 | 2753 |
| 2754 if (len > w + 1) | |
| 2755 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2756 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2757 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
|
2758 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2759 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2760 else |
| 4065 | 2761 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2762 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2763 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
|
2764 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
|
2765 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2766 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2767 * line number */ |
| 4065 | 2768 num = lnum; |
| 2769 fmt = "%-*ld "; | |
| 2770 } | |
| 2771 } | |
| 2772 | |
| 2773 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2774 #ifdef FEAT_RIGHTLEFT |
| 2775 if (wp->w_p_rl) | |
| 2776 /* 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
|
2777 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
|
2778 HL_ATTR(HLF_FL)); |
| 7 | 2779 else |
| 2780 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2781 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2782 col += len; |
| 2783 } | |
| 2784 } | |
| 2785 | |
| 2786 /* | |
| 2787 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2788 */ | |
| 29 | 2789 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2790 |
| 2791 txtcol = col; /* remember where text starts */ | |
| 2792 | |
| 2793 /* | |
| 2794 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2795 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2796 * in columns number-col - window-width. | |
| 2797 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2798 col = text_to_screenline(wp, text, col); |
| 7 | 2799 |
| 2800 /* Fill the rest of the line with the fold filler */ | |
| 2801 #ifdef FEAT_RIGHTLEFT | |
| 2802 if (wp->w_p_rl) | |
| 2803 col -= txtcol; | |
| 2804 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2805 while (col < wp->w_width |
| 7 | 2806 #ifdef FEAT_RIGHTLEFT |
| 2807 - (wp->w_p_rl ? txtcol : 0) | |
| 2808 #endif | |
| 2809 ) | |
| 2810 { | |
| 2811 if (enc_utf8) | |
| 2812 { | |
| 2813 if (fill_fold >= 0x80) | |
| 2814 { | |
| 2815 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2816 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
|
2817 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2818 } |
| 2819 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2820 { |
| 7 | 2821 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2822 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2823 } |
|
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
|
2824 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
|
2825 } |
|
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
|
2826 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
|
2827 ScreenLines[off + col++] = fill_fold; |
| 7 | 2828 } |
| 2829 | |
| 2830 if (text != buf) | |
| 2831 vim_free(text); | |
| 2832 | |
| 2833 /* | |
| 2834 * 6. set highlighting for the Visual area an other text. | |
| 2835 * If all folded lines are in the Visual area, highlight the line. | |
| 2836 */ | |
| 2837 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2838 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2839 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2840 { |
| 2841 /* Visual is after curwin->w_cursor */ | |
| 2842 top = &curwin->w_cursor; | |
| 2843 bot = &VIsual; | |
| 2844 } | |
| 2845 else | |
| 2846 { | |
| 2847 /* Visual is before curwin->w_cursor */ | |
| 2848 top = &VIsual; | |
| 2849 bot = &curwin->w_cursor; | |
| 2850 } | |
| 2851 if (lnum >= top->lnum | |
| 2852 && lnume <= bot->lnum | |
| 2853 && (VIsual_mode != 'v' | |
| 2854 || ((lnum > top->lnum | |
| 2855 || (lnum == top->lnum | |
| 2856 && top->col == 0)) | |
| 2857 && (lnume < bot->lnum | |
| 2858 || (lnume == bot->lnum | |
| 2859 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2860 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2861 { |
| 2862 if (VIsual_mode == Ctrl_V) | |
| 2863 { | |
| 2864 /* 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
|
2865 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2866 { |
| 3040 | 2867 if (wp->w_old_cursor_lcol != MAXCOL |
| 2868 && 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
|
2869 < (colnr_T)wp->w_width) |
| 7 | 2870 len = wp->w_old_cursor_lcol; |
| 2871 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2872 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
|
2873 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2874 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2875 } |
| 2876 } | |
| 2877 else | |
| 216 | 2878 { |
| 7 | 2879 /* 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
|
2880 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2881 } |
| 7 | 2882 } |
| 2883 } | |
| 2884 | |
| 743 | 2885 #ifdef FEAT_SYN_HL |
| 6685 | 2886 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2887 if (wp->w_p_cc_cols) | |
| 2888 { | |
| 2889 int i = 0; | |
| 2890 int j = wp->w_p_cc_cols[i]; | |
| 2891 int old_txtcol = txtcol; | |
| 2892 | |
| 2893 while (j > -1) | |
| 2894 { | |
| 2895 txtcol += j; | |
| 2896 if (wp->w_p_wrap) | |
| 2897 txtcol -= wp->w_skipcol; | |
| 2898 else | |
| 2899 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
|
2900 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2901 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
|
2902 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2903 txtcol = old_txtcol; |
| 2904 j = wp->w_p_cc_cols[++i]; | |
| 2905 } | |
| 2906 } | |
| 2907 | |
| 743 | 2908 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2909 if (wp->w_p_cuc) |
| 2910 { | |
| 2911 txtcol += wp->w_virtcol; | |
| 2912 if (wp->w_p_wrap) | |
| 2913 txtcol -= wp->w_skipcol; | |
| 2914 else | |
| 2915 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
|
2916 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2917 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
|
2918 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2919 } |
| 743 | 2920 #endif |
| 7 | 2921 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2922 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
|
2923 (int)wp->w_width, 0); |
| 7 | 2924 |
| 2925 /* | |
| 2926 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2927 * updated (saves a call to plines() later). | |
| 2928 */ | |
| 2929 if (wp == curwin | |
| 2930 && lnum <= curwin->w_cursor.lnum | |
| 2931 && lnume >= curwin->w_cursor.lnum) | |
| 2932 { | |
| 2933 curwin->w_cline_row = row; | |
| 2934 curwin->w_cline_height = 1; | |
| 2935 curwin->w_cline_folded = TRUE; | |
| 2936 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2937 } | |
| 2938 } | |
| 2939 | |
| 2940 /* | |
| 2941 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2942 */ | |
| 2943 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2944 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2945 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2946 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2947 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2948 int attr) |
| 7 | 2949 { |
| 216 | 2950 int i; |
| 2951 | |
| 7 | 2952 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2953 if (enc_utf8) | |
| 2954 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 2955 for (i = 0; i < len; ++i) |
| 2956 ScreenAttrs[off + i] = attr; | |
| 7 | 2957 } |
| 2958 | |
| 2959 /* | |
| 2960 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2961 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2962 */ |
| 2963 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2964 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2965 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2966 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2967 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2968 linenr_T lnum) /* current line number */ |
| 7 | 2969 { |
| 2970 int i = 0; | |
| 2971 int level; | |
| 2972 int first_level; | |
| 519 | 2973 int empty; |
| 6553 | 2974 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2975 |
| 2976 /* Init to all spaces. */ | |
| 6929 | 2977 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2978 |
| 2979 level = win_foldinfo.fi_level; | |
| 2980 if (level > 0) | |
| 2981 { | |
| 519 | 2982 /* If there is only one column put more info in it. */ |
| 6553 | 2983 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2984 |
| 7 | 2985 /* If the column is too narrow, we start at the lowest level that |
| 2986 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2987 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2988 if (first_level < 1) |
| 2989 first_level = 1; | |
| 2990 | |
| 6553 | 2991 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2992 { |
| 2993 if (win_foldinfo.fi_lnum == lnum | |
| 2994 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2995 p[i] = '-'; | |
| 2996 else if (first_level == 1) | |
| 2997 p[i] = '|'; | |
| 2998 else if (first_level + i <= 9) | |
| 2999 p[i] = '0' + first_level + i; | |
| 3000 else | |
| 3001 p[i] = '>'; | |
| 3002 if (first_level + i == level) | |
| 3003 break; | |
| 3004 } | |
| 3005 } | |
| 3006 if (closed) | |
| 6553 | 3007 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3008 } |
| 3009 #endif /* FEAT_FOLDING */ | |
| 3010 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3011 #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
|
3012 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
|
3013 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
|
3014 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3015 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3016 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
|
3017 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3018 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
|
3019 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
|
3020 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
|
3021 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3022 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
|
3023 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
|
3024 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
|
3025 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
|
3026 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
|
3027 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3028 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
|
3029 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3030 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
|
3031 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3032 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
|
3033 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
|
3034 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
|
3035 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
|
3036 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
|
3037 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3038 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3039 |
| 7 | 3040 /* |
| 3041 * Display line "lnum" of window 'wp' on the screen. | |
| 3042 * Start at row "startrow", stop when "endrow" is reached. | |
| 3043 * wp->w_virtcol needs to be valid. | |
| 3044 * | |
| 3045 * Return the number of last row the line occupies. | |
| 3046 */ | |
| 3047 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3048 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3049 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3050 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3051 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3052 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
|
3053 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
|
3054 int number_only) // only update the number column |
| 7 | 3055 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3056 int col = 0; /* visual column on screen */ |
| 7 | 3057 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3058 int c = 0; /* init for GCC */ | |
| 3059 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3060 #ifdef FEAT_LINEBREAK |
| 3061 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3062 #endif | |
| 7 | 3063 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3064 char_u *line; /* current line */ | |
| 3065 char_u *ptr; /* current position in "line" */ | |
| 3066 int row; /* row in the window, excl w_winrow */ | |
| 3067 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3068 | |
| 3069 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3070 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3071 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3072 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3073 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
|
3074 int c_final = NUL; /* final char, mandatory if set */ |
| 7 | 3075 int extra_attr = 0; /* attributes when n_extra != 0 */ |
| 3076 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3077 displaying lcs_eol at end-of-line */ | |
| 3078 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3079 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3080 | |
| 3081 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3082 int saved_n_extra = 0; | |
| 3083 char_u *saved_p_extra = NULL; | |
| 3084 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
|
3085 int saved_c_final = 0; |
| 7 | 3086 int saved_char_attr = 0; |
| 3087 | |
| 3088 int n_attr = 0; /* chars with special attr */ | |
| 3089 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3090 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3091 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3092 | |
| 3093 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3094 | |
| 3095 int fromcol, tocol; /* start/end of inverting */ | |
| 3096 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3097 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3098 pos_T *top, *bot; | |
| 1813 | 3099 int lnum_in_visual_area = FALSE; |
| 7 | 3100 pos_T pos; |
| 3101 long v; | |
| 3102 | |
| 3103 int char_attr = 0; /* attributes for next character */ | |
| 674 | 3104 int attr_pri = FALSE; /* char_attr has priority */ |
| 7 | 3105 int area_highlighting = FALSE; /* Visual or incsearch highlighting |
| 3106 in this line */ | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3107 int vi_attr = 0; /* attributes for Visual and incsearch |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3108 highlighting */ |
| 7 | 3109 int area_attr = 0; /* attributes desired by highlighting */ |
| 3110 int search_attr = 0; /* attributes desired by 'hlsearch' */ | |
| 3111 #ifdef FEAT_SYN_HL | |
| 743 | 3112 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3113 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3114 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3115 int save_did_emsg; | |
| 1437 | 3116 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
|
3117 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3118 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3119 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3120 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3121 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3122 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
|
3123 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3124 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3125 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3126 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
|
3127 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
|
3128 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
|
3129 #endif |
| 743 | 3130 #ifdef FEAT_SPELL |
| 221 | 3131 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3132 # define SPWORDLEN 150 |
| 3133 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3134 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3135 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3136 starts */ |
| 221 | 3137 int spell_attr = 0; /* attributes desired by spelling */ |
| 3138 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3139 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3140 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3141 * there are no spell errors */ |
| 386 | 3142 static int cap_col = -1; /* column to check for Cap word */ |
| 3143 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3144 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3145 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3146 int extra_check = 0; // has extra highlighting |
| 7 | 3147 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3148 int mb_l = 1; /* multi-byte byte length */ | |
| 3149 int mb_c = 0; /* decoded multi-byte character */ | |
| 3150 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3151 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3152 #ifdef FEAT_DIFF |
| 3153 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3154 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3155 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3156 int change_start = MAXCOL; /* first col of changed area */ |
| 3157 int change_end = -1; /* last col of changed area */ | |
| 3158 #endif | |
| 3159 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3160 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3161 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
|
3162 chars */ |
| 7 | 3163 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3164 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3165 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3166 # define LINE_ATTR |
| 1536 | 3167 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3168 #endif |
| 3169 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3170 matchitem_T *cur; /* points to the match list */ |
| 3171 match_T *shl; /* points to search_hl or a match */ | |
| 3172 int shl_flag; /* flag to indicate whether search_hl | |
| 3173 has been processed or not */ | |
| 5979 | 3174 int pos_inprogress; /* marks that position match search is |
| 3175 in progress */ | |
| 1326 | 3176 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3177 equals startcol of search_hl or one | |
| 3178 of the matches */ | |
| 7 | 3179 #endif |
| 3180 #ifdef FEAT_ARABIC | |
| 3181 int prev_c = 0; /* previous Arabic character */ | |
| 3182 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3183 #endif | |
| 910 | 3184 #if defined(LINE_ATTR) |
| 867 | 3185 int did_line_attr = 0; |
| 3186 #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
|
3187 #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
|
3188 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3189 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3190 int win_attr = 0; // background for whole window |
| 7 | 3191 |
| 3192 /* draw_state: items that are drawn in sequence: */ | |
| 3193 #define WL_START 0 /* nothing done yet */ | |
| 3194 #ifdef FEAT_CMDWIN | |
| 3195 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3196 #else | |
| 3197 # define WL_CMDLINE WL_START | |
| 3198 #endif | |
| 3199 #ifdef FEAT_FOLDING | |
| 3200 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3201 #else | |
| 3202 # define WL_FOLD WL_CMDLINE | |
| 3203 #endif | |
| 3204 #ifdef FEAT_SIGNS | |
| 3205 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3206 #else | |
| 3207 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3208 #endif | |
| 3209 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3210 #ifdef FEAT_LINEBREAK |
| 3211 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3212 #else | |
| 3213 # define WL_BRI WL_NR | |
| 3214 #endif | |
| 7 | 3215 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3216 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3217 #else |
| 5995 | 3218 # define WL_SBR WL_BRI |
| 7 | 3219 #endif |
| 3220 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3221 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3222 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3223 int feedback_col = 0; |
| 3224 int feedback_old_attr = -1; | |
| 3225 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3226 int screen_line_flags = 0; |
| 7 | 3227 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3228 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3229 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
|
3230 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
|
3231 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
|
3232 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
|
3233 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3234 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
|
3235 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3236 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
|
3237 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3238 int match_conc = 0; /* cchar for match functions */ |
| 6520 | 3239 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3240 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3241 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3242 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3243 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3244 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3245 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3246 col -= boguscols; \ |
| 6520 | 3247 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3248 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3249 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3250 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3251 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3252 #endif |
| 7 | 3253 |
| 3254 if (startrow > endrow) /* past the end already! */ | |
| 3255 return startrow; | |
| 3256 | |
| 3257 row = startrow; | |
| 3258 screen_row = row + W_WINROW(wp); | |
| 3259 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3260 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
|
3261 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3262 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3263 * 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
|
3264 * 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
|
3265 */ |
| 7 | 3266 #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
|
3267 extra_check = wp->w_p_lbr; |
| 7 | 3268 #endif |
| 3269 #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
|
3270 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
|
3271 # 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
|
3272 && !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
|
3273 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3274 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3275 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3276 /* 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
|
3277 * 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
|
3278 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
|
3279 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
|
3280 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
|
3281 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
|
3282 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
|
3283 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3284 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3285 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
|
3286 #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
|
3287 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
|
3288 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3289 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3290 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
|
3291 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
|
3292 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3293 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3294 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3295 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3296 /* 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
|
3297 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
|
3298 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
|
3299 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3300 #endif |
| 3301 | |
|
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
|
3302 #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
|
3303 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
|
3304 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3305 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
|
3306 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3307 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
|
3308 } |
|
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
|
3309 #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
|
3310 |
| 743 | 3311 #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
|
3312 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
|
3313 && *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
|
3314 && 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
|
3315 && *(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
|
3316 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3317 /* 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
|
3318 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
|
3319 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
|
3320 |
|
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
|
3321 /* 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
|
3322 * 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
|
3323 * 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
|
3324 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
|
3325 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
|
3326 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3327 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
|
3328 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
|
3329 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3330 |
|
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
|
3331 /* 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
|
3332 * 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
|
3333 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
|
3334 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
|
3335 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
|
3336 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3337 /* 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
|
3338 * 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
|
3339 * 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
|
3340 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
|
3341 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
|
3342 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
|
3343 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
|
3344 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
|
3345 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3346 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3347 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3348 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3349 * 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
|
3350 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3351 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
|
3352 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
|
3353 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
|
3354 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3355 /* 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
|
3356 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
|
3357 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3358 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
|
3359 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
|
3360 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3361 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
|
3362 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3363 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
|
3364 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
|
3365 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3366 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
|
3367 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
|
3368 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3369 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
|
3370 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3371 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
|
3372 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
|
3373 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3374 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3375 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
|
3376 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3377 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3378 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
|
3379 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
|
3380 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3381 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
|
3382 fromcol = 0; |
| 7 | 3383 else |
| 3384 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3385 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
|
3386 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
|
3387 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
|
3388 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3389 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3390 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
|
3391 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3392 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
|
3393 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3394 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
|
3395 tocol = MAXCOL; |
| 7 | 3396 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3397 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
|
3398 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
|
3399 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3400 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3401 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
|
3402 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
|
3403 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
|
3404 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3405 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3406 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
|
3407 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3408 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3409 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3410 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3411 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3412 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3413 /* 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
|
3414 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
|
3415 #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
|
3416 && !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
|
3417 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3418 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3419 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
|
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 /* 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
|
3422 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
|
3423 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3424 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3425 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3426 #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
|
3427 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
|
3428 && 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
|
3429 || (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
|
3430 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3431 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
|
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 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3436 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3437 * 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
|
3438 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3439 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
|
3440 && 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
|
3441 && 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
|
3442 && 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
|
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 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
|
3445 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
|
3446 (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
|
3447 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3448 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
|
3449 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
|
3450 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3451 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
|
3452 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
|
3453 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
|
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 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3456 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
|
3457 /* 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
|
3458 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
|
3459 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
|
3460 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3461 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
|
3462 } |
| 7 | 3463 } |
| 3464 | |
| 3465 #ifdef FEAT_DIFF | |
| 3466 filler_lines = diff_check(wp, lnum); | |
| 3467 if (filler_lines < 0) | |
| 3468 { | |
| 3469 if (filler_lines == -1) | |
| 3470 { | |
| 3471 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3472 diff_hlf = HLF_ADD; /* added line */ | |
| 3473 else if (change_start == 0) | |
| 3474 diff_hlf = HLF_TXD; /* changed text */ | |
| 3475 else | |
| 3476 diff_hlf = HLF_CHD; /* changed line */ | |
| 3477 } | |
| 3478 else | |
| 3479 diff_hlf = HLF_ADD; /* added line */ | |
| 3480 filler_lines = 0; | |
| 3481 area_highlighting = TRUE; | |
| 3482 } | |
| 3483 if (lnum == wp->w_topline) | |
| 3484 filler_lines = wp->w_topfill; | |
| 3485 filler_todo = filler_lines; | |
| 3486 #endif | |
| 3487 | |
| 3488 #ifdef LINE_ATTR | |
| 3489 # ifdef FEAT_SIGNS | |
| 3490 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3491 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3492 if (v != 0) | |
| 3493 line_attr = sign_get_attr((int)v, TRUE); | |
| 3494 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3495 # if defined(FEAT_QUICKFIX) |
| 7 | 3496 /* Highlight the current line in the quickfix window. */ |
| 644 | 3497 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
|
3498 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3499 # endif |
| 3500 if (line_attr != 0) | |
| 3501 area_highlighting = TRUE; | |
| 3502 #endif | |
| 3503 | |
| 3504 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3505 ptr = line; | |
| 3506 | |
| 743 | 3507 #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
|
3508 if (has_spell && !number_only) |
| 348 | 3509 { |
| 386 | 3510 /* For checking first word with a capital skip white space. */ |
| 3511 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
|
3512 cap_col = getwhitecols(line); |
| 386 | 3513 |
| 348 | 3514 /* To be able to spell-check over line boundaries copy the end of the |
| 3515 * current line into nextline[]. Above the start of the next line was | |
| 3516 * copied to nextline[SPWORDLEN]. */ | |
| 3517 if (nextline[SPWORDLEN] == NUL) | |
| 3518 { | |
| 3519 /* No next line or it is empty. */ | |
| 3520 nextlinecol = MAXCOL; | |
| 3521 nextline_idx = 0; | |
| 3522 } | |
| 3523 else | |
| 3524 { | |
| 835 | 3525 v = (long)STRLEN(line); |
| 348 | 3526 if (v < SPWORDLEN) |
| 3527 { | |
| 3528 /* Short line, use it completely and append the start of the | |
| 3529 * next line. */ | |
| 3530 nextlinecol = 0; | |
| 3531 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3532 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3533 nextline_idx = v + 1; |
| 3534 } | |
| 3535 else | |
| 3536 { | |
| 3537 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3538 nextlinecol = v - SPWORDLEN; | |
| 3539 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3540 nextline_idx = SPWORDLEN + 1; | |
| 3541 } | |
| 3542 } | |
| 3543 } | |
| 3544 #endif | |
| 3545 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3546 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3547 { |
|
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
|
3548 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
|
3549 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3550 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3551 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3552 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3553 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
|
3554 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
|
3555 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3556 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3557 } |
| 7 | 3558 } |
| 3559 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3560 if (*wp->w_p_wcr != NUL) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3561 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3562 int attr = syn_name2attr(wp->w_p_wcr); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3563 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3564 // 'wincolor' highlighting for the whole window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3565 if (attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3566 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3567 win_attr = attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3568 area_highlighting = TRUE; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3569 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3570 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3571 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3572 if (bt_popup(wp->w_buffer)) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3573 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3574 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3575 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3576 if (win_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3577 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3578 win_attr = HL_ATTR(HLF_PNI); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3579 area_highlighting = TRUE; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3580 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3581 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3582 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3583 |
| 7 | 3584 /* |
| 3585 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3586 * first character to be displayed. | |
| 3587 */ | |
| 3588 if (wp->w_p_wrap) | |
| 3589 v = wp->w_skipcol; | |
| 3590 else | |
| 3591 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
|
3592 if (v > 0 && !number_only) |
| 7 | 3593 { |
| 3594 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3595 |
| 7 | 3596 while (vcol < v && *ptr != NUL) |
| 3597 { | |
| 5995 | 3598 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3599 vcol += c; |
| 3600 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3601 MB_PTR_ADV(ptr); |
| 7 | 3602 } |
| 3603 | |
| 1984 | 3604 /* When: |
| 3605 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3606 * - 'colorcolumn' is set, or |
| 1984 | 3607 * - 'virtualedit' is set, or |
| 3608 * - the visual mode is active, | |
| 3609 * the end of the line may be before the start of the displayed part. | |
| 3610 */ | |
| 3611 if (vcol < v && ( | |
| 5735 | 3612 #ifdef FEAT_SYN_HL |
| 3613 wp->w_p_cuc || draw_color_col || | |
| 3614 #endif | |
| 3615 virtual_active() || | |
| 3616 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3617 vcol = v; |
| 3618 | |
| 3619 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3620 * that character but skip the first few screen characters. */ | |
| 3621 if (vcol > v) | |
| 3622 { | |
| 3623 vcol -= c; | |
| 3624 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
|
3625 /* 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
|
3626 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3627 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
|
3628 n_skip = v - vcol; |
| 7 | 3629 } |
| 3630 | |
| 3631 /* | |
| 3632 * Adjust for when the inverted text is before the screen, | |
| 3633 * and when the start of the inverted text is before the screen. | |
| 3634 */ | |
| 3635 if (tocol <= vcol) | |
| 3636 fromcol = 0; | |
| 3637 else if (fromcol >= 0 && fromcol < vcol) | |
| 3638 fromcol = vcol; | |
| 3639 | |
| 3640 #ifdef FEAT_LINEBREAK | |
| 3641 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3642 if (wp->w_p_wrap) | |
| 3643 need_showbreak = TRUE; | |
| 3644 #endif | |
| 743 | 3645 #ifdef FEAT_SPELL |
| 499 | 3646 /* When spell checking a word we need to figure out the start of the |
| 3647 * word and if it's badly spelled or not. */ | |
| 3648 if (has_spell) | |
| 3649 { | |
| 3650 int len; | |
| 1536 | 3651 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3652 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3653 |
| 3654 pos = wp->w_cursor; | |
| 3655 wp->w_cursor.lnum = lnum; | |
| 1536 | 3656 wp->w_cursor.col = linecol; |
| 534 | 3657 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3658 |
| 3659 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3660 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3661 ptr = line + linecol; | |
| 3662 | |
| 530 | 3663 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3664 { |
| 3665 /* no bad word found at line start, don't check until end of a | |
| 3666 * word */ | |
| 534 | 3667 spell_hlf = HLF_COUNT; |
| 3572 | 3668 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3669 } |
| 3670 else | |
| 534 | 3671 { |
| 499 | 3672 /* bad word found, use attributes until end of word */ |
| 3673 word_end = wp->w_cursor.col + len + 1; | |
| 3674 | |
| 534 | 3675 /* Turn index into actual attributes. */ |
| 3676 if (spell_hlf != HLF_COUNT) | |
| 3677 spell_attr = highlight_attr[spell_hlf]; | |
| 3678 } | |
| 499 | 3679 wp->w_cursor = pos; |
| 501 | 3680 |
| 743 | 3681 # ifdef FEAT_SYN_HL |
| 501 | 3682 /* Need to restart syntax highlighting for this line. */ |
| 3683 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3684 syntax_start(wp, lnum); |
| 743 | 3685 # endif |
| 499 | 3686 } |
| 3687 #endif | |
| 7 | 3688 } |
| 3689 | |
| 3690 /* | |
| 3691 * Correct highlighting for cursor that can't be disabled. | |
| 3692 * Avoids having to check this for each character. | |
| 3693 */ | |
| 3694 if (fromcol >= 0) | |
| 3695 { | |
| 3696 if (noinvcur) | |
| 3697 { | |
| 3698 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3699 { | |
| 3700 /* highlighting starts at cursor, let it start just after the | |
| 3701 * cursor */ | |
| 3702 fromcol_prev = fromcol; | |
| 3703 fromcol = -1; | |
| 3704 } | |
| 3705 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3706 /* restart highlighting after the cursor */ | |
| 3707 fromcol_prev = wp->w_virtcol; | |
| 3708 } | |
| 3709 if (fromcol >= tocol) | |
| 3710 fromcol = -1; | |
| 3711 } | |
| 3712 | |
| 3713 #ifdef FEAT_SEARCH_EXTRA | |
| 3714 /* | |
| 1326 | 3715 * Handle highlighting the last used search pattern and matches. |
| 3716 * 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
|
3717 * Not in a popup window. |
| 7 | 3718 */ |
| 1326 | 3719 cur = wp->w_match_head; |
| 3720 shl_flag = FALSE; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3721 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
|
3722 && !(screen_line_flags & SLF_POPUP)) |
| 1326 | 3723 { |
| 3724 if (shl_flag == FALSE) | |
| 3725 { | |
| 3726 shl = &search_hl; | |
| 3727 shl_flag = TRUE; | |
| 3728 } | |
| 3729 else | |
| 3730 shl = &cur->hl; | |
| 36 | 3731 shl->startcol = MAXCOL; |
| 3732 shl->endcol = MAXCOL; | |
| 7 | 3733 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3734 shl->is_addpos = FALSE; |
| 5979 | 3735 v = (long)(ptr - line); |
| 3736 if (cur != NULL) | |
| 3737 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3738 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
|
3739 shl == &search_hl ? NULL : cur); |
| 5979 | 3740 |
| 3741 /* Need to get the line again, a multi-line regexp may have made it | |
| 3742 * invalid. */ | |
| 3743 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3744 ptr = line + v; | |
| 3745 | |
| 3746 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3747 { | |
| 3748 if (shl->lnum == lnum) | |
| 3749 shl->startcol = shl->rm.startpos[0].col; | |
| 3750 else | |
| 3751 shl->startcol = 0; | |
| 3752 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3753 - shl->rm.startpos[0].lnum) | |
| 3754 shl->endcol = shl->rm.endpos[0].col; | |
| 3755 else | |
| 3756 shl->endcol = MAXCOL; | |
| 3757 /* Highlight one character for an empty match. */ | |
| 3758 if (shl->startcol == shl->endcol) | |
| 3759 { | |
| 3760 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3761 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3762 else |
| 5979 | 3763 ++shl->endcol; |
| 3764 } | |
| 3765 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3766 { | |
| 3767 shl->attr_cur = shl->attr; | |
| 3768 search_attr = shl->attr; | |
| 3769 } | |
| 3770 area_highlighting = TRUE; | |
| 7 | 3771 } |
| 1326 | 3772 if (shl != &search_hl && cur != NULL) |
| 3773 cur = cur->next; | |
| 7 | 3774 } |
| 3775 #endif | |
| 3776 | |
| 743 | 3777 #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
|
3778 // 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
|
3779 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
|
3780 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3781 // 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
|
3782 // 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
|
3783 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
|
3784 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3785 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
|
3786 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3787 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
3788 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 3789 } |
| 3790 #endif | |
| 3791 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3792 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3793 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3794 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3795 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3796 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
|
3797 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3798 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3799 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3800 // 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
|
3801 // aligned. |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3802 text_props = (textprop_T *)alloc( |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3803 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
|
3804 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3805 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
|
3806 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
|
3807 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3808 // Allocate an array for the indexes. |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3809 text_prop_idxs = (int *)alloc(text_prop_count * sizeof(int)); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3810 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3811 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3812 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3813 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3814 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3815 |
| 504 | 3816 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3817 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3818 |
| 7 | 3819 #ifdef FEAT_RIGHTLEFT |
| 3820 if (wp->w_p_rl) | |
| 3821 { | |
| 3822 /* Rightleft window: process the text in the normal direction, but put | |
| 3823 * it in current_ScreenLine[] from right to left. Start at the | |
| 3824 * 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
|
3825 col = wp->w_width - 1; |
| 7 | 3826 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3827 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 3828 } |
| 3829 #endif | |
| 3830 | |
| 3831 /* | |
| 3832 * Repeat for the whole displayed line. | |
| 3833 */ | |
| 3834 for (;;) | |
| 3835 { | |
| 6947 | 3836 #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
|
3837 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
|
3838 int did_decrement_ptr = FALSE; |
| 6947 | 3839 #endif |
| 7 | 3840 /* Skip this quickly when working on the text. */ |
| 3841 if (draw_state != WL_LINE) | |
| 3842 { | |
| 3843 #ifdef FEAT_CMDWIN | |
| 3844 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3845 { | |
| 3846 draw_state = WL_CMDLINE; | |
| 3847 if (cmdwin_type != 0 && wp == curwin) | |
| 3848 { | |
| 3849 /* Draw the cmdline character. */ | |
| 3850 n_extra = 1; | |
| 1340 | 3851 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
|
3852 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3853 char_attr = HL_ATTR(HLF_AT); |
| 7 | 3854 } |
| 3855 } | |
| 3856 #endif | |
| 3857 | |
| 3858 #ifdef FEAT_FOLDING | |
| 3859 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3860 { | |
| 6553 | 3861 int fdc = compute_foldcolumn(wp, 0); |
| 3862 | |
| 7 | 3863 draw_state = WL_FOLD; |
| 6553 | 3864 if (fdc > 0) |
| 7 | 3865 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3866 /* 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
|
3867 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3868 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3869 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3870 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3871 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3872 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3873 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
|
3874 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3875 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3876 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3877 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
|
3878 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3879 char_attr = HL_ATTR(HLF_FC); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3880 } |
| 7 | 3881 } |
| 3882 } | |
| 3883 #endif | |
| 3884 | |
| 3885 #ifdef FEAT_SIGNS | |
| 3886 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3887 { | |
| 3888 draw_state = WL_SIGN; | |
| 3889 /* Show the sign column when there are any signs in this | |
| 3890 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3891 if (signcolumn_on(wp)) |
| 7 | 3892 { |
| 2661 | 3893 int text_sign; |
| 7 | 3894 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3895 int icon_sign; |
| 7 | 3896 # endif |
| 3897 | |
| 3898 /* Draw two cells with the sign value or blank. */ | |
| 3899 c_extra = ' '; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3900 c_final = NUL; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
3901 char_attr = HL_ATTR(HLF_SC); |
| 7 | 3902 n_extra = 2; |
| 3903 | |
| 5921 | 3904 if (row == startrow |
| 3905 #ifdef FEAT_DIFF | |
| 3906 + filler_lines && filler_todo <= 0 | |
| 3907 #endif | |
| 3908 ) | |
| 7 | 3909 { |
| 3910 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3911 SIGN_TEXT); | |
| 3912 # ifdef FEAT_SIGN_ICONS | |
| 3913 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3914 SIGN_ICON); | |
| 3915 if (gui.in_use && icon_sign != 0) | |
| 3916 { | |
| 3917 /* Use the image in this position. */ | |
| 3918 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
|
3919 c_final = NUL; |
| 7 | 3920 # ifdef FEAT_NETBEANS_INTG |
| 3921 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
|
3922 { |
| 7 | 3923 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
|
3924 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3925 } |
| 7 | 3926 # endif |
| 3927 char_attr = icon_sign; | |
| 3928 } | |
| 3929 else | |
| 3930 # endif | |
| 3931 if (text_sign != 0) | |
| 3932 { | |
| 3933 p_extra = sign_get_text(text_sign); | |
| 3934 if (p_extra != NULL) | |
| 3935 { | |
| 3936 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
|
3937 c_final = NUL; |
| 835 | 3938 n_extra = (int)STRLEN(p_extra); |
| 7 | 3939 } |
| 3940 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3941 } | |
| 3942 } | |
| 3943 } | |
| 3944 } | |
| 3945 #endif | |
| 3946 | |
| 3947 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3948 { | |
| 3949 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3950 /* 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
|
3951 * 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
|
3952 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3953 && (row == startrow |
| 3954 #ifdef FEAT_DIFF | |
| 3955 + filler_lines | |
| 3956 #endif | |
| 3957 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3958 { | |
| 3959 /* Draw the line number (empty space after wrapping). */ | |
| 3960 if (row == startrow | |
| 3961 #ifdef FEAT_DIFF | |
| 3962 + filler_lines | |
| 3963 #endif | |
| 3964 ) | |
| 3965 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3966 long num; |
| 4065 | 3967 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3968 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3969 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
|
3970 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3971 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3972 else |
| 4065 | 3973 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3974 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3975 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
|
3976 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3977 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3978 /* 'number' + 'relativenumber' */ |
| 4065 | 3979 num = lnum; |
| 3980 fmt = "%-*ld "; | |
| 3981 } | |
| 3982 } | |
| 3983 | |
| 3984 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3985 number_width(wp), num); |
| 7 | 3986 if (wp->w_skipcol > 0) |
| 3987 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3988 *p_extra = '-'; | |
| 3989 #ifdef FEAT_RIGHTLEFT | |
| 3990 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
|
3991 { |
|
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
|
3992 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
|
3993 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
|
3994 |
|
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
|
3995 // 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
|
3996 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
|
3997 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
|
3998 { |
|
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
|
3999 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
|
4000 *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
|
4001 *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
|
4002 } |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4003 } |
| 7 | 4004 #endif |
| 4005 p_extra = extra; | |
| 4006 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
|
4007 c_final = NUL; |
| 7 | 4008 } |
| 4009 else | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4010 { |
| 7 | 4011 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4012 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4013 } |
| 13 | 4014 n_extra = number_width(wp) + 1; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4015 char_attr = HL_ATTR(HLF_N); |
| 743 | 4016 #ifdef FEAT_SYN_HL |
| 4017 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 4018 * the current line differently. |
| 4019 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 4020 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4021 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 4022 && 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
|
4023 char_attr = HL_ATTR(HLF_CLN); |
| 743 | 4024 #endif |
| 7 | 4025 } |
| 4026 } | |
| 4027 | |
| 5995 | 4028 #ifdef FEAT_LINEBREAK |
| 4029 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4030 && n_extra == 0 && *p_sbr != NUL) | |
| 4031 /* draw indent after showbreak value */ | |
| 4032 draw_state = WL_BRI; | |
| 4033 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4034 /* After the showbreak, draw the breakindent */ | |
| 4035 draw_state = WL_BRI - 1; | |
| 4036 | |
| 4037 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4038 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4039 { | |
| 4040 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4041 /* 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
|
4042 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
|
4043 && (row != startrow || need_showbreak) |
| 5995 | 4044 # ifdef FEAT_DIFF |
| 4045 && filler_lines == 0 | |
| 6834 | 4046 # endif |
| 5995 | 4047 ) |
| 4048 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4049 char_attr = 0; |
| 6834 | 4050 # ifdef FEAT_DIFF |
| 5995 | 4051 if (diff_hlf != (hlf_T)0) |
| 6106 | 4052 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4053 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4054 # ifdef FEAT_SYN_HL |
| 6106 | 4055 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4056 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
|
4057 HL_ATTR(HLF_CUL)); |
| 6834 | 4058 # endif |
| 6106 | 4059 } |
| 6834 | 4060 # endif |
| 6028 | 4061 p_extra = NULL; |
| 5995 | 4062 c_extra = ' '; |
| 4063 n_extra = get_breakindent_win(wp, | |
| 4064 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4065 /* Correct end of highlighted area for 'breakindent', | |
| 4066 * required when 'linebreak' is also set. */ | |
| 4067 if (tocol == vcol) | |
| 4068 tocol += n_extra; | |
| 4069 } | |
| 4070 } | |
| 4071 #endif | |
| 4072 | |
| 7 | 4073 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4074 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4075 { | |
| 4076 draw_state = WL_SBR; | |
| 4077 # ifdef FEAT_DIFF | |
| 4078 if (filler_todo > 0) | |
| 4079 { | |
| 4080 /* Draw "deleted" diff line(s). */ | |
| 4081 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
|
4082 { |
| 7 | 4083 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4084 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4085 } |
| 7 | 4086 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4087 { |
| 7 | 4088 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
|
4089 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4090 } |
| 7 | 4091 # ifdef FEAT_RIGHTLEFT |
| 4092 if (wp->w_p_rl) | |
| 4093 n_extra = col + 1; | |
| 4094 else | |
| 4095 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4096 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
|
4097 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4098 } |
| 4099 # endif | |
| 4100 # ifdef FEAT_LINEBREAK | |
| 4101 if (*p_sbr != NUL && need_showbreak) | |
| 4102 { | |
| 4103 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4104 p_extra = p_sbr; | |
| 4105 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
|
4106 c_final = NUL; |
| 7 | 4107 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
|
4108 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4109 need_showbreak = FALSE; |
| 6503 | 4110 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4111 /* Correct end of highlighted area for 'showbreak', |
| 4112 * required when 'linebreak' is also set. */ | |
| 4113 if (tocol == vcol) | |
| 4114 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4115 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4116 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4117 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4118 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
|
4119 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4120 #endif |
| 7 | 4121 } |
| 4122 # endif | |
| 4123 } | |
| 4124 #endif | |
| 4125 | |
| 4126 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4127 { | |
| 4128 draw_state = WL_LINE; | |
| 4129 if (saved_n_extra) | |
| 4130 { | |
| 4131 /* Continue item from end of wrapped line. */ | |
| 4132 n_extra = saved_n_extra; | |
| 4133 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
|
4134 c_final = saved_c_final; |
| 7 | 4135 p_extra = saved_p_extra; |
| 4136 char_attr = saved_char_attr; | |
| 4137 } | |
| 4138 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4139 char_attr = win_attr; |
| 7 | 4140 } |
| 4141 } | |
| 4142 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4143 // 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
|
4144 // 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
|
4145 // 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
|
4146 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4147 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4148 #ifdef FEAT_DIFF |
| 4149 && filler_todo <= 0 | |
| 4150 #endif | |
| 4151 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4152 || (number_only && draw_state > WL_NR)) |
| 7 | 4153 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4154 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
|
4155 screen_line_flags); |
| 819 | 4156 /* Pretend we have finished updating the window. Except when |
| 4157 * 'cursorcolumn' is set. */ | |
| 4158 #ifdef FEAT_SYN_HL | |
| 4159 if (wp->w_p_cuc) | |
| 4160 row = wp->w_cline_row + wp->w_cline_height; | |
| 4161 else | |
| 4162 #endif | |
| 4163 row = wp->w_height; | |
| 7 | 4164 break; |
| 4165 } | |
| 4166 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4167 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
|
4168 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4169 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4170 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4171 )) |
| 7 | 4172 { |
| 4173 /* handle Visual or match highlighting in this line */ | |
| 4174 if (vcol == fromcol | |
| 4175 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4176 && (*mb_ptr2cells)(ptr) > 1) | |
| 4177 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4178 && vcol_prev < vcol /* not at margin */ |
| 7 | 4179 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4180 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4181 else if (area_attr != 0 |
| 4182 && (vcol == tocol | |
| 4183 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4184 area_attr = 0; /* stop highlighting */ | |
| 4185 | |
| 4186 #ifdef FEAT_SEARCH_EXTRA | |
| 4187 if (!n_extra) | |
| 4188 { | |
| 4189 /* | |
| 4190 * Check for start/end of search pattern match. | |
| 4191 * After end, check for start/end of next match. | |
| 4192 * When another match, have to check for start again. | |
| 4193 * Watch out for matching an empty string! | |
| 1326 | 4194 * Do this for 'search_hl' and the match list (ordered by |
| 4195 * priority). | |
| 7 | 4196 */ |
| 36 | 4197 v = (long)(ptr - line); |
| 1326 | 4198 cur = wp->w_match_head; |
| 4199 shl_flag = FALSE; | |
| 4200 while (cur != NULL || shl_flag == FALSE) | |
| 4201 { | |
| 4202 if (shl_flag == FALSE | |
| 4203 && ((cur != NULL | |
| 4204 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4205 || cur == NULL)) | |
| 4206 { | |
| 4207 shl = &search_hl; | |
| 4208 shl_flag = TRUE; | |
| 4209 } | |
| 4210 else | |
| 4211 shl = &cur->hl; | |
| 5979 | 4212 if (cur != NULL) |
| 4213 cur->pos.cur = 0; | |
| 4214 pos_inprogress = TRUE; | |
| 4215 while (shl->rm.regprog != NULL | |
| 4216 || (cur != NULL && pos_inprogress)) | |
| 7 | 4217 { |
| 36 | 4218 if (shl->startcol != MAXCOL |
| 4219 && v >= (long)shl->startcol | |
| 4220 && v < (long)shl->endcol) | |
| 7 | 4221 { |
| 6430 | 4222 int tmp_col = v + MB_PTR2LEN(ptr); |
| 4223 | |
| 4224 if (shl->endcol < tmp_col) | |
| 4225 shl->endcol = tmp_col; | |
| 7 | 4226 shl->attr_cur = shl->attr; |
| 6947 | 4227 #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
|
4228 // 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
|
4229 // the match. |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4230 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
|
4231 && 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
|
4232 && 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
|
4233 == cur->hlg_id) |
| 6947 | 4234 { |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4235 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4236 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4237 match_conc = cur->conceal_char; |
| 4238 } | |
| 4239 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4240 has_match_conc = match_conc = 0; |
| 6947 | 4241 #endif |
| 7 | 4242 } |
| 6430 | 4243 else if (v == (long)shl->endcol) |
| 7 | 4244 { |
| 4245 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4246 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
|
4247 shl == &search_hl ? NULL : cur); |
| 5979 | 4248 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4249 ? FALSE : TRUE; |
| 7 | 4250 |
| 4251 /* Need to get the line again, a multi-line regexp | |
| 4252 * may have made it invalid. */ | |
| 4253 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4254 ptr = line + v; | |
| 4255 | |
| 4256 if (shl->lnum == lnum) | |
| 4257 { | |
| 36 | 4258 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4259 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4260 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4261 else |
| 36 | 4262 shl->endcol = MAXCOL; |
| 4263 | |
| 4264 if (shl->startcol == shl->endcol) | |
| 7 | 4265 { |
| 4266 /* highlight empty match, try again after | |
| 4267 * it */ | |
| 4268 if (has_mbyte) | |
| 474 | 4269 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4270 + shl->endcol); |
| 7 | 4271 else |
| 36 | 4272 ++shl->endcol; |
| 7 | 4273 } |
| 4274 | |
| 4275 /* Loop to check if the match starts at the | |
| 4276 * current position */ | |
| 4277 continue; | |
| 4278 } | |
| 4279 } | |
| 4280 break; | |
| 4281 } | |
| 1326 | 4282 if (shl != &search_hl && cur != NULL) |
| 4283 cur = cur->next; | |
| 4284 } | |
| 4285 | |
| 4286 /* Use attributes from match with highest priority among | |
| 4287 * 'search_hl' and the match list. */ | |
| 4288 search_attr = search_hl.attr_cur; | |
| 4289 cur = wp->w_match_head; | |
| 4290 shl_flag = FALSE; | |
| 4291 while (cur != NULL || shl_flag == FALSE) | |
| 4292 { | |
| 4293 if (shl_flag == FALSE | |
| 4294 && ((cur != NULL | |
| 4295 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4296 || cur == NULL)) | |
| 699 | 4297 { |
| 1326 | 4298 shl = &search_hl; |
| 4299 shl_flag = TRUE; | |
| 699 | 4300 } |
| 1326 | 4301 else |
| 4302 shl = &cur->hl; | |
| 4303 if (shl->attr_cur != 0) | |
| 4304 search_attr = shl->attr_cur; | |
| 4305 if (shl != &search_hl && cur != NULL) | |
| 4306 cur = cur->next; | |
| 4307 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4308 /* 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
|
4309 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
|
4310 || (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
|
4311 search_attr = 0; |
| 7 | 4312 } |
| 4313 #endif | |
| 4314 | |
| 4315 #ifdef FEAT_DIFF | |
| 674 | 4316 if (diff_hlf != (hlf_T)0) |
| 7 | 4317 { |
| 1295 | 4318 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4319 && n_extra == 0) | |
| 7 | 4320 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4321 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4322 && n_extra == 0) | |
| 7 | 4323 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
|
4324 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4325 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
|
4326 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4327 } |
| 4328 #endif | |
| 4329 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4330 #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
|
4331 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
|
4332 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4333 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4334 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
|
4335 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4336 // 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
|
4337 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
|
4338 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4339 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
|
4340 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4341 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
|
4342 + 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
|
4343 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4344 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
|
4345 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
|
4346 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
|
4347 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4348 * (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
|
4349 --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
|
4350 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4351 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4352 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4353 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4354 // 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
|
4355 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
|
4356 && 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
|
4357 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
|
4358 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4359 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
|
4360 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
|
4361 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
|
4362 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4363 // 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
|
4364 // 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
|
4365 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
|
4366 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
|
4367 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
|
4368 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
|
4369 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4370 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
|
4371 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4372 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
|
4373 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
|
4374 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
|
4375 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4376 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
|
4377 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4378 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
|
4379 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4380 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
|
4381 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4382 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
|
4383 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
|
4384 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4385 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4386 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4387 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4388 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4389 |
| 674 | 4390 /* Decide which of the highlight attributes to use. */ |
| 4391 attr_pri = TRUE; | |
| 6717 | 4392 #ifdef LINE_ATTR |
| 674 | 4393 if (area_attr != 0) |
| 6717 | 4394 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4395 else if (search_attr != 0) |
| 6717 | 4396 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
|
4397 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4398 else if (text_prop_type != NULL) |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4399 char_attr = hl_combine_attr(line_attr, text_prop_attr); |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4400 # endif |
| 674 | 4401 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4402 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4403 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4404 // 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
|
4405 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4406 char_attr = line_attr; |
| 6717 | 4407 #else |
| 4408 if (area_attr != 0) | |
| 4409 char_attr = area_attr; | |
| 4410 else if (search_attr != 0) | |
| 4411 char_attr = search_attr; | |
| 674 | 4412 #endif |
| 4413 else | |
| 4414 { | |
| 4415 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4416 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4417 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
|
4418 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4419 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
|
4420 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
|
4421 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
|
4422 else |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4423 char_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
|
4424 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4425 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4426 #endif |
| 674 | 4427 #ifdef FEAT_SYN_HL |
| 4428 if (has_syntax) | |
| 4429 char_attr = syntax_attr; | |
| 4430 else | |
| 4431 #endif | |
| 4432 char_attr = 0; | |
| 4433 } | |
| 7 | 4434 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4435 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4436 char_attr = win_attr; |
| 7 | 4437 |
| 4438 /* | |
| 4439 * Get the next character to put on the screen. | |
| 4440 */ | |
| 4441 /* | |
| 1340 | 4442 * The "p_extra" points to the extra stuff that is inserted to |
| 4443 * represent special characters (non-printable stuff) and other | |
| 4444 * 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
|
4445 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4446 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4447 * "p_extra[n_extra]". | |
| 7 | 4448 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4449 */ | |
| 4450 if (n_extra > 0) | |
| 4451 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4452 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
|
4453 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4454 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4455 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
|
4456 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4457 { |
| 4458 mb_utf8 = TRUE; | |
| 714 | 4459 u8cc[0] = 0; |
| 819 | 4460 c = 0xc0; |
| 7 | 4461 } |
| 4462 else | |
| 4463 mb_utf8 = FALSE; | |
| 4464 } | |
| 4465 else | |
| 4466 { | |
| 4467 c = *p_extra; | |
| 4468 if (has_mbyte) | |
| 4469 { | |
| 4470 mb_c = c; | |
| 4471 if (enc_utf8) | |
| 4472 { | |
| 4473 /* If the UTF-8 character is more than one byte: | |
| 4474 * 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
|
4475 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4476 mb_utf8 = FALSE; |
| 4477 if (mb_l > n_extra) | |
| 4478 mb_l = 1; | |
| 4479 else if (mb_l > 1) | |
| 4480 { | |
| 714 | 4481 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4482 mb_utf8 = TRUE; |
| 819 | 4483 c = 0xc0; |
| 7 | 4484 } |
| 4485 } | |
| 4486 else | |
| 4487 { | |
| 4488 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4489 mb_l = MB_BYTE2LEN(c); | |
| 4490 if (mb_l >= n_extra) | |
| 4491 mb_l = 1; | |
| 4492 else if (mb_l > 1) | |
| 4493 mb_c = (c << 8) + p_extra[1]; | |
| 4494 } | |
| 504 | 4495 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4496 mb_l = 1; | |
| 4497 | |
| 7 | 4498 /* If a double-width char doesn't fit display a '>' in the |
| 4499 * last column. */ | |
| 504 | 4500 if (( |
| 7 | 4501 # ifdef FEAT_RIGHTLEFT |
| 4502 wp->w_p_rl ? (col <= 0) : | |
| 4503 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4504 (col >= wp->w_width - 1)) |
| 7 | 4505 && (*mb_char2cells)(mb_c) == 2) |
| 4506 { | |
| 4507 c = '>'; | |
| 4508 mb_c = c; | |
| 4509 mb_l = 1; | |
| 4510 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
|
4511 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4512 /* put the pointer back to output the double-width |
| 4513 * character at the start of the next line. */ | |
| 4514 ++n_extra; | |
| 4515 --p_extra; | |
| 4516 } | |
| 4517 else | |
| 4518 { | |
| 4519 n_extra -= mb_l - 1; | |
| 4520 p_extra += mb_l - 1; | |
| 4521 } | |
| 4522 } | |
| 4523 ++p_extra; | |
| 4524 } | |
| 4525 --n_extra; | |
| 4526 } | |
| 4527 else | |
| 4528 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4529 #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
|
4530 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4531 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4532 |
| 6026 | 4533 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
|
4534 VIM_CLEAR(p_extra_free); |
| 7 | 4535 /* |
| 4536 * Get a character from the line itself. | |
| 4537 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4538 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4539 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4540 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4541 #endif |
| 7 | 4542 if (has_mbyte) |
| 4543 { | |
| 4544 mb_c = c; | |
| 4545 if (enc_utf8) | |
| 4546 { | |
| 4547 /* If the UTF-8 character is more than one byte: Decode it | |
| 4548 * 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
|
4549 mb_l = utfc_ptr2len(ptr); |
| 7 | 4550 mb_utf8 = FALSE; |
| 4551 if (mb_l > 1) | |
| 4552 { | |
| 714 | 4553 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4554 /* Overlong encoded ASCII or ASCII with composing char |
| 4555 * is displayed normally, except a NUL. */ | |
| 4556 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
|
4557 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4558 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4559 #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
|
4560 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4561 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4562 } |
| 7 | 4563 mb_utf8 = TRUE; |
| 507 | 4564 |
| 4565 /* At start of the line we can have a composing char. | |
| 4566 * Draw it as a space with a composing char. */ | |
| 4567 if (utf_iscomposing(mb_c)) | |
| 4568 { | |
| 1326 | 4569 int i; |
| 4570 | |
| 714 | 4571 for (i = Screen_mco - 1; i > 0; --i) |
| 4572 u8cc[i] = u8cc[i - 1]; | |
| 4573 u8cc[0] = mb_c; | |
| 507 | 4574 mb_c = ' '; |
| 4575 } | |
| 7 | 4576 } |
| 4577 | |
| 4578 if ((mb_l == 1 && c >= 0x80) | |
| 4579 || (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
|
4580 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4581 { |
| 4582 /* | |
| 4583 * Illegal UTF-8 byte: display as <xx>. | |
| 4584 * Non-BMP character : display as ? or fullwidth ?. | |
| 4585 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4586 transchar_hex(extra, mb_c); |
| 714 | 4587 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4588 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
|
4589 rl_mirror(extra); |
| 714 | 4590 # endif |
| 7 | 4591 p_extra = extra; |
| 4592 c = *p_extra; | |
| 4593 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4594 mb_utf8 = (c >= 0x80); | |
| 4595 n_extra = (int)STRLEN(p_extra); | |
| 4596 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
|
4597 c_final = NUL; |
| 7 | 4598 if (area_attr == 0 && search_attr == 0) |
| 4599 { | |
| 4600 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
|
4601 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4602 saved_attr2 = char_attr; /* save current attr */ |
| 4603 } | |
| 4604 } | |
| 4605 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4606 mb_l = 1; | |
| 4607 #ifdef FEAT_ARABIC | |
| 4608 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4609 { | |
| 4610 /* Do Arabic shaping. */ | |
| 714 | 4611 int pc, pc1, nc; |
| 4612 int pcc[MAX_MCO]; | |
| 7 | 4613 |
| 4614 /* The idea of what is the previous and next | |
| 4615 * character depends on 'rightleft'. */ | |
| 4616 if (wp->w_p_rl) | |
| 4617 { | |
| 4618 pc = prev_c; | |
| 4619 pc1 = prev_c1; | |
| 4620 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4621 prev_c1 = u8cc[0]; |
| 7 | 4622 } |
| 4623 else | |
| 4624 { | |
| 714 | 4625 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4626 nc = prev_c; |
| 714 | 4627 pc1 = pcc[0]; |
| 7 | 4628 } |
| 4629 prev_c = mb_c; | |
| 4630 | |
| 714 | 4631 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4632 } |
| 4633 else | |
| 4634 prev_c = mb_c; | |
| 4635 #endif | |
| 4636 } | |
| 4637 else /* enc_dbcs */ | |
| 4638 { | |
| 4639 mb_l = MB_BYTE2LEN(c); | |
| 4640 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4641 mb_l = 1; | |
| 4642 else if (mb_l > 1) | |
| 4643 { | |
| 4644 /* We assume a second byte below 32 is illegal. | |
| 4645 * Hopefully this is OK for all double-byte encodings! | |
| 4646 */ | |
| 4647 if (ptr[1] >= 32) | |
| 4648 mb_c = (c << 8) + ptr[1]; | |
| 4649 else | |
| 4650 { | |
| 4651 if (ptr[1] == NUL) | |
| 4652 { | |
| 4653 /* head byte at end of line */ | |
| 4654 mb_l = 1; | |
| 4655 transchar_nonprint(extra, c); | |
| 4656 } | |
| 4657 else | |
| 4658 { | |
| 4659 /* illegal tail byte */ | |
| 4660 mb_l = 2; | |
| 4661 STRCPY(extra, "XX"); | |
| 4662 } | |
| 4663 p_extra = extra; | |
| 4664 n_extra = (int)STRLEN(extra) - 1; | |
| 4665 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
|
4666 c_final = NUL; |
| 7 | 4667 c = *p_extra++; |
| 4668 if (area_attr == 0 && search_attr == 0) | |
| 4669 { | |
| 4670 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
|
4671 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4672 saved_attr2 = char_attr; /* save current attr */ |
| 4673 } | |
| 4674 mb_c = c; | |
| 4675 } | |
| 4676 } | |
| 4677 } | |
| 4678 /* If a double-width char doesn't fit display a '>' in the | |
| 4679 * last column; the character is displayed at the start of the | |
| 4680 * next line. */ | |
| 4681 if (( | |
| 4682 # ifdef FEAT_RIGHTLEFT | |
| 4683 wp->w_p_rl ? (col <= 0) : | |
| 4684 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4685 (col >= wp->w_width - 1)) |
| 7 | 4686 && (*mb_char2cells)(mb_c) == 2) |
| 4687 { | |
| 4688 c = '>'; | |
| 4689 mb_c = c; | |
| 4690 mb_utf8 = FALSE; | |
| 4691 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
|
4692 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
|
4693 // 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
|
4694 // displayed at the start of the next line. |
| 7 | 4695 --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
|
4696 #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
|
4697 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
|
4698 #endif |
| 7 | 4699 } |
| 4700 else if (*ptr != NUL) | |
| 4701 ptr += mb_l - 1; | |
| 4702 | |
| 4703 /* 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
|
4704 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4705 * 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
|
4706 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4707 { |
| 4708 n_extra = 1; | |
| 3586 | 4709 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
|
4710 c_final = NUL; |
| 7 | 4711 c = ' '; |
| 4712 if (area_attr == 0 && search_attr == 0) | |
| 4713 { | |
| 4714 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
|
4715 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4716 saved_attr2 = char_attr; /* save current attr */ |
| 4717 } | |
| 4718 mb_c = c; | |
| 4719 mb_utf8 = FALSE; | |
| 4720 mb_l = 1; | |
| 4721 } | |
| 4722 | |
| 4723 } | |
| 4724 ++ptr; | |
| 4725 | |
| 4726 if (extra_check) | |
| 4727 { | |
| 743 | 4728 #ifdef FEAT_SPELL |
| 221 | 4729 int can_spell = TRUE; |
| 743 | 4730 #endif |
| 4731 | |
|
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
|
4732 #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
|
4733 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
|
4734 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4735 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
|
4736 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4737 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
|
4738 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
|
4739 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
|
4740 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
|
4741 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4742 #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
|
4743 |
| 743 | 4744 #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
|
4745 // 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
|
4746 // (double-wide char that doesn't fit). |
| 221 | 4747 v = (long)(ptr - line); |
| 4748 if (has_syntax && v > 0) | |
| 7 | 4749 { |
| 4750 /* Get the syntax attribute for the character. If there | |
| 4751 * is an error, disable syntax highlighting. */ | |
| 4752 save_did_emsg = did_emsg; | |
| 4753 did_emsg = FALSE; | |
| 4754 | |
| 221 | 4755 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4756 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4757 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4758 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4759 NULL, FALSE); |
| 7 | 4760 |
| 4761 if (did_emsg) | |
| 482 | 4762 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4763 wp->w_s->b_syn_error = TRUE; |
| 482 | 4764 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4765 syntax_attr = 0; |
| 482 | 4766 } |
| 7 | 4767 else |
| 4768 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4769 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4770 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4771 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4772 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
|
4773 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4774 #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
|
4775 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
|
4776 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4777 #endif |
| 7 | 4778 |
| 4779 /* Need to get the line again, a multi-line regexp may | |
| 4780 * have made it invalid. */ | |
| 4781 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4782 ptr = line + v; | |
| 4783 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4784 # 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
|
4785 // 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
|
4786 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
|
4787 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4788 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4789 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
|
4790 # 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
|
4791 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
|
4792 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4793 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
|
4794 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
|
4795 else |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4796 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
|
4797 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4798 # 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
|
4799 /* 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
|
4800 * 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
|
4801 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
|
4802 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
|
4803 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
|
4804 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
|
4805 # endif |
| 7 | 4806 } |
| 743 | 4807 #endif |
| 4808 | |
| 4809 #ifdef FEAT_SPELL | |
| 301 | 4810 /* Check spelling (unless at the end of the line). |
| 319 | 4811 * Only do this when there is no syntax highlighting, the |
| 4812 * @Spell cluster is not used or the current syntax item | |
| 4813 * contains the @Spell cluster. */ | |
| 348 | 4814 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4815 { |
| 230 | 4816 spell_attr = 0; |
| 743 | 4817 if (c != 0 && ( |
| 4818 # ifdef FEAT_SYN_HL | |
| 4819 !has_syntax || | |
| 4820 # endif | |
| 4821 can_spell)) | |
| 221 | 4822 { |
| 348 | 4823 char_u *prev_ptr, *p; |
| 4824 int len; | |
| 534 | 4825 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 4826 if (has_mbyte) |
| 4827 { | |
| 4828 prev_ptr = ptr - mb_l; | |
| 4829 v -= mb_l - 1; | |
| 4830 } | |
| 4831 else | |
| 4832 prev_ptr = ptr - 1; | |
| 348 | 4833 |
| 4834 /* Use nextline[] if possible, it has the start of the | |
| 4835 * next line concatenated. */ | |
| 4836 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4837 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4838 else | |
| 4839 p = prev_ptr; | |
| 835 | 4840 cap_col -= (int)(prev_ptr - line); |
| 625 | 4841 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4842 nochange); | |
| 348 | 4843 word_end = v + len; |
| 301 | 4844 |
| 4845 /* In Insert mode only highlight a word that | |
| 4846 * doesn't touch the cursor. */ | |
| 534 | 4847 if (spell_hlf != HLF_COUNT |
| 301 | 4848 && (State & INSERT) != 0 |
| 4849 && wp->w_cursor.lnum == lnum | |
| 4850 && wp->w_cursor.col >= | |
| 4851 (colnr_T)(prev_ptr - line) | |
| 4852 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4853 { |
| 534 | 4854 spell_hlf = HLF_COUNT; |
| 301 | 4855 spell_redraw_lnum = lnum; |
| 221 | 4856 } |
| 348 | 4857 |
| 534 | 4858 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4859 && (p - nextline) + len > nextline_idx) |
| 4860 { | |
| 4861 /* Remember that the good word continues at the | |
| 4862 * start of the next line. */ | |
| 4863 checked_lnum = lnum + 1; | |
| 835 | 4864 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4865 } |
| 386 | 4866 |
| 534 | 4867 /* Turn index into actual attributes. */ |
| 4868 if (spell_hlf != HLF_COUNT) | |
| 4869 spell_attr = highlight_attr[spell_hlf]; | |
| 4870 | |
| 386 | 4871 if (cap_col > 0) |
| 4872 { | |
| 4873 if (p != prev_ptr | |
| 4874 && (p - nextline) + cap_col >= nextline_idx) | |
| 4875 { | |
| 4876 /* Remember that the word in the next line | |
| 4877 * must start with a capital. */ | |
| 4878 capcol_lnum = lnum + 1; | |
| 835 | 4879 cap_col = (int)((p - nextline) + cap_col |
| 4880 - nextline_idx); | |
| 386 | 4881 } |
| 4882 else | |
| 4883 /* Compute the actual column. */ | |
| 835 | 4884 cap_col += (int)(prev_ptr - line); |
| 386 | 4885 } |
| 221 | 4886 } |
| 4887 } | |
| 4888 if (spell_attr != 0) | |
| 348 | 4889 { |
| 674 | 4890 if (!attr_pri) |
| 348 | 4891 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4892 else | |
| 4893 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4894 } | |
| 7 | 4895 #endif |
| 4896 #ifdef FEAT_LINEBREAK | |
| 4897 /* | |
| 221 | 4898 * Found last space before word: check for line break. |
| 7 | 4899 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4900 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
|
4901 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4902 { |
| 6693 | 4903 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
|
4904 char_u *p = ptr - (mb_off + 1); |
| 6681 | 4905 |
| 5995 | 4906 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4907 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4908 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4909 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
|
4910 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
4911 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
|
4912 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
|
4913 # else |
| 6371 | 4914 n_extra = (int)wp->w_buffer->b_p_ts |
| 4915 - 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
|
4916 # endif |
| 6371 | 4917 |
| 6693 | 4918 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
|
4919 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4920 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4921 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4922 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4923 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4924 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4925 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4926 #endif |
| 6026 | 4927 if (!wp->w_p_list) |
| 4928 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4929 } |
| 7 | 4930 } |
| 4931 #endif | |
| 4932 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4933 // '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
|
4934 // 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
|
4935 // 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
|
4936 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
|
4937 && ((((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
|
4938 || (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
|
4939 && ((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
|
4940 || (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
|
4941 && 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
|
4942 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4943 && 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
|
4944 && 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
|
4945 && 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
|
4946 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4947 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
|
4948 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
|
4949 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4950 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
|
4951 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
|
4952 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
|
4953 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4954 mb_c = c; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4955 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
|
4956 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4957 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
|
4958 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
|
4959 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4960 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4961 else |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4962 mb_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4963 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4964 |
| 7 | 4965 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4966 { | |
| 4967 c = lcs_trail; | |
| 674 | 4968 if (!attr_pri) |
| 7 | 4969 { |
| 4970 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
|
4971 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4972 saved_attr2 = char_attr; /* save current attr */ |
| 4973 } | |
| 4974 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
|
4975 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4976 { |
| 4977 mb_utf8 = TRUE; | |
| 714 | 4978 u8cc[0] = 0; |
| 819 | 4979 c = 0xc0; |
| 7 | 4980 } |
| 4981 else | |
| 4982 mb_utf8 = FALSE; | |
| 4983 } | |
| 4984 } | |
| 4985 | |
| 4986 /* | |
| 4987 * Handling of non-printable characters. | |
| 4988 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4989 if (!vim_isprintc(c)) |
| 7 | 4990 { |
| 4991 /* | |
| 4992 * when getting a character from the file, we may have to | |
| 4993 * turn it into something else on the way to putting it | |
| 4994 * into "ScreenLines". | |
| 4995 */ | |
| 4996 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 4997 { | |
| 6026 | 4998 int tab_len = 0; |
| 6503 | 4999 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 5000 #ifdef FEAT_LINEBREAK | |
| 5001 /* only adjust the tab_len, when at the first column | |
| 5002 * after the showbreak value was drawn */ | |
| 5003 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 5004 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 5005 #endif | |
| 7 | 5006 /* 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
|
5007 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5008 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
|
5009 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
|
5010 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
|
5011 #else |
| 6026 | 5012 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
|
5013 - 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
|
5014 #endif |
| 6503 | 5015 |
| 6026 | 5016 #ifdef FEAT_LINEBREAK |
| 6100 | 5017 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 5018 #endif |
| 5019 /* tab amount depends on current column */ | |
| 5020 n_extra = tab_len; | |
| 5021 #ifdef FEAT_LINEBREAK | |
| 5022 else | |
| 5023 { | |
| 5024 char_u *p; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5025 int len; |
| 6026 | 5026 int i; |
| 5027 int saved_nextra = n_extra; | |
| 5028 | |
| 6172 | 5029 #ifdef FEAT_CONCEAL |
| 6627 | 5030 if (vcol_off > 0) |
| 6172 | 5031 /* there are characters to conceal */ |
| 5032 tab_len += vcol_off; | |
| 6520 | 5033 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 5034 */ | |
| 5035 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 5036 && n_extra > tab_len) | |
| 5037 tab_len += n_extra - tab_len; | |
| 5038 #endif | |
| 5039 | |
| 6026 | 5040 /* if n_extra > 0, it gives the number of chars, to |
| 5041 * use for a tab, else we need to calculate the width | |
| 5042 * for a tab */ | |
| 5043 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 5044 if (n_extra > 0) | |
| 5045 len += n_extra - tab_len; | |
| 5046 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
|
5047 p = alloc(len + 1); |
| 6026 | 5048 vim_memset(p, ' ', len); |
| 5049 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5050 vim_free(p_extra_free); |
| 6026 | 5051 p_extra_free = p; |
| 5052 for (i = 0; i < tab_len; i++) | |
| 5053 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5054 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5055 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5056 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5057 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5058 } |
| 6026 | 5059 mb_char2bytes(lcs_tab2, p); |
| 5060 p += mb_char2len(lcs_tab2); | |
| 5061 n_extra += mb_char2len(lcs_tab2) | |
| 5062 - (saved_nextra > 0 ? 1 : 0); | |
| 5063 } | |
| 5064 p_extra = p_extra_free; | |
| 6172 | 5065 #ifdef FEAT_CONCEAL |
| 5066 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 5067 * macro below, so need to adjust for that here */ | |
| 6627 | 5068 if (vcol_off > 0) |
| 6172 | 5069 n_extra -= vcol_off; |
| 5070 #endif | |
| 6026 | 5071 } |
| 5072 #endif | |
| 3984 | 5073 #ifdef FEAT_CONCEAL |
| 6627 | 5074 { |
| 5075 int vc_saved = vcol_off; | |
| 5076 | |
| 5077 /* Tab alignment should be identical regardless of | |
| 5078 * 'conceallevel' value. So tab compensates of all | |
| 5079 * previous concealed characters, and thus resets | |
| 5080 * vcol_off and boguscols accumulated so far in the | |
| 5081 * line. Note that the tab can be longer than | |
| 5082 * 'tabstop' when there are concealed characters. */ | |
| 5083 FIX_FOR_BOGUSCOLS; | |
| 5084 | |
| 5085 /* Make sure, the highlighting for the tab char will be | |
| 5086 * correctly set further below (effectively reverts the | |
| 5087 * FIX_FOR_BOGSUCOLS macro */ | |
| 5088 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 5089 && lcs_tab1) |
| 6627 | 5090 tab_len += vc_saved; |
| 5091 } | |
| 3984 | 5092 #endif |
| 7 | 5093 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 5094 if (wp->w_p_list) | |
| 5095 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5096 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5097 #ifdef FEAT_LINEBREAK |
| 5098 if (wp->w_p_lbr) | |
| 5099 c_extra = NUL; /* using p_extra from above */ | |
| 5100 else | |
| 5101 #endif | |
| 5102 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
|
5103 c_final = lcs_tab3; |
| 6026 | 5104 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
|
5105 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5106 saved_attr2 = char_attr; /* save current attr */ |
| 5107 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
|
5108 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5109 { |
| 5110 mb_utf8 = TRUE; | |
| 714 | 5111 u8cc[0] = 0; |
| 819 | 5112 c = 0xc0; |
| 7 | 5113 } |
| 5114 } | |
| 5115 else | |
| 5116 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5117 c_final = NUL; |
| 7 | 5118 c_extra = ' '; |
| 5119 c = ' '; | |
| 5120 } | |
| 5121 } | |
| 36 | 5122 else if (c == NUL |
| 6799 | 5123 && (wp->w_p_list |
| 36 | 5124 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5125 && tocol > vcol | |
| 5126 && VIsual_mode != Ctrl_V | |
| 5127 && ( | |
| 5128 # ifdef FEAT_RIGHTLEFT | |
| 5129 wp->w_p_rl ? (col >= 0) : | |
| 5130 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5131 (col < wp->w_width)) |
| 36 | 5132 && !(noinvcur |
| 1850 | 5133 && lnum == wp->w_cursor.lnum |
| 36 | 5134 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5135 && lcs_eol_one > 0) |
| 7 | 5136 { |
| 36 | 5137 /* Display a '$' after the line or highlight an extra |
| 5138 * character if the line break is included. */ | |
| 7 | 5139 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5140 /* For a diff line the highlighting continues after the | |
| 5141 * "$". */ | |
| 5142 if ( | |
| 5143 # ifdef FEAT_DIFF | |
| 534 | 5144 diff_hlf == (hlf_T)0 |
| 7 | 5145 # ifdef LINE_ATTR |
| 5146 && | |
| 5147 # endif | |
| 5148 # endif | |
| 5149 # ifdef LINE_ATTR | |
| 5150 line_attr == 0 | |
| 5151 # endif | |
| 5152 ) | |
| 5153 #endif | |
| 5154 { | |
| 5155 /* In virtualedit, visual selections may extend | |
| 5156 * beyond end of line. */ | |
| 5157 if (area_highlighting && virtual_active() | |
| 5158 && tocol != MAXCOL && vcol < tocol) | |
| 5159 n_extra = 0; | |
| 5160 else | |
| 5161 { | |
| 5162 p_extra = at_end_str; | |
| 5163 n_extra = 1; | |
| 5164 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
|
5165 c_final = NUL; |
| 7 | 5166 } |
| 5167 } | |
| 6799 | 5168 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5169 c = lcs_eol; |
| 5170 else | |
| 5171 c = ' '; | |
| 7 | 5172 lcs_eol_one = -1; |
| 5173 --ptr; /* put it back at the NUL */ | |
| 674 | 5174 if (!attr_pri) |
| 7 | 5175 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5176 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5177 n_attr = 1; |
| 5178 } | |
| 5179 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
|
5180 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5181 { |
| 5182 mb_utf8 = TRUE; | |
| 714 | 5183 u8cc[0] = 0; |
| 819 | 5184 c = 0xc0; |
| 7 | 5185 } |
| 5186 else | |
| 5187 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5188 } | |
| 5189 else if (c != NUL) | |
| 5190 { | |
| 5191 p_extra = transchar(c); | |
| 6064 | 5192 if (n_extra == 0) |
| 5193 n_extra = byte2cells(c) - 1; | |
| 7 | 5194 #ifdef FEAT_RIGHTLEFT |
| 5195 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5196 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5197 #endif | |
| 5198 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
|
5199 c_final = NUL; |
| 6026 | 5200 #ifdef FEAT_LINEBREAK |
| 5201 if (wp->w_p_lbr) | |
| 5202 { | |
| 5203 char_u *p; | |
| 5204 | |
| 5205 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
|
5206 p = alloc(n_extra + 1); |
| 6026 | 5207 vim_memset(p, ' ', n_extra); |
| 5208 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5209 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5210 vim_free(p_extra_free); |
| 6026 | 5211 p_extra_free = p_extra = p; |
| 5212 } | |
| 5213 else | |
| 5214 #endif | |
| 5215 { | |
| 5216 n_extra = byte2cells(c) - 1; | |
| 5217 c = *p_extra++; | |
| 5218 } | |
| 674 | 5219 if (!attr_pri) |
| 7 | 5220 { |
| 5221 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
|
5222 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5223 saved_attr2 = char_attr; /* save current attr */ |
| 5224 } | |
| 5225 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5226 } | |
| 5227 else if (VIsual_active | |
| 5228 && (VIsual_mode == Ctrl_V | |
| 5229 || VIsual_mode == 'v') | |
| 5230 && virtual_active() | |
| 5231 && tocol != MAXCOL | |
| 5232 && vcol < tocol | |
| 5233 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5234 #ifdef FEAT_RIGHTLEFT |
| 7 | 5235 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5236 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5237 (col < wp->w_width))) |
| 7 | 5238 { |
| 5239 c = ' '; | |
| 5240 --ptr; /* put it back at the NUL */ | |
| 5241 } | |
| 910 | 5242 #if defined(LINE_ATTR) |
| 7 | 5243 else if (( |
| 5244 # ifdef FEAT_DIFF | |
| 910 | 5245 diff_hlf != (hlf_T)0 || |
| 7 | 5246 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5247 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5248 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
|
5249 # endif |
| 7 | 5250 line_attr != 0 |
| 5251 ) && ( | |
| 5252 # ifdef FEAT_RIGHTLEFT | |
| 5253 wp->w_p_rl ? (col >= 0) : | |
| 5254 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5255 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5256 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5257 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5258 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5259 < wp->w_width))) |
| 7 | 5260 { |
| 5261 /* Highlight until the right side of the window */ | |
| 5262 c = ' '; | |
| 5263 --ptr; /* put it back at the NUL */ | |
| 867 | 5264 |
| 5265 /* Remember we do the char for line highlighting. */ | |
| 5266 ++did_line_attr; | |
| 5267 | |
| 5268 /* 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
|
5269 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
|
5270 && (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
|
5271 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5272 char_attr = line_attr; |
| 7 | 5273 # ifdef FEAT_DIFF |
| 5274 if (diff_hlf == HLF_TXD) | |
| 5275 { | |
| 5276 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5277 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5278 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5279 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5280 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5281 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
|
5282 HL_ATTR(HLF_CUL)); |
| 6106 | 5283 } |
| 7 | 5284 } |
| 5285 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5286 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5287 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
|
5288 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5289 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
|
5290 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
|
5291 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
|
5292 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
|
5293 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5294 # endif |
| 7 | 5295 } |
| 5296 #endif | |
| 5297 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5298 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5299 #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
|
5300 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
|
5301 && (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
|
5302 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
|
5303 && ((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
|
5304 && !(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
|
5305 && 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
|
5306 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5307 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5308 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5309 && (syn_get_sub_char() != NUL || match_conc |
| 5310 || 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
|
5311 && 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
|
5312 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5313 /* 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
|
5314 * character. */ |
| 6947 | 5315 if (match_conc) |
| 5316 c = match_conc; | |
| 5317 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
|
5318 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5319 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5320 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5321 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5322 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5323 |
|
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
|
5324 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5325 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5326 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5327 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5328 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5329 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
|
5330 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5331 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5332 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5333 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5334 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5335 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5336 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5337 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5338 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5339 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5340 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5341 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5342 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5343 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5344 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5345 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5346 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5347 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5348 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5349 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5350 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5351 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5352 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
|
5353 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
|
5354 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5355 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5356 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5357 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5358 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5359 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5360 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
|
5361 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5362 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5363 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5364 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
|
5365 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5366 } |
|
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
|
5367 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5368 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
|
5369 // 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
|
5370 ++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
|
5371 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5372 #endif // FEAT_CONCEAL |
| 7 | 5373 } |
| 5374 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5375 #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
|
5376 /* 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
|
5377 * 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
|
5378 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
|
5379 && 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
|
5380 && 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
|
5381 && (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
|
5382 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5383 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5384 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
|
5385 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
|
5386 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5387 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5388 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
|
5389 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
|
5390 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
|
5391 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5392 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5393 |
| 7 | 5394 /* Don't override visual selection highlighting. */ |
| 5395 if (n_attr > 0 | |
| 5396 && draw_state == WL_LINE | |
| 674 | 5397 && !attr_pri) |
| 7 | 5398 char_attr = extra_attr; |
| 5399 | |
| 42 | 5400 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5401 /* XIM don't send preedit_start and preedit_end, but they send |
| 5402 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5403 * 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
|
5404 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
|
5405 && xic != NULL |
| 1850 | 5406 && lnum == wp->w_cursor.lnum |
| 7 | 5407 && (State & INSERT) |
| 5408 && !p_imdisable | |
| 5409 && im_is_preediting() | |
| 5410 && draw_state == WL_LINE) | |
| 5411 { | |
| 5412 colnr_T tcol; | |
| 5413 | |
| 5414 if (preedit_end_col == MAXCOL) | |
| 1850 | 5415 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5416 else |
| 5417 tcol = preedit_end_col; | |
| 5418 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5419 { | |
| 5420 if (feedback_old_attr < 0) | |
| 5421 { | |
| 5422 feedback_col = 0; | |
| 5423 feedback_old_attr = char_attr; | |
| 5424 } | |
| 5425 char_attr = im_get_feedback_attr(feedback_col); | |
| 5426 if (char_attr < 0) | |
| 5427 char_attr = feedback_old_attr; | |
| 5428 feedback_col++; | |
| 5429 } | |
| 5430 else if (feedback_old_attr >= 0) | |
| 5431 { | |
| 5432 char_attr = feedback_old_attr; | |
| 5433 feedback_old_attr = -1; | |
| 5434 feedback_col = 0; | |
| 5435 } | |
| 5436 } | |
| 5437 #endif | |
| 5438 /* | |
| 5439 * Handle the case where we are in column 0 but not on the first | |
| 5440 * character of the line and the user wants us to show us a | |
| 5441 * special character (via 'listchars' option "precedes:<char>". | |
| 5442 */ | |
| 5443 if (lcs_prec_todo != NUL | |
| 6276 | 5444 && wp->w_p_list |
| 7 | 5445 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5446 #ifdef FEAT_DIFF | |
| 5447 && filler_todo <= 0 | |
| 5448 #endif | |
| 5449 && draw_state > WL_NR | |
| 5450 && c != NUL) | |
| 5451 { | |
| 5452 c = lcs_prec; | |
| 5453 lcs_prec_todo = NUL; | |
| 3586 | 5454 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5455 { | |
| 5456 /* Double-width character being overwritten by the "precedes" | |
| 5457 * character, need to fill up half the character. */ | |
| 5458 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
|
5459 c_final = NUL; |
| 3586 | 5460 n_extra = 1; |
| 5461 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
|
5462 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5463 } |
| 7 | 5464 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
|
5465 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5466 { |
| 5467 mb_utf8 = TRUE; | |
| 714 | 5468 u8cc[0] = 0; |
| 819 | 5469 c = 0xc0; |
| 7 | 5470 } |
| 5471 else | |
| 5472 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5473 if (!attr_pri) |
| 7 | 5474 { |
| 5475 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
|
5476 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5477 n_attr3 = 1; |
| 5478 } | |
| 5479 } | |
| 5480 | |
| 5481 /* | |
| 867 | 5482 * At end of the text line or just after the last character. |
| 7 | 5483 */ |
| 867 | 5484 if (c == NUL |
| 910 | 5485 #if defined(LINE_ATTR) |
| 867 | 5486 || did_line_attr == 1 |
| 5487 #endif | |
| 5488 ) | |
| 5489 { | |
| 5490 #ifdef FEAT_SEARCH_EXTRA | |
| 5491 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5492 |
| 5493 /* we're not really at that column when skipping some text */ | |
| 1439 | 5494 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5495 ++prevcol; |
| 867 | 5496 #endif |
| 5497 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5498 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5499 * highlight match at end of line. If it's beyond the last |
| 5500 * char on the screen, just overwrite that one (tricky!) Not | |
| 5501 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5502 #ifdef FEAT_SEARCH_EXTRA |
| 5503 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5504 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5505 prevcol_hl_flag = TRUE; |
| 5506 else | |
| 5507 { | |
| 5508 cur = wp->w_match_head; | |
| 5509 while (cur != NULL) | |
| 5510 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5511 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5512 { |
| 5513 prevcol_hl_flag = TRUE; | |
| 5514 break; | |
| 5515 } | |
| 5516 cur = cur->next; | |
| 5517 } | |
| 5518 } | |
| 5519 #endif | |
| 7 | 5520 if (lcs_eol == lcs_eol_one |
| 1850 | 5521 && ((area_attr != 0 && vcol == fromcol |
| 5522 && (VIsual_mode != Ctrl_V | |
| 5523 || lnum == VIsual.lnum | |
| 5524 || lnum == curwin->w_cursor.lnum) | |
| 5525 && c == NUL) | |
| 7 | 5526 #ifdef FEAT_SEARCH_EXTRA |
| 5527 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5528 || (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
|
5529 # 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
|
5530 && !(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
|
5531 && !(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
|
5532 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5533 # 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
|
5534 && 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
|
5535 # endif |
| 910 | 5536 # if defined(LINE_ATTR) |
| 867 | 5537 && did_line_attr <= 1 |
| 5538 # endif | |
| 5539 ) | |
| 7 | 5540 #endif |
| 5541 )) | |
| 5542 { | |
| 5543 int n = 0; | |
| 5544 | |
| 5545 #ifdef FEAT_RIGHTLEFT | |
| 5546 if (wp->w_p_rl) | |
| 5547 { | |
| 5548 if (col < 0) | |
| 5549 n = 1; | |
| 5550 } | |
| 5551 else | |
| 5552 #endif | |
| 5553 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5554 if (col >= wp->w_width) |
| 7 | 5555 n = -1; |
| 5556 } | |
| 5557 if (n != 0) | |
| 5558 { | |
| 5559 /* At the window boundary, highlight the last character | |
| 5560 * instead (better than nothing). */ | |
| 5561 off += n; | |
| 5562 col += n; | |
| 5563 } | |
| 5564 else | |
| 5565 { | |
| 5566 /* Add a blank character to highlight. */ | |
| 5567 ScreenLines[off] = ' '; | |
| 5568 if (enc_utf8) | |
| 5569 ScreenLinesUC[off] = 0; | |
| 5570 } | |
| 5571 #ifdef FEAT_SEARCH_EXTRA | |
| 5572 if (area_attr == 0) | |
| 5573 { | |
| 1326 | 5574 /* Use attributes from match with highest priority among |
| 5575 * 'search_hl' and the match list. */ | |
| 5576 char_attr = search_hl.attr; | |
| 5577 cur = wp->w_match_head; | |
| 5578 shl_flag = FALSE; | |
| 5579 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5580 { |
| 1326 | 5581 if (shl_flag == FALSE |
| 5582 && ((cur != NULL | |
| 5583 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5584 || cur == NULL)) | |
| 699 | 5585 { |
| 1326 | 5586 shl = &search_hl; |
| 5587 shl_flag = TRUE; | |
| 699 | 5588 } |
| 1326 | 5589 else |
| 5590 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5591 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
|
5592 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5593 char_attr = shl->attr; |
| 5594 if (shl != &search_hl && cur != NULL) | |
| 5595 cur = cur->next; | |
| 699 | 5596 } |
| 7 | 5597 } |
| 5598 #endif | |
| 5599 ScreenAttrs[off] = char_attr; | |
| 5600 #ifdef FEAT_RIGHTLEFT | |
| 5601 if (wp->w_p_rl) | |
| 1437 | 5602 { |
| 7 | 5603 --col; |
| 1437 | 5604 --off; |
| 5605 } | |
| 7 | 5606 else |
| 5607 #endif | |
| 1437 | 5608 { |
| 7 | 5609 ++col; |
| 1437 | 5610 ++off; |
| 5611 } | |
| 743 | 5612 ++vcol; |
| 1437 | 5613 #ifdef FEAT_SYN_HL |
| 5614 eol_hl_off = 1; | |
| 5615 #endif | |
| 743 | 5616 } |
| 867 | 5617 } |
| 5618 | |
| 5619 /* | |
| 5620 * At end of the text line. | |
| 5621 */ | |
| 5622 if (c == NUL) | |
| 5623 { | |
| 743 | 5624 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5625 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5626 if (wp->w_p_wrap) |
| 5627 v = wp->w_skipcol; | |
| 5628 else | |
| 5629 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5630 |
| 820 | 5631 /* check if line ends before left margin */ |
| 5632 if (vcol < v + col - win_col_off(wp)) | |
| 5633 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
|
5634 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5635 // 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
|
5636 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5637 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5638 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5639 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5640 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5641 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5642 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
|
5643 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5644 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5645 && (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
|
5646 && (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
|
5647 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
|
5648 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5649 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5650 || win_attr != 0) |
| 743 | 5651 # ifdef FEAT_RIGHTLEFT |
| 5652 && !wp->w_p_rl | |
| 5653 # endif | |
| 5654 ) | |
| 5655 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5656 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5657 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5658 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5659 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5660 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5661 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5662 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5663 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
|
5664 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5665 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5666 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5667 while (col < wp->w_width) |
| 743 | 5668 { |
| 5669 ScreenLines[off] = ' '; | |
| 5670 if (enc_utf8) | |
| 5671 ScreenLinesUC[off] = 0; | |
| 5672 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5673 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5674 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
|
5675 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5676 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5677 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
|
5678 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
|
5679 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
|
5680 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5681 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5682 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5683 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5684 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5685 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5686 |
| 743 | 5687 ++vcol; |
| 5688 } | |
| 5689 } | |
| 5690 #endif | |
| 7 | 5691 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5692 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
|
5693 (int)wp->w_width, screen_line_flags); |
| 7 | 5694 row++; |
| 5695 | |
| 5696 /* | |
| 5697 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5698 * updated (saves a call to plines() later). | |
| 5699 */ | |
| 5700 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5701 { | |
| 5702 curwin->w_cline_row = startrow; | |
| 5703 curwin->w_cline_height = row - startrow; | |
| 5704 #ifdef FEAT_FOLDING | |
| 5705 curwin->w_cline_folded = FALSE; | |
| 5706 #endif | |
| 5707 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5708 } | |
| 5709 | |
| 5710 break; | |
| 5711 } | |
| 5712 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5713 // 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
|
5714 // '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
|
5715 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
|
5716 && wp->w_p_list |
| 7 | 5717 && !wp->w_p_wrap |
| 5718 #ifdef FEAT_DIFF | |
| 5719 && filler_todo <= 0 | |
| 5720 #endif | |
| 5721 && ( | |
| 5722 #ifdef FEAT_RIGHTLEFT | |
| 5723 wp->w_p_rl ? col == 0 : | |
| 5724 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5725 col == wp->w_width - 1) |
| 7 | 5726 && (*ptr != NUL |
| 1555 | 5727 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5728 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5729 { | |
| 5730 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
|
5731 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5732 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
|
5733 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5734 { |
| 5735 mb_utf8 = TRUE; | |
| 714 | 5736 u8cc[0] = 0; |
| 819 | 5737 c = 0xc0; |
| 7 | 5738 } |
| 5739 else | |
| 5740 mb_utf8 = FALSE; | |
| 5741 } | |
| 5742 | |
| 743 | 5743 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5744 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5745 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5746 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
|
5747 |
| 743 | 5748 /* 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
|
5749 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5750 * 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
|
5751 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5752 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
|
5753 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
|
5754 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5755 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5756 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
|
5757 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5758 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5759 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
|
5760 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
|
5761 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5762 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
|
5763 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5764 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
|
5765 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
|
5766 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5767 } |
| 743 | 5768 #endif |
| 5769 | |
| 7 | 5770 /* |
| 5771 * Store character to be displayed. | |
| 5772 * Skip characters that are left of the screen for 'nowrap'. | |
| 5773 */ | |
| 5774 vcol_prev = vcol; | |
| 5775 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5776 { | |
| 5777 /* | |
| 5778 * Store the character. | |
| 5779 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5780 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5781 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5782 { | |
| 5783 /* A double-wide character is: put first halve in left cell. */ | |
| 5784 --off; | |
| 5785 --col; | |
| 5786 } | |
| 5787 #endif | |
| 5788 ScreenLines[off] = c; | |
| 5789 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5790 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5791 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5792 ScreenLines[off] = 0x8e; |
| 7 | 5793 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5794 } |
| 7 | 5795 else if (enc_utf8) |
| 5796 { | |
| 5797 if (mb_utf8) | |
| 5798 { | |
| 1326 | 5799 int i; |
| 5800 | |
| 7 | 5801 ScreenLinesUC[off] = mb_c; |
| 819 | 5802 if ((c & 0xff) == 0) |
| 5803 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5804 for (i = 0; i < Screen_mco; ++i) |
| 5805 { | |
| 5806 ScreenLinesC[i][off] = u8cc[i]; | |
| 5807 if (u8cc[i] == 0) | |
| 5808 break; | |
| 5809 } | |
| 7 | 5810 } |
| 5811 else | |
| 5812 ScreenLinesUC[off] = 0; | |
| 5813 } | |
| 5814 if (multi_attr) | |
| 5815 { | |
| 5816 ScreenAttrs[off] = multi_attr; | |
| 5817 multi_attr = 0; | |
| 5818 } | |
| 5819 else | |
| 5820 ScreenAttrs[off] = char_attr; | |
| 5821 | |
| 5822 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5823 { | |
| 5824 /* Need to fill two screen columns. */ | |
| 5825 ++off; | |
| 5826 ++col; | |
| 5827 if (enc_utf8) | |
| 5828 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5829 ScreenLines[off] = 0; | |
| 5830 else | |
| 5831 /* DBCS: Put second byte in the second screen char. */ | |
| 5832 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5833 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5834 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5835 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5836 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5837 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5838 ++vcol; |
| 7 | 5839 /* When "tocol" is halfway a character, set it to the end of |
| 5840 * the character, otherwise highlighting won't stop. */ | |
| 5841 if (tocol == vcol) | |
| 5842 ++tocol; | |
| 5843 #ifdef FEAT_RIGHTLEFT | |
| 5844 if (wp->w_p_rl) | |
| 5845 { | |
| 5846 /* now it's time to backup one cell */ | |
| 5847 --off; | |
| 5848 --col; | |
| 5849 } | |
| 5850 #endif | |
| 5851 } | |
| 5852 #ifdef FEAT_RIGHTLEFT | |
| 5853 if (wp->w_p_rl) | |
| 5854 { | |
| 5855 --off; | |
| 5856 --col; | |
| 5857 } | |
| 5858 else | |
| 5859 #endif | |
| 5860 { | |
| 5861 ++off; | |
| 5862 ++col; | |
| 5863 } | |
| 5864 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5865 #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
|
5866 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
|
5867 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5868 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5869 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5870 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5871 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5872 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5873 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5874 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5875 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5876 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5877 * 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
|
5878 * 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
|
5879 * 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
|
5880 * 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
|
5881 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5882 * 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
|
5883 * 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
|
5884 * 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
|
5885 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5886 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5887 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5888 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5889 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5890 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5891 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5892 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5893 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5894 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5895 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5896 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5897 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5898 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5899 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5900 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5901 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5902 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5903 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5904 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5905 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5906 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5907 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
|
5908 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5909 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5910 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5911 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5912 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5913 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5914 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5915 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5916 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5917 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5918 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5919 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5920 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5921 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5922 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5923 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5924 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5925 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5926 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5927 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5928 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5929 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5930 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5931 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5932 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5933 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5934 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5935 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5936 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5937 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5938 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5939 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5940 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5941 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5942 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5943 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5944 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5945 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5946 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5947 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5948 #endif /* FEAT_CONCEAL */ |
| 7 | 5949 else |
| 5950 --n_skip; | |
| 5951 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5952 /* 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
|
5953 * column. */ |
| 1849 | 5954 if (draw_state > WL_NR |
| 7 | 5955 #ifdef FEAT_DIFF |
| 5956 && filler_todo <= 0 | |
| 5957 #endif | |
| 5958 ) | |
| 5959 ++vcol; | |
| 5960 | |
| 743 | 5961 #ifdef FEAT_SYN_HL |
| 5962 if (vcol_save_attr >= 0) | |
| 5963 char_attr = vcol_save_attr; | |
| 5964 #endif | |
| 5965 | |
| 7 | 5966 /* restore attributes after "predeces" in 'listchars' */ |
| 5967 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5968 char_attr = saved_attr3; | |
| 5969 | |
| 5970 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5971 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5972 char_attr = saved_attr2; | |
| 5973 | |
| 5974 /* | |
| 5975 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5976 * so far. If there is no more to display it is caught above. |
| 7 | 5977 */ |
| 5978 if (( | |
| 5979 #ifdef FEAT_RIGHTLEFT | |
| 5980 wp->w_p_rl ? (col < 0) : | |
| 5981 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5982 (col >= wp->w_width)) |
| 7 | 5983 && (*ptr != NUL |
| 5984 #ifdef FEAT_DIFF | |
| 5985 || filler_todo > 0 | |
| 5986 #endif | |
| 2724 | 5987 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5988 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5989 ) | |
| 5990 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5991 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5992 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
|
5993 (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
|
5994 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5995 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5996 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
|
5997 (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
|
5998 #endif |
| 7 | 5999 ++row; |
| 6000 ++screen_row; | |
| 6001 | |
| 6002 /* When not wrapping and finished diff lines, or when displayed | |
| 6003 * '$' and highlighting until last column, break here. */ | |
| 6004 if ((!wp->w_p_wrap | |
| 6005 #ifdef FEAT_DIFF | |
| 6006 && filler_todo <= 0 | |
| 6007 #endif | |
| 6008 ) || lcs_eol_one == -1) | |
| 6009 break; | |
| 6010 | |
| 6011 /* When the window is too narrow draw all "@" lines. */ | |
| 6012 if (draw_state != WL_LINE | |
| 6013 #ifdef FEAT_DIFF | |
| 6014 && filler_todo <= 0 | |
| 6015 #endif | |
| 6016 ) | |
| 6017 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
6018 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 6019 draw_vsep_win(wp, row); |
| 6020 row = endrow; | |
| 6021 } | |
| 6022 | |
| 6023 /* When line got too long for screen break here. */ | |
| 6024 if (row == endrow) | |
| 6025 { | |
| 6026 ++row; | |
| 6027 break; | |
| 6028 } | |
| 6029 | |
| 6030 if (screen_cur_row == screen_row - 1 | |
| 6031 #ifdef FEAT_DIFF | |
| 6032 && filler_todo <= 0 | |
| 6033 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6034 && wp->w_width == Columns) |
| 7 | 6035 { |
| 6036 /* Remember that the line wraps, used for modeless copy. */ | |
| 6037 LineWraps[screen_row - 1] = TRUE; | |
| 6038 | |
| 6039 /* | |
| 6040 * Special trick to make copy/paste of wrapped lines work with | |
| 6041 * xterm/screen: write an extra character beyond the end of | |
| 6042 * the line. This will work with all terminal types | |
| 6043 * (regardless of the xn,am settings). | |
| 6044 * Only do this on a fast tty. | |
| 6045 * Only do this if the cursor is on the current line | |
| 6046 * (something has been written in it). | |
| 6047 * Don't do this for the GUI. | |
| 6048 * Don't do this for double-width characters. | |
| 6049 * Don't do this for a window not at the right screen border. | |
| 6050 */ | |
| 6051 if (p_tf | |
| 6052 #ifdef FEAT_GUI | |
| 6053 && !gui.in_use | |
| 6054 #endif | |
| 6055 && !(has_mbyte | |
| 1378 | 6056 && ((*mb_off2cells)(LineOffset[screen_row], |
| 6057 LineOffset[screen_row] + screen_Columns) | |
| 6058 == 2 | |
| 7 | 6059 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 6060 + (int)Columns - 2, |
| 6061 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6062 == 2))) |
| 7 | 6063 { |
| 6064 /* First make sure we are at the end of the screen line, | |
| 6065 * then output the same character again to let the | |
| 6066 * terminal know about the wrap. If the terminal doesn't | |
| 6067 * 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
|
6068 if (screen_cur_col != wp->w_width) |
| 7 | 6069 screen_char(LineOffset[screen_row - 1] |
| 6070 + (unsigned)Columns - 1, | |
| 6071 screen_row - 1, (int)(Columns - 1)); | |
| 6072 | |
| 6073 /* When there is a multi-byte character, just output a | |
| 6074 * space to keep it simple. */ | |
| 148 | 6075 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 6076 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 6077 out_char(' '); |
| 6078 else | |
| 6079 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 6080 + (Columns - 1)]); | |
| 6081 /* force a redraw of the first char on the next line */ | |
| 6082 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 6083 screen_start(); /* don't know where cursor is now */ | |
| 6084 } | |
| 6085 } | |
| 6086 | |
| 6087 col = 0; | |
| 6088 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6089 #ifdef FEAT_RIGHTLEFT | |
| 6090 if (wp->w_p_rl) | |
| 6091 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6092 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 6093 off += col; |
| 6094 } | |
| 6095 #endif | |
| 6096 | |
| 6097 /* reset the drawing state for the start of a wrapped line */ | |
| 6098 draw_state = WL_START; | |
| 6099 saved_n_extra = n_extra; | |
| 6100 saved_p_extra = p_extra; | |
| 6101 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
|
6102 saved_c_final = c_final; |
| 7 | 6103 saved_char_attr = char_attr; |
| 6104 n_extra = 0; | |
| 6105 lcs_prec_todo = lcs_prec; | |
| 6106 #ifdef FEAT_LINEBREAK | |
| 6107 # ifdef FEAT_DIFF | |
| 6108 if (filler_todo <= 0) | |
| 6109 # endif | |
| 6110 need_showbreak = TRUE; | |
| 6111 #endif | |
| 6112 #ifdef FEAT_DIFF | |
| 6113 --filler_todo; | |
| 6114 /* When the filler lines are actually below the last line of the | |
| 6115 * file, don't draw the line itself, break here. */ | |
| 6116 if (filler_todo == 0 && wp->w_botfill) | |
| 6117 break; | |
| 6118 #endif | |
| 6119 } | |
| 6120 | |
| 6121 } /* for every character in the line */ | |
| 6122 | |
| 743 | 6123 #ifdef FEAT_SPELL |
| 386 | 6124 /* After an empty line check first word for capital. */ |
| 6125 if (*skipwhite(line) == NUL) | |
| 6126 { | |
| 6127 capcol_lnum = lnum + 1; | |
| 6128 cap_col = 0; | |
| 6129 } | |
| 6130 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6131 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6132 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6133 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6134 #endif |
| 386 | 6135 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6136 vim_free(p_extra_free); |
| 7 | 6137 return row; |
| 6138 } | |
| 6139 | |
| 714 | 6140 /* |
| 6141 * 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
|
6142 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6143 */ |
| 6144 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6145 comp_char_differs(int off_from, int off_to) |
| 714 | 6146 { |
| 6147 int i; | |
| 6148 | |
| 6149 for (i = 0; i < Screen_mco; ++i) | |
| 6150 { | |
| 6151 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6152 return TRUE; | |
| 6153 if (ScreenLinesC[i][off_from] == 0) | |
| 6154 break; | |
| 6155 } | |
| 6156 return FALSE; | |
| 6157 } | |
| 6158 | |
| 7 | 6159 /* |
| 6160 * Check whether the given character needs redrawing: | |
| 6161 * - the (first byte of the) character is different | |
| 6162 * - the attributes are different | |
| 6163 * - the character is multi-byte and the next byte is different | |
| 1616 | 6164 * - the character is two cells wide and the second cell differs. |
| 7 | 6165 */ |
| 6166 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6167 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6168 { |
| 6169 if (cols > 0 | |
| 6170 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6171 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6172 || (enc_dbcs != 0 | |
| 6173 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6174 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6175 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6176 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6177 != ScreenLines[off_to + 1]))) | |
| 6178 || (enc_utf8 | |
| 6179 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6180 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6181 && comp_char_differs(off_from, off_to)) |
| 3759 | 6182 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6183 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6184 != ScreenLines[off_to + 1]))))) |
| 7 | 6185 return TRUE; |
| 6186 return FALSE; | |
| 6187 } | |
| 6188 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6189 #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
|
6190 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6191 * 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
|
6192 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6193 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6194 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
|
6195 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6196 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
|
6197 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6198 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6199 |
| 7 | 6200 /* |
| 6201 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6202 * have actually changed. Handle insert/delete character. | |
| 6203 * "coloff" gives the first column on the screen for this line. | |
| 6204 * "endcol" gives the columns where valid characters are. | |
| 6205 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6206 * 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
|
6207 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6208 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6209 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6210 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6211 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6212 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6213 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6214 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6215 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6216 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6217 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
|
6218 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6219 int flags UNUSED) |
| 7 | 6220 { |
| 6221 unsigned off_from; | |
| 6222 unsigned off_to; | |
| 1378 | 6223 unsigned max_off_from; |
| 6224 unsigned max_off_to; | |
| 7 | 6225 int col = 0; |
| 6226 int hl; | |
| 6227 int force = FALSE; /* force update rest of the line */ | |
| 6228 int redraw_this /* bool: does character need redraw? */ | |
| 6229 #ifdef FEAT_GUI | |
| 6230 = TRUE /* For GUI when while-loop empty */ | |
| 6231 #endif | |
| 6232 ; | |
| 6233 int redraw_next; /* redraw_this for next character */ | |
| 6234 int clear_next = FALSE; | |
| 6235 int char_cells; /* 1: normal char */ | |
| 6236 /* 2: occupies two display cells */ | |
| 6237 # define CHAR_CELLS char_cells | |
| 6238 | |
| 3413 | 6239 /* Check for illegal row and col, just in case. */ |
| 6240 if (row >= Rows) | |
| 6241 row = Rows - 1; | |
| 6242 if (endcol > Columns) | |
| 6243 endcol = Columns; | |
| 6244 | |
| 7 | 6245 # ifdef FEAT_CLIPBOARD |
| 6246 clip_may_clear_selection(row, row); | |
| 6247 # endif | |
| 6248 | |
| 6249 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6250 off_to = LineOffset[row] + coloff; | |
| 1378 | 6251 max_off_from = off_from + screen_Columns; |
| 6252 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6253 |
| 6254 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6255 if (flags & SLF_RIGHTLEFT) |
| 7 | 6256 { |
| 6257 /* Clear rest first, because it's left of the text. */ | |
| 6258 if (clear_width > 0) | |
| 6259 { | |
| 6260 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6261 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6262 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6263 { |
| 6264 ++off_to; | |
| 6265 ++col; | |
| 6266 } | |
| 6267 if (col <= endcol) | |
| 6268 screen_fill(row, row + 1, col + coloff, | |
| 6269 endcol + coloff + 1, ' ', ' ', 0); | |
| 6270 } | |
| 6271 col = endcol + 1; | |
| 6272 off_to = LineOffset[row] + col + coloff; | |
| 6273 off_from += col; | |
| 6274 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6275 } | |
| 6276 #endif /* FEAT_RIGHTLEFT */ | |
| 6277 | |
| 6278 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6279 | |
| 6280 while (col < endcol) | |
| 6281 { | |
| 6282 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6283 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6284 else |
| 6285 char_cells = 1; | |
| 6286 | |
| 6287 redraw_this = redraw_next; | |
| 6288 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6289 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6290 | |
| 6291 #ifdef FEAT_GUI | |
| 6292 /* If the next character was bold, then redraw the current character to | |
| 6293 * remove any pixels that might have spilt over into us. This only | |
| 6294 * happens in the GUI. | |
| 6295 */ | |
| 6296 if (redraw_next && gui.in_use) | |
| 6297 { | |
| 6298 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6299 if (hl > HL_ALL) |
| 6300 hl = syn_attr2attr(hl); | |
| 6301 if (hl & HL_BOLD) | |
| 7 | 6302 redraw_this = TRUE; |
| 6303 } | |
| 6304 #endif | |
| 6305 | |
| 6306 if (redraw_this) | |
| 6307 { | |
| 6308 /* | |
| 6309 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6310 * Attributes for characters are stored at the position where the | |
| 6311 * cursor is when writing the highlighting code. The | |
| 6312 * start-highlighting code must be written with the cursor on the | |
| 6313 * first highlighted character. The stop-highlighting code must | |
| 6314 * be written with the cursor just after the last highlighted | |
| 6315 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6316 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6317 * to clear the rest of the line, and force redrawing it |
| 6318 * completely. | |
| 6319 */ | |
| 6320 if ( p_wiv | |
| 6321 && !force | |
| 6322 #ifdef FEAT_GUI | |
| 6323 && !gui.in_use | |
| 6324 #endif | |
| 6325 && ScreenAttrs[off_to] != 0 | |
| 6326 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6327 { | |
| 6328 /* | |
| 6329 * Need to remove highlighting attributes here. | |
| 6330 */ | |
| 6331 windgoto(row, col + coloff); | |
| 6332 out_str(T_CE); /* clear rest of this screen line */ | |
| 6333 screen_start(); /* don't know where cursor is now */ | |
| 6334 force = TRUE; /* force redraw of rest of the line */ | |
| 6335 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6336 | |
| 6337 /* | |
| 6338 * If the previous character was highlighted, need to stop | |
| 6339 * highlighting at this character. | |
| 6340 */ | |
| 6341 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6342 { | |
| 6343 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6344 term_windgoto(row, col + coloff); | |
| 6345 screen_stop_highlight(); | |
| 6346 } | |
| 6347 else | |
| 6348 screen_attr = 0; /* highlighting has stopped */ | |
| 6349 } | |
| 6350 if (enc_dbcs != 0) | |
| 6351 { | |
| 6352 /* Check if overwriting a double-byte with a single-byte or | |
| 6353 * the other way around requires another character to be | |
| 6354 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6355 * ScreenLinesUC[] is sufficient. */ | |
| 6356 if (char_cells == 1 | |
| 6357 && col + 1 < endcol | |
| 1378 | 6358 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6359 { |
| 6360 /* Writing a single-cell character over a double-cell | |
| 6361 * character: need to redraw the next cell. */ | |
| 6362 ScreenLines[off_to + 1] = 0; | |
| 6363 redraw_next = TRUE; | |
| 6364 } | |
| 6365 else if (char_cells == 2 | |
| 6366 && col + 2 < endcol | |
| 1378 | 6367 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6368 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6369 { |
| 6370 /* Writing the second half of a double-cell character over | |
| 6371 * a double-cell character: need to redraw the second | |
| 6372 * cell. */ | |
| 6373 ScreenLines[off_to + 2] = 0; | |
| 6374 redraw_next = TRUE; | |
| 6375 } | |
| 6376 | |
| 6377 if (enc_dbcs == DBCS_JPNU) | |
| 6378 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6379 } | |
| 6380 /* When writing a single-width character over a double-width | |
| 6381 * character and at the end of the redrawn text, need to clear out | |
| 6382 * the right halve of the old character. | |
| 6383 * Also required when writing the right halve of a double-width | |
| 6384 * char over the left halve of an existing one. */ | |
| 6385 if (has_mbyte && col + char_cells == endcol | |
| 6386 && ((char_cells == 1 | |
| 1378 | 6387 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6388 || (char_cells == 2 |
| 1378 | 6389 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6390 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6391 clear_next = TRUE; |
| 6392 | |
| 6393 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6394 if (enc_utf8) | |
| 6395 { | |
| 6396 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6397 if (ScreenLinesUC[off_from] != 0) | |
| 6398 { | |
| 714 | 6399 int i; |
| 6400 | |
| 6401 for (i = 0; i < Screen_mco; ++i) | |
| 6402 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6403 } |
| 6404 } | |
| 6405 if (char_cells == 2) | |
| 6406 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6407 | |
| 6408 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6409 /* The bold trick makes a single column of pixels appear in the |
| 6410 * next character. When a bold character is removed, the next | |
| 7 | 6411 * character should be redrawn too. This happens for our own GUI |
| 6412 * and for some xterms. */ | |
| 6413 if ( | |
| 6414 # ifdef FEAT_GUI | |
| 6415 gui.in_use | |
| 6416 # endif | |
| 6417 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6418 || | |
| 6419 # endif | |
| 6420 # ifdef UNIX | |
| 6421 term_is_xterm | |
| 6422 # endif | |
| 6423 ) | |
| 6424 { | |
| 6425 hl = ScreenAttrs[off_to]; | |
| 743 | 6426 if (hl > HL_ALL) |
| 6427 hl = syn_attr2attr(hl); | |
| 6428 if (hl & HL_BOLD) | |
| 7 | 6429 redraw_next = TRUE; |
| 6430 } | |
| 6431 #endif | |
| 6432 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6433 |
| 819 | 6434 /* For simplicity set the attributes of second half of a |
| 6435 * double-wide character equal to the first half. */ | |
| 6436 if (char_cells == 2) | |
| 6437 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6438 | |
| 7 | 6439 if (enc_dbcs != 0 && char_cells == 2) |
| 6440 screen_char_2(off_to, row, col + coloff); | |
| 6441 else | |
| 6442 screen_char(off_to, row, col + coloff); | |
| 6443 } | |
| 6444 else if ( p_wiv | |
| 6445 #ifdef FEAT_GUI | |
| 6446 && !gui.in_use | |
| 6447 #endif | |
| 6448 && col + coloff > 0) | |
| 6449 { | |
| 6450 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6451 { | |
| 6452 /* | |
| 6453 * Don't output stop-highlight when moving the cursor, it will | |
| 6454 * stop the highlighting when it should continue. | |
| 6455 */ | |
| 6456 screen_attr = 0; | |
| 6457 } | |
| 6458 else if (screen_attr != 0) | |
| 6459 screen_stop_highlight(); | |
| 6460 } | |
| 6461 | |
| 6462 off_to += CHAR_CELLS; | |
| 6463 off_from += CHAR_CELLS; | |
| 6464 col += CHAR_CELLS; | |
| 6465 } | |
| 6466 | |
| 6467 if (clear_next) | |
| 6468 { | |
| 6469 /* Clear the second half of a double-wide character of which the left | |
| 6470 * half was overwritten with a single-wide character. */ | |
| 6471 ScreenLines[off_to] = ' '; | |
| 6472 if (enc_utf8) | |
| 6473 ScreenLinesUC[off_to] = 0; | |
| 6474 screen_char(off_to, row, col + coloff); | |
| 6475 } | |
| 6476 | |
| 6477 if (clear_width > 0 | |
| 6478 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6479 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6480 #endif |
| 6481 ) | |
| 6482 { | |
| 6483 #ifdef FEAT_GUI | |
| 6484 int startCol = col; | |
| 6485 #endif | |
| 6486 | |
| 6487 /* blank out the rest of the line */ | |
| 6488 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6489 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6490 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6491 { |
| 6492 ++off_to; | |
| 6493 ++col; | |
| 6494 } | |
| 6495 if (col < clear_width) | |
| 6496 { | |
| 6497 #ifdef FEAT_GUI | |
| 6498 /* | |
| 6499 * In the GUI, clearing the rest of the line may leave pixels | |
| 6500 * behind if the first character cleared was bold. Some bold | |
| 6501 * fonts spill over the left. In this case we redraw the previous | |
| 6502 * character too. If we didn't skip any blanks above, then we | |
| 6503 * only redraw if the character wasn't already redrawn anyway. | |
| 6504 */ | |
| 996 | 6505 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6506 { |
| 6507 hl = ScreenAttrs[off_to]; | |
| 6508 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6509 { |
| 6510 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6511 |
| 996 | 6512 if (enc_utf8) |
| 6513 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6514 * that its width is 2. */ | |
| 6515 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6516 else if (enc_dbcs != 0) | |
| 6517 { | |
| 6518 /* find previous character by counting from first | |
| 6519 * column and get its width. */ | |
| 6520 unsigned off = LineOffset[row]; | |
| 1378 | 6521 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6522 |
| 6523 while (off < off_to) | |
| 6524 { | |
| 1378 | 6525 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6526 off += prev_cells; |
| 6527 } | |
| 6528 } | |
| 6529 | |
| 6530 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6531 screen_char_2(off_to - prev_cells, row, | |
| 6532 col + coloff - prev_cells); | |
| 6533 else | |
| 6534 screen_char(off_to - prev_cells, row, | |
| 6535 col + coloff - prev_cells); | |
| 6536 } | |
| 7 | 6537 } |
| 6538 #endif | |
| 6539 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6540 ' ', ' ', 0); | |
| 6541 off_to += clear_width - col; | |
| 6542 col = clear_width; | |
| 6543 } | |
| 6544 } | |
| 6545 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6546 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6547 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6548 && !(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
|
6549 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6550 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6551 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6552 // 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
|
6553 // right of the window contents. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6554 if (coloff + col < Columns) |
| 7 | 6555 { |
| 6556 int c; | |
| 6557 | |
| 6558 c = fillchar_vsep(&hl); | |
| 6477 | 6559 if (ScreenLines[off_to] != (schar_T)c |
| 714 | 6560 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6561 != (c >= 0x80 ? c : 0)) | |
| 7 | 6562 || ScreenAttrs[off_to] != hl) |
| 6563 { | |
| 6564 ScreenLines[off_to] = c; | |
| 6565 ScreenAttrs[off_to] = hl; | |
| 6566 if (enc_utf8) | |
| 6567 { | |
| 6568 if (c >= 0x80) | |
| 6569 { | |
| 6570 ScreenLinesUC[off_to] = c; | |
| 714 | 6571 ScreenLinesC[0][off_to] = 0; |
| 7 | 6572 } |
| 6573 else | |
| 6574 ScreenLinesUC[off_to] = 0; | |
| 6575 } | |
| 6576 screen_char(off_to, row, col + coloff); | |
| 6577 } | |
| 6578 } | |
| 6579 else | |
| 6580 LineWraps[row] = FALSE; | |
| 6581 } | |
| 6582 } | |
| 6583 | |
| 474 | 6584 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6585 /* |
| 474 | 6586 * Mirror text "str" for right-left displaying. |
| 6587 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6588 */ |
| 474 | 6589 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6590 rl_mirror(char_u *str) |
| 7 | 6591 { |
| 6592 char_u *p1, *p2; | |
| 6593 int t; | |
| 6594 | |
| 6595 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6596 { | |
| 6597 t = *p1; | |
| 6598 *p1 = *p2; | |
| 6599 *p2 = t; | |
| 6600 } | |
| 6601 } | |
| 6602 #endif | |
| 6603 | |
| 6604 /* | |
| 6605 * mark all status lines for redraw; used after first :cd | |
| 6606 */ | |
| 6607 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6608 status_redraw_all(void) |
| 7 | 6609 { |
| 6610 win_T *wp; | |
| 6611 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6612 FOR_ALL_WINDOWS(wp) |
| 7 | 6613 if (wp->w_status_height) |
| 6614 { | |
| 6615 wp->w_redr_status = TRUE; | |
| 6616 redraw_later(VALID); | |
| 6617 } | |
| 6618 } | |
| 6619 | |
| 6620 /* | |
| 6621 * mark all status lines of the current buffer for redraw | |
| 6622 */ | |
| 6623 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6624 status_redraw_curbuf(void) |
| 7 | 6625 { |
| 6626 win_T *wp; | |
| 6627 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6628 FOR_ALL_WINDOWS(wp) |
| 7 | 6629 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6630 { | |
| 6631 wp->w_redr_status = TRUE; | |
| 6632 redraw_later(VALID); | |
| 6633 } | |
| 6634 } | |
| 6635 | |
| 6636 /* | |
| 6637 * Redraw all status lines that need to be redrawn. | |
| 6638 */ | |
| 6639 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6640 redraw_statuslines(void) |
| 7 | 6641 { |
| 6642 win_T *wp; | |
| 6643 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6644 FOR_ALL_WINDOWS(wp) |
| 7 | 6645 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
|
6646 win_redr_status(wp, FALSE); |
| 673 | 6647 if (redraw_tabline) |
| 677 | 6648 draw_tabline(); |
| 7 | 6649 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6650 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6651 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6652 /* |
| 6653 * Redraw all status lines at the bottom of frame "frp". | |
| 6654 */ | |
| 6655 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6656 win_redraw_last_status(frame_T *frp) |
| 7 | 6657 { |
| 6658 if (frp->fr_layout == FR_LEAF) | |
| 6659 frp->fr_win->w_redr_status = TRUE; | |
| 6660 else if (frp->fr_layout == FR_ROW) | |
| 6661 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6662 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6663 win_redraw_last_status(frp); |
| 6664 } | |
| 6665 else /* frp->fr_layout == FR_COL */ | |
| 6666 { | |
| 6667 frp = frp->fr_child; | |
| 6668 while (frp->fr_next != NULL) | |
| 6669 frp = frp->fr_next; | |
| 6670 win_redraw_last_status(frp); | |
| 6671 } | |
| 6672 } | |
| 6673 #endif | |
| 6674 | |
| 6675 /* | |
| 6676 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6677 */ | |
| 6678 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6679 draw_vsep_win(win_T *wp, int row) |
| 7 | 6680 { |
| 6681 int hl; | |
| 6682 int c; | |
| 6683 | |
| 6684 if (wp->w_vsep_width) | |
| 6685 { | |
| 6686 /* draw the vertical separator right of this window */ | |
| 6687 c = fillchar_vsep(&hl); | |
| 6688 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6689 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6690 c, ' ', hl); | |
| 6691 } | |
| 6692 } | |
| 6693 | |
| 6694 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6695 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6696 |
| 6697 /* | |
| 1378 | 6698 * Get the length of an item as it will be shown in the status line. |
| 7 | 6699 */ |
| 6700 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6701 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6702 { |
| 6703 int len = 0; | |
| 6704 | |
| 6705 #ifdef FEAT_MENU | |
| 6706 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6707 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6708 | |
| 6709 /* Check for menu separators - replace with '|'. */ | |
| 6710 if (emenu && menu_is_separator(s)) | |
| 6711 return 1; | |
| 6712 #endif | |
| 6713 | |
| 6714 while (*s != NUL) | |
| 6715 { | |
| 1685 | 6716 s += skip_status_match_char(xp, s); |
| 42 | 6717 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6718 MB_PTR_ADV(s); |
| 7 | 6719 } |
| 6720 | |
| 6721 return len; | |
| 6722 } | |
| 6723 | |
| 6724 /* | |
| 1685 | 6725 * Return the number of characters that should be skipped in a status match. |
| 277 | 6726 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6727 */ | |
| 6728 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6729 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6730 { |
| 1685 | 6731 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6732 #ifdef FEAT_MENU |
| 6733 || ((xp->xp_context == EXPAND_MENUS | |
| 6734 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6735 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6736 #endif | |
| 1685 | 6737 ) |
| 6738 { | |
| 6739 #ifndef BACKSLASH_IN_FILENAME | |
| 6740 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6741 return 2; | |
| 6742 #endif | |
| 6743 return 1; | |
| 6744 } | |
| 6745 return 0; | |
| 277 | 6746 } |
| 6747 | |
| 6748 /* | |
| 7 | 6749 * Show wildchar matches in the status line. |
| 6750 * Show at least the "match" item. | |
| 6751 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6752 * | |
| 6753 * If inversion is possible we use it. Else '=' characters are used. | |
| 6754 */ | |
| 6755 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6756 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6757 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6758 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6759 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6760 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6761 int showtail) |
| 7 | 6762 { |
| 6763 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6764 int row; | |
| 6765 char_u *buf; | |
| 6766 int len; | |
| 1378 | 6767 int clen; /* length in screen cells */ |
| 7 | 6768 int fillchar; |
| 6769 int attr; | |
| 6770 int i; | |
| 6771 int highlight = TRUE; | |
| 6772 char_u *selstart = NULL; | |
| 6773 int selstart_col = 0; | |
| 6774 char_u *selend = NULL; | |
| 6775 static int first_match = 0; | |
| 6776 int add_left = FALSE; | |
| 6777 char_u *s; | |
| 6778 #ifdef FEAT_MENU | |
| 6779 int emenu; | |
| 6780 #endif | |
| 6781 int l; | |
| 6782 | |
| 6783 if (matches == NULL) /* interrupted completion? */ | |
| 6784 return; | |
| 6785 | |
| 39 | 6786 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
|
6787 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 6788 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
|
6789 buf = alloc(Columns + 1); |
| 7 | 6790 if (buf == NULL) |
| 6791 return; | |
| 6792 | |
| 6793 if (match == -1) /* don't show match but original text */ | |
| 6794 { | |
| 6795 match = 0; | |
| 6796 highlight = FALSE; | |
| 6797 } | |
| 6798 /* count 1 for the ending ">" */ | |
| 6799 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6800 if (match == 0) | |
| 6801 first_match = 0; | |
| 6802 else if (match < first_match) | |
| 6803 { | |
| 6804 /* jumping left, as far as we can go */ | |
| 6805 first_match = match; | |
| 6806 add_left = TRUE; | |
| 6807 } | |
| 6808 else | |
| 6809 { | |
| 6810 /* check if match fits on the screen */ | |
| 6811 for (i = first_match; i < match; ++i) | |
| 6812 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6813 if (first_match > 0) | |
| 6814 clen += 2; | |
| 6815 /* jumping right, put match at the left */ | |
| 6816 if ((long)clen > Columns) | |
| 6817 { | |
| 6818 first_match = match; | |
| 6819 /* if showing the last match, we can add some on the left */ | |
| 6820 clen = 2; | |
| 6821 for (i = match; i < num_matches; ++i) | |
| 6822 { | |
| 6823 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6824 if ((long)clen >= Columns) | |
| 6825 break; | |
| 6826 } | |
| 6827 if (i == num_matches) | |
| 6828 add_left = TRUE; | |
| 6829 } | |
| 6830 } | |
| 6831 if (add_left) | |
| 6832 while (first_match > 0) | |
| 6833 { | |
| 6834 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6835 if ((long)clen >= Columns) | |
| 6836 break; | |
| 6837 --first_match; | |
| 6838 } | |
| 6839 | |
|
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
|
6840 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6841 |
| 6842 if (first_match == 0) | |
| 6843 { | |
| 6844 *buf = NUL; | |
| 6845 len = 0; | |
| 6846 } | |
| 6847 else | |
| 6848 { | |
| 6849 STRCPY(buf, "< "); | |
| 6850 len = 2; | |
| 6851 } | |
| 6852 clen = len; | |
| 6853 | |
| 6854 i = first_match; | |
| 6855 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6856 { | |
| 6857 if (i == match) | |
| 6858 { | |
| 6859 selstart = buf + len; | |
| 6860 selstart_col = clen; | |
| 6861 } | |
| 6862 | |
| 6863 s = L_MATCH(i); | |
| 6864 /* Check for menu separators - replace with '|' */ | |
| 6865 #ifdef FEAT_MENU | |
| 6866 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6867 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6868 if (emenu && menu_is_separator(s)) | |
| 6869 { | |
| 6870 STRCPY(buf + len, transchar('|')); | |
| 6871 l = (int)STRLEN(buf + len); | |
| 6872 len += l; | |
| 6873 clen += l; | |
| 6874 } | |
| 6875 else | |
| 6876 #endif | |
| 6877 for ( ; *s != NUL; ++s) | |
| 6878 { | |
| 1685 | 6879 s += skip_status_match_char(xp, s); |
| 7 | 6880 clen += ptr2cells(s); |
| 474 | 6881 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6882 { |
| 6883 STRNCPY(buf + len, s, l); | |
| 6884 s += l - 1; | |
| 6885 len += l; | |
| 6886 } | |
| 6887 else | |
| 6888 { | |
| 6889 STRCPY(buf + len, transchar_byte(*s)); | |
| 6890 len += (int)STRLEN(buf + len); | |
| 6891 } | |
| 6892 } | |
| 6893 if (i == match) | |
| 6894 selend = buf + len; | |
| 6895 | |
| 6896 *(buf + len++) = ' '; | |
| 6897 *(buf + len++) = ' '; | |
| 6898 clen += 2; | |
| 6899 if (++i == num_matches) | |
| 6900 break; | |
| 6901 } | |
| 6902 | |
| 6903 if (i != num_matches) | |
| 6904 { | |
| 6905 *(buf + len++) = '>'; | |
| 6906 ++clen; | |
| 6907 } | |
| 6908 | |
| 6909 buf[len] = NUL; | |
| 6910 | |
| 6911 row = cmdline_row - 1; | |
| 6912 if (row >= 0) | |
| 6913 { | |
| 6914 if (wild_menu_showing == 0) | |
| 6915 { | |
| 6916 if (msg_scrolled > 0) | |
| 6917 { | |
| 6918 /* Put the wildmenu just above the command line. If there is | |
| 6919 * no room, scroll the screen one line up. */ | |
| 6920 if (cmdline_row == Rows - 1) | |
| 6921 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6922 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6923 ++msg_scrolled; |
| 6924 } | |
| 6925 else | |
| 6926 { | |
| 6927 ++cmdline_row; | |
| 6928 ++row; | |
| 6929 } | |
| 6930 wild_menu_showing = WM_SCROLLED; | |
| 6931 } | |
| 6932 else | |
| 6933 { | |
| 6934 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6935 * Set 'winminheight' to zero to avoid that the window is | |
| 6936 * resized. */ | |
| 6937 if (lastwin->w_status_height == 0) | |
| 6938 { | |
| 6939 save_p_ls = p_ls; | |
| 6940 save_p_wmh = p_wmh; | |
| 6941 p_ls = 2; | |
| 6942 p_wmh = 0; | |
| 6943 last_status(FALSE); | |
| 6944 } | |
| 6945 wild_menu_showing = WM_SHOWN; | |
| 6946 } | |
| 6947 } | |
| 6948 | |
| 6949 screen_puts(buf, row, 0, attr); | |
| 6950 if (selstart != NULL && highlight) | |
| 6951 { | |
| 6952 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6953 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6954 } |
| 6955 | |
| 6956 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6957 } | |
| 6958 | |
| 6959 win_redraw_last_status(topframe); | |
| 6960 vim_free(buf); | |
| 6961 } | |
| 6962 #endif | |
| 6963 | |
| 6964 /* | |
| 6965 * Redraw the status line of window wp. | |
| 6966 * | |
| 6967 * 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
|
6968 * 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
|
6969 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6970 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6971 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
6972 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 6973 { |
| 6974 int row; | |
| 6975 char_u *p; | |
| 6976 int len; | |
| 6977 int fillchar; | |
| 6978 int attr; | |
| 6979 int this_ru_col; | |
| 1910 | 6980 static int busy = FALSE; |
| 6981 | |
| 6982 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6983 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6984 if (busy) | |
| 6985 return; | |
| 6986 busy = TRUE; | |
| 7 | 6987 |
| 6988 wp->w_redr_status = FALSE; | |
| 6989 if (wp->w_status_height == 0) | |
| 6990 { | |
| 6991 /* no status line, can only be last window */ | |
| 6992 redraw_cmdline = TRUE; | |
| 6993 } | |
| 540 | 6994 else if (!redrawing() |
| 6995 #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
|
6996 // 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
|
6997 // 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
|
6998 || (!ignore_pum && pum_visible()) |
| 540 | 6999 #endif |
| 7000 ) | |
| 7 | 7001 { |
| 7002 /* Don't redraw right now, do it later. */ | |
| 7003 wp->w_redr_status = TRUE; | |
| 7004 } | |
| 7005 #ifdef FEAT_STL_OPT | |
| 40 | 7006 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 7007 { |
| 7008 /* redraw custom status line */ | |
| 1983 | 7009 redraw_custom_statusline(wp); |
| 7 | 7010 } |
| 7011 #endif | |
| 7012 else | |
| 7013 { | |
|
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
|
7014 fillchar = fillchar_status(&attr, wp); |
| 7 | 7015 |
| 685 | 7016 get_trans_bufname(wp->w_buffer); |
| 7 | 7017 p = NameBuff; |
| 7018 len = (int)STRLEN(p); | |
| 7019 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7020 if (bt_help(wp->w_buffer) |
| 7 | 7021 #ifdef FEAT_QUICKFIX |
| 7022 || wp->w_p_pvw | |
| 7023 #endif | |
| 7024 || bufIsChanged(wp->w_buffer) | |
| 7025 || wp->w_buffer->b_p_ro) | |
| 7026 *(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
|
7027 if (bt_help(wp->w_buffer)) |
| 7 | 7028 { |
| 809 | 7029 STRCPY(p + len, _("[Help]")); |
| 7 | 7030 len += (int)STRLEN(p + len); |
| 7031 } | |
| 7032 #ifdef FEAT_QUICKFIX | |
| 7033 if (wp->w_p_pvw) | |
| 7034 { | |
| 7035 STRCPY(p + len, _("[Preview]")); | |
| 7036 len += (int)STRLEN(p + len); | |
| 7037 } | |
| 7038 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7039 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
|
7040 #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
|
7041 && !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
|
7042 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7043 ) |
| 7 | 7044 { |
| 7045 STRCPY(p + len, "[+]"); | |
| 7046 len += 3; | |
| 7047 } | |
| 7048 if (wp->w_buffer->b_p_ro) | |
| 7049 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
7050 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
|
7051 len += (int)STRLEN(p + len); |
| 7 | 7052 } |
| 7053 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7054 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
|
7055 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
|
7056 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 7057 if (this_ru_col <= 1) |
| 7058 { | |
| 7059 p = (char_u *)"<"; /* No room for file name! */ | |
| 7060 len = 1; | |
| 7061 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7062 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7063 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7064 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7065 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7066 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7067 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7068 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7069 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7070 * 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
|
7071 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
|
7072 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7073 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7074 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7075 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7076 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7077 p = p + i - 1; |
| 7 | 7078 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7079 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7080 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7081 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7082 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7083 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7084 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7085 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7086 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7087 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7088 } |
| 7 | 7089 |
| 7090 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
|
7091 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
|
7092 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
|
7093 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 7094 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7095 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 7096 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 7097 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
|
7098 - 1 + wp->w_wincol), attr); |
| 7 | 7099 |
| 7100 #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
|
7101 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 7102 #endif |
| 7103 } | |
| 7104 | |
| 7105 /* | |
| 7106 * May need to draw the character below the vertical separator. | |
| 7107 */ | |
| 7108 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7109 { | |
| 7110 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
|
7111 fillchar = fillchar_status(&attr, wp); |
| 7 | 7112 else |
| 7113 fillchar = fillchar_vsep(&attr); | |
| 7114 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7115 attr); | |
| 7116 } | |
| 1910 | 7117 busy = FALSE; |
| 7 | 7118 } |
| 7119 | |
| 680 | 7120 #ifdef FEAT_STL_OPT |
| 7121 /* | |
| 7122 * Redraw the status line according to 'statusline' and take care of any | |
| 7123 * errors encountered. | |
| 7124 */ | |
| 7125 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7126 redraw_custom_statusline(win_T *wp) |
| 680 | 7127 { |
| 1983 | 7128 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7129 int saved_did_emsg = did_emsg; |
| 1983 | 7130 |
| 7131 /* When called recursively return. This can happen when the statusline | |
| 7132 * contains an expression that triggers a redraw. */ | |
| 7133 if (entered) | |
| 7134 return; | |
| 7135 entered = TRUE; | |
| 680 | 7136 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7137 did_emsg = FALSE; |
| 680 | 7138 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7139 if (did_emsg) |
| 1983 | 7140 { |
| 7141 /* When there is an error disable the statusline, otherwise the | |
| 7142 * display is messed up with errors and a redraw triggers the problem | |
| 7143 * again and again. */ | |
| 680 | 7144 set_string_option_direct((char_u *)"statusline", -1, |
| 7145 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7146 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7147 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7148 did_emsg |= saved_did_emsg; |
| 1983 | 7149 entered = FALSE; |
| 680 | 7150 } |
| 7151 #endif | |
| 7152 | |
| 7 | 7153 /* |
| 7154 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7155 * line of the window right of it. If not, then it's a vertical separator. | |
| 7156 * Only call if (wp->w_vsep_width != 0). | |
| 7157 */ | |
| 7158 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7159 stl_connected(win_T *wp) |
| 7 | 7160 { |
| 7161 frame_T *fr; | |
| 7162 | |
| 7163 fr = wp->w_frame; | |
| 7164 while (fr->fr_parent != NULL) | |
| 7165 { | |
| 7166 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7167 { | |
| 7168 if (fr->fr_next != NULL) | |
| 7169 break; | |
| 7170 } | |
| 7171 else | |
| 7172 { | |
| 7173 if (fr->fr_next != NULL) | |
| 7174 return TRUE; | |
| 7175 } | |
| 7176 fr = fr->fr_parent; | |
| 7177 } | |
| 7178 return FALSE; | |
| 7179 } | |
| 7180 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7181 |
| 7 | 7182 /* |
| 7183 * Get the value to show for the language mappings, active 'keymap'. | |
| 7184 */ | |
| 7185 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7186 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7187 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7188 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
|
7189 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
|
7190 int len) /* length of buffer */ |
| 7 | 7191 { |
| 7192 char_u *p; | |
| 7193 | |
| 7194 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7195 return FALSE; | |
| 7196 | |
| 7197 { | |
| 7198 #ifdef FEAT_EVAL | |
| 7199 buf_T *old_curbuf = curbuf; | |
| 7200 win_T *old_curwin = curwin; | |
| 7201 char_u *s; | |
| 7202 | |
| 7203 curbuf = wp->w_buffer; | |
| 7204 curwin = wp; | |
| 7205 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7206 ++emsg_skip; | |
| 714 | 7207 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7208 --emsg_skip; |
| 7209 curbuf = old_curbuf; | |
| 7210 curwin = old_curwin; | |
| 7211 if (p == NULL || *p == NUL) | |
| 7212 #endif | |
| 7213 { | |
| 7214 #ifdef FEAT_KEYMAP | |
| 7215 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7216 p = wp->w_buffer->b_p_keymap; | |
| 7217 else | |
| 7218 #endif | |
| 7219 p = (char_u *)"lang"; | |
| 7220 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7221 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7222 buf[0] = NUL; |
| 7223 #ifdef FEAT_EVAL | |
| 7224 vim_free(s); | |
| 7225 #endif | |
| 7226 } | |
| 7227 return buf[0] != NUL; | |
| 7228 } | |
| 7229 | |
| 7230 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7231 /* | |
| 677 | 7232 * Redraw the status line or ruler of window "wp". |
| 7233 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7234 */ |
| 7235 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7236 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7237 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7238 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7239 { |
| 5539 | 7240 static int entered = FALSE; |
| 7 | 7241 int attr; |
| 7242 int curattr; | |
| 7243 int row; | |
| 7244 int col = 0; | |
| 7245 int maxwidth; | |
| 7246 int width; | |
| 7247 int n; | |
| 7248 int len; | |
| 7249 int fillchar; | |
| 7250 char_u buf[MAXPATHL]; | |
| 1983 | 7251 char_u *stl; |
| 7 | 7252 char_u *p; |
| 681 | 7253 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7254 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7255 int use_sandbox = FALSE; |
| 2693 | 7256 win_T *ewp; |
| 7257 int p_crb_save; | |
| 7 | 7258 |
| 5539 | 7259 /* There is a tiny chance that this gets called recursively: When |
| 7260 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7261 * Avoid trouble by not allowing recursion. */ | |
| 7262 if (entered) | |
| 7263 return; | |
| 7264 entered = TRUE; | |
| 7265 | |
| 7 | 7266 /* setup environment for the task at hand */ |
| 677 | 7267 if (wp == NULL) |
| 7268 { | |
| 7269 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7270 stl = p_tal; |
| 677 | 7271 row = 0; |
| 707 | 7272 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7273 attr = HL_ATTR(HLF_TPF); |
| 677 | 7274 maxwidth = Columns; |
| 7275 # ifdef FEAT_EVAL | |
| 681 | 7276 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7277 # endif |
| 7278 } | |
| 40 | 7279 else |
| 677 | 7280 { |
| 7281 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
|
7282 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
|
7283 maxwidth = wp->w_width; |
| 677 | 7284 |
| 7285 if (draw_ruler) | |
| 7286 { | |
| 1983 | 7287 stl = p_ruf; |
| 677 | 7288 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7289 if (*stl == '%') |
| 7290 { | |
| 7291 if (*++stl == '-') | |
| 7292 stl++; | |
| 7293 if (atoi((char *)stl)) | |
| 7294 while (VIM_ISDIGIT(*stl)) | |
| 7295 stl++; | |
| 7296 if (*stl++ != '(') | |
| 7297 stl = p_ruf; | |
| 677 | 7298 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7299 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
|
7300 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
|
7301 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
|
7302 maxwidth = wp->w_width - col; |
| 677 | 7303 if (!wp->w_status_height) |
| 7304 { | |
| 7305 row = Rows - 1; | |
| 7306 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7307 fillchar = ' '; | |
| 7308 attr = 0; | |
| 7309 } | |
| 7310 | |
| 7311 # ifdef FEAT_EVAL | |
| 681 | 7312 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7313 # endif |
| 7314 } | |
| 7315 else | |
| 7316 { | |
| 7317 if (*wp->w_p_stl != NUL) | |
| 1983 | 7318 stl = wp->w_p_stl; |
| 677 | 7319 else |
| 1983 | 7320 stl = p_stl; |
| 677 | 7321 # ifdef FEAT_EVAL |
| 681 | 7322 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7323 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7324 # endif |
| 7325 } | |
| 7326 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7327 col += wp->w_wincol; |
| 677 | 7328 } |
| 7329 | |
| 7 | 7330 if (maxwidth <= 0) |
| 5539 | 7331 goto theend; |
| 677 | 7332 |
| 2693 | 7333 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7334 * the cursor away and back. */ | |
| 7335 ewp = wp == NULL ? curwin : wp; | |
| 7336 p_crb_save = ewp->w_p_crb; | |
| 7337 ewp->w_p_crb = FALSE; | |
| 7338 | |
| 1983 | 7339 /* Make a copy, because the statusline may include a function call that |
| 7340 * might change the option value and free the memory. */ | |
| 7341 stl = vim_strsave(stl); | |
| 2693 | 7342 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7343 stl, use_sandbox, |
| 681 | 7344 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7345 vim_free(stl); |
| 2693 | 7346 ewp->w_p_crb = p_crb_save; |
| 2661 | 7347 |
| 7348 /* Make all characters printable. */ | |
| 7349 p = transstr(buf); | |
| 7350 if (p != NULL) | |
| 7351 { | |
| 7352 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7353 vim_free(p); | |
| 7354 } | |
| 7355 | |
| 7356 /* fill up with "fillchar" */ | |
| 835 | 7357 len = (int)STRLEN(buf); |
| 1883 | 7358 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7359 { |
| 7360 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7361 ++width; | |
| 7362 } | |
| 7363 buf[len] = NUL; | |
| 7364 | |
| 681 | 7365 /* |
| 7366 * Draw each snippet with the specified highlighting. | |
| 7367 */ | |
| 7 | 7368 curattr = attr; |
| 7369 p = buf; | |
| 681 | 7370 for (n = 0; hltab[n].start != NULL; n++) |
| 7371 { | |
| 7372 len = (int)(hltab[n].start - p); | |
| 7 | 7373 screen_puts_len(p, len, row, col, curattr); |
| 7374 col += vim_strnsize(p, len); | |
| 681 | 7375 p = hltab[n].start; |
| 7376 | |
| 7377 if (hltab[n].userhl == 0) | |
| 7 | 7378 curattr = attr; |
| 681 | 7379 else if (hltab[n].userhl < 0) |
| 7380 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
|
7381 #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
|
7382 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
|
7383 && 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
|
7384 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
|
7385 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
|
7386 && 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
|
7387 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
|
7388 #endif |
| 680 | 7389 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7390 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7391 else |
| 681 | 7392 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7393 } |
| 7394 screen_puts(p, row, col, curattr); | |
| 681 | 7395 |
| 7396 if (wp == NULL) | |
| 7397 { | |
| 7398 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7399 col = 0; | |
| 7400 len = 0; | |
| 7401 p = buf; | |
| 7402 fillchar = 0; | |
| 7403 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7404 { | |
| 7405 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7406 while (col < len) | |
| 7407 TabPageIdxs[col++] = fillchar; | |
| 7408 p = tabtab[n].start; | |
| 7409 fillchar = tabtab[n].userhl; | |
| 7410 } | |
| 7411 while (col < Columns) | |
| 7412 TabPageIdxs[col++] = fillchar; | |
| 7413 } | |
| 5539 | 7414 |
| 7415 theend: | |
| 7416 entered = FALSE; | |
| 7 | 7417 } |
| 7418 | |
| 7419 #endif /* FEAT_STL_OPT */ | |
| 7420 | |
| 7421 /* | |
| 7422 * Output a single character directly to the screen and update ScreenLines. | |
| 7423 */ | |
| 7424 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7425 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7426 { |
| 3549 | 7427 char_u buf[MB_MAXBYTES + 1]; |
| 7428 | |
| 7429 if (has_mbyte) | |
| 7430 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7431 else | |
| 7432 { | |
| 7433 buf[0] = c; | |
| 7434 buf[1] = NUL; | |
| 7435 } | |
| 7 | 7436 screen_puts(buf, row, col, attr); |
| 7437 } | |
| 7438 | |
| 7439 /* | |
| 7440 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7441 * Also return its attribute in *attrp; | |
| 7442 */ | |
| 7443 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7444 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7445 { |
| 7446 unsigned off; | |
| 7447 | |
| 7448 /* safety check */ | |
| 7449 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7450 { | |
| 7451 off = LineOffset[row] + col; | |
| 7452 *attrp = ScreenAttrs[off]; | |
| 7453 bytes[0] = ScreenLines[off]; | |
| 7454 bytes[1] = NUL; | |
| 7455 | |
| 7456 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7457 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7458 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7459 { | |
| 7460 bytes[0] = ScreenLines[off]; | |
| 7461 bytes[1] = ScreenLines2[off]; | |
| 7462 bytes[2] = NUL; | |
| 7463 } | |
| 7464 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7465 { | |
| 7466 bytes[1] = ScreenLines[off + 1]; | |
| 7467 bytes[2] = NUL; | |
| 7468 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7469 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7470 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7471 |
| 714 | 7472 /* |
| 7473 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7474 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7475 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7476 */ |
| 7477 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7478 screen_comp_differs(int off, int *u8cc) |
| 714 | 7479 { |
| 7480 int i; | |
| 7481 | |
| 7482 for (i = 0; i < Screen_mco; ++i) | |
| 7483 { | |
| 7484 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7485 return TRUE; | |
| 7486 if (u8cc[i] == 0) | |
| 7487 break; | |
| 7488 } | |
| 7489 return FALSE; | |
| 7490 } | |
| 7491 | |
| 7 | 7492 /* |
| 7493 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7494 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7495 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7496 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7497 */ | |
| 7498 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7499 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7500 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7501 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7502 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7503 int attr) |
| 7 | 7504 { |
| 7505 screen_puts_len(text, -1, row, col, attr); | |
| 7506 } | |
| 7507 | |
| 7508 /* | |
| 7509 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7510 * a NUL. | |
| 7511 */ | |
| 7512 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7513 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7514 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7515 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7516 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7517 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7518 int attr) |
| 7 | 7519 { |
| 7520 unsigned off; | |
| 7521 char_u *ptr = text; | |
| 5923 | 7522 int len = textlen; |
| 7 | 7523 int c; |
| 1378 | 7524 unsigned max_off; |
| 7 | 7525 int mbyte_blen = 1; |
| 7526 int mbyte_cells = 1; | |
| 7527 int u8c = 0; | |
| 714 | 7528 int u8cc[MAX_MCO]; |
| 7 | 7529 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7530 #ifdef FEAT_ARABIC |
| 7 | 7531 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7532 int pc, nc, nc1; |
| 7533 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7534 #endif |
| 1843 | 7535 int force_redraw_this; |
| 7536 int force_redraw_next = FALSE; | |
| 7537 int need_redraw; | |
| 7 | 7538 |
| 7539 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7540 return; | |
| 1843 | 7541 off = LineOffset[row] + col; |
| 7 | 7542 |
| 1668 | 7543 /* When drawing over the right halve of a double-wide char clear out the |
| 7544 * left halve. Only needed in a terminal. */ | |
| 1685 | 7545 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
|
7546 #ifdef FEAT_GUI |
| 1668 | 7547 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7548 #endif |
| 1668 | 7549 && mb_fix_col(col, row) != col) |
| 1843 | 7550 { |
| 7551 ScreenLines[off - 1] = ' '; | |
| 7552 ScreenAttrs[off - 1] = 0; | |
| 7553 if (enc_utf8) | |
| 7554 { | |
| 7555 ScreenLinesUC[off - 1] = 0; | |
| 7556 ScreenLinesC[0][off - 1] = 0; | |
| 7557 } | |
| 7558 /* redraw the previous cell, make it empty */ | |
| 7559 screen_char(off - 1, row, col - 1); | |
| 7560 /* force the cell at "col" to be redrawn */ | |
| 7561 force_redraw_next = TRUE; | |
| 7562 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7563 |
| 1378 | 7564 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7565 while (col < screen_Columns |
| 7566 && (len < 0 || (int)(ptr - text) < len) | |
| 7567 && *ptr != NUL) | |
| 7 | 7568 { |
| 7569 c = *ptr; | |
| 7570 /* check if this is the first byte of a multibyte */ | |
| 7571 if (has_mbyte) | |
| 7572 { | |
| 7573 if (enc_utf8 && len > 0) | |
| 474 | 7574 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7575 else |
| 474 | 7576 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7577 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7578 mbyte_cells = 1; | |
| 7579 else if (enc_dbcs != 0) | |
| 7580 mbyte_cells = mbyte_blen; | |
| 7581 else /* enc_utf8 */ | |
| 7582 { | |
| 7583 if (len >= 0) | |
| 714 | 7584 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7585 (int)((text + len) - ptr)); |
| 7586 else | |
| 714 | 7587 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7588 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7589 #ifdef FEAT_ARABIC |
| 7 | 7590 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7591 { | |
| 7592 /* Do Arabic shaping. */ | |
| 7593 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7594 { | |
| 7595 /* Past end of string to be displayed. */ | |
| 7596 nc = NUL; | |
| 7597 nc1 = NUL; | |
| 7598 } | |
| 7599 else | |
| 714 | 7600 { |
| 1994 | 7601 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7602 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7603 nc1 = pcc[0]; |
| 7604 } | |
| 7 | 7605 pc = prev_c; |
| 7606 prev_c = u8c; | |
| 714 | 7607 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7608 } |
| 7609 else | |
| 7610 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7611 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7612 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7613 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7614 /* 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
|
7615 * 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
|
7616 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7617 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7618 } |
| 7 | 7619 } |
| 7620 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7621 |
| 1843 | 7622 force_redraw_this = force_redraw_next; |
| 7623 force_redraw_next = FALSE; | |
| 7624 | |
| 7625 need_redraw = ScreenLines[off] != c | |
| 7 | 7626 || (mbyte_cells == 2 |
| 7627 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7628 || (enc_dbcs == DBCS_JPNU | |
| 7629 && c == 0x8e | |
| 7630 && ScreenLines2[off] != ptr[1]) | |
| 7631 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7632 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7633 (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
|
7634 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7635 && screen_comp_differs(off, u8cc)))) |
| 7 | 7636 || ScreenAttrs[off] != attr |
| 1843 | 7637 || exmode_active; |
| 7638 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7639 if (need_redraw || force_redraw_this) |
| 7 | 7640 { |
| 7641 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7642 /* The bold trick makes a single row of pixels appear in the next | |
| 7643 * character. When a bold character is removed, the next | |
| 7644 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7645 * and for some xterms. */ |
| 7646 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7647 # ifdef FEAT_GUI |
| 7648 gui.in_use | |
| 7649 # endif | |
| 7650 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7651 || | |
| 7652 # endif | |
| 7653 # ifdef UNIX | |
| 7654 term_is_xterm | |
| 7655 # endif | |
| 1843 | 7656 )) |
| 7657 { | |
| 7658 int n = ScreenAttrs[off]; | |
| 7659 | |
| 7660 if (n > HL_ALL) | |
| 7661 n = syn_attr2attr(n); | |
| 7662 if (n & HL_BOLD) | |
| 7663 force_redraw_next = TRUE; | |
| 7 | 7664 } |
| 7665 #endif | |
| 7666 /* When at the end of the text and overwriting a two-cell | |
| 7667 * character with a one-cell character, need to clear the next | |
| 7668 * cell. Also when overwriting the left halve of a two-cell char | |
| 7669 * with the right halve of a two-cell char. Do this only once | |
| 7670 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7671 if (clear_next_cell) | |
| 7672 clear_next_cell = FALSE; | |
| 7673 else if (has_mbyte | |
| 7674 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7675 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7676 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7677 || (mbyte_cells == 2 |
| 1378 | 7678 && (*mb_off2cells)(off, max_off) == 1 |
| 7679 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7680 clear_next_cell = TRUE; |
| 7681 | |
| 7682 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7683 * it confuses mb_off2cells(). */ | |
| 7684 if (enc_dbcs | |
| 1378 | 7685 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7686 || (mbyte_cells == 2 |
| 1378 | 7687 && (*mb_off2cells)(off, max_off) == 1 |
| 7688 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7689 ScreenLines[off + mbyte_blen] = 0; |
| 7690 ScreenLines[off] = c; | |
| 7691 ScreenAttrs[off] = attr; | |
| 7692 if (enc_utf8) | |
| 7693 { | |
| 714 | 7694 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7695 ScreenLinesUC[off] = 0; |
| 7696 else | |
| 7697 { | |
| 714 | 7698 int i; |
| 7699 | |
| 7 | 7700 ScreenLinesUC[off] = u8c; |
| 714 | 7701 for (i = 0; i < Screen_mco; ++i) |
| 7702 { | |
| 7703 ScreenLinesC[i][off] = u8cc[i]; | |
| 7704 if (u8cc[i] == 0) | |
| 7705 break; | |
| 7706 } | |
| 7 | 7707 } |
| 7708 if (mbyte_cells == 2) | |
| 7709 { | |
| 7710 ScreenLines[off + 1] = 0; | |
| 7711 ScreenAttrs[off + 1] = attr; | |
| 7712 } | |
| 7713 screen_char(off, row, col); | |
| 7714 } | |
| 7715 else if (mbyte_cells == 2) | |
| 7716 { | |
| 7717 ScreenLines[off + 1] = ptr[1]; | |
| 7718 ScreenAttrs[off + 1] = attr; | |
| 7719 screen_char_2(off, row, col); | |
| 7720 } | |
| 7721 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7722 { | |
| 7723 ScreenLines2[off] = ptr[1]; | |
| 7724 screen_char(off, row, col); | |
| 7725 } | |
| 7726 else | |
| 7727 screen_char(off, row, col); | |
| 7728 } | |
| 7729 if (has_mbyte) | |
| 7730 { | |
| 7731 off += mbyte_cells; | |
| 7732 col += mbyte_cells; | |
| 7733 ptr += mbyte_blen; | |
| 7734 if (clear_next_cell) | |
| 5923 | 7735 { |
| 7736 /* This only happens at the end, display one space next. */ | |
| 7 | 7737 ptr = (char_u *)" "; |
| 5923 | 7738 len = -1; |
| 7739 } | |
| 7 | 7740 } |
| 7741 else | |
| 7742 { | |
| 7743 ++off; | |
| 7744 ++col; | |
| 7745 ++ptr; | |
| 7746 } | |
| 7747 } | |
| 1843 | 7748 |
| 7749 /* If we detected the next character needs to be redrawn, but the text | |
| 7750 * doesn't extend up to there, update the character here. */ | |
| 7751 if (force_redraw_next && col < screen_Columns) | |
| 7752 { | |
| 7753 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7754 screen_char_2(off, row, col); | |
| 7755 else | |
| 7756 screen_char(off, row, col); | |
| 7757 } | |
| 7 | 7758 } |
| 7759 | |
| 7760 #ifdef FEAT_SEARCH_EXTRA | |
| 7761 /* | |
| 1326 | 7762 * Prepare for 'hlsearch' highlighting. |
| 7 | 7763 */ |
| 7764 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7765 start_search_hl(void) |
| 7 | 7766 { |
| 7767 if (p_hls && !no_hlsearch) | |
| 7768 { | |
| 7769 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
|
7770 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7771 # ifdef FEAT_RELTIME |
| 7772 /* Set the time limit to 'redrawtime'. */ | |
| 7773 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7774 # endif | |
| 7 | 7775 } |
| 7776 } | |
| 7777 | |
| 7778 /* | |
| 1326 | 7779 * Clean up for 'hlsearch' highlighting. |
| 7 | 7780 */ |
| 7781 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7782 end_search_hl(void) |
| 7 | 7783 { |
| 7784 if (search_hl.rm.regprog != NULL) | |
| 7785 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7786 vim_regfree(search_hl.rm.regprog); |
| 7 | 7787 search_hl.rm.regprog = NULL; |
| 7788 } | |
| 7789 } | |
| 7790 | |
| 7791 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7792 * 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
|
7793 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7794 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7795 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
|
7796 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7797 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7798 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7799 /* 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
|
7800 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7801 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7802 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7803 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7804 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7805 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7806 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7807 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7808 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
|
7809 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
|
7810 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7811 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7812 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7813 /* 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
|
7814 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
|
7815 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7816 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7817 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7818 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
|
7819 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7820 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7821 /* 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
|
7822 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7823 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7824 /* |
| 7 | 7825 * Advance to the match in window "wp" line "lnum" or past it. |
| 7826 */ | |
| 7827 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7828 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7829 { |
| 1326 | 7830 matchitem_T *cur; /* points to the match list */ |
| 7831 match_T *shl; /* points to search_hl or a match */ | |
| 7832 int shl_flag; /* flag to indicate whether search_hl | |
| 7833 has been processed or not */ | |
| 5979 | 7834 int pos_inprogress; /* marks that position match search is |
| 7835 in progress */ | |
| 7 | 7836 int n; |
| 7837 | |
| 7838 /* | |
| 7839 * When using a multi-line pattern, start searching at the top | |
| 7840 * of the window or just after a closed fold. | |
| 1326 | 7841 * Do this both for search_hl and the match list. |
| 7 | 7842 */ |
| 1326 | 7843 cur = wp->w_match_head; |
| 7844 shl_flag = FALSE; | |
| 7845 while (cur != NULL || shl_flag == FALSE) | |
| 7846 { | |
| 7847 if (shl_flag == FALSE) | |
| 7848 { | |
| 7849 shl = &search_hl; | |
| 7850 shl_flag = TRUE; | |
| 7851 } | |
| 7852 else | |
| 7853 shl = &cur->hl; | |
| 7 | 7854 if (shl->rm.regprog != NULL |
| 7855 && shl->lnum == 0 | |
| 7856 && re_multiline(shl->rm.regprog)) | |
| 7857 { | |
| 7858 if (shl->first_lnum == 0) | |
| 7859 { | |
| 7860 # ifdef FEAT_FOLDING | |
| 7861 for (shl->first_lnum = lnum; | |
| 7862 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7863 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7864 NULL, NULL, TRUE, NULL)) | |
| 7865 break; | |
| 7866 # else | |
| 7867 shl->first_lnum = wp->w_topline; | |
| 7868 # endif | |
| 7869 } | |
| 5979 | 7870 if (cur != NULL) |
| 7871 cur->pos.cur = 0; | |
| 7872 pos_inprogress = TRUE; | |
| 7 | 7873 n = 0; |
| 5979 | 7874 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7875 || (cur != NULL && pos_inprogress))) | |
| 7876 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7877 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
|
7878 shl == &search_hl ? NULL : cur); |
| 5979 | 7879 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7880 ? FALSE : TRUE; | |
| 7 | 7881 if (shl->lnum != 0) |
| 7882 { | |
| 7883 shl->first_lnum = shl->lnum | |
| 7884 + shl->rm.endpos[0].lnum | |
| 7885 - shl->rm.startpos[0].lnum; | |
| 7886 n = shl->rm.endpos[0].col; | |
| 7887 } | |
| 7888 else | |
| 7889 { | |
| 7890 ++shl->first_lnum; | |
| 7891 n = 0; | |
| 7892 } | |
| 7893 } | |
| 7894 } | |
| 1326 | 7895 if (shl != &search_hl && cur != NULL) |
| 7896 cur = cur->next; | |
| 7 | 7897 } |
| 7898 } | |
| 7899 | |
| 7900 /* | |
| 1326 | 7901 * Search for a next 'hlsearch' or match. |
| 7 | 7902 * Uses shl->buf. |
| 7903 * Sets shl->lnum and shl->rm contents. | |
| 7904 * Note: Assumes a previous match is always before "lnum", unless | |
| 7905 * shl->lnum is zero. | |
| 7906 * Careful: Any pointers for buffer lines will become invalid. | |
| 7907 */ | |
| 7908 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7909 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7910 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7911 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
|
7912 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7913 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
|
7914 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7915 { |
| 7916 linenr_T l; | |
| 7917 colnr_T matchcol; | |
| 7918 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
|
7919 int save_called_emsg = called_emsg; |
| 7 | 7920 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7921 // 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
|
7922 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
|
7923 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7924 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
|
7925 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7926 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7927 |
| 7 | 7928 if (shl->lnum != 0) |
| 7929 { | |
| 7930 /* Check for three situations: | |
| 7931 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7932 * 2. If the previous match includes "mincol", use it. | |
| 7933 * 3. Continue after the previous match. | |
| 7934 */ | |
| 7935 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7936 if (lnum > l) | |
| 7937 shl->lnum = 0; | |
| 7938 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7939 return; | |
| 7940 } | |
| 7941 | |
| 7942 /* | |
| 7943 * Repeat searching for a match until one is found that includes "mincol" | |
| 7944 * or none is found in this line. | |
| 7945 */ | |
| 7946 called_emsg = FALSE; | |
| 7947 for (;;) | |
| 7948 { | |
| 1521 | 7949 #ifdef FEAT_RELTIME |
| 7950 /* Stop searching after passing the time limit. */ | |
| 7951 if (profile_passed_limit(&(shl->tm))) | |
| 7952 { | |
| 7953 shl->lnum = 0; /* no match found in time */ | |
| 7954 break; | |
| 7955 } | |
| 7956 #endif | |
| 7 | 7957 /* Three situations: |
| 7958 * 1. No useful previous match: search from start of line. | |
| 7959 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7960 * Break the loop if this is beyond the end of the line. | |
| 7961 * 3. Vi compatible searching: continue at end of previous match. | |
| 7962 */ | |
| 7963 if (shl->lnum == 0) | |
| 7964 matchcol = 0; | |
| 7965 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7966 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7967 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7968 { | |
| 688 | 7969 char_u *ml; |
| 685 | 7970 |
| 7971 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7972 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7973 if (*ml == NUL) |
| 7974 { | |
| 7975 ++matchcol; | |
| 7 | 7976 shl->lnum = 0; |
| 7977 break; | |
| 7978 } | |
| 685 | 7979 if (has_mbyte) |
| 7980 matchcol += mb_ptr2len(ml); | |
| 7981 else | |
| 7982 ++matchcol; | |
| 7 | 7983 } |
| 7984 else | |
| 7985 matchcol = shl->rm.endpos[0].col; | |
| 7986 | |
| 7987 shl->lnum = lnum; | |
| 5979 | 7988 if (shl->rm.regprog != NULL) |
| 7989 { | |
| 6394 | 7990 /* Remember whether shl->rm is using a copy of the regprog in |
| 7991 * cur->match. */ | |
| 7992 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 7993 && shl == &cur->hl | |
| 7994 && 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
|
7995 int timed_out = FALSE; |
| 6394 | 7996 |
| 5979 | 7997 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 7998 matchcol, | |
| 1521 | 7999 #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
|
8000 &(shl->tm), &timed_out |
| 1521 | 8001 #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
|
8002 NULL, NULL |
| 5979 | 8003 #endif |
| 8004 ); | |
| 6394 | 8005 /* Copy the regprog, in case it got freed and recompiled. */ |
| 8006 if (regprog_is_copy) | |
| 8007 cur->match.regprog = cur->hl.rm.regprog; | |
| 8008 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8009 if (called_emsg || got_int || timed_out) |
| 5979 | 8010 { |
| 8011 /* Error while handling regexp: stop using this regexp. */ | |
| 8012 if (shl == &search_hl) | |
| 8013 { | |
| 8014 /* don't free regprog in the match list, it's a copy */ | |
| 8015 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
|
8016 set_no_hlsearch(TRUE); |
| 5979 | 8017 } |
| 8018 shl->rm.regprog = NULL; | |
| 8019 shl->lnum = 0; | |
| 8020 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 8021 message */ | |
| 8022 break; | |
| 8023 } | |
| 8024 } | |
| 8025 else if (cur != NULL) | |
| 8026 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 8027 else |
| 8028 nmatched = 0; | |
| 7 | 8029 if (nmatched == 0) |
| 8030 { | |
| 8031 shl->lnum = 0; /* no match found */ | |
| 8032 break; | |
| 8033 } | |
| 8034 if (shl->rm.startpos[0].lnum > 0 | |
| 8035 || shl->rm.startpos[0].col >= mincol | |
| 8036 || nmatched > 1 | |
| 8037 || shl->rm.endpos[0].col > mincol) | |
| 8038 { | |
| 8039 shl->lnum += shl->rm.startpos[0].lnum; | |
| 8040 break; /* useful match found */ | |
| 8041 } | |
| 8042 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8043 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8044 // 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
|
8045 called_emsg = save_called_emsg; |
| 7 | 8046 } |
| 8047 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8048 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8049 * 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
|
8050 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8051 */ |
| 5979 | 8052 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8053 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8054 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
|
8055 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8056 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8057 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 8058 { |
| 8059 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8060 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8061 |
| 5979 | 8062 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 8063 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8064 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8065 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8066 if (pos->lnum == 0) |
| 5979 | 8067 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8068 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8069 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8070 if (pos->lnum == lnum) |
| 5979 | 8071 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8072 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8073 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8074 /* 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
|
8075 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8076 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
|
8077 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8078 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8079 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8080 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8081 posmatch->pos[found] = tmp; |
| 5979 | 8082 } |
| 8083 } | |
| 8084 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8085 found = i; |
| 5979 | 8086 } |
| 8087 } | |
| 8088 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8089 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8090 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8091 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
|
8092 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8093 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
|
8094 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8095 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8096 shl->lnum = lnum; |
| 5979 | 8097 shl->rm.startpos[0].lnum = 0; |
| 8098 shl->rm.startpos[0].col = start; | |
| 8099 shl->rm.endpos[0].lnum = 0; | |
| 8100 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
|
8101 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8102 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8103 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8104 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8105 return 0; |
| 5979 | 8106 } |
| 5985 | 8107 #endif |
| 5979 | 8108 |
| 7 | 8109 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8110 screen_start_highlight(int attr) |
| 7 | 8111 { |
| 8112 attrentry_T *aep = NULL; | |
| 8113 | |
| 8114 screen_attr = attr; | |
| 8115 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
8116 #ifdef MSWIN |
| 7 | 8117 && termcap_active |
| 8118 #endif | |
| 8119 ) | |
| 8120 { | |
| 8121 #ifdef FEAT_GUI | |
| 8122 if (gui.in_use) | |
| 8123 { | |
| 8124 char buf[20]; | |
| 8125 | |
| 681 | 8126 /* The GUI handles this internally. */ |
| 8127 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8128 OUT_STR(buf); |
| 8129 } | |
| 8130 else | |
| 8131 #endif | |
| 8132 { | |
| 8133 if (attr > HL_ALL) /* special HL attr. */ | |
| 8134 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8135 if (IS_CTERM) |
| 7 | 8136 aep = syn_cterm_attr2entry(attr); |
| 8137 else | |
| 8138 aep = syn_term_attr2entry(attr); | |
| 8139 if (aep == NULL) /* did ":syntax clear" */ | |
| 8140 attr = 0; | |
| 8141 else | |
| 8142 attr = aep->ae_attr; | |
| 8143 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8144 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8145 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
|
8146 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
|
8147 #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
|
8148 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
|
8149 ? 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
|
8150 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8151 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8152 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8153 /* If the Normal FG color has BOLD attribute and the new HL |
| 8154 * has a FG color defined, clear BOLD. */ | |
| 8155 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
|
8156 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8157 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
|
8158 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
|
8159 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
|
8160 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
|
8161 || ((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
|
8162 && *T_US != NUL) |
| 7 | 8163 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
|
8164 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8165 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
|
8166 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8167 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
|
8168 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
|
8169 out_str(T_STS); |
| 7 | 8170 |
| 8171 /* | |
| 8172 * Output the color or start string after bold etc., in case the | |
| 8173 * bold etc. override the color setting. | |
| 8174 */ | |
| 8175 if (aep != NULL) | |
| 8176 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8177 #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
|
8178 /* 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
|
8179 * 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
|
8180 * 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
|
8181 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
|
8182 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8183 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
|
8184 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
|
8185 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8186 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8187 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8188 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
|
8189 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8190 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
|
8191 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
|
8192 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8193 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8194 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
|
8195 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8196 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
|
8197 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8198 } |
| 8199 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8200 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8201 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
|
8202 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8203 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
|
8204 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
|
8205 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8206 |
|
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
|
8207 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
|
8208 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8209 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
|
8210 out_str(aep->ae_u.term.start); |
| 7 | 8211 } |
| 8212 } | |
| 8213 } | |
| 8214 } | |
| 8215 } | |
| 8216 | |
| 8217 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8218 screen_stop_highlight(void) |
| 7 | 8219 { |
| 8220 int do_ME = FALSE; /* output T_ME code */ | |
| 8221 | |
| 8222 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
|
8223 #ifdef MSWIN |
| 7 | 8224 && termcap_active |
| 8225 #endif | |
| 8226 ) | |
| 8227 { | |
| 8228 #ifdef FEAT_GUI | |
| 8229 if (gui.in_use) | |
| 8230 { | |
| 8231 char buf[20]; | |
| 8232 | |
| 8233 /* use internal GUI code */ | |
| 8234 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8235 OUT_STR(buf); | |
| 8236 } | |
| 8237 else | |
| 8238 #endif | |
| 8239 { | |
| 8240 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8241 { | |
| 8242 attrentry_T *aep; | |
| 8243 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8244 if (IS_CTERM) |
| 7 | 8245 { |
| 8246 /* | |
| 8247 * Assume that t_me restores the original colors! | |
| 8248 */ | |
| 8249 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
|
8250 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8251 #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
|
8252 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
|
8253 ? 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
|
8254 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8255 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8256 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
|
8257 #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
|
8258 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
|
8259 ? 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
|
8260 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8261 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8262 aep->ae_u.cterm.bg_color))) |
| 7 | 8263 do_ME = TRUE; |
| 8264 } | |
| 8265 else | |
| 8266 { | |
| 8267 aep = syn_term_attr2entry(screen_attr); | |
| 8268 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8269 { | |
| 8270 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8271 do_ME = TRUE; | |
| 8272 else | |
| 8273 out_str(aep->ae_u.term.stop); | |
| 8274 } | |
| 8275 } | |
| 8276 if (aep == NULL) /* did ":syntax clear" */ | |
| 8277 screen_attr = 0; | |
| 8278 else | |
| 8279 screen_attr = aep->ae_attr; | |
| 8280 } | |
| 8281 | |
| 8282 /* | |
| 8283 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8284 * same sequence several times. | |
| 8285 */ | |
| 8286 if (screen_attr & HL_STANDOUT) | |
| 8287 { | |
| 8288 if (STRCMP(T_SE, T_ME) == 0) | |
| 8289 do_ME = TRUE; | |
| 8290 else | |
| 8291 out_str(T_SE); | |
| 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 ((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
|
8294 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8295 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
|
8296 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8297 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8298 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
|
8299 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8300 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
|
8301 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8302 { |
| 8303 if (STRCMP(T_UE, T_ME) == 0) | |
| 8304 do_ME = TRUE; | |
| 8305 else | |
| 8306 out_str(T_UE); | |
| 8307 } | |
| 8308 if (screen_attr & HL_ITALIC) | |
| 8309 { | |
| 8310 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8311 do_ME = TRUE; | |
| 8312 else | |
| 8313 out_str(T_CZR); | |
| 8314 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8315 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8316 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8317 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
|
8318 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8319 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8320 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8321 } |
| 7 | 8322 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8323 out_str(T_ME); | |
| 8324 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8325 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8326 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8327 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8328 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
|
8329 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
|
8330 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
|
8331 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
|
8332 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8333 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8334 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8335 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8336 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8337 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8338 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8339 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8340 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
|
8341 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8342 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
|
8343 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8344 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8345 } |
| 7 | 8346 } |
| 8347 } | |
| 8348 } | |
| 8349 screen_attr = 0; | |
| 8350 } | |
| 8351 | |
| 8352 /* | |
| 8353 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8354 * The machine specific code may override this again. | |
| 8355 */ | |
| 8356 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8357 reset_cterm_colors(void) |
| 7 | 8358 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8359 if (IS_CTERM) |
| 7 | 8360 { |
| 8361 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8362 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8363 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
|
8364 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8365 : (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
|
8366 #else |
| 7 | 8367 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
|
8368 #endif |
| 7 | 8369 { |
| 8370 out_str(T_OP); | |
| 8371 screen_attr = -1; | |
| 8372 } | |
| 8373 if (cterm_normal_fg_bold) | |
| 8374 { | |
| 8375 out_str(T_ME); | |
| 8376 screen_attr = -1; | |
| 8377 } | |
| 8378 } | |
| 8379 } | |
| 8380 | |
| 8381 /* | |
| 8382 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8383 * using the attributes from ScreenAttrs["off"]. | |
| 8384 */ | |
| 8385 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8386 screen_char(unsigned off, int row, int col) |
| 7 | 8387 { |
| 8388 int attr; | |
| 8389 | |
| 8390 /* Check for illegal values, just in case (could happen just after | |
| 8391 * resizing). */ | |
| 8392 if (row >= screen_Rows || col >= screen_Columns) | |
| 8393 return; | |
| 8394 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8395 #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
|
8396 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
|
8397 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8398 #endif |
| 6602 | 8399 /* Outputting a character in the last cell on the screen may scroll the |
| 8400 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8401 * mark the character invalid (update it when scrolled up). */ | |
| 8402 if (*T_XN == NUL | |
| 8403 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8404 #ifdef FEAT_RIGHTLEFT |
| 8405 /* account for first command-line character in rightleft mode */ | |
| 8406 && !cmdmsg_rl | |
| 8407 #endif | |
| 8408 ) | |
| 8409 { | |
| 8410 ScreenAttrs[off] = (sattr_T)-1; | |
| 8411 return; | |
| 8412 } | |
| 8413 | |
| 8414 /* | |
| 8415 * Stop highlighting first, so it's easier to move the cursor. | |
| 8416 */ | |
| 8417 if (screen_char_attr != 0) | |
| 8418 attr = screen_char_attr; | |
| 8419 else | |
| 8420 attr = ScreenAttrs[off]; | |
| 8421 if (screen_attr != attr) | |
| 8422 screen_stop_highlight(); | |
| 8423 | |
| 8424 windgoto(row, col); | |
| 8425 | |
| 8426 if (screen_attr != attr) | |
| 8427 screen_start_highlight(attr); | |
| 8428 | |
| 8429 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8430 { | |
| 8431 char_u buf[MB_MAXBYTES + 1]; | |
| 8432 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8433 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
|
8434 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8435 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8436 #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
|
8437 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8438 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8439 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8440 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8441 /* 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
|
8442 * 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
|
8443 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
|
8444 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
|
8445 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8446 /* 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
|
8447 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8448 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
|
8449 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8450 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8451 ++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
|
8452 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8453 /* 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
|
8454 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
|
8455 out_str(buf); |
| 7 | 8456 } |
| 8457 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8458 { |
| 7 | 8459 out_flush_check(); |
| 8460 out_char(ScreenLines[off]); | |
| 8461 /* double-byte character in single-width cell */ | |
| 8462 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8463 out_char(ScreenLines2[off]); | |
| 8464 } | |
| 8465 | |
| 8466 screen_cur_col++; | |
| 8467 } | |
| 8468 | |
| 8469 /* | |
| 8470 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8471 * on the screen at position 'row' and 'col'. | |
| 8472 * The attributes of the first byte is used for all. This is required to | |
| 8473 * output the two bytes of a double-byte character with nothing in between. | |
| 8474 */ | |
| 8475 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8476 screen_char_2(unsigned off, int row, int col) |
| 7 | 8477 { |
| 8478 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8479 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8480 return; | |
| 8481 | |
| 8482 /* Outputting the last character on the screen may scrollup the screen. | |
| 8483 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8484 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8485 { | |
| 8486 ScreenAttrs[off] = (sattr_T)-1; | |
| 8487 return; | |
| 8488 } | |
| 8489 | |
| 8490 /* Output the first byte normally (positions the cursor), then write the | |
| 8491 * second byte directly. */ | |
| 8492 screen_char(off, row, col); | |
| 8493 out_char(ScreenLines[off + 1]); | |
| 8494 ++screen_cur_col; | |
| 8495 } | |
| 8496 | |
| 8497 /* | |
| 8498 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8499 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8500 */ | |
| 8501 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8502 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8503 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8504 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8505 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8506 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8507 int invert) |
| 7 | 8508 { |
| 8509 int r, c; | |
| 8510 int off; | |
| 1378 | 8511 int max_off; |
| 7 | 8512 |
| 534 | 8513 /* Can't use ScreenLines unless initialized */ |
| 8514 if (ScreenLines == NULL) | |
| 8515 return; | |
| 8516 | |
| 7 | 8517 if (invert) |
| 8518 screen_char_attr = HL_INVERSE; | |
| 8519 for (r = row; r < row + height; ++r) | |
| 8520 { | |
| 8521 off = LineOffset[r]; | |
| 1378 | 8522 max_off = off + screen_Columns; |
| 7 | 8523 for (c = col; c < col + width; ++c) |
| 8524 { | |
| 1378 | 8525 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8526 { |
| 8527 screen_char_2(off + c, r, c); | |
| 8528 ++c; | |
| 8529 } | |
| 8530 else | |
| 8531 { | |
| 8532 screen_char(off + c, r, c); | |
| 1378 | 8533 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8534 ++c; |
| 8535 } | |
| 8536 } | |
| 8537 } | |
| 8538 screen_char_attr = 0; | |
| 8539 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8540 |
| 7 | 8541 /* |
| 8542 * Redraw the characters for a vertically split window. | |
| 8543 */ | |
| 8544 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8545 redraw_block(int row, int end, win_T *wp) |
| 7 | 8546 { |
| 8547 int col; | |
| 8548 int width; | |
| 8549 | |
| 8550 # ifdef FEAT_CLIPBOARD | |
| 8551 clip_may_clear_selection(row, end - 1); | |
| 8552 # endif | |
| 8553 | |
| 8554 if (wp == NULL) | |
| 8555 { | |
| 8556 col = 0; | |
| 8557 width = Columns; | |
| 8558 } | |
| 8559 else | |
| 8560 { | |
| 8561 col = wp->w_wincol; | |
| 8562 width = wp->w_width; | |
| 8563 } | |
| 8564 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8565 } | |
| 8566 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8567 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8568 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
|
8569 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8570 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8571 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8572 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8573 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8574 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8575 |
| 7 | 8576 /* |
| 8577 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8578 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8579 * Use attributes 'attr'. | |
| 8580 */ | |
| 8581 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8582 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8583 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8584 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8585 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8586 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8587 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8588 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8589 int attr) |
| 7 | 8590 { |
| 8591 int row; | |
| 8592 int col; | |
| 8593 int off; | |
| 8594 int end_off; | |
| 8595 int did_delete; | |
| 8596 int c; | |
| 8597 int norm_term; | |
| 8598 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8599 int force_next = FALSE; | |
| 8600 #endif | |
| 8601 | |
| 8602 if (end_row > screen_Rows) /* safety check */ | |
| 8603 end_row = screen_Rows; | |
| 8604 if (end_col > screen_Columns) /* safety check */ | |
| 8605 end_col = screen_Columns; | |
| 8606 if (ScreenLines == NULL | |
| 8607 || start_row >= end_row | |
| 8608 || start_col >= end_col) /* nothing to do */ | |
| 8609 return; | |
| 8610 | |
| 8611 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8612 norm_term = ( | |
| 8613 #ifdef FEAT_GUI | |
| 8614 !gui.in_use && | |
| 8615 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8616 !IS_CTERM); |
| 7 | 8617 for (row = start_row; row < end_row; ++row) |
| 8618 { | |
| 1668 | 8619 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8620 #ifdef FEAT_GUI |
| 1668 | 8621 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8622 #endif |
| 1668 | 8623 ) |
| 8624 { | |
| 8625 /* When drawing over the right halve of a double-wide char clear | |
| 8626 * out the left halve. When drawing over the left halve of a | |
| 8627 * double wide-char clear out the right halve. Only needed in a | |
| 8628 * terminal. */ | |
| 1685 | 8629 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8630 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8631 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8632 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8633 } |
| 7 | 8634 /* |
| 8635 * Try to use delete-line termcap code, when no attributes or in a | |
| 8636 * "normal" terminal, where a bold/italic space is just a | |
| 8637 * space. | |
| 8638 */ | |
| 8639 did_delete = FALSE; | |
| 8640 if (c2 == ' ' | |
| 8641 && end_col == Columns | |
| 8642 && can_clear(T_CE) | |
| 8643 && (attr == 0 | |
| 8644 || (norm_term | |
| 8645 && attr <= HL_ALL | |
| 8646 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8647 { | |
| 8648 /* | |
| 8649 * check if we really need to clear something | |
| 8650 */ | |
| 8651 col = start_col; | |
| 8652 if (c1 != ' ') /* don't clear first char */ | |
| 8653 ++col; | |
| 8654 | |
| 8655 off = LineOffset[row] + col; | |
| 8656 end_off = LineOffset[row] + end_col; | |
| 8657 | |
| 8658 /* skip blanks (used often, keep it fast!) */ | |
| 8659 if (enc_utf8) | |
| 8660 while (off < end_off && ScreenLines[off] == ' ' | |
| 8661 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8662 ++off; | |
| 8663 else | |
| 8664 while (off < end_off && ScreenLines[off] == ' ' | |
| 8665 && ScreenAttrs[off] == 0) | |
| 8666 ++off; | |
| 8667 if (off < end_off) /* something to be cleared */ | |
| 8668 { | |
| 8669 col = off - LineOffset[row]; | |
| 8670 screen_stop_highlight(); | |
| 8671 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8672 out_str(T_CE); | |
| 8673 screen_start(); /* don't know where cursor is now */ | |
| 8674 col = end_col - col; | |
| 8675 while (col--) /* clear chars in ScreenLines */ | |
| 8676 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8677 space_to_screenline(off, 0); |
| 7 | 8678 ++off; |
| 8679 } | |
| 8680 } | |
| 8681 did_delete = TRUE; /* the chars are cleared now */ | |
| 8682 } | |
| 8683 | |
| 8684 off = LineOffset[row] + start_col; | |
| 8685 c = c1; | |
| 8686 for (col = start_col; col < end_col; ++col) | |
| 8687 { | |
| 8688 if (ScreenLines[off] != c | |
| 714 | 8689 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8690 != (c >= 0x80 ? c : 0)) | |
| 7 | 8691 || ScreenAttrs[off] != attr |
| 8692 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8693 || force_next | |
| 8694 #endif | |
| 8695 ) | |
| 8696 { | |
| 8697 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8698 /* The bold trick may make a single row of pixels appear in | |
| 8699 * the next character. When a bold character is removed, the | |
| 8700 * next character should be redrawn too. This happens for our | |
| 8701 * own GUI and for some xterms. */ | |
| 8702 if ( | |
| 8703 # ifdef FEAT_GUI | |
| 8704 gui.in_use | |
| 8705 # endif | |
| 8706 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8707 || | |
| 8708 # endif | |
| 8709 # ifdef UNIX | |
| 8710 term_is_xterm | |
| 8711 # endif | |
| 8712 ) | |
| 8713 { | |
| 8714 if (ScreenLines[off] != ' ' | |
| 8715 && (ScreenAttrs[off] > HL_ALL | |
| 8716 || ScreenAttrs[off] & HL_BOLD)) | |
| 8717 force_next = TRUE; | |
| 8718 else | |
| 8719 force_next = FALSE; | |
| 8720 } | |
| 8721 #endif | |
| 8722 ScreenLines[off] = c; | |
| 8723 if (enc_utf8) | |
| 8724 { | |
| 8725 if (c >= 0x80) | |
| 8726 { | |
| 8727 ScreenLinesUC[off] = c; | |
| 714 | 8728 ScreenLinesC[0][off] = 0; |
| 7 | 8729 } |
| 8730 else | |
| 8731 ScreenLinesUC[off] = 0; | |
| 8732 } | |
| 8733 ScreenAttrs[off] = attr; | |
| 8734 if (!did_delete || c != ' ') | |
| 8735 screen_char(off, row, col); | |
| 8736 } | |
| 8737 ++off; | |
| 8738 if (col == start_col) | |
| 8739 { | |
| 8740 if (did_delete) | |
| 8741 break; | |
| 8742 c = c2; | |
| 8743 } | |
| 8744 } | |
| 8745 if (end_col == Columns) | |
| 8746 LineWraps[row] = FALSE; | |
| 8747 if (row == Rows - 1) /* overwritten the command line */ | |
| 8748 { | |
| 8749 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
|
8750 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
|
8751 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8752 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8753 if (start_col == 0) |
| 8754 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8755 } |
| 8756 } | |
| 8757 } | |
| 8758 | |
| 8759 /* | |
| 8760 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8761 * screen or the command line. | |
| 8762 */ | |
| 8763 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8764 check_for_delay(int check_msg_scroll) |
| 7 | 8765 { |
| 8766 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8767 && !did_wait_return | |
| 8768 && emsg_silent == 0) | |
| 8769 { | |
| 8770 out_flush(); | |
| 8771 ui_delay(1000L, TRUE); | |
| 8772 emsg_on_display = FALSE; | |
| 8773 if (check_msg_scroll) | |
| 8774 msg_scroll = FALSE; | |
| 8775 } | |
| 8776 } | |
| 8777 | |
| 8778 /* | |
|
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
|
8779 * 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
|
8780 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8781 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
|
8782 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
|
8783 { |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8784 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
|
8785 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8786 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
|
8787 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
|
8788 } |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8789 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8790 /* |
| 7 | 8791 * screen_valid - allocate screen buffers if size changed |
| 3263 | 8792 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8793 * Returns TRUE if there is a valid screen to write to. |
| 8794 * Returns FALSE when starting up and screen not initialized yet. | |
| 8795 */ | |
| 8796 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8797 screen_valid(int doclear) |
| 7 | 8798 { |
| 3263 | 8799 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8800 return (ScreenLines != NULL); |
| 8801 } | |
| 8802 | |
| 8803 /* | |
| 8804 * Resize the shell to Rows and Columns. | |
| 8805 * Allocate ScreenLines[] and associated items. | |
| 8806 * | |
| 8807 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8808 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8809 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8810 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8811 * final size of the shell is needed. | |
| 8812 */ | |
| 8813 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8814 screenalloc(int doclear) |
| 7 | 8815 { |
| 8816 int new_row, old_row; | |
| 8817 #ifdef FEAT_GUI | |
| 8818 int old_Rows; | |
| 8819 #endif | |
| 8820 win_T *wp; | |
| 8821 int outofmem = FALSE; | |
| 8822 int len; | |
| 8823 schar_T *new_ScreenLines; | |
| 8824 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8825 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8826 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8827 int i; |
| 7 | 8828 sattr_T *new_ScreenAttrs; |
| 8829 unsigned *new_LineOffset; | |
| 8830 char_u *new_LineWraps; | |
| 681 | 8831 short *new_TabPageIdxs; |
| 671 | 8832 tabpage_T *tp; |
| 7 | 8833 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8834 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8835 int retry_count = 0; |
| 8836 | |
| 8837 retry: | |
| 7 | 8838 /* |
| 8839 * Allocation of the screen buffers is done only when the size changes and | |
| 8840 * when Rows and Columns have been set and we have started doing full | |
| 8841 * screen stuff. | |
| 8842 */ | |
| 8843 if ((ScreenLines != NULL | |
| 8844 && Rows == screen_Rows | |
| 8845 && Columns == screen_Columns | |
| 8846 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8847 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8848 && p_mco == Screen_mco) |
| 7 | 8849 || Rows == 0 |
| 8850 || Columns == 0 | |
| 8851 || (!full_screen && ScreenLines == NULL)) | |
| 8852 return; | |
| 8853 | |
| 8854 /* | |
| 8855 * It's possible that we produce an out-of-memory message below, which | |
| 8856 * will cause this function to be called again. To break the loop, just | |
| 8857 * return here. | |
| 8858 */ | |
| 8859 if (entered) | |
| 8860 return; | |
| 8861 entered = TRUE; | |
| 8862 | |
| 911 | 8863 /* |
| 8864 * Note that the window sizes are updated before reallocating the arrays, | |
| 8865 * thus we must not redraw here! | |
| 8866 */ | |
| 8867 ++RedrawingDisabled; | |
| 8868 | |
| 7 | 8869 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8870 | |
| 8871 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8872 | |
| 8873 /* | |
| 8874 * We're changing the size of the screen. | |
| 8875 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8876 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8877 * lines (unless the screen is going to be cleared). | |
| 8878 * - Free the old arrays. | |
| 8879 * | |
| 8880 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8881 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8882 * size is wrong. | |
| 8883 */ | |
| 671 | 8884 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8885 win_free_lsize(wp); |
| 1946 | 8886 if (aucmd_win != NULL) |
| 8887 win_free_lsize(aucmd_win); | |
| 7 | 8888 |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8889 new_ScreenLines = (schar_T *)lalloc( |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8890 (Rows + 1) * Columns * sizeof(schar_T), FALSE); |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
8891 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8892 if (enc_utf8) |
| 8893 { | |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8894 new_ScreenLinesUC = (u8char_T *)lalloc( |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8895 (Rows + 1) * Columns * sizeof(u8char_T), FALSE); |
| 714 | 8896 for (i = 0; i < p_mco; ++i) |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8897 new_ScreenLinesC[i] = (u8char_T *)lalloc_clear( |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8898 (Rows + 1) * Columns * sizeof(u8char_T), FALSE); |
| 7 | 8899 } |
| 8900 if (enc_dbcs == DBCS_JPNU) | |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8901 new_ScreenLines2 = (schar_T *)lalloc( |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8902 (Rows + 1) * Columns * sizeof(schar_T), FALSE); |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8903 new_ScreenAttrs = (sattr_T *)lalloc( |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8904 (Rows + 1) * Columns * sizeof(sattr_T), FALSE); |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8905 new_LineOffset = (unsigned *)lalloc(Rows * sizeof(unsigned), FALSE); |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8906 new_LineWraps = (char_u *)lalloc(Rows * sizeof(char_u), FALSE); |
|
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
8907 new_TabPageIdxs = (short *)lalloc(Columns * sizeof(short), FALSE); |
| 7 | 8908 |
| 677 | 8909 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8910 { |
| 8911 if (win_alloc_lines(wp) == FAIL) | |
| 8912 { | |
| 8913 outofmem = TRUE; | |
| 1819 | 8914 goto give_up; |
| 8915 } | |
| 8916 } | |
| 1946 | 8917 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8918 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8919 outofmem = TRUE; |
| 1819 | 8920 give_up: |
| 7 | 8921 |
| 714 | 8922 for (i = 0; i < p_mco; ++i) |
| 8923 if (new_ScreenLinesC[i] == NULL) | |
| 8924 break; | |
| 7 | 8925 if (new_ScreenLines == NULL |
| 714 | 8926 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8927 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8928 || new_ScreenAttrs == NULL | |
| 8929 || new_LineOffset == NULL | |
| 8930 || new_LineWraps == NULL | |
| 671 | 8931 || new_TabPageIdxs == NULL |
| 7 | 8932 || outofmem) |
| 8933 { | |
| 944 | 8934 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8935 { |
| 8936 /* guess the size */ | |
| 8937 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8938 | |
| 8939 /* Remember we did this to avoid getting outofmem messages over | |
| 8940 * and over again. */ | |
| 944 | 8941 done_outofmem_msg = TRUE; |
| 534 | 8942 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8943 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8944 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 8945 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
|
8946 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
|
8947 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8948 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8949 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8950 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8951 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 8952 } |
| 8953 else | |
| 8954 { | |
| 944 | 8955 done_outofmem_msg = FALSE; |
| 534 | 8956 |
| 7 | 8957 for (new_row = 0; new_row < Rows; ++new_row) |
| 8958 { | |
| 8959 new_LineOffset[new_row] = new_row * Columns; | |
| 8960 new_LineWraps[new_row] = FALSE; | |
| 8961 | |
| 8962 /* | |
| 8963 * If the screen is not going to be cleared, copy as much as | |
| 8964 * possible from the old screen to the new one and clear the rest | |
| 8965 * (used when resizing the window at the "--more--" prompt or when | |
| 8966 * executing an external command, for the GUI). | |
| 8967 */ | |
| 3263 | 8968 if (!doclear) |
| 7 | 8969 { |
| 8970 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 8971 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 8972 if (enc_utf8) | |
| 8973 { | |
| 8974 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 8975 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 8976 for (i = 0; i < p_mco; ++i) |
| 8977 (void)vim_memset(new_ScreenLinesC[i] | |
| 8978 + new_row * Columns, | |
| 7 | 8979 0, (size_t)Columns * sizeof(u8char_T)); |
| 8980 } | |
| 8981 if (enc_dbcs == DBCS_JPNU) | |
| 8982 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 8983 0, (size_t)Columns * sizeof(schar_T)); | |
| 8984 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 8985 0, (size_t)Columns * sizeof(sattr_T)); | |
| 8986 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 8987 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 8988 { |
| 8989 if (screen_Columns < Columns) | |
| 8990 len = screen_Columns; | |
| 8991 else | |
| 8992 len = Columns; | |
| 571 | 8993 /* When switching to utf-8 don't copy characters, they |
| 714 | 8994 * may be invalid now. Also when p_mco changes. */ |
| 8995 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 8996 && p_mco == Screen_mco) | |
| 26 | 8997 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 8998 ScreenLines + LineOffset[old_row], | |
| 8999 (size_t)len * sizeof(schar_T)); | |
| 714 | 9000 if (enc_utf8 && ScreenLinesUC != NULL |
| 9001 && p_mco == Screen_mco) | |
| 7 | 9002 { |
| 9003 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 9004 ScreenLinesUC + LineOffset[old_row], | |
| 9005 (size_t)len * sizeof(u8char_T)); | |
| 714 | 9006 for (i = 0; i < p_mco; ++i) |
| 9007 mch_memmove(new_ScreenLinesC[i] | |
| 9008 + new_LineOffset[new_row], | |
| 9009 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 9010 (size_t)len * sizeof(u8char_T)); |
| 9011 } | |
| 9012 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 9013 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 9014 ScreenLines2 + LineOffset[old_row], | |
| 9015 (size_t)len * sizeof(schar_T)); | |
| 9016 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 9017 ScreenAttrs + LineOffset[old_row], | |
| 9018 (size_t)len * sizeof(sattr_T)); | |
| 9019 } | |
| 9020 } | |
| 9021 } | |
| 9022 /* Use the last line of the screen for the current line. */ | |
| 9023 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 9024 } | |
| 9025 | |
| 356 | 9026 free_screenlines(); |
| 9027 | |
| 7 | 9028 ScreenLines = new_ScreenLines; |
| 9029 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 9030 for (i = 0; i < p_mco; ++i) |
| 9031 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 9032 Screen_mco = p_mco; | |
| 7 | 9033 ScreenLines2 = new_ScreenLines2; |
| 9034 ScreenAttrs = new_ScreenAttrs; | |
| 9035 LineOffset = new_LineOffset; | |
| 9036 LineWraps = new_LineWraps; | |
| 671 | 9037 TabPageIdxs = new_TabPageIdxs; |
| 7 | 9038 |
| 9039 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9040 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9041 #ifdef FEAT_GUI | |
| 9042 old_Rows = screen_Rows; | |
| 9043 #endif | |
| 9044 screen_Rows = Rows; | |
| 9045 screen_Columns = Columns; | |
| 9046 | |
| 9047 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9048 if (doclear) |
| 7 | 9049 screenclear2(); |
| 9050 #ifdef FEAT_GUI | |
| 9051 else if (gui.in_use | |
| 9052 && !gui.starting | |
| 9053 && ScreenLines != NULL | |
| 9054 && old_Rows != Rows) | |
| 9055 { | |
| 9056 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9057 /* | |
| 9058 * Adjust the position of the cursor, for when executing an external | |
| 9059 * command. | |
| 9060 */ | |
| 9061 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9062 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9063 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9064 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9065 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9066 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9067 } | |
| 9068 #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
|
9069 clear_TabPageIdxs(); |
| 7 | 9070 |
| 9071 entered = FALSE; | |
| 911 | 9072 --RedrawingDisabled; |
| 766 | 9073 |
| 1824 | 9074 /* |
| 9075 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9076 * in case applying autocommands always changes Rows or Columns. | |
| 9077 */ | |
| 9078 if (starting == 0 && ++retry_count <= 3) | |
| 9079 { | |
| 766 | 9080 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9081 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9082 * jump back to check if we need to allocate the screen again. */ | |
| 9083 goto retry; | |
| 9084 } | |
| 7 | 9085 } |
| 9086 | |
| 9087 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9088 free_screenlines(void) |
| 356 | 9089 { |
| 714 | 9090 int i; |
| 9091 | |
| 356 | 9092 vim_free(ScreenLinesUC); |
| 714 | 9093 for (i = 0; i < Screen_mco; ++i) |
| 9094 vim_free(ScreenLinesC[i]); | |
| 356 | 9095 vim_free(ScreenLines2); |
| 714 | 9096 vim_free(ScreenLines); |
| 356 | 9097 vim_free(ScreenAttrs); |
| 9098 vim_free(LineOffset); | |
| 9099 vim_free(LineWraps); | |
| 671 | 9100 vim_free(TabPageIdxs); |
| 356 | 9101 } |
| 9102 | |
| 9103 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9104 screenclear(void) |
| 7 | 9105 { |
| 9106 check_for_delay(FALSE); | |
| 9107 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9108 screenclear2(); /* clear the screen */ | |
| 9109 } | |
| 9110 | |
| 9111 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9112 screenclear2(void) |
| 7 | 9113 { |
| 9114 int i; | |
| 9115 | |
| 9116 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9117 #ifdef FEAT_GUI | |
| 9118 || (gui.in_use && gui.starting) | |
| 9119 #endif | |
| 9120 ) | |
| 9121 return; | |
| 9122 | |
| 9123 #ifdef FEAT_GUI | |
| 9124 if (!gui.in_use) | |
| 9125 #endif | |
| 9126 screen_attr = -1; /* force setting the Normal colors */ | |
| 9127 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9128 | |
| 9129 #ifdef FEAT_CLIPBOARD | |
| 9130 /* disable selection without redrawing it */ | |
| 9131 clip_scroll_selection(9999); | |
| 9132 #endif | |
| 9133 | |
| 9134 /* blank out ScreenLines */ | |
| 9135 for (i = 0; i < Rows; ++i) | |
| 9136 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9137 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9138 LineWraps[i] = FALSE; |
| 9139 } | |
| 9140 | |
| 9141 if (can_clear(T_CL)) | |
| 9142 { | |
| 9143 out_str(T_CL); /* clear the display */ | |
| 9144 clear_cmdline = FALSE; | |
| 644 | 9145 mode_displayed = FALSE; |
| 7 | 9146 } |
| 9147 else | |
| 9148 { | |
| 9149 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9150 for (i = 0; i < Rows; ++i) | |
| 9151 lineinvalid(LineOffset[i], (int)Columns); | |
| 9152 clear_cmdline = TRUE; | |
| 9153 } | |
| 9154 | |
| 9155 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9156 | |
| 9157 win_rest_invalid(firstwin); | |
| 9158 redraw_cmdline = TRUE; | |
| 673 | 9159 redraw_tabline = TRUE; |
| 7 | 9160 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9161 must_redraw = NOT_VALID; | |
| 9162 compute_cmdrow(); | |
| 9163 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9164 msg_col = 0; | |
| 9165 screen_start(); /* don't know where cursor is now */ | |
| 9166 msg_scrolled = 0; /* can't scroll back */ | |
| 9167 msg_didany = FALSE; | |
| 9168 msg_didout = FALSE; | |
| 9169 } | |
| 9170 | |
| 9171 /* | |
| 9172 * Clear one line in ScreenLines. | |
| 9173 */ | |
| 9174 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9175 lineclear(unsigned off, int width, int attr) |
| 7 | 9176 { |
| 9177 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9178 if (enc_utf8) | |
| 9179 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9180 (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
|
9181 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9182 } |
| 9183 | |
| 9184 /* | |
| 9185 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9186 * invalid value. | |
| 9187 */ | |
| 9188 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9189 lineinvalid(unsigned off, int width) |
| 7 | 9190 { |
| 9191 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9192 } | |
| 9193 | |
| 9194 /* | |
| 9195 * Copy part of a Screenline for vertically split window "wp". | |
| 9196 */ | |
| 9197 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9198 linecopy(int to, int from, win_T *wp) |
| 7 | 9199 { |
| 9200 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9201 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9202 | |
| 9203 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9204 wp->w_width * sizeof(schar_T)); | |
| 9205 if (enc_utf8) | |
| 9206 { | |
| 714 | 9207 int i; |
| 9208 | |
| 7 | 9209 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9210 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9211 for (i = 0; i < p_mco; ++i) |
| 9212 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9213 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9214 } |
| 9215 if (enc_dbcs == DBCS_JPNU) | |
| 9216 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9217 wp->w_width * sizeof(schar_T)); | |
| 9218 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9219 wp->w_width * sizeof(sattr_T)); | |
| 9220 } | |
| 9221 | |
| 9222 /* | |
| 9223 * Return TRUE if clearing with term string "p" would work. | |
| 9224 * It can't work when the string is empty or it won't set the right background. | |
| 9225 */ | |
| 9226 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9227 can_clear(char_u *p) |
| 7 | 9228 { |
| 9229 return (*p != NUL && (t_colors <= 1 | |
| 9230 #ifdef FEAT_GUI | |
| 9231 || gui.in_use | |
| 9232 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9233 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9234 || (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
|
9235 || (!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
|
9236 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9237 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9238 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9239 || *T_UT != NUL)); |
| 7 | 9240 } |
| 9241 | |
| 9242 /* | |
| 9243 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9244 * something directly to the screen (shell commands) or a terminal control | |
| 9245 * code. | |
| 9246 */ | |
| 9247 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9248 screen_start(void) |
| 7 | 9249 { |
| 9250 screen_cur_row = screen_cur_col = 9999; | |
| 9251 } | |
| 9252 | |
| 9253 /* | |
| 9254 * Move the cursor to position "row","col" in the screen. | |
| 9255 * This tries to find the most efficient way to move, minimizing the number of | |
| 9256 * characters sent to the terminal. | |
| 9257 */ | |
| 9258 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9259 windgoto(int row, int col) |
| 7 | 9260 { |
| 205 | 9261 sattr_T *p; |
| 7 | 9262 int i; |
| 9263 int plan; | |
| 9264 int cost; | |
| 9265 int wouldbe_col; | |
| 9266 int noinvcurs; | |
| 9267 char_u *bs; | |
| 9268 int goto_cost; | |
| 9269 int attr; | |
| 9270 | |
| 1213 | 9271 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9272 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9273 | |
| 9274 #define PLAN_LE 1 | |
| 9275 #define PLAN_CR 2 | |
| 9276 #define PLAN_NL 3 | |
| 9277 #define PLAN_WRITE 4 | |
| 9278 /* Can't use ScreenLines unless initialized */ | |
| 9279 if (ScreenLines == NULL) | |
| 9280 return; | |
| 9281 | |
| 9282 if (col != screen_cur_col || row != screen_cur_row) | |
| 9283 { | |
| 9284 /* Check for valid position. */ | |
| 9285 if (row < 0) /* window without text lines? */ | |
| 9286 row = 0; | |
| 9287 if (row >= screen_Rows) | |
| 9288 row = screen_Rows - 1; | |
| 9289 if (col >= screen_Columns) | |
| 9290 col = screen_Columns - 1; | |
| 9291 | |
| 9292 /* check if no cursor movement is allowed in highlight mode */ | |
| 9293 if (screen_attr && *T_MS == NUL) | |
| 9294 noinvcurs = HIGHL_COST; | |
| 9295 else | |
| 9296 noinvcurs = 0; | |
| 9297 goto_cost = GOTO_COST + noinvcurs; | |
| 9298 | |
| 9299 /* | |
| 9300 * Plan how to do the positioning: | |
| 9301 * 1. Use CR to move it to column 0, same row. | |
| 9302 * 2. Use T_LE to move it a few columns to the left. | |
| 9303 * 3. Use NL to move a few lines down, column 0. | |
| 9304 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9305 * | |
| 9306 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9307 * position is unknown then (some terminals wrap, some don't ) | |
| 9308 * | |
| 1213 | 9309 * First check if the highlighting attributes allow us to write |
| 7 | 9310 * characters to move the cursor to the right. |
| 9311 */ | |
| 9312 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9313 { | |
| 9314 /* | |
| 9315 * If the cursor is in the same row, bigger col, we can use CR | |
| 9316 * or T_LE. | |
| 9317 */ | |
| 9318 bs = NULL; /* init for GCC */ | |
| 9319 attr = screen_attr; | |
| 9320 if (row == screen_cur_row && col < screen_cur_col) | |
| 9321 { | |
| 9322 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9323 if (*T_LE) | |
| 9324 bs = T_LE; /* "cursor left" */ | |
| 9325 else | |
| 9326 bs = T_BC; /* "backspace character (old) */ | |
| 9327 if (*bs) | |
| 9328 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9329 else | |
| 9330 cost = 999; | |
| 9331 if (col + 1 < cost) /* using CR is less characters */ | |
| 9332 { | |
| 9333 plan = PLAN_CR; | |
| 9334 wouldbe_col = 0; | |
| 9335 cost = 1; /* CR is just one character */ | |
| 9336 } | |
| 9337 else | |
| 9338 { | |
| 9339 plan = PLAN_LE; | |
| 9340 wouldbe_col = col; | |
| 9341 } | |
| 9342 if (noinvcurs) /* will stop highlighting */ | |
| 9343 { | |
| 9344 cost += noinvcurs; | |
| 9345 attr = 0; | |
| 9346 } | |
| 9347 } | |
| 9348 | |
| 9349 /* | |
| 9350 * If the cursor is above where we want to be, we can use CR LF. | |
| 9351 */ | |
| 9352 else if (row > screen_cur_row) | |
| 9353 { | |
| 9354 plan = PLAN_NL; | |
| 9355 wouldbe_col = 0; | |
| 9356 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9357 if (noinvcurs) /* will stop highlighting */ | |
| 9358 { | |
| 9359 cost += noinvcurs; | |
| 9360 attr = 0; | |
| 9361 } | |
| 9362 } | |
| 9363 | |
| 9364 /* | |
| 9365 * If the cursor is in the same row, smaller col, just use write. | |
| 9366 */ | |
| 9367 else | |
| 9368 { | |
| 9369 plan = PLAN_WRITE; | |
| 9370 wouldbe_col = screen_cur_col; | |
| 9371 cost = 0; | |
| 9372 } | |
| 9373 | |
| 9374 /* | |
| 9375 * Check if any characters that need to be written have the | |
| 9376 * correct attributes. Also avoid UTF-8 characters. | |
| 9377 */ | |
| 9378 i = col - wouldbe_col; | |
| 9379 if (i > 0) | |
| 9380 cost += i; | |
| 9381 if (cost < goto_cost && i > 0) | |
| 9382 { | |
| 9383 /* | |
| 9384 * Check if the attributes are correct without additionally | |
| 9385 * stopping highlighting. | |
| 9386 */ | |
| 9387 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9388 while (i && *p++ == attr) | |
| 9389 --i; | |
| 9390 if (i != 0) | |
| 9391 { | |
| 9392 /* | |
| 9393 * Try if it works when highlighting is stopped here. | |
| 9394 */ | |
| 9395 if (*--p == 0) | |
| 9396 { | |
| 9397 cost += noinvcurs; | |
| 9398 while (i && *p++ == 0) | |
| 9399 --i; | |
| 9400 } | |
| 9401 if (i != 0) | |
| 9402 cost = 999; /* different attributes, don't do it */ | |
| 9403 } | |
| 9404 if (enc_utf8) | |
| 9405 { | |
| 9406 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9407 for (i = wouldbe_col; i < col; ++i) | |
| 9408 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9409 { | |
| 9410 cost = 999; | |
| 9411 break; | |
| 9412 } | |
| 9413 } | |
| 9414 } | |
| 9415 | |
| 9416 /* | |
| 9417 * We can do it without term_windgoto()! | |
| 9418 */ | |
| 9419 if (cost < goto_cost) | |
| 9420 { | |
| 9421 if (plan == PLAN_LE) | |
| 9422 { | |
| 9423 if (noinvcurs) | |
| 9424 screen_stop_highlight(); | |
| 9425 while (screen_cur_col > col) | |
| 9426 { | |
| 9427 out_str(bs); | |
| 9428 --screen_cur_col; | |
| 9429 } | |
| 9430 } | |
| 9431 else if (plan == PLAN_CR) | |
| 9432 { | |
| 9433 if (noinvcurs) | |
| 9434 screen_stop_highlight(); | |
| 9435 out_char('\r'); | |
| 9436 screen_cur_col = 0; | |
| 9437 } | |
| 9438 else if (plan == PLAN_NL) | |
| 9439 { | |
| 9440 if (noinvcurs) | |
| 9441 screen_stop_highlight(); | |
| 9442 while (screen_cur_row < row) | |
| 9443 { | |
| 9444 out_char('\n'); | |
| 9445 ++screen_cur_row; | |
| 9446 } | |
| 9447 screen_cur_col = 0; | |
| 9448 } | |
| 9449 | |
| 9450 i = col - screen_cur_col; | |
| 9451 if (i > 0) | |
| 9452 { | |
| 9453 /* | |
| 9454 * Use cursor-right if it's one character only. Avoids | |
| 9455 * removing a line of pixels from the last bold char, when | |
| 9456 * using the bold trick in the GUI. | |
| 9457 */ | |
| 9458 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9459 { | |
| 9460 while (i-- > 0) | |
| 9461 out_char(*T_ND); | |
| 9462 } | |
| 9463 else | |
| 9464 { | |
| 9465 int off; | |
| 9466 | |
| 9467 off = LineOffset[row] + screen_cur_col; | |
| 9468 while (i-- > 0) | |
| 9469 { | |
| 9470 if (ScreenAttrs[off] != screen_attr) | |
| 9471 screen_stop_highlight(); | |
| 9472 out_flush_check(); | |
| 9473 out_char(ScreenLines[off]); | |
| 9474 if (enc_dbcs == DBCS_JPNU | |
| 9475 && ScreenLines[off] == 0x8e) | |
| 9476 out_char(ScreenLines2[off]); | |
| 9477 ++off; | |
| 9478 } | |
| 9479 } | |
| 9480 } | |
| 9481 } | |
| 9482 } | |
| 9483 else | |
| 9484 cost = 999; | |
| 9485 | |
| 9486 if (cost >= goto_cost) | |
| 9487 { | |
| 9488 if (noinvcurs) | |
| 9489 screen_stop_highlight(); | |
| 5995 | 9490 if (row == screen_cur_row && (col > screen_cur_col) |
| 9491 && *T_CRI != NUL) | |
| 7 | 9492 term_cursor_right(col - screen_cur_col); |
| 9493 else | |
| 9494 term_windgoto(row, col); | |
| 9495 } | |
| 9496 screen_cur_row = row; | |
| 9497 screen_cur_col = col; | |
| 9498 } | |
| 9499 } | |
| 9500 | |
| 9501 /* | |
| 9502 * Set cursor to its position in the current window. | |
| 9503 */ | |
| 9504 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9505 setcursor(void) |
| 7 | 9506 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9507 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
|
9508 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9509 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9510 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9511 * 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
|
9512 * 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
|
9513 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9514 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9515 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
|
9516 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9517 if (force || redrawing()) |
| 7 | 9518 { |
| 9519 validate_cursor(); | |
| 9520 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
|
9521 curwin->w_wincol + ( |
| 7 | 9522 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9523 /* With 'rightleft' set and the cursor on a double-wide |
| 9524 * 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
|
9525 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
|
9526 - ((has_mbyte |
| 1545 | 9527 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9528 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9529 #endif |
| 9530 curwin->w_wcol)); | |
| 9531 } | |
| 9532 } | |
| 9533 | |
| 9534 | |
| 9535 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9536 * 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
|
9537 * 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
|
9538 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9539 * scrolling. |
| 9540 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9541 */ | |
| 9542 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9543 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9544 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9545 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9546 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9547 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9548 int mayclear) |
| 7 | 9549 { |
| 9550 int did_delete; | |
| 9551 int nextrow; | |
| 9552 int lastrow; | |
| 9553 int retval; | |
| 9554 | |
| 9555 if (invalid) | |
| 9556 wp->w_lines_valid = 0; | |
| 9557 | |
| 9558 if (wp->w_height < 5) | |
| 9559 return FAIL; | |
| 9560 | |
| 9561 if (line_count > wp->w_height - row) | |
| 9562 line_count = wp->w_height - row; | |
| 9563 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9564 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9565 if (retval != MAYBE) |
| 9566 return retval; | |
| 9567 | |
| 9568 /* | |
| 9569 * If there is a next window or a status line, we first try to delete the | |
| 9570 * lines at the bottom to avoid messing what is after the window. | |
| 9571 * If this fails and there are following windows, don't do anything to avoid | |
| 9572 * messing up those windows, better just redraw. | |
| 9573 */ | |
| 9574 did_delete = FALSE; | |
| 9575 if (wp->w_next != NULL || wp->w_status_height) | |
| 9576 { | |
| 9577 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
|
9578 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9579 did_delete = TRUE; |
| 9580 else if (wp->w_next) | |
| 9581 return FAIL; | |
| 9582 } | |
| 9583 /* | |
| 9584 * if no lines deleted, blank the lines that will end up below the window | |
| 9585 */ | |
| 9586 if (!did_delete) | |
| 9587 { | |
| 9588 wp->w_redr_status = TRUE; | |
| 9589 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
|
9590 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9591 lastrow = nextrow + line_count; |
| 9592 if (lastrow > Rows) | |
| 9593 lastrow = Rows; | |
| 9594 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
|
9595 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9596 ' ', ' ', 0); |
| 9597 } | |
| 9598 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9599 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9600 == FAIL) |
| 9601 { | |
| 9602 /* deletion will have messed up other windows */ | |
| 9603 if (did_delete) | |
| 9604 { | |
| 9605 wp->w_redr_status = TRUE; | |
| 9606 win_rest_invalid(W_NEXT(wp)); | |
| 9607 } | |
| 9608 return FAIL; | |
| 9609 } | |
| 9610 | |
| 9611 return OK; | |
| 9612 } | |
| 9613 | |
| 9614 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9615 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9616 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9617 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9618 * scrolling | |
| 9619 * Return OK for success, FAIL if the lines are not deleted. | |
| 9620 */ | |
| 9621 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9622 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9623 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9624 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9625 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9626 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9627 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9628 int clear_attr) /* for clearing lines */ |
| 7 | 9629 { |
| 9630 int retval; | |
| 9631 | |
| 9632 if (invalid) | |
| 9633 wp->w_lines_valid = 0; | |
| 9634 | |
| 9635 if (line_count > wp->w_height - row) | |
| 9636 line_count = wp->w_height - row; | |
| 9637 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9638 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9639 if (retval != MAYBE) |
| 9640 return retval; | |
| 9641 | |
| 9642 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
|
9643 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9644 return FAIL; |
| 9645 | |
| 9646 /* | |
| 9647 * If there are windows or status lines below, try to put them at the | |
| 9648 * correct place. If we can't do that, they have to be redrawn. | |
| 9649 */ | |
| 9650 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9651 { | |
| 9652 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
|
9653 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9654 { |
| 9655 wp->w_redr_status = TRUE; | |
| 9656 win_rest_invalid(wp->w_next); | |
| 9657 } | |
| 9658 } | |
| 9659 /* | |
| 9660 * If this is the last window and there is no status line, redraw the | |
| 9661 * command line later. | |
| 9662 */ | |
| 9663 else | |
| 9664 redraw_cmdline = TRUE; | |
| 9665 return OK; | |
| 9666 } | |
| 9667 | |
| 9668 /* | |
| 9669 * Common code for win_ins_lines() and win_del_lines(). | |
| 9670 * Returns OK or FAIL when the work has been done. | |
| 9671 * Returns MAYBE when not finished yet. | |
| 9672 */ | |
| 9673 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9674 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9675 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9676 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9677 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9678 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9679 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9680 int clear_attr) |
| 7 | 9681 { |
| 9682 int retval; | |
| 9683 | |
| 9684 if (!redrawing() || line_count <= 0) | |
| 9685 return FAIL; | |
| 9686 | |
|
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
|
9687 /* 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
|
9688 * 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
|
9689 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
|
9690 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
|
9691 |
| 7 | 9692 /* 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
|
9693 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9694 { |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9695 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
|
9696 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9697 return FAIL; |
| 9698 } | |
| 9699 | |
| 9700 /* | |
| 9701 * Delete all remaining lines | |
| 9702 */ | |
| 9703 if (row + line_count >= wp->w_height) | |
| 9704 { | |
| 9705 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
|
9706 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9707 ' ', ' ', 0); |
| 9708 return OK; | |
| 9709 } | |
| 9710 | |
| 9711 /* | |
|
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
|
9712 * When scrolling, the message on the command line should be cleared, |
| 7 | 9713 * 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
|
9714 * Don't do this when avoiding to insert lines. |
| 7 | 9715 */ |
|
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
|
9716 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
|
9717 clear_cmdline = TRUE; |
| 7 | 9718 |
| 9719 /* | |
| 9720 * If the terminal can set a scroll region, use that. | |
| 9721 * Always do this in a vertically split window. This will redraw from | |
| 9722 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9723 * win_line(). | |
| 9724 * 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
|
9725 * 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
|
9726 * scroll-up . |
| 7 | 9727 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9728 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
|
9729 { |
| 7 | 9730 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9731 scroll_region_set(wp, row); | |
| 9732 if (del) | |
| 9733 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
|
9734 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9735 else |
| 9736 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
|
9737 wp->w_height - row, clear_attr, wp); |
| 7 | 9738 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9739 scroll_region_reset(); | |
| 9740 return retval; | |
| 9741 } | |
| 9742 | |
| 9743 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9744 return FAIL; | |
| 9745 | |
| 9746 return MAYBE; | |
| 9747 } | |
| 9748 | |
| 9749 /* | |
| 9750 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9751 */ | |
| 9752 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9753 win_rest_invalid(win_T *wp) |
| 7 | 9754 { |
| 9755 while (wp != NULL) | |
| 9756 { | |
| 9757 redraw_win_later(wp, NOT_VALID); | |
| 9758 wp->w_redr_status = TRUE; | |
| 9759 wp = wp->w_next; | |
| 9760 } | |
| 9761 redraw_cmdline = TRUE; | |
| 9762 } | |
| 9763 | |
| 9764 /* | |
| 9765 * The rest of the routines in this file perform screen manipulations. The | |
| 9766 * given operation is performed physically on the screen. The corresponding | |
| 9767 * change is also made to the internal screen image. In this way, the editor | |
| 9768 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9769 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9770 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9771 * screen changes, and in the meantime, everything still works. | |
| 9772 */ | |
| 9773 | |
| 9774 /* | |
| 9775 * types for inserting or deleting lines | |
| 9776 */ | |
| 9777 #define USE_T_CAL 1 | |
| 9778 #define USE_T_CDL 2 | |
| 9779 #define USE_T_AL 3 | |
| 9780 #define USE_T_CE 4 | |
| 9781 #define USE_T_DL 5 | |
| 9782 #define USE_T_SR 6 | |
| 9783 #define USE_NL 7 | |
| 9784 #define USE_T_CD 8 | |
| 9785 #define USE_REDRAW 9 | |
| 9786 | |
| 9787 /* | |
| 9788 * insert lines on the screen and update ScreenLines[] | |
| 9789 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9790 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9791 * 'row' and 'end' are relative to the start of the region. | |
| 9792 * | |
| 9793 * return FAIL for failure, OK for success. | |
| 9794 */ | |
| 446 | 9795 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9796 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9797 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9798 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9799 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9800 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9801 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9802 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9803 { |
| 9804 int i; | |
| 9805 int j; | |
| 9806 unsigned temp; | |
| 9807 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9808 int cursor_col = 0; |
| 7 | 9809 int type; |
| 9810 int result_empty; | |
| 9811 int can_ce = can_clear(T_CE); | |
| 9812 | |
| 9813 /* | |
| 9814 * FAIL if | |
| 9815 * - there is no valid screen | |
| 9816 * - the screen has to be redrawn completely | |
| 9817 * - the line count is less than one | |
| 9818 * - 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
|
9819 * - redrawing for a callback and there is a modeless selection |
| 7 | 9820 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9821 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
|
9822 #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
|
9823 || (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
|
9824 && 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
|
9825 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9826 ) |
| 7 | 9827 return FAIL; |
| 9828 | |
| 9829 /* | |
| 9830 * There are seven ways to insert lines: | |
| 9831 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9832 * characters from ScreenLines[]. | |
| 9833 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9834 * the insert is just empty lines | |
| 9835 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9836 * present or line_count > 1. It looks better if we do all the inserts | |
| 9837 * at once. | |
| 9838 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9839 * insert is just empty lines and T_CE is not present or line_count > | |
| 9840 * 1. | |
| 9841 * 4. Use T_AL (insert line) if it exists. | |
| 9842 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9843 * just empty lines. | |
| 9844 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9845 * just empty lines. | |
| 9846 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9847 * the 'da' flag is not set or we have clear line capability. | |
| 9848 * 8. redraw the characters from ScreenLines[]. | |
| 9849 * | |
| 9850 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9851 * the scrollbar for the window. It does have insert line, use that if it | |
| 9852 * exists. | |
| 9853 */ | |
| 9854 result_empty = (row + line_count >= end); | |
| 9855 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9856 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
|
9857 else if (can_clear(T_CD) && result_empty) |
| 7 | 9858 type = USE_T_CD; |
| 9859 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9860 type = USE_T_CAL; | |
| 9861 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9862 type = USE_T_CDL; | |
| 9863 else if (*T_AL != NUL) | |
| 9864 type = USE_T_AL; | |
| 9865 else if (can_ce && result_empty) | |
| 9866 type = USE_T_CE; | |
| 9867 else if (*T_DL != NUL && result_empty) | |
| 9868 type = USE_T_DL; | |
| 9869 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9870 type = USE_T_SR; | |
| 9871 else | |
| 9872 return FAIL; | |
| 9873 | |
| 9874 /* | |
| 9875 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9876 * care of t_db if necessary. | |
| 9877 */ | |
| 9878 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9879 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
|
9880 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9881 |
| 9882 /* | |
| 9883 * If text is retained below the screen, first clear or delete as many | |
| 9884 * lines at the bottom of the window as are about to be inserted so that | |
| 9885 * the deleted lines won't later surface during a screen_del_lines. | |
| 9886 */ | |
| 9887 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
|
9888 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9889 |
| 9890 #ifdef FEAT_CLIPBOARD | |
| 9891 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9892 * 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
|
9893 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9894 clip_clear_selection(&clip_star); |
| 7 | 9895 else |
| 9896 clip_scroll_selection(-line_count); | |
| 9897 #endif | |
| 9898 | |
| 9899 #ifdef FEAT_GUI | |
| 9900 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9901 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9902 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9903 #endif |
| 9904 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9905 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
|
9906 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
|
9907 |
| 7 | 9908 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9909 cursor_row = row; | |
| 9910 else | |
| 9911 cursor_row = row + off; | |
| 9912 | |
| 9913 /* | |
| 9914 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9915 * Clear the inserted lines in ScreenLines[]. | |
| 9916 */ | |
| 9917 row += off; | |
| 9918 end += off; | |
| 9919 for (i = 0; i < line_count; ++i) | |
| 9920 { | |
| 9921 if (wp != NULL && wp->w_width != Columns) | |
| 9922 { | |
| 9923 /* need to copy part of a line */ | |
| 9924 j = end - 1 - i; | |
| 9925 while ((j -= line_count) >= row) | |
| 9926 linecopy(j + line_count, j, wp); | |
| 9927 j += line_count; | |
| 9928 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
|
9929 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
|
9930 clear_attr); |
| 7 | 9931 else |
| 9932 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9933 LineWraps[j] = FALSE; | |
| 9934 } | |
| 9935 else | |
| 9936 { | |
| 9937 j = end - 1 - i; | |
| 9938 temp = LineOffset[j]; | |
| 9939 while ((j -= line_count) >= row) | |
| 9940 { | |
| 9941 LineOffset[j + line_count] = LineOffset[j]; | |
| 9942 LineWraps[j + line_count] = LineWraps[j]; | |
| 9943 } | |
| 9944 LineOffset[j + line_count] = temp; | |
| 9945 LineWraps[j + line_count] = FALSE; | |
| 9946 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
|
9947 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9948 else |
| 9949 lineinvalid(temp, (int)Columns); | |
| 9950 } | |
| 9951 } | |
| 9952 | |
| 9953 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9954 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
|
9955 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
|
9956 screen_start_highlight(clear_attr); |
| 7 | 9957 |
| 9958 /* redraw the characters */ | |
| 9959 if (type == USE_REDRAW) | |
| 9960 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
|
9961 else if (type == USE_T_CAL) |
| 7 | 9962 { |
| 9963 term_append_lines(line_count); | |
| 9964 screen_start(); /* don't know where cursor is now */ | |
| 9965 } | |
| 9966 else | |
| 9967 { | |
| 9968 for (i = 0; i < line_count; i++) | |
| 9969 { | |
| 9970 if (type == USE_T_AL) | |
| 9971 { | |
| 9972 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
|
9973 windgoto(cursor_row, cursor_col); |
| 7 | 9974 out_str(T_AL); |
| 9975 } | |
| 9976 else /* type == USE_T_SR */ | |
| 9977 out_str(T_SR); | |
| 9978 screen_start(); /* don't know where cursor is now */ | |
| 9979 } | |
| 9980 } | |
| 9981 | |
| 9982 /* | |
| 9983 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 9984 * have been scrolled down into the region. | |
| 9985 */ | |
| 9986 if (type == USE_T_SR && *T_DA) | |
| 9987 { | |
| 9988 for (i = 0; i < line_count; ++i) | |
| 9989 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9990 windgoto(off + i, cursor_col); |
| 7 | 9991 out_str(T_CE); |
| 9992 screen_start(); /* don't know where cursor is now */ | |
| 9993 } | |
| 9994 } | |
| 9995 | |
| 9996 #ifdef FEAT_GUI | |
| 9997 gui_can_update_cursor(); | |
| 9998 if (gui.in_use) | |
| 9999 out_flush(); /* always flush after a scroll */ | |
| 10000 #endif | |
| 10001 return OK; | |
| 10002 } | |
| 10003 | |
| 10004 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10005 * 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
|
10006 * "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
|
10007 * 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
|
10008 * "row" and "end" are relative to the start of the region. |
| 7 | 10009 * |
| 10010 * Return OK for success, FAIL if the lines are not deleted. | |
| 10011 */ | |
| 10012 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10013 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10014 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10015 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10016 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10017 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10018 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
|
10019 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
|
10020 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10021 { |
| 10022 int j; | |
| 10023 int i; | |
| 10024 unsigned temp; | |
| 10025 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10026 int cursor_col = 0; |
| 7 | 10027 int cursor_end; |
| 10028 int result_empty; /* result is empty until end of region */ | |
| 10029 int can_delete; /* deleting line codes can be used */ | |
| 10030 int type; | |
| 10031 | |
| 10032 /* | |
| 10033 * FAIL if | |
| 10034 * - there is no valid screen | |
| 10035 * - the screen has to be redrawn completely | |
| 10036 * - the line count is less than one | |
| 10037 * - 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
|
10038 * - redrawing for a callback and there is a modeless selection |
| 7 | 10039 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10040 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
|
10041 || (!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
|
10042 #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
|
10043 || (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
|
10044 && 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
|
10045 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10046 ) |
| 7 | 10047 return FAIL; |
| 10048 | |
| 10049 /* | |
| 10050 * Check if the rest of the current region will become empty. | |
| 10051 */ | |
| 10052 result_empty = row + line_count >= end; | |
| 10053 | |
| 10054 /* | |
| 10055 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10056 * available. | |
| 10057 */ | |
| 10058 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10059 | |
| 10060 /* | |
| 10061 * There are six ways to delete lines: | |
| 10062 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10063 * characters from ScreenLines[]. | |
| 10064 * 1. Use T_CD if it exists and the result is empty. | |
| 10065 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10066 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10067 * none of the other ways work. | |
| 10068 * 4. Use T_CE (erase line) if the result is empty. | |
| 10069 * 5. Use T_DL (delete line) if it exists. | |
| 10070 * 6. redraw the characters from ScreenLines[]. | |
| 10071 */ | |
| 10072 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10073 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
|
10074 else if (can_clear(T_CD) && result_empty) |
| 7 | 10075 type = USE_T_CD; |
| 10076 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10077 /* | |
| 10078 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10079 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10080 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10081 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10082 * the trick... | |
| 10083 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10084 * (Olaf Seibert) | |
| 10085 */ | |
| 10086 else if (row == 0 && T_DB == empty_option | |
| 10087 && (line_count == 1 || *T_CDL == NUL)) | |
| 10088 #else | |
| 10089 else if (row == 0 && ( | |
| 10090 #ifndef AMIGA | |
| 10091 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10092 * up, so use delete-line command */ | |
| 10093 line_count == 1 || | |
| 10094 #endif | |
| 10095 *T_CDL == NUL)) | |
| 10096 #endif | |
| 10097 type = USE_NL; | |
| 10098 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10099 type = USE_T_CDL; | |
| 10100 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
|
10101 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10102 type = USE_T_CE; |
| 10103 else if (*T_DL != NUL && can_delete) | |
| 10104 type = USE_T_DL; | |
| 10105 else if (*T_CDL != NUL && can_delete) | |
| 10106 type = USE_T_CDL; | |
| 10107 else | |
| 10108 return FAIL; | |
| 10109 | |
| 10110 #ifdef FEAT_CLIPBOARD | |
| 10111 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10112 * 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
|
10113 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10114 clip_clear_selection(&clip_star); |
| 7 | 10115 else |
| 10116 clip_scroll_selection(line_count); | |
| 10117 #endif | |
| 10118 | |
| 10119 #ifdef FEAT_GUI | |
| 10120 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10121 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10122 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
|
10123 && gui.cursor_row < end + off); |
| 7 | 10124 #endif |
| 10125 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10126 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
|
10127 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
|
10128 |
| 7 | 10129 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10130 { | |
| 10131 cursor_row = row; | |
| 10132 cursor_end = end; | |
| 10133 } | |
| 10134 else | |
| 10135 { | |
| 10136 cursor_row = row + off; | |
| 10137 cursor_end = end + off; | |
| 10138 } | |
| 10139 | |
| 10140 /* | |
| 10141 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10142 * Clear the inserted lines in ScreenLines[]. | |
| 10143 */ | |
| 10144 row += off; | |
| 10145 end += off; | |
| 10146 for (i = 0; i < line_count; ++i) | |
| 10147 { | |
| 10148 if (wp != NULL && wp->w_width != Columns) | |
| 10149 { | |
| 10150 /* need to copy part of a line */ | |
| 10151 j = row + i; | |
| 10152 while ((j += line_count) <= end - 1) | |
| 10153 linecopy(j - line_count, j, wp); | |
| 10154 j -= line_count; | |
| 10155 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
|
10156 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
|
10157 clear_attr); |
| 7 | 10158 else |
| 10159 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10160 LineWraps[j] = FALSE; | |
| 10161 } | |
| 10162 else | |
| 10163 { | |
| 10164 /* whole width, moving the line pointers is faster */ | |
| 10165 j = row + i; | |
| 10166 temp = LineOffset[j]; | |
| 10167 while ((j += line_count) <= end - 1) | |
| 10168 { | |
| 10169 LineOffset[j - line_count] = LineOffset[j]; | |
| 10170 LineWraps[j - line_count] = LineWraps[j]; | |
| 10171 } | |
| 10172 LineOffset[j - line_count] = temp; | |
| 10173 LineWraps[j - line_count] = FALSE; | |
| 10174 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
|
10175 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10176 else |
| 10177 lineinvalid(temp, (int)Columns); | |
| 10178 } | |
| 10179 } | |
| 10180 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10181 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
|
10182 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10183 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
|
10184 screen_start_highlight(clear_attr); |
| 7 | 10185 |
| 10186 /* redraw the characters */ | |
| 10187 if (type == USE_REDRAW) | |
| 10188 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
|
10189 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10190 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10191 windgoto(cursor_row, cursor_col); |
| 7 | 10192 out_str(T_CD); |
| 10193 screen_start(); /* don't know where cursor is now */ | |
| 10194 } | |
| 10195 else if (type == USE_T_CDL) | |
| 10196 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10197 windgoto(cursor_row, cursor_col); |
| 7 | 10198 term_delete_lines(line_count); |
| 10199 screen_start(); /* don't know where cursor is now */ | |
| 10200 } | |
| 10201 /* | |
| 10202 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10203 * the whole screen (scroll region) up by outputting newlines on the | |
| 10204 * last line. | |
| 10205 */ | |
| 10206 else if (type == USE_NL) | |
| 10207 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10208 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10209 for (i = line_count; --i >= 0; ) |
| 10210 out_char('\n'); /* cursor will remain on same line */ | |
| 10211 } | |
| 10212 else | |
| 10213 { | |
| 10214 for (i = line_count; --i >= 0; ) | |
| 10215 { | |
| 10216 if (type == USE_T_DL) | |
| 10217 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10218 windgoto(cursor_row, cursor_col); |
| 7 | 10219 out_str(T_DL); /* delete a line */ |
| 10220 } | |
| 10221 else /* type == USE_T_CE */ | |
| 10222 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10223 windgoto(cursor_row + i, cursor_col); |
| 7 | 10224 out_str(T_CE); /* erase a line */ |
| 10225 } | |
| 10226 screen_start(); /* don't know where cursor is now */ | |
| 10227 } | |
| 10228 } | |
| 10229 | |
| 10230 /* | |
| 10231 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10232 * scrolled up at the bottom of the region. | |
| 10233 */ | |
| 10234 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10235 { | |
| 10236 for (i = line_count; i > 0; --i) | |
| 10237 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10238 windgoto(cursor_end - i, cursor_col); |
| 7 | 10239 out_str(T_CE); /* erase a line */ |
| 10240 screen_start(); /* don't know where cursor is now */ | |
| 10241 } | |
| 10242 } | |
| 10243 | |
| 10244 #ifdef FEAT_GUI | |
| 10245 gui_can_update_cursor(); | |
| 10246 if (gui.in_use) | |
| 10247 out_flush(); /* always flush after a scroll */ | |
| 10248 #endif | |
| 10249 | |
| 10250 return OK; | |
| 10251 } | |
| 10252 | |
| 10253 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10254 * 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
|
10255 * 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
|
10256 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10257 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10258 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10259 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10260 // 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
|
10261 // 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
|
10262 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10263 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10264 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10265 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10266 { |
|
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
|
10267 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
|
10268 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10269 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10270 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10271 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10272 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10273 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10274 * Show the current mode and ruler. |
| 7 | 10275 * |
| 10276 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10277 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10278 * 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
|
10279 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 10280 * Return the length of the message (0 if no message). |
| 10281 */ | |
| 10282 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10283 showmode(void) |
| 7 | 10284 { |
| 10285 int need_clear; | |
| 10286 int length = 0; | |
| 10287 int do_mode; | |
| 10288 int attr; | |
| 10289 int nwr_save; | |
| 10290 #ifdef FEAT_INS_EXPAND | |
| 10291 int sub_attr; | |
| 10292 #endif | |
| 10293 | |
| 642 | 10294 do_mode = ((p_smd && msg_silent == 0) |
| 10295 && ((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
|
10296 || restart_edit != NUL |
| 5735 | 10297 || 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
|
10298 if (do_mode || reg_recording != 0) |
| 7 | 10299 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10300 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10301 return 0; // show mode later |
| 7 | 10302 |
| 10303 nwr_save = need_wait_return; | |
| 10304 | |
| 10305 /* wait a bit before overwriting an important message */ | |
| 10306 check_for_delay(FALSE); | |
| 10307 | |
| 10308 /* if the cmdline is more than one line high, erase top lines */ | |
| 10309 need_clear = clear_cmdline; | |
| 10310 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10311 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10312 | |
| 10313 /* Position on the last line in the window, column 0 */ | |
| 10314 msg_pos_mode(); | |
| 10315 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10316 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10317 if (do_mode) |
| 10318 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10319 msg_puts_attr("--", attr); |
| 7 | 10320 #if defined(FEAT_XIM) |
| 2520 | 10321 if ( |
| 10322 # ifdef FEAT_GUI_GTK | |
| 10323 preedit_get_status() | |
| 1668 | 10324 # else |
| 10325 im_get_status() | |
| 2520 | 10326 # endif |
| 1668 | 10327 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10328 # 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
|
10329 msg_puts_attr(" IM", attr); |
| 7 | 10330 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10331 msg_puts_attr(" XIM", attr); |
| 7 | 10332 # endif |
| 10333 #endif | |
| 10334 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10335 if (gui.in_use) | |
| 10336 { | |
| 10337 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10338 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10339 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10340 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10341 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
|
10342 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10343 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
|
10344 } |
| 7 | 10345 } |
| 10346 #endif | |
| 10347 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10348 /* CTRL-X in Insert mode */ |
| 10349 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10350 { |
| 10351 /* These messages can get long, avoid a wrap in a narrow | |
| 10352 * window. Prefer showing edit_submode_extra. */ | |
| 10353 length = (Rows - msg_row) * Columns - 3; | |
| 10354 if (edit_submode_extra != NULL) | |
| 10355 length -= vim_strsize(edit_submode_extra); | |
| 10356 if (length > 0) | |
| 10357 { | |
| 10358 if (edit_submode_pre != NULL) | |
| 10359 length -= vim_strsize(edit_submode_pre); | |
| 10360 if (length - vim_strsize(edit_submode) > 0) | |
| 10361 { | |
| 10362 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
|
10363 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
|
10364 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10365 } |
| 10366 if (edit_submode_extra != NULL) | |
| 10367 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10368 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10369 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
|
10370 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10371 else |
| 10372 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10373 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10374 } |
| 10375 } | |
| 10376 } | |
| 10377 else | |
| 10378 #endif | |
| 10379 { | |
| 10380 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
|
10381 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10382 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
|
10383 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10384 else if (State & INSERT) |
| 10385 { | |
| 10386 #ifdef FEAT_RIGHTLEFT | |
| 10387 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10388 msg_puts_attr(_(" REVERSE"), attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10389 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10390 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10391 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10392 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
|
10393 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10394 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
|
10395 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10396 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
|
10397 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10398 #ifdef FEAT_RIGHTLEFT |
| 10399 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10400 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10401 #endif |
| 10402 #ifdef FEAT_KEYMAP | |
| 10403 if (State & LANGMAP) | |
| 10404 { | |
| 10405 # ifdef FEAT_ARABIC | |
| 10406 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
|
10407 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10408 else |
| 10409 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10410 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
|
10411 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10412 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10413 } |
| 10414 #endif | |
| 10415 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
|
10416 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10417 |
| 10418 if (VIsual_active) | |
| 10419 { | |
| 10420 char *p; | |
| 10421 | |
| 10422 /* Don't concatenate separate words to avoid translation | |
| 10423 * problems. */ | |
| 10424 switch ((VIsual_select ? 4 : 0) | |
| 10425 + (VIsual_mode == Ctrl_V) * 2 | |
| 10426 + (VIsual_mode == 'V')) | |
| 10427 { | |
| 10428 case 0: p = N_(" VISUAL"); break; | |
| 10429 case 1: p = N_(" VISUAL LINE"); break; | |
| 10430 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10431 case 4: p = N_(" SELECT"); break; | |
| 10432 case 5: p = N_(" SELECT LINE"); break; | |
| 10433 default: p = N_(" SELECT BLOCK"); break; | |
| 10434 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10435 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
|
10436 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10437 msg_puts_attr(" --", attr); |
| 7 | 10438 } |
| 644 | 10439 |
| 7 | 10440 need_clear = TRUE; |
| 10441 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10442 if (reg_recording != 0 |
| 7 | 10443 #ifdef FEAT_INS_EXPAND |
| 10444 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10445 #endif | |
| 10446 ) | |
| 10447 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10448 recording_mode(attr); |
| 7 | 10449 need_clear = TRUE; |
| 10450 } | |
| 644 | 10451 |
| 10452 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
|
10453 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10454 msg_clr_eos(); |
| 10455 msg_didout = FALSE; /* overwrite this message */ | |
| 10456 length = msg_col; | |
| 10457 msg_col = 0; | |
| 10458 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10459 } | |
| 10460 else if (clear_cmdline && msg_silent == 0) | |
| 10461 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10462 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
|
10463 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
|
10464 { |
|
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
|
10465 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
|
10466 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
|
10467 } |
| 7 | 10468 |
| 10469 #ifdef FEAT_CMDL_INFO | |
| 10470 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10471 if (VIsual_active) | |
| 10472 clear_showcmd(); | |
| 10473 | |
| 10474 /* If the last window has no status line, the ruler is after the mode | |
| 10475 * 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
|
10476 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
|
10477 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10478 #endif |
| 10479 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
|
10480 redraw_mode = FALSE; |
| 7 | 10481 clear_cmdline = FALSE; |
| 10482 | |
| 10483 return length; | |
| 10484 } | |
| 10485 | |
| 10486 /* | |
| 10487 * Position for a mode message. | |
| 10488 */ | |
| 10489 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10490 msg_pos_mode(void) |
| 7 | 10491 { |
| 10492 msg_col = 0; | |
| 10493 msg_row = Rows - 1; | |
| 10494 } | |
| 10495 | |
| 10496 /* | |
| 10497 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10498 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10499 * Caller should check "mode_displayed". |
| 7 | 10500 */ |
| 10501 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10502 unshowmode(int force) |
| 7 | 10503 { |
| 10504 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10505 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10506 */ |
| 10507 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10508 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10509 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10510 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10511 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10512 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10513 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10514 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10515 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10516 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10517 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10518 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10519 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
|
10520 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
|
10521 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10522 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
|
10523 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
|
10524 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
|
10525 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10526 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10527 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10528 msg_row = save_msg_row; |
| 7 | 10529 } |
| 10530 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10531 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10532 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10533 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10534 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10535 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10536 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10537 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10538 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10539 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
|
10540 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10541 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10542 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10543 |
| 667 | 10544 /* |
| 10545 * Draw the tab pages line at the top of the Vim window. | |
| 10546 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10547 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10548 draw_tabline(void) |
| 667 | 10549 { |
| 10550 int tabcount = 0; | |
| 10551 tabpage_T *tp; | |
| 10552 int tabwidth; | |
| 10553 int col = 0; | |
| 673 | 10554 int scol = 0; |
| 667 | 10555 int attr; |
| 10556 win_T *wp; | |
| 671 | 10557 win_T *cwp; |
| 10558 int wincount; | |
| 10559 int modified; | |
| 667 | 10560 int c; |
| 10561 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10562 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
|
10563 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
|
10564 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10565 char_u *p; |
| 677 | 10566 int room; |
| 10567 int use_sep_chars = (t_colors < 8 | |
| 10568 #ifdef FEAT_GUI | |
| 10569 && !gui.in_use | |
| 10570 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10571 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10572 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10573 #endif |
| 677 | 10574 ); |
| 673 | 10575 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10576 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10577 return; |
| 673 | 10578 redraw_tabline = FALSE; |
| 667 | 10579 |
| 685 | 10580 #ifdef FEAT_GUI_TABLINE |
| 798 | 10581 /* Take care of a GUI tabline. */ |
| 685 | 10582 if (gui_use_tabline()) |
| 10583 { | |
| 10584 gui_update_tabline(); | |
| 10585 return; | |
| 10586 } | |
| 10587 #endif | |
| 10588 | |
| 10589 if (tabline_height() < 1) | |
| 667 | 10590 return; |
| 10591 | |
| 677 | 10592 #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
|
10593 clear_TabPageIdxs(); |
| 681 | 10594 |
| 677 | 10595 /* Use the 'tabline' option if it's set. */ |
| 10596 if (*p_tal != NUL) | |
| 10597 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10598 int saved_did_emsg = did_emsg; |
| 680 | 10599 |
| 10600 /* Check for an error. If there is one we would loop in redrawing the | |
| 10601 * 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
|
10602 did_emsg = FALSE; |
| 677 | 10603 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10604 if (did_emsg) |
| 680 | 10605 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10606 (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
|
10607 did_emsg |= saved_did_emsg; |
| 680 | 10608 } |
| 10609 else | |
| 10610 #endif | |
| 10611 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10612 FOR_ALL_TABPAGES(tp) |
| 680 | 10613 ++tabcount; |
| 10614 | |
| 10615 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10616 if (tabwidth < 6) | |
| 10617 tabwidth = 6; | |
| 10618 | |
| 10619 attr = attr_nosel; | |
| 10620 tabcount = 0; | |
| 699 | 10621 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10622 tp = tp->tp_next) | |
| 680 | 10623 { |
| 10624 scol = col; | |
| 10625 | |
| 10626 if (tp->tp_topframe == topframe) | |
| 10627 attr = attr_sel; | |
| 10628 if (use_sep_chars && col > 0) | |
| 10629 screen_putchar('|', 0, col++, attr); | |
| 10630 | |
| 10631 if (tp->tp_topframe != topframe) | |
| 10632 attr = attr_nosel; | |
| 10633 | |
| 10634 screen_putchar(' ', 0, col++, attr); | |
| 10635 | |
| 10636 if (tp == curtab) | |
| 10637 { | |
| 10638 cwp = curwin; | |
| 10639 wp = firstwin; | |
| 10640 } | |
| 10641 else | |
| 10642 { | |
| 10643 cwp = tp->tp_curwin; | |
| 10644 wp = tp->tp_firstwin; | |
| 10645 } | |
| 10646 | |
| 10647 modified = FALSE; | |
| 10648 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10649 if (bufIsChanged(wp->w_buffer)) | |
| 10650 modified = TRUE; | |
| 10651 if (modified || wincount > 1) | |
| 10652 { | |
| 10653 if (wincount > 1) | |
| 10654 { | |
| 10655 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10656 len = (int)STRLEN(NameBuff); |
| 699 | 10657 if (col + len >= Columns - 3) |
| 10658 break; | |
| 680 | 10659 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10660 #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
|
10661 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10662 #else |
| 6106 | 10663 attr |
| 680 | 10664 #endif |
| 10665 ); | |
| 10666 col += len; | |
| 10667 } | |
| 10668 if (modified) | |
| 10669 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10670 screen_putchar(' ', 0, col++, attr); | |
| 10671 } | |
| 10672 | |
| 10673 room = scol - col + tabwidth - 1; | |
| 10674 if (room > 0) | |
| 10675 { | |
| 685 | 10676 /* Get buffer name in NameBuff[] */ |
| 10677 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10678 shorten_dir(NameBuff); |
| 680 | 10679 len = vim_strsize(NameBuff); |
| 10680 p = NameBuff; | |
| 10681 if (has_mbyte) | |
| 10682 while (len > room) | |
| 10683 { | |
| 10684 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10685 MB_PTR_ADV(p); |
| 680 | 10686 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10687 else if (len > room) |
| 677 | 10688 { |
| 680 | 10689 p += len - room; |
| 10690 len = room; | |
| 677 | 10691 } |
| 699 | 10692 if (len > Columns - col - 1) |
| 10693 len = Columns - col - 1; | |
| 680 | 10694 |
| 835 | 10695 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10696 col += len; |
| 10697 } | |
| 10698 screen_putchar(' ', 0, col++, attr); | |
| 10699 | |
| 10700 /* Store the tab page number in TabPageIdxs[], so that | |
| 10701 * jump_to_mouse() knows where each one is. */ | |
| 10702 ++tabcount; | |
| 10703 while (scol < col) | |
| 10704 TabPageIdxs[scol++] = tabcount; | |
| 10705 } | |
| 10706 | |
| 10707 if (use_sep_chars) | |
| 10708 c = '_'; | |
| 10709 else | |
| 10710 c = ' '; | |
| 10711 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10712 |
| 10713 /* Put an "X" for closing the current tab if there are several. */ | |
| 10714 if (first_tabpage->tp_next != NULL) | |
| 10715 { | |
| 10716 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10717 TabPageIdxs[Columns - 1] = -999; | |
| 10718 } | |
| 10719 } | |
| 834 | 10720 |
| 10721 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10722 * set. */ | |
| 10723 redraw_tabline = FALSE; | |
| 667 | 10724 } |
| 685 | 10725 |
| 10726 /* | |
| 10727 * Get buffer name for "buf" into NameBuff[]. | |
| 10728 * Takes care of special buffer names and translates special characters. | |
| 10729 */ | |
| 10730 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10731 get_trans_bufname(buf_T *buf) |
| 685 | 10732 { |
| 10733 if (buf_spname(buf) != NULL) | |
| 3839 | 10734 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10735 else |
| 10736 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10737 trans_characters(NameBuff, MAXPATHL); | |
| 10738 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10739 |
| 7 | 10740 /* |
| 10741 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10742 */ | |
| 10743 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
|
10744 fillchar_status(int *attr, win_T *wp) |
| 7 | 10745 { |
| 10746 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
|
10747 |
|
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
|
10748 #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
|
10749 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
|
10750 { |
|
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
|
10751 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
|
10752 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10753 *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
|
10754 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
|
10755 } |
|
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
|
10756 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10757 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10758 *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
|
10759 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
|
10760 } |
|
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
|
10761 } |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10762 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
|
10763 #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
|
10764 if (wp == curwin) |
| 7 | 10765 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10766 *attr = HL_ATTR(HLF_S); |
| 7 | 10767 fill = fill_stl; |
| 10768 } | |
| 10769 else | |
| 10770 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10771 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10772 fill = fill_stlnc; |
| 10773 } | |
| 10774 /* Use fill when there is highlighting, and highlighting of current | |
| 10775 * window differs, or the fillchars differ, or this is not the | |
| 10776 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10777 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
|
10778 || wp != curwin || ONE_WINDOW) |
| 7 | 10779 || (fill_stl != fill_stlnc))) |
| 10780 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
|
10781 if (wp == curwin) |
| 7 | 10782 return '^'; |
| 10783 return '='; | |
| 10784 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10785 |
| 7 | 10786 /* |
| 10787 * Get the character to use in a separator between vertically split windows. | |
| 10788 * Get its attributes in "*attr". | |
| 10789 */ | |
| 10790 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10791 fillchar_vsep(int *attr) |
| 7 | 10792 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10793 *attr = HL_ATTR(HLF_C); |
| 7 | 10794 if (*attr == 0 && fill_vert == ' ') |
| 10795 return '|'; | |
| 10796 else | |
| 10797 return fill_vert; | |
| 10798 } | |
| 10799 | |
| 10800 /* | |
| 10801 * Return TRUE if redrawing should currently be done. | |
| 10802 */ | |
| 10803 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10804 redrawing(void) |
| 7 | 10805 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10806 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10807 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
|
10808 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10809 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10810 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10811 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10812 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10813 || 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
|
10814 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10815 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10816 } |
| 10817 | |
| 10818 /* | |
| 10819 * Return TRUE if printing messages should currently be done. | |
| 10820 */ | |
| 10821 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10822 messaging(void) |
| 7 | 10823 { |
| 10824 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10825 } | |
| 10826 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10827 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10828 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10829 * 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
|
10830 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10831 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10832 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
|
10833 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10834 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10835 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
|
10836 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
|
10837 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10838 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10839 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
|
10840 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
|
10841 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
|
10842 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10843 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
|
10844 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
|
10845 ++item_count; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10846 wp->w_winbar_items = (winbar_item_T *)alloc_clear( |
|
16768
695d9ef00b03
patch 8.1.1386: unessesary type casts for lalloc()
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
10847 sizeof(winbar_item_T) * (item_count + 1)); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10848 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10849 /* 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
|
10850 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
|
10851 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
|
10852 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10853 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
|
10854 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
|
10855 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10856 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10857 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10858 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
|
10859 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
|
10860 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10861 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10862 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10863 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
|
10864 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
|
10865 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
|
10866 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10867 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10868 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
|
10869 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
|
10870 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10871 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
|
10872 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10873 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10874 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
|
10875 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
|
10876 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10877 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10878 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
|
10879 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10880 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
|
10881 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10882 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10883 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
|
10884 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10885 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
|
10886 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10887 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10888 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
|
10889 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10890 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
|
10891 (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
|
10892 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10893 #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
|
10894 |
| 7 | 10895 /* |
| 10896 * Show current status info in ruler and various other places | |
| 10897 * If always is FALSE, only show ruler if position has changed. | |
| 10898 */ | |
| 10899 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10900 showruler(int always) |
| 7 | 10901 { |
| 10902 if (!always && !redrawing()) | |
| 10903 return; | |
| 574 | 10904 #ifdef FEAT_INS_EXPAND |
| 10905 if (pum_visible()) | |
| 10906 { | |
| 10907 /* Don't redraw right now, do it later. */ | |
| 10908 curwin->w_redr_status = TRUE; | |
| 10909 return; | |
| 10910 } | |
| 10911 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10912 #if defined(FEAT_STL_OPT) |
| 40 | 10913 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 10914 redraw_custom_statusline(curwin); |
| 7 | 10915 else |
| 10916 #endif | |
| 10917 #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
|
10918 win_redr_ruler(curwin, always, FALSE); |
| 7 | 10919 #endif |
| 10920 | |
| 10921 #ifdef FEAT_TITLE | |
| 10922 if (need_maketitle | |
| 10923 # ifdef FEAT_STL_OPT | |
| 10924 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10925 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10926 # endif | |
| 10927 ) | |
| 10928 maketitle(); | |
| 10929 #endif | |
| 1588 | 10930 /* Redraw the tab pages line if needed. */ |
| 10931 if (redraw_tabline) | |
| 10932 draw_tabline(); | |
| 7 | 10933 } |
| 10934 | |
| 10935 #ifdef FEAT_CMDL_INFO | |
| 10936 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
|
10937 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 10938 { |
| 1869 | 10939 #define RULER_BUF_LEN 70 |
| 10940 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10941 int row; |
| 10942 int fillchar; | |
| 10943 int attr; | |
| 10944 int empty_line = FALSE; | |
| 10945 colnr_T virtcol; | |
| 10946 int i; | |
| 1869 | 10947 size_t len; |
| 7 | 10948 int o; |
| 10949 int this_ru_col; | |
| 10950 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
10951 int width; |
| 7 | 10952 |
| 10953 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10954 if (!p_ru) | |
| 10955 return; | |
| 10956 | |
| 10957 /* | |
| 10958 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10959 * after deleting lines, before cursor.lnum is corrected. | |
| 10960 */ | |
| 10961 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10962 return; | |
| 10963 | |
| 10964 #ifdef FEAT_INS_EXPAND | |
| 10965 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10966 * the (long) mode message. */ | |
| 10967 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10968 if (edit_submode != NULL) | |
| 10969 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
|
10970 // 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
|
10971 // 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
|
10972 if (!ignore_pum && pum_visible()) |
| 540 | 10973 return; |
| 7 | 10974 #endif |
| 10975 | |
| 10976 #ifdef FEAT_STL_OPT | |
| 10977 if (*p_ruf) | |
| 10978 { | |
| 680 | 10979 int save_called_emsg = called_emsg; |
| 10980 | |
| 10981 called_emsg = FALSE; | |
| 7 | 10982 win_redr_custom(wp, TRUE); |
| 680 | 10983 if (called_emsg) |
| 10984 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 10985 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 10986 called_emsg |= save_called_emsg; |
| 7 | 10987 return; |
| 10988 } | |
| 10989 #endif | |
| 10990 | |
| 10991 /* | |
| 10992 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 10993 */ | |
| 10994 if (!(State & INSERT) | |
| 10995 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 10996 empty_line = TRUE; | |
| 10997 | |
| 10998 /* | |
| 10999 * Only draw the ruler when something changed. | |
| 11000 */ | |
| 11001 validate_virtcol_win(wp); | |
| 11002 if ( redraw_cmdline | |
| 11003 || always | |
| 11004 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 11005 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 11006 || wp->w_virtcol != wp->w_ru_virtcol | |
| 11007 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 11008 || wp->w_topline != wp->w_ru_topline | |
| 11009 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 11010 #ifdef FEAT_DIFF | |
| 11011 || wp->w_topfill != wp->w_ru_topfill | |
| 11012 #endif | |
| 11013 || empty_line != wp->w_ru_empty) | |
| 11014 { | |
| 11015 cursor_off(); | |
| 11016 if (wp->w_status_height) | |
| 11017 { | |
| 11018 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
|
11019 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
|
11020 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
|
11021 width = wp->w_width; |
| 7 | 11022 } |
| 11023 else | |
| 11024 { | |
| 11025 row = Rows - 1; | |
| 11026 fillchar = ' '; | |
| 11027 attr = 0; | |
| 11028 width = Columns; | |
| 11029 off = 0; | |
| 11030 } | |
| 11031 | |
| 11032 /* In list mode virtcol needs to be recomputed */ | |
| 11033 virtcol = wp->w_virtcol; | |
| 11034 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 11035 { | |
| 11036 wp->w_p_list = FALSE; | |
| 11037 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 11038 wp->w_p_list = TRUE; | |
| 11039 } | |
| 11040 | |
| 11041 /* | |
| 11042 * Some sprintfs return the length, some return a pointer. | |
| 11043 * To avoid portability problems we use strlen() here. | |
| 11044 */ | |
| 1869 | 11045 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11046 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11047 ? 0L | |
| 11048 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11049 len = STRLEN(buffer); |
| 11050 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11051 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11052 (int)virtcol + 1); | |
| 11053 | |
| 11054 /* | |
| 11055 * Add a "50%" if there is room for it. | |
| 11056 * On the last line, don't print in the last column (scrolls the | |
| 11057 * screen up on some terminals). | |
| 11058 */ | |
| 11059 i = (int)STRLEN(buffer); | |
| 1869 | 11060 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11061 o = i + vim_strsize(buffer + i + 1); |
| 11062 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11063 ++o; | |
| 11064 this_ru_col = ru_col - (Columns - width); | |
| 11065 if (this_ru_col < 0) | |
| 11066 this_ru_col = 0; | |
| 11067 /* Never use more than half the window/screen width, leave the other | |
| 11068 * 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
|
11069 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
|
11070 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
|
11071 if (this_ru_col + o < width) |
| 7 | 11072 { |
| 6466 | 11073 /* 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
|
11074 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11075 { |
| 11076 if (has_mbyte) | |
| 11077 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11078 else | |
| 11079 buffer[i++] = fillchar; | |
| 11080 ++o; | |
| 11081 } | |
| 1869 | 11082 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11083 } |
| 11084 /* Truncate at window boundary. */ | |
| 11085 if (has_mbyte) | |
| 11086 { | |
| 11087 o = 0; | |
| 474 | 11088 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11089 { |
| 11090 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
|
11091 if (this_ru_col + o > width) |
| 7 | 11092 { |
| 11093 buffer[i] = NUL; | |
| 11094 break; | |
| 11095 } | |
| 11096 } | |
| 11097 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
11098 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
|
11099 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
|
11100 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11101 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11102 i = redraw_cmdline; |
| 11103 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
|
11104 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
|
11105 (int)(off + width), |
| 7 | 11106 fillchar, fillchar, attr); |
| 11107 /* don't redraw the cmdline because of showing the ruler */ | |
| 11108 redraw_cmdline = i; | |
| 11109 wp->w_ru_cursor = wp->w_cursor; | |
| 11110 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11111 wp->w_ru_empty = empty_line; | |
| 11112 wp->w_ru_topline = wp->w_topline; | |
| 11113 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11114 #ifdef FEAT_DIFF | |
| 11115 wp->w_ru_topfill = wp->w_topfill; | |
| 11116 #endif | |
| 11117 } | |
| 11118 } | |
| 11119 #endif | |
| 13 | 11120 |
| 11121 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11122 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11123 * 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
|
11124 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11125 * Otherwise it depends on 'numberwidth' and the line count. |
| 11126 */ | |
| 11127 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11128 number_width(win_T *wp) |
| 13 | 11129 { |
| 11130 int n; | |
| 11131 linenr_T lnum; | |
| 11132 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11133 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
|
11134 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11135 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11136 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11137 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11138 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
|
11139 |
| 6679 | 11140 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11141 return wp->w_nrwidth_width; |
| 11142 wp->w_nrwidth_line_count = lnum; | |
| 11143 | |
| 11144 n = 0; | |
| 11145 do | |
| 11146 { | |
| 856 | 11147 lnum /= 10; |
| 11148 ++n; | |
| 13 | 11149 } while (lnum > 0); |
| 11150 | |
| 11151 /* 'numberwidth' gives the minimal width plus one */ | |
| 11152 if (n < wp->w_p_nuw - 1) | |
| 11153 n = wp->w_p_nuw - 1; | |
| 11154 | |
| 11155 wp->w_nrwidth_width = n; | |
| 6679 | 11156 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11157 return n; |
| 11158 } | |
| 11159 #endif | |
| 3986 | 11160 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11161 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 11162 /* |
| 11163 * Return the current cursor column. This is the actual position on the | |
| 11164 * screen. First column is 0. | |
| 11165 */ | |
| 11166 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11167 screen_screencol(void) |
| 3986 | 11168 { |
| 11169 return screen_cur_col; | |
| 11170 } | |
| 11171 | |
| 11172 /* | |
| 11173 * Return the current cursor row. This is the actual position on the screen. | |
| 11174 * First row is 0. | |
| 11175 */ | |
| 11176 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11177 screen_screenrow(void) |
| 3986 | 11178 { |
| 11179 return screen_cur_row; | |
| 11180 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11181 #endif |