Karsten Hopp 0a82a9
To: vim-dev@vim.org
Karsten Hopp 0a82a9
Subject: patch 7.1.109
Karsten Hopp 0a82a9
Fcc: outbox
Karsten Hopp 0a82a9
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 0a82a9
Mime-Version: 1.0
Karsten Hopp 0a82a9
Content-Type: text/plain; charset=ISO-8859-1
Karsten Hopp 0a82a9
Content-Transfer-Encoding: 8bit
Karsten Hopp 0a82a9
------------
Karsten Hopp 0a82a9
Karsten Hopp 0a82a9
Patch 7.1.109
Karsten Hopp 0a82a9
Problem:    GTK: when there are many tab pages, clicking on the arrow left of
Karsten Hopp 0a82a9
	    the labels moves to the next tab page on the right. (Simeon Bird)
Karsten Hopp 0a82a9
Solution:   Check the X coordinate of the click and pass -1 as value for the
Karsten Hopp 0a82a9
	    left arrow.
Karsten Hopp 0a82a9
Files:	    src/gui_gtk_x11.c, src/term.c
Karsten Hopp 0a82a9
Karsten Hopp 0a82a9
Karsten Hopp 0a82a9
*** ../vim-7.1.108/src/gui_gtk_x11.c	Wed Sep  5 21:45:54 2007
Karsten Hopp 0a82a9
--- src/gui_gtk_x11.c	Fri Sep 14 20:59:55 2007
Karsten Hopp 0a82a9
***************
Karsten Hopp 0a82a9
*** 3223,3230 ****
Karsten Hopp 0a82a9
  	{
Karsten Hopp 0a82a9
  	    if (clicked_page == 0)
Karsten Hopp 0a82a9
  	    {
Karsten Hopp 0a82a9
! 		/* Click after all tabs moves to next tab page. */
Karsten Hopp 0a82a9
! 		if (send_tabline_event(0) && gtk_main_level() > 0)
Karsten Hopp 0a82a9
  		    gtk_main_quit();
Karsten Hopp 0a82a9
  	    }
Karsten Hopp 0a82a9
  #ifndef HAVE_GTK2
Karsten Hopp 0a82a9
--- 3223,3231 ----
Karsten Hopp 0a82a9
  	{
Karsten Hopp 0a82a9
  	    if (clicked_page == 0)
Karsten Hopp 0a82a9
  	    {
Karsten Hopp 0a82a9
! 		/* Click after all tabs moves to next tab page.  When "x" is
Karsten Hopp 0a82a9
! 		 * small guess it's the left button. */
Karsten Hopp 0a82a9
! 		if (send_tabline_event(x < 50 ? -1 : 0) && gtk_main_level() > 0)
Karsten Hopp 0a82a9
  		    gtk_main_quit();
Karsten Hopp 0a82a9
  	    }
Karsten Hopp 0a82a9
  #ifndef HAVE_GTK2
Karsten Hopp 0a82a9
*** ../vim-7.1.108/src/term.c	Thu May 10 20:48:32 2007
Karsten Hopp 0a82a9
--- src/term.c	Fri Sep 14 20:56:40 2007
Karsten Hopp 0a82a9
***************
Karsten Hopp 0a82a9
*** 4809,4814 ****
Karsten Hopp 0a82a9
--- 4809,4816 ----
Karsten Hopp 0a82a9
  	    if (num_bytes == -1)
Karsten Hopp 0a82a9
  		return -1;
Karsten Hopp 0a82a9
  	    current_tab = (int)bytes[0];
Karsten Hopp 0a82a9
+ 	    if (current_tab == 255)	/* -1 in a byte gives 255 */
Karsten Hopp 0a82a9
+ 		current_tab = -1;
Karsten Hopp 0a82a9
  	    slen += num_bytes;
Karsten Hopp 0a82a9
  	}
Karsten Hopp 0a82a9
  	else if (key_name[0] == (int)KS_TABMENU)
Karsten Hopp 0a82a9
*** ../vim-7.1.108/src/version.c	Fri Sep 14 19:56:18 2007
Karsten Hopp 0a82a9
--- src/version.c	Sat Sep 15 14:05:25 2007
Karsten Hopp 0a82a9
***************
Karsten Hopp 0a82a9
*** 668,669 ****
Karsten Hopp 0a82a9
--- 668,671 ----
Karsten Hopp 0a82a9
  {   /* Add new patch number below this line */
Karsten Hopp 0a82a9
+ /**/
Karsten Hopp 0a82a9
+     109,
Karsten Hopp 0a82a9
  /**/
Karsten Hopp 0a82a9
Karsten Hopp 0a82a9
-- 
Karsten Hopp 0a82a9
No letters of the alphabet were harmed in the creation of this message.
Karsten Hopp 0a82a9
Karsten Hopp 0a82a9
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 0a82a9
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 0a82a9
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 0a82a9
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///