diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-18 22:13:31 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-18 22:13:31 +0100 |
| commit | c3719bd87beca9f72d2e9f11e36d561c2c3b57b0 (patch) | |
| tree | 2ca909ca8d4a040e48cc484b2ae7512014d3eaf0 /src/os_unix.c | |
| parent | c7d16dce2f180c8ebfc8105ad090b0ea2deedcdc (diff) | |
| download | vim-c3719bd87beca9f72d2e9f11e36d561c2c3b57b0.zip | |
patch 8.0.1312: balloon_show() only works in terminal when compiled with GUI
Problem: balloon_show() only works in terminal when compiled with the GUI.
Solution: Add FEAT_BEVAL_GUI and refactor to move common code out of the GUI
specific file.
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 1c2a90276..b61dc4827 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -475,7 +475,7 @@ mch_inchar( if ((wait_time < 0 || wait_time > 100L) && channel_any_readahead()) wait_time = 10L; #endif -#ifdef FEAT_BEVAL +#ifdef FEAT_BEVAL_GUI if (p_beval && wait_time > 100L) /* The 'balloonexpr' may indirectly invoke a callback while waiting * for a character, need to check often. */ @@ -3572,13 +3572,13 @@ static int mouse_ison = FALSE; void mch_setmouse(int on) { -# ifdef FEAT_BEVALTERM +# ifdef FEAT_BEVAL_TERM static int bevalterm_ison = FALSE; # endif int xterm_mouse_vers; if (on == mouse_ison -# ifdef FEAT_BEVALTERM +# ifdef FEAT_BEVAL_TERM && p_bevalterm == bevalterm_ison # endif ) @@ -3610,7 +3610,7 @@ mch_setmouse(int on) } # endif -# ifdef FEAT_BEVALTERM +# ifdef FEAT_BEVAL_TERM if (bevalterm_ison != (p_bevalterm && on)) { bevalterm_ison = (p_bevalterm && on); @@ -3627,7 +3627,7 @@ mch_setmouse(int on) out_str_nf((char_u *) (xterm_mouse_vers > 1 ? ( -# ifdef FEAT_BEVALTERM +# ifdef FEAT_BEVAL_TERM bevalterm_ison ? IF_EB("\033[?1003h", ESC_STR "[?1003h") : # endif @@ -3735,7 +3735,7 @@ mch_setmouse(int on) # endif } -#if defined(FEAT_BEVALTERM) || defined(PROTO) +#if defined(FEAT_BEVAL_TERM) || defined(PROTO) /* * Called when 'balloonevalterm' changed. */ |