diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-06 20:00:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-06 20:00:19 +0200 |
| commit | 6bc9305a02f77136e65347951618575b2033cbc9 (patch) | |
| tree | 3676930ee5adf93581682142d845abcadfd3b5db /src/term.c | |
| parent | 3d3f21764a8003b90216ae6fb988af1dae5f5d70 (diff) | |
| download | vim-git-6bc9305a02f77136e65347951618575b2033cbc9.tar.gz | |
patch 8.1.1127: getwinpos() doesn't work in terminal on MS-Windows consolev8.1.1127
Problem: getwinpos() doesn't work in terminal on MS-Windows console.
Solution: Adjust #ifdefs. Disable test for MS-Windows console.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/term.c b/src/term.c index d114be978..ff1adc9ad 100644 --- a/src/term.c +++ b/src/term.c @@ -2843,7 +2843,7 @@ static int winpos_x = -1; static int winpos_y = -1; static int did_request_winpos = 0; -# if (defined(FEAT_EVAL) && defined(HAVE_TGETENT)) || defined(PROTO) +# if defined(FEAT_EVAL) || defined(FEAT_TERMINAL) || defined(PROTO) /* * Try getting the Vim window position from the terminal. * Returns OK or FAIL. @@ -4858,7 +4858,7 @@ check_termcode( /* * Check for a window position response from the terminal: - * {lead}3;{x}:{y}t + * {lead}3;{x};{y}t */ else if (did_request_winpos && ((len >= 4 && tp[0] == ESC && tp[1] == '[') @@ -4925,11 +4925,11 @@ check_termcode( if (i - j >= 21 && STRNCMP(tp + j + 3, "rgb:", 4) == 0 && tp[j + 11] == '/' && tp[j + 16] == '/') { -#ifdef FEAT_TERMINAL +# ifdef FEAT_TERMINAL int rval = hexhex2nr(tp + j + 7); int gval = hexhex2nr(tp + j + 12); int bval = hexhex2nr(tp + j + 17); -#endif +# endif if (is_bg) { char *newval = (3 * '6' < tp[j+7] + tp[j+12] @@ -4937,11 +4937,11 @@ check_termcode( LOG_TR(("Received RBG response: %s", tp)); rbg_status = STATUS_GOT; -#ifdef FEAT_TERMINAL +# ifdef FEAT_TERMINAL bg_r = rval; bg_g = gval; bg_b = bval; -#endif +# endif if (!option_was_set((char_u *)"bg") && STRCMP(p_bg, newval) != 0) { @@ -4952,7 +4952,7 @@ check_termcode( redraw_asap(CLEAR); } } -#ifdef FEAT_TERMINAL +# ifdef FEAT_TERMINAL else { LOG_TR(("Received RFG response: %s", tp)); @@ -4961,7 +4961,7 @@ check_termcode( fg_g = gval; fg_b = bval; } -#endif +# endif } /* got finished code: consume it */ |