updated for version 7.3.234

Problem:    With GTK menu may be popping down.
Solution:   Use event time instead of GDK_CURRENT_TIME. (Hong Xu)

diff --git a/src/gui.c b/src/gui.c
index 244dbd547466f25a1f5bcf5fbef978152159bb68..d7024a82f5b0572161a210ca0a953394e36ec4fe 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -84,6 +84,10 @@ gui_start()
     gui.starting = TRUE;
     full_screen = FALSE;
 
+#ifdef FEAT_GUI_GTK
+    gui.event_time = GDK_CURRENT_TIME;
+#endif
+
 #ifdef MAY_FORK
     if (!gui.dofork || vim_strchr(p_go, GO_FORG) || recursive)
        dofork = FALSE;

diff --git a/src/gui.h b/src/gui.h
index 8db9238af492b1feabcbb4c1425fcebb2ecc889a..e0c1c5c8aa178f7402bd81d4bcf1ef80649c75d4 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
@@ -401,6 +401,8 @@ typedef struct Gui
     GtkAccelGroup *accel_group;
     GtkWidget  *filedlg;           /* file selection dialog */
     char_u     *browse_fname;      /* file name from filedlg */
+
+    guint32    event_time;
 #endif /* FEAT_GUI_GTK */
 
 #if defined(FEAT_GUI_TABLINE) \

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 94cebd471b6d1d064bdf3bd7841e7e40e2a9cdb4..50079b406aa8dff735fae1c34b34f34498fcd072 100644 (file)
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -1391,7 +1391,7 @@ gui_mch_show_popupmenu(vimmenu_T *menu)
     gtk_menu_popup(GTK_MENU(menu->submenu_id),
                   NULL, NULL,
                   (GtkMenuPositionFunc)NULL, NULL,
-                  3U, (guint32)GDK_CURRENT_TIME);
+                  3U, gui.event_time);
 }
 
 /* Ugly global variable to pass "mouse_pos" flag from gui_make_popup() to

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 77be9767b6d07da7ab2d3fc521ed8be53ce536e3..9d95f1a48bb4f1a91cb5278e1ecfaf1f4466e6e5 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -88,8 +88,6 @@ extern void bonobo_dock_item_set_behavior(BonoboDockItem *dock_item, BonoboDockI
 # include <X11/Sunkeysym.h>
 #endif
 
-static guint32 clipboard_event_time = CurrentTime;
-
 /*
  * Easy-to-use macro for multihead support.
  */
@@ -934,7 +932,7 @@ key_press_event(GtkWidget *widget UNUSED,
     guint      state;
     char_u     *s, *d;
 
-    clipboard_event_time = event->time;
+    gui.event_time = event->time;
     key_sym = event->keyval;
     state = event->state;
 
@@ -1129,7 +1127,7 @@ key_release_event(GtkWidget *widget UNUSED,
                  GdkEventKey *event,
                  gpointer data UNUSED)
 {
-    clipboard_event_time = event->time;
+    gui.event_time = event->time;
     /*
      * GTK+ 2 input methods may do fancy stuff on key release events too.
      * With the default IM for instance, you can enter any UCS code point
@@ -1622,7 +1620,7 @@ button_press_event(GtkWidget *widget,
     int x, y;
     int_u vim_modifiers;
 
-    clipboard_event_time = event->time;
+    gui.event_time = event->time;
 
     /* Make sure we have focus now we've been selected */
     if (gtk_socket_id != 0 && !GTK_WIDGET_HAS_FOCUS(widget))
@@ -1733,7 +1731,7 @@ button_release_event(GtkWidget *widget UNUSED,
     int x, y;
     int_u vim_modifiers;
 
-    clipboard_event_time = event->time;
+    gui.event_time = event->time;
 
     /* Remove any motion "machine gun" timers used for automatic further
        extension of allocation areas if outside of the applications window
@@ -5654,7 +5652,7 @@ clip_mch_own_selection(VimClipboard *cbd)
     int success;
 
     success = gtk_selection_owner_set(gui.drawarea, cbd->gtk_sel_atom,
-                                     clipboard_event_time);
+                                     gui.event_time);
     gui_mch_update();
     return (success) ? OK : FAIL;
 }

diff --git a/src/version.c b/src/version.c
index 0057a0a076a24332c13f09868540fb3d63daba17..ccb59a02ad8df2fc527c0624294170c9bd78782f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    234,
 /**/
     233,
 /**/