mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 7.4.938
Problem: X11 and GTK have moure mouse buttons than Vim supports. Solution: Recognize more mouse buttons. (Benoit Pierre, closes #498)
This commit is contained in:
@@ -1680,17 +1680,15 @@ button_press_event(GtkWidget *widget,
|
|||||||
|
|
||||||
switch (event->button)
|
switch (event->button)
|
||||||
{
|
{
|
||||||
case 1:
|
/* Keep in sync with gui_x11.c.
|
||||||
button = MOUSE_LEFT;
|
* Buttons 4-7 are handled in scroll_event() */
|
||||||
break;
|
case 1: button = MOUSE_LEFT; break;
|
||||||
case 2:
|
case 2: button = MOUSE_MIDDLE; break;
|
||||||
button = MOUSE_MIDDLE;
|
case 3: button = MOUSE_RIGHT; break;
|
||||||
break;
|
case 8: button = MOUSE_X1; break;
|
||||||
case 3:
|
case 9: button = MOUSE_X2; break;
|
||||||
button = MOUSE_RIGHT;
|
default:
|
||||||
break;
|
return FALSE; /* Unknown button */
|
||||||
default:
|
|
||||||
return FALSE; /* Unknown button */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef FEAT_XIM
|
#ifdef FEAT_XIM
|
||||||
|
@@ -1127,11 +1127,16 @@ gui_x11_mouse_cb(w, dud, event, dum)
|
|||||||
gui_x11_timer_cb, &timed_out);
|
gui_x11_timer_cb, &timed_out);
|
||||||
switch (event->xbutton.button)
|
switch (event->xbutton.button)
|
||||||
{
|
{
|
||||||
|
/* keep in sync with gui_gtk_x11.c */
|
||||||
case Button1: button = MOUSE_LEFT; break;
|
case Button1: button = MOUSE_LEFT; break;
|
||||||
case Button2: button = MOUSE_MIDDLE; break;
|
case Button2: button = MOUSE_MIDDLE; break;
|
||||||
case Button3: button = MOUSE_RIGHT; break;
|
case Button3: button = MOUSE_RIGHT; break;
|
||||||
case Button4: button = MOUSE_4; break;
|
case Button4: button = MOUSE_4; break;
|
||||||
case Button5: button = MOUSE_5; break;
|
case Button5: button = MOUSE_5; break;
|
||||||
|
case 6: button = MOUSE_7; break;
|
||||||
|
case 7: button = MOUSE_6; break;
|
||||||
|
case 8: button = MOUSE_X1; break;
|
||||||
|
case 9: button = MOUSE_X2; break;
|
||||||
default:
|
default:
|
||||||
return; /* Unknown button */
|
return; /* Unknown button */
|
||||||
}
|
}
|
||||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
938,
|
||||||
/**/
|
/**/
|
||||||
937,
|
937,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user