Refactor context menu code to ui_menu_popup

geany · Sep 11, 2022 · 3bffc45 · 3bffc45
1 parent 85de036
commit 3bffc45
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 74 deletions.
diff --git a/src/callbacks.c b/src/callbacks.c
@@ -634,11 +634,7 @@ gboolean toolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, gpointer u
 {
 	if (event->button == 3)
 	{
-#if GTK_CHECK_VERSION(3,22,0)
-		gtk_menu_popup_at_pointer(GTK_MENU(ui_widgets.toolbar_menu), NULL);
-#else
-		gtk_menu_popup(GTK_MENU(ui_widgets.toolbar_menu), NULL, NULL, NULL, NULL, event->button, event->time);
-#endif
+		ui_menu_popup(GTK_MENU(ui_widgets.toolbar_menu), NULL, NULL, event->button, event->time);
 		return TRUE;
 	}
 	return FALSE;

diff --git a/src/editor.c b/src/editor.c
@@ -346,12 +346,7 @@ static gboolean on_editor_button_press_event(GtkWidget *widget, GdkEventButton *
 		g_signal_emit_by_name(geany_object, "update-editor-menu",
 			current_word, editor_info.click_pos, doc);
 
-#if GTK_CHECK_VERSION(3,22,0)
-		gtk_menu_popup_at_pointer(GTK_MENU(main_widgets.editor_menu), NULL);
-#else
-		gtk_menu_popup(GTK_MENU(main_widgets.editor_menu),
-			NULL, NULL, NULL, NULL, event->button, event->time);
-#endif
+		ui_menu_popup(GTK_MENU(main_widgets.editor_menu), NULL, NULL, event->button, event->time);
 		return TRUE;
 	}
 	return FALSE;

diff --git a/src/msgwindow.c b/src/msgwindow.c
@@ -1236,32 +1236,20 @@ static gboolean on_msgwin_button_press_event(GtkWidget *widget, GdkEventButton *
 		{
 			case MSG_STATUS:
 			{
-#if GTK_CHECK_VERSION(3,22,0)
-				gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_status_menu), NULL);
-#else
-				gtk_menu_popup(GTK_MENU(msgwindow.popup_status_menu), NULL, NULL, NULL, NULL,
-																	event->button, event->time);
-#endif
+				ui_menu_popup(GTK_MENU(msgwindow.popup_status_menu), NULL, NULL,
+							  event->button, event->time);
 				break;
 			}
 			case MSG_MESSAGE:
 			{
-#if GTK_CHECK_VERSION(3,22,0)
-				gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_msg_menu), NULL);
-#else
-				gtk_menu_popup(GTK_MENU(msgwindow.popup_msg_menu), NULL, NULL, NULL, NULL,
-																	event->button, event->time);
-#endif
+				ui_menu_popup(GTK_MENU(msgwindow.popup_msg_menu), NULL, NULL,
+							  event->button, event->time);
 				break;
 			}
 			case MSG_COMPILER:
 			{
-#if GTK_CHECK_VERSION(3,22,0)
-				gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_compiler_menu), NULL);
-#else
-				gtk_menu_popup(GTK_MENU(msgwindow.popup_compiler_menu), NULL, NULL, NULL, NULL,
-																	event->button, event->time);
-#endif
+				ui_menu_popup(GTK_MENU(msgwindow.popup_compiler_menu), NULL, NULL,
+							  event->button, event->time);
 				break;
 			}
 		}

diff --git a/src/notebook.c b/src/notebook.c
@@ -508,11 +508,7 @@ static void show_tab_bar_popup_menu(GdkEventButton *event, GeanyDocument *doc)
 	gtk_container_add(GTK_CONTAINER(menu), menu_item);
 	g_signal_connect(menu_item, "activate", G_CALLBACK(on_close_all1_activate), NULL);
 
-#if GTK_CHECK_VERSION(3,22,0)
-	gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
-#else
-	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
-#endif
+	ui_menu_popup(GTK_MENU(menu), NULL, NULL, event->button, event->time);
 }
 
 

diff --git a/src/plugins.c b/src/plugins.c
@@ -1642,12 +1642,8 @@ static gboolean pm_treeview_button_press_cb(GtkWidget *widget, GdkEventButton *e
 {
 	if (event->button == 3)
 	{
-#if GTK_CHECK_VERSION(3,22,0)
-		gtk_menu_popup_at_pointer(GTK_MENU(pm_widgets.popup_menu), NULL);
-#else
-		gtk_menu_popup(GTK_MENU(pm_widgets.popup_menu), NULL, NULL, NULL, NULL,
-				event->button, event->time);
-#endif
+		ui_menu_popup(GTK_MENU(pm_widgets.popup_menu), NULL, NULL,
+					  event->button, event->time);
 	}
 	return FALSE;
 }

diff --git a/src/prefs.c b/src/prefs.c
@@ -246,11 +246,7 @@ static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget, GdkEventButton
 		event_time = gtk_get_current_event_time();
 	}
 
-#if GTK_CHECK_VERSION(3,22,0)
-	gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
-#else
-	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, event_time);
-#endif
+	ui_menu_popup(GTK_MENU(menu), NULL, NULL, button, event_time);
 }
 
 

diff --git a/src/sidebar.c b/src/sidebar.c
@@ -145,12 +145,7 @@ on_default_tag_tree_button_press_event(GtkWidget *widget, GdkEventButton *event,
 {
 	if (event->button == 3)
 	{
-#if GTK_CHECK_VERSION(3,22,0)
-		gtk_menu_popup_at_pointer(GTK_MENU(tv.popup_taglist), NULL);
-#else
-		gtk_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, NULL, NULL,
-			event->button, event->time);
-#endif
+		ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, event->button, event->time);
 		return TRUE;
 	}
 	return FALSE;
@@ -1492,21 +1487,13 @@ static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event
 
 			/* update menu item sensitivity */
 			documents_menu_update(selection);
-#if GTK_CHECK_VERSION(3,22,0)
-			gtk_menu_popup_at_pointer(GTK_MENU(openfiles_popup_menu), NULL);
-#else
-			gtk_menu_popup(GTK_MENU(openfiles_popup_menu), NULL, NULL, NULL, NULL,
-					event->button, event->time);
-#endif
+			ui_menu_popup(GTK_MENU(openfiles_popup_menu), NULL, NULL,
+						  event->button, event->time);
 		}
 		else
 		{
-#if GTK_CHECK_VERSION(3,22,0)
-			gtk_menu_popup_at_pointer(GTK_MENU(tv.popup_taglist), NULL);
-#else
-			gtk_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, NULL, NULL,
-					event->button, event->time);
-#endif
+			ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL,
+						  event->button, event->time);
 		}
 		handled = TRUE;
 	}

diff --git a/src/symbols.c b/src/symbols.c
@@ -1536,12 +1536,8 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b
 
 	g_object_set_data_full(G_OBJECT(menu), "geany-button-event", button_event,
 	                       button_event ? (GDestroyNotify) gdk_event_free : NULL);
-#if GTK_CHECK_VERSION(3,22,0)
-	gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
-#else
-	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, goto_popup_position_func, doc->editor->sci,
-				   button_event ? button_event->button : 0, gtk_get_current_event_time ());
-#endif
+	ui_menu_popup(GTK_MENU(menu), goto_popup_position_func, doc->editor->sci,
+				  button_event ? button_event->button : 0, gtk_get_current_event_time ());
 }
 
 

diff --git a/src/ui_utils.c b/src/ui_utils.c
@@ -3229,3 +3229,15 @@ gboolean ui_encodings_combo_box_set_active_encoding(GtkComboBox *combo, gint enc
 	}
 	return FALSE;
 }
+
+void ui_menu_popup(GtkMenu* menu, GtkMenuPositionFunc func, gpointer data, guint button, guint32 activate_time)
+{
+	/* Use appropriate function for menu popup:
+		- gtk_menu_popup_at_pointer is not available on GTK older than 3.22
+		- gtk_menu_popup is deprecated and causes issues on multimonitor wayland setups */
+#if GTK_CHECK_VERSION(3,22,0)
+	gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+#else
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, func, data, button, activate_time);
+#endif
+}
diff --git a/src/ui_utils.h b/src/ui_utils.h
@@ -368,6 +368,8 @@ gboolean ui_encodings_combo_box_set_active_encoding(GtkComboBox *combo, gint enc
 
 gchar *ui_get_project_directory(const gchar *path);
 
+void ui_menu_popup(GtkMenu* menu, GtkMenuPositionFunc func, gpointer data, guint button, guint32 activate_time);
+
 #endif /* GEANY_PRIVATE */
 
 G_END_DECLS

diff --git a/src/vte.c b/src/vte.c
@@ -526,11 +526,7 @@ static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpo
 	if (event->button == 3)
 	{
 		gtk_widget_grab_focus(vte_config.vte);
-#if GTK_CHECK_VERSION(3,22,0)
-		gtk_menu_popup_at_pointer(GTK_MENU(vte_config.menu), NULL);
-#else
-		gtk_menu_popup(GTK_MENU(vte_config.menu), NULL, NULL, NULL, NULL, event->button, event->time);
-#endif
+		ui_menu_popup(GTK_MENU(vte_config.menu), NULL, NULL, event->button, event->time);
 		return TRUE;
 	}
 	else if (event->button == 2)