patch 8.2.3654: GTK: a touch-drag does not update the selection
Problem: GTK: a touch-drag does not update the selection.
Solution: Add GDK_BUTTON1_MASK to the state. (Chris Dalton, close #9196,
closes #9194)
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 4e89c4e..6381a95 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -397,6 +397,12 @@
#endif
/*
+ * GTK doesn't set the GDK_BUTTON1_MASK state when dragging a touch. Add this
+ * state when dragging.
+ */
+static guint dragging_button_state = 0;
+
+/*
* Parse the GUI related command-line arguments. Any arguments used are
* deleted from argv, and *argc is decremented accordingly. This is called
* when vim is started, whether or not the GUI has been started.
@@ -1585,6 +1591,9 @@
int_u vim_modifiers;
GtkAllocation allocation;
+ // Need to add GDK_BUTTON1_MASK state when dragging a touch.
+ state |= dragging_button_state;
+
button = (state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK |
GDK_BUTTON3_MASK | GDK_BUTTON4_MASK |
GDK_BUTTON5_MASK))
@@ -1811,7 +1820,11 @@
{
// Keep in sync with gui_x11.c.
// Buttons 4-7 are handled in scroll_event()
- case 1: button = MOUSE_LEFT; break;
+ case 1:
+ button = MOUSE_LEFT;
+ // needed for touch-drag
+ dragging_button_state |= GDK_BUTTON1_MASK;
+ break;
case 2: button = MOUSE_MIDDLE; break;
case 3: button = MOUSE_RIGHT; break;
case 8: button = MOUSE_X1; break;
@@ -1906,6 +1919,13 @@
gui_send_mouse_event(MOUSE_RELEASE, x, y, FALSE, vim_modifiers);
+ switch (event->button)
+ {
+ case 1: // MOUSE_LEFT
+ dragging_button_state = 0;
+ break;
+ }
+
return TRUE;
}