|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.359
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.359
|
|
|
d6ba96 |
Problem: When 'ttymouse' is set to 'uxterm' the xterm version is not
|
|
|
d6ba96 |
requested. (Tomas Janousek)
|
|
|
d6ba96 |
Solution: Do not mark uxterm as a conflict mouse and add
|
|
|
d6ba96 |
resume_get_esc_sequence().
|
|
|
d6ba96 |
Files: src/term.c, src/os_unix.c, src/proto/term.pro
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.358/src/term.c 2014-05-22 21:22:15.361995652 +0200
|
|
|
d6ba96 |
--- src/term.c 2014-07-09 18:49:57.127730739 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 3330,3335 ****
|
|
|
d6ba96 |
--- 3330,3348 ----
|
|
|
d6ba96 |
return crv_status == CRV_SENT || u7_status == U7_SENT
|
|
|
d6ba96 |
|| xt_index_out > xt_index_in;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
+ /*
|
|
|
d6ba96 |
+ * If requesting the version was disabled in did_request_esc_sequence(),
|
|
|
d6ba96 |
+ * enable it again.
|
|
|
d6ba96 |
+ */
|
|
|
d6ba96 |
+ void
|
|
|
d6ba96 |
+ resume_get_esc_sequence()
|
|
|
d6ba96 |
+ {
|
|
|
d6ba96 |
+ if (crv_status == 0)
|
|
|
d6ba96 |
+ crv_status = CRV_GET;
|
|
|
d6ba96 |
+ if (u7_status == 0)
|
|
|
d6ba96 |
+ u7_status = U7_GET;
|
|
|
d6ba96 |
+ }
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.358/src/os_unix.c 2014-05-22 21:22:15.361995652 +0200
|
|
|
d6ba96 |
--- src/os_unix.c 2014-07-09 18:56:58.483722175 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 3780,3788 ****
|
|
|
d6ba96 |
# ifdef FEAT_MOUSE_URXVT
|
|
|
d6ba96 |
/* same as the dec mouse */
|
|
|
d6ba96 |
if (use_xterm_mouse() == 3
|
|
|
d6ba96 |
- # ifdef FEAT_TERMRESPONSE
|
|
|
d6ba96 |
- && !did_request_esc_sequence()
|
|
|
d6ba96 |
- # endif
|
|
|
d6ba96 |
# ifdef FEAT_GUI
|
|
|
d6ba96 |
&& !gui.in_use
|
|
|
d6ba96 |
# endif
|
|
|
d6ba96 |
--- 3780,3785 ----
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 3797,3803 ****
|
|
|
d6ba96 |
mch_setmouse(FALSE);
|
|
|
d6ba96 |
setmouse();
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
! xterm_conflict_mouse = TRUE;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
else
|
|
|
d6ba96 |
del_mouse_termcode(KS_URXVT_MOUSE);
|
|
|
d6ba96 |
--- 3794,3801 ----
|
|
|
d6ba96 |
mch_setmouse(FALSE);
|
|
|
d6ba96 |
setmouse();
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
! /* It's OK to request the xterm version for uxterm. */
|
|
|
d6ba96 |
! resume_get_esc_sequence();
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
else
|
|
|
d6ba96 |
del_mouse_termcode(KS_URXVT_MOUSE);
|
|
|
d6ba96 |
*** ../vim-7.4.358/src/proto/term.pro 2014-05-22 18:14:27.570224664 +0200
|
|
|
d6ba96 |
--- src/proto/term.pro 2014-07-09 18:53:31.827726375 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 35,40 ****
|
|
|
d6ba96 |
--- 35,41 ----
|
|
|
d6ba96 |
void starttermcap __ARGS((void));
|
|
|
d6ba96 |
void stoptermcap __ARGS((void));
|
|
|
d6ba96 |
int did_request_esc_sequence __ARGS((void));
|
|
|
d6ba96 |
+ void resume_get_esc_sequence __ARGS((void));
|
|
|
d6ba96 |
void may_req_termresponse __ARGS((void));
|
|
|
d6ba96 |
void may_req_ambiguous_char_width __ARGS((void));
|
|
|
d6ba96 |
int swapping_screen __ARGS((void));
|
|
|
d6ba96 |
*** ../vim-7.4.358/src/version.c 2014-07-09 17:51:46.075801693 +0200
|
|
|
d6ba96 |
--- src/version.c 2014-07-09 18:50:55.515729552 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 736,737 ****
|
|
|
d6ba96 |
--- 736,739 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 359,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
An indication you must be a manager:
|
|
|
d6ba96 |
You give constructive feedback to your dog.
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|