Commits October 2023

commits@lists.geany.org

1 participants
150 discussions

[geany/geany] 40ae11: Remove unused variable
by Colomban Wendling 15 Oct '23

15 Oct '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 15 Oct 2023 21:31:37 UTC Commit: 40ae11b5b3d08548bf8be96655f4acb8715f313b https://github.com/geany/geany/commit/40ae11b5b3d08548bf8be96655f4acb8715f3… Log Message: ----------- Remove unused variable Remove variable leftover from 4f45f7014b3e7aabf650a68153ea38db4ffc5fcb Modified Paths: -------------- src/tagmanager/tm_workspace.c Modified: src/tagmanager/tm_workspace.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -950,7 +950,6 @@ GPtrArray *tm_workspace_find_prefix(const char *prefix, const gchar *current_scope, guint max_num) { - TMTagAttrType attrs[] = { tm_tag_attr_name_t, 0 }; GPtrArray *tags = g_ptr_array_new(); GPtrArray *header_candidates; SortInfo sort_info; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d10cfb: Position goto popup at the mouse when triggered with it
by Colomban Wendling 15 Oct '23

15 Oct '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 12 Oct 2023 21:45:30 UTC Commit: d10cfb503d30ee9bb7848f171dc857e2e90f0de5 https://github.com/geany/geany/commit/d10cfb503d30ee9bb7848f171dc857e2e90f0… Log Message: ----------- Position goto popup at the mouse when triggered with it Recent changes made it always popup at the caret, which is almost OK as the caret is moved to the click location, but it is still better to actually popup at the pointer when a click triggered it so the position relative to the pointer is always the same. Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1432,6 +1432,7 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b GtkWidget *first = NULL; GtkWidget *menu; GtkSizeGroup *group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + GdkEvent *event; TMTag *tmtag; guint i; gchar **short_names, **file_names; @@ -1497,7 +1498,13 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b if (first) /* always select the first item for better keyboard navigation */ g_signal_connect(menu, "realize", G_CALLBACK(gtk_menu_shell_select_item), first); - show_menu_at_caret(GTK_MENU(menu), doc->editor->sci); + event = gtk_get_current_event(); + if (event && event->type == GDK_BUTTON_PRESS) + gtk_menu_popup_at_pointer(GTK_MENU(menu), event); + else + show_menu_at_caret(GTK_MENU(menu), doc->editor->sci); + if (event) + gdk_event_free(event); g_object_unref(group); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4a2999: Fix popup overlapping the carret
by Jan Dolinar 15 Oct '23

15 Oct '23

Branch: refs/heads/master Author: Jan Dolinar <jan.dolinar(a)firma.seznam.cz> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 10 Oct 2023 13:30:35 UTC Commit: 4a2999c18e2db59bb40b90ad6453732a2596a316 https://github.com/geany/geany/commit/4a2999c18e2db59bb40b90ad6453732a2596a… Log Message: ----------- Fix popup overlapping the carret Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 12 lines changed, 8 insertions(+), 4 deletions(-) =================================================================== @@ -1407,6 +1407,7 @@ static guint get_tag_class(const TMTag *tag) return TM_ICON_STRUCT; } + /* opens menu at caret position */ static void show_menu_at_caret(GtkMenu* menu, ScintillaObject *sci) { @@ -1415,10 +1416,13 @@ static void show_menu_at_caret(GtkMenu* menu, ScintillaObject *sci) gint line = sci_get_line_from_position(sci, pos); gint line_height = SSM(sci, SCI_TEXTHEIGHT, line, 0); gint x = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos); - gint y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos) + line_height; - GdkRectangle rect = {x, y, 0, 0}; - GdkGravity rect_anchor = gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL ? GDK_GRAVITY_NORTH_EAST : GDK_GRAVITY_NORTH_WEST; - gtk_menu_popup_at_rect(GTK_MENU(menu), window, &rect, rect_anchor, GDK_GRAVITY_NORTH_WEST, NULL); + gint y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos); + gint pos_next = sci_get_position_after(sci, pos); + gint char_width = 0; + if (sci_get_line_from_position(sci, pos_next) == line) + char_width = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos_next) - x; + GdkRectangle rect = {x, y, char_width, line_height}; + gtk_menu_popup_at_rect(GTK_MENU(menu), window, &rect, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, NULL); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bbfc20: drop ui_menu_popup function
by Jan Dolinar 15 Oct '23

15 Oct '23

Branch: refs/heads/master Author: Jan Dolinar <jan.dolinar(a)firma.seznam.cz> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 10 Oct 2023 13:30:33 UTC Commit: bbfc201313f948f0528280a9089bc79af1af98a0 https://github.com/geany/geany/commit/bbfc201313f948f0528280a9089bc79af1af9… Log Message: ----------- drop ui_menu_popup function Modified Paths: -------------- src/callbacks.c src/editor.c src/msgwindow.c src/notebook.c src/plugins.c src/prefs.c src/sidebar.c src/symbols.c src/ui_utils.c src/ui_utils.h src/vte.c Modified: src/callbacks.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -634,7 +634,7 @@ gboolean toolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, gpointer u { if (event->button == 3) { - ui_menu_popup(GTK_MENU(ui_widgets.toolbar_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(ui_widgets.toolbar_menu), NULL); return TRUE; } return FALSE; Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -346,7 +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); - ui_menu_popup(GTK_MENU(main_widgets.editor_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(main_widgets.editor_menu), NULL); return TRUE; } return FALSE; Modified: src/msgwindow.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1236,17 +1236,17 @@ static gboolean on_msgwin_button_press_event(GtkWidget *widget, GdkEventButton * { case MSG_STATUS: { - ui_menu_popup(GTK_MENU(msgwindow.popup_status_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_status_menu), NULL); break; } case MSG_MESSAGE: { - ui_menu_popup(GTK_MENU(msgwindow.popup_msg_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_msg_menu), NULL); break; } case MSG_COMPILER: { - ui_menu_popup(GTK_MENU(msgwindow.popup_compiler_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_compiler_menu), NULL); break; } } Modified: src/notebook.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -512,7 +512,7 @@ static void show_tab_bar_popup_menu(GeanyDocument *doc) gtk_container_add(GTK_CONTAINER(menu), menu_item); g_signal_connect(menu_item, "activate", G_CALLBACK(on_close_all1_activate), NULL); - ui_menu_popup(GTK_MENU(menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL); } Modified: src/plugins.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1642,7 +1642,7 @@ static gboolean pm_treeview_button_press_cb(GtkWidget *widget, GdkEventButton *e { if (event->button == 3) { - ui_menu_popup(GTK_MENU(pm_widgets.popup_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(pm_widgets.popup_menu), NULL); } return FALSE; } Modified: src/prefs.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -234,7 +234,7 @@ static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget) gtk_menu_attach_to_widget(GTK_MENU(menu), widget, NULL); } - ui_menu_popup(GTK_MENU(menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL); } Modified: src/sidebar.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -145,7 +145,7 @@ on_default_tag_tree_button_press_event(GtkWidget *widget, GdkEventButton *event, { if (event->button == 3) { - ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(tv.popup_taglist), NULL); return TRUE; } return FALSE; @@ -1513,11 +1513,11 @@ static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event /* update menu item sensitivity */ documents_menu_update(selection); - ui_menu_popup(GTK_MENU(openfiles_popup_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(openfiles_popup_menu), NULL); } else { - ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(tv.popup_taglist), NULL); } handled = TRUE; } Modified: src/symbols.c 16 lines changed, 15 insertions(+), 1 deletions(-) =================================================================== @@ -1407,6 +1407,20 @@ static guint get_tag_class(const TMTag *tag) return TM_ICON_STRUCT; } +/* opens menu at caret position */ +static void show_menu_at_caret(GtkMenu* menu, ScintillaObject *sci) +{ + GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(sci)); + gint pos = sci_get_current_position(sci); + gint line = sci_get_line_from_position(sci, pos); + gint line_height = SSM(sci, SCI_TEXTHEIGHT, line, 0); + gint x = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos); + gint y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos) + line_height; + GdkRectangle rect = {x, y, 0, 0}; + GdkGravity rect_anchor = gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL ? GDK_GRAVITY_NORTH_EAST : GDK_GRAVITY_NORTH_WEST; + gtk_menu_popup_at_rect(GTK_MENU(menu), window, &rect, rect_anchor, GDK_GRAVITY_NORTH_WEST, NULL); +} + static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_best) { @@ -1478,7 +1492,7 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b if (first) /* always select the first item for better keyboard navigation */ g_signal_connect(menu, "realize", G_CALLBACK(gtk_menu_shell_select_item), first); - ui_menu_popup(GTK_MENU(menu), doc->editor->sci); + show_menu_at_caret(GTK_MENU(menu), doc->editor->sci); g_object_unref(group); } Modified: src/ui_utils.c 20 lines changed, 0 insertions(+), 20 deletions(-) =================================================================== @@ -3257,23 +3257,3 @@ gboolean ui_encodings_combo_box_set_active_encoding(GtkComboBox *combo, gint enc } return FALSE; } - - -/* opens menu at caret position (if ScintillaObject is passed) or at current pointer position */ -void ui_menu_popup(GtkMenu* menu, ScintillaObject *sci) -{ - if (!sci) - gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL); - else - { - GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(sci)); - gint pos = sci_get_current_position(sci); - gint line = sci_get_line_from_position(sci, pos); - gint line_height = SSM(sci, SCI_TEXTHEIGHT, line, 0); - gint x = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos); - gint y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos) + line_height; - GdkRectangle rect = {x, y, 0, 0}; - GdkGravity rect_anchor = gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL ? GDK_GRAVITY_NORTH_EAST : GDK_GRAVITY_NORTH_WEST; - gtk_menu_popup_at_rect(GTK_MENU(menu), window, &rect, rect_anchor, GDK_GRAVITY_NORTH_WEST, NULL); - } -} Modified: src/ui_utils.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -373,8 +373,6 @@ gchar *ui_get_project_directory(const gchar *path); void ui_menu_sort_by_label(GtkMenu *menu); -void ui_menu_popup(GtkMenu* menu, ScintillaObject *sci); - #endif /* GEANY_PRIVATE */ G_END_DECLS Modified: src/vte.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -526,7 +526,7 @@ static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpo if (event->button == 3) { gtk_widget_grab_focus(vte_config.vte); - ui_menu_popup(GTK_MENU(vte_config.menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(vte_config.menu), NULL); return TRUE; } else if (event->button == 2) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3498fe: Fix popup position on a wrapping corner case
by Colomban Wendling 15 Oct '23

15 Oct '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 12 Oct 2023 20:46:40 UTC Commit: 3498fe12a3be953511b810e568991e4149f2613a https://github.com/geany/geany/commit/3498fe12a3be953511b810e568991e4149f26… Log Message: ----------- Fix popup position on a wrapping corner case Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1419,7 +1419,8 @@ static void show_menu_at_caret(GtkMenu* menu, ScintillaObject *sci) gint y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos); gint pos_next = sci_get_position_after(sci, pos); gint char_width = 0; - if (sci_get_line_from_position(sci, pos_next) == line) + /* if next pos is on the same Y (same line and not after wrapping), diff the X */ + if (pos_next > pos && SSM(sci, SCI_POINTYFROMPOSITION, 0, pos_next) == y) char_width = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos_next) - x; GdkRectangle rect = {x, y, char_width, line_height}; gtk_menu_popup_at_rect(GTK_MENU(menu), window, &rect, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 869606: Pass the event to gtk_menu_popup_at_pointer() when possible
by Colomban Wendling 15 Oct '23

15 Oct '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 12 Oct 2023 21:36:23 UTC Commit: 869606ee1427b3611d01ee37c4811942241bb320 https://github.com/geany/geany/commit/869606ee1427b3611d01ee37c4811942241bb… Log Message: ----------- Pass the event to gtk_menu_popup_at_pointer() when possible It is slightly better to do so as it allows GTK so select the right pointer in some less common situations. Modified Paths: -------------- src/callbacks.c src/editor.c src/msgwindow.c src/notebook.c src/plugins.c src/prefs.c src/sidebar.c src/vte.c Modified: src/callbacks.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -634,7 +634,7 @@ gboolean toolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, gpointer u { if (event->button == 3) { - gtk_menu_popup_at_pointer(GTK_MENU(ui_widgets.toolbar_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(ui_widgets.toolbar_menu), (GdkEvent *) event); return TRUE; } return FALSE; Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -346,7 +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); - gtk_menu_popup_at_pointer(GTK_MENU(main_widgets.editor_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(main_widgets.editor_menu), (GdkEvent *) event); return TRUE; } return FALSE; Modified: src/msgwindow.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1236,17 +1236,17 @@ static gboolean on_msgwin_button_press_event(GtkWidget *widget, GdkEventButton * { case MSG_STATUS: { - gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_status_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_status_menu), (GdkEvent *) event); break; } case MSG_MESSAGE: { - gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_msg_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_msg_menu), (GdkEvent *) event); break; } case MSG_COMPILER: { - gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_compiler_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_compiler_menu), (GdkEvent *) event); break; } } Modified: src/notebook.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -458,7 +458,7 @@ static void on_close_documents_right_activate(GtkMenuItem *menuitem, GeanyDocume } -static void show_tab_bar_popup_menu(GeanyDocument *doc) +static void show_tab_bar_popup_menu(GdkEventButton *event, GeanyDocument *doc) { GtkWidget *menu_item; static GtkWidget *menu = NULL; @@ -512,7 +512,7 @@ static void show_tab_bar_popup_menu(GeanyDocument *doc) gtk_container_add(GTK_CONTAINER(menu), menu_item); g_signal_connect(menu_item, "activate", G_CALLBACK(on_close_all1_activate), NULL); - gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(menu), (GdkEvent *) event); } @@ -541,7 +541,7 @@ static gboolean notebook_tab_bar_click_cb(GtkWidget *widget, GdkEventButton *eve * on a tab directly */ else if (event->button == 3) { - show_tab_bar_popup_menu(NULL); + show_tab_bar_popup_menu(event, NULL); return TRUE; } return FALSE; @@ -676,7 +676,7 @@ static gboolean notebook_tab_click(GtkWidget *widget, GdkEventButton *event, gpo /* right-click is first handled here if it happened on a notebook tab */ if (event->button == 3) { - show_tab_bar_popup_menu(doc); + show_tab_bar_popup_menu(event, doc); return TRUE; } Modified: src/plugins.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1642,7 +1642,7 @@ static gboolean pm_treeview_button_press_cb(GtkWidget *widget, GdkEventButton *e { if (event->button == 3) { - gtk_menu_popup_at_pointer(GTK_MENU(pm_widgets.popup_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(pm_widgets.popup_menu), (GdkEvent *) event); } return FALSE; } Modified: src/prefs.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -211,7 +211,7 @@ static void kb_tree_view_change_button_clicked_cb(GtkWidget *button, KbData *kbd } -static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget) +static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget, GdkEventButton *event) { static GtkWidget *menu = NULL; @@ -234,13 +234,13 @@ static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget) gtk_menu_attach_to_widget(GTK_MENU(menu), widget, NULL); } - gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(menu), (GdkEvent *) event); } static gboolean kb_popup_menu_cb(GtkWidget *widget, KbData *kbdata) { - kb_show_popup_menu(kbdata, widget); + kb_show_popup_menu(kbdata, widget, NULL); return TRUE; } @@ -250,7 +250,7 @@ static gboolean kb_tree_view_button_press_event_cb(GtkWidget *widget, GdkEventBu { if (event->button == 3 && event->type == GDK_BUTTON_PRESS) { - kb_show_popup_menu(kbdata, widget); + kb_show_popup_menu(kbdata, widget, event); return TRUE; } else if (event->type == GDK_2BUTTON_PRESS) Modified: src/sidebar.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -145,7 +145,7 @@ on_default_tag_tree_button_press_event(GtkWidget *widget, GdkEventButton *event, { if (event->button == 3) { - gtk_menu_popup_at_pointer(GTK_MENU(tv.popup_taglist), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(tv.popup_taglist), (GdkEvent *) event); return TRUE; } return FALSE; @@ -1513,11 +1513,11 @@ static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event /* update menu item sensitivity */ documents_menu_update(selection); - gtk_menu_popup_at_pointer(GTK_MENU(openfiles_popup_menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(openfiles_popup_menu), (GdkEvent *) event); } else { - gtk_menu_popup_at_pointer(GTK_MENU(tv.popup_taglist), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(tv.popup_taglist), (GdkEvent *) event); } handled = TRUE; } Modified: src/vte.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -526,7 +526,7 @@ static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpo if (event->button == 3) { gtk_widget_grab_focus(vte_config.vte); - gtk_menu_popup_at_pointer(GTK_MENU(vte_config.menu), NULL); + gtk_menu_popup_at_pointer(GTK_MENU(vte_config.menu), (GdkEvent *) event); return TRUE; } else if (event->button == 2) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 705dc3: Use gtk_menu_popup_at_pointer() in filebrowser as well
by Colomban Wendling 15 Oct '23

15 Oct '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 12 Oct 2023 21:39:50 UTC Commit: 705dc3c8eb39c43e54daf171811b412d6eaa5032 https://github.com/geany/geany/commit/705dc3c8eb39c43e54daf171811b412d6eaa5… Log Message: ----------- Use gtk_menu_popup_at_pointer() in filebrowser as well Modified Paths: -------------- plugins/filebrowser.c Modified: plugins/filebrowser.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -743,7 +743,7 @@ static gboolean on_button_press(GtkWidget *widget, GdkEventButton *event, gpoint gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(popup_items.show_hidden_files), show_hidden_files); - gtk_menu_popup(GTK_MENU(popup_menu), NULL, NULL, NULL, NULL, event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(popup_menu), (GdkEvent *) event); /* don't return TRUE here, unless the selection won't be changed */ } return FALSE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d90645: Fix go to symbol definition popup location
by Jan Dolinar 15 Oct '23

15 Oct '23

Branch: refs/heads/master Author: Jan Dolinar <jan.dolinar(a)firma.seznam.cz> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 10 Oct 2023 13:28:08 UTC Commit: d906453916469769e68a2b35345813aa66737e7e https://github.com/geany/geany/commit/d906453916469769e68a2b35345813aa66737… Log Message: ----------- Fix go to symbol definition popup location Modified Paths: -------------- src/callbacks.c src/editor.c src/msgwindow.c src/notebook.c src/plugins.c src/prefs.c src/sidebar.c src/symbols.c src/ui_utils.c src/ui_utils.h src/vte.c Modified: src/callbacks.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -634,7 +634,7 @@ gboolean toolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, gpointer u { if (event->button == 3) { - ui_menu_popup(GTK_MENU(ui_widgets.toolbar_menu), NULL, NULL, event->button, event->time); + ui_menu_popup(GTK_MENU(ui_widgets.toolbar_menu), NULL, event->button, event->time); return TRUE; } return FALSE; Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -346,7 +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); - ui_menu_popup(GTK_MENU(main_widgets.editor_menu), NULL, NULL, event->button, event->time); + ui_menu_popup(GTK_MENU(main_widgets.editor_menu), NULL, event->button, event->time); return TRUE; } return FALSE; Modified: src/msgwindow.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1236,19 +1236,19 @@ static gboolean on_msgwin_button_press_event(GtkWidget *widget, GdkEventButton * { case MSG_STATUS: { - ui_menu_popup(GTK_MENU(msgwindow.popup_status_menu), NULL, NULL, + ui_menu_popup(GTK_MENU(msgwindow.popup_status_menu), NULL, event->button, event->time); break; } case MSG_MESSAGE: { - ui_menu_popup(GTK_MENU(msgwindow.popup_msg_menu), NULL, NULL, + ui_menu_popup(GTK_MENU(msgwindow.popup_msg_menu), NULL, event->button, event->time); break; } case MSG_COMPILER: { - ui_menu_popup(GTK_MENU(msgwindow.popup_compiler_menu), NULL, NULL, + ui_menu_popup(GTK_MENU(msgwindow.popup_compiler_menu), NULL, event->button, event->time); break; } Modified: src/notebook.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -512,7 +512,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); - ui_menu_popup(GTK_MENU(menu), NULL, NULL, event->button, event->time); + ui_menu_popup(GTK_MENU(menu), NULL, event->button, event->time); } Modified: src/plugins.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1642,7 +1642,7 @@ static gboolean pm_treeview_button_press_cb(GtkWidget *widget, GdkEventButton *e { if (event->button == 3) { - ui_menu_popup(GTK_MENU(pm_widgets.popup_menu), NULL, NULL, + ui_menu_popup(GTK_MENU(pm_widgets.popup_menu), NULL, event->button, event->time); } return FALSE; Modified: src/prefs.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -247,7 +247,7 @@ static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget, GdkEventButton event_time = gtk_get_current_event_time(); } - ui_menu_popup(GTK_MENU(menu), NULL, NULL, button, event_time); + ui_menu_popup(GTK_MENU(menu), NULL, button, event_time); } Modified: src/sidebar.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -145,7 +145,7 @@ on_default_tag_tree_button_press_event(GtkWidget *widget, GdkEventButton *event, { if (event->button == 3) { - ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, event->button, event->time); + ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL, event->button, event->time); return TRUE; } return FALSE; @@ -1513,12 +1513,12 @@ static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event /* update menu item sensitivity */ documents_menu_update(selection); - ui_menu_popup(GTK_MENU(openfiles_popup_menu), NULL, NULL, + ui_menu_popup(GTK_MENU(openfiles_popup_menu), NULL, event->button, event->time); } else { - ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, + ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL, event->button, event->time); } handled = TRUE; Modified: src/symbols.c 80 lines changed, 1 insertions(+), 79 deletions(-) =================================================================== @@ -1408,84 +1408,6 @@ static guint get_tag_class(const TMTag *tag) } -/* positions a popup at the caret from the ScintillaObject in @p data */ -static void goto_popup_position_func(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data) -{ - gint line_height; - GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(menu)); - gint monitor_num; - GdkRectangle monitor; - GtkRequisition req; - GdkEventButton *event_button = g_object_get_data(G_OBJECT(menu), "geany-button-event"); - - if (event_button) - { - /* if we got a mouse click, popup at that position */ - *x = (gint) event_button->x_root; - *y = (gint) event_button->y_root; - line_height = 0; /* we don't want to offset below the line or anything */ - } - else /* keyboard positioning */ - { - ScintillaObject *sci = data; - GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(sci)); - gint pos = sci_get_current_position(sci); - gint line = sci_get_line_from_position(sci, pos); - gint pos_x = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos); - gint pos_y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos); - - line_height = SSM(sci, SCI_TEXTHEIGHT, line, 0); - - gdk_window_get_origin(window, x, y); - *x += pos_x; - *y += pos_y; - } - - monitor_num = gdk_screen_get_monitor_at_point(screen, *x, *y); - - gtk_widget_get_preferred_size(GTK_WIDGET(menu), NULL, &req); - -#if GTK_CHECK_VERSION(3, 4, 0) - gdk_screen_get_monitor_workarea(screen, monitor_num, &monitor); -#else - gdk_screen_get_monitor_geometry(screen, monitor_num, &monitor); -#endif - - /* put on one size of the X position, but within the monitor */ - if (gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL) - { - if (*x - req.width - 1 >= monitor.x) - *x -= req.width + 1; - else if (*x + req.width > monitor.x + monitor.width) - *x = monitor.x; - else - *x += 1; - } - else - { - if (*x + req.width + 1 <= monitor.x + monitor.width) - *x = MAX(monitor.x, *x + 1); - else if (*x - req.width - 1 >= monitor.x) - *x -= req.width + 1; - else - *x = monitor.x + MAX(0, monitor.width - req.width); - } - - /* try to put, in order: - * 1. below the Y position, under the line - * 2. above the Y position - * 3. within the monitor */ - if (*y + line_height + req.height <= monitor.y + monitor.height) - *y = MAX(monitor.y, *y + line_height); - else if (*y - req.height >= monitor.y) - *y = *y - req.height; - else - *y = monitor.y + MAX(0, monitor.height - req.height); - - *push_in = FALSE; -} - - static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_best) { GtkWidget *first = NULL; @@ -1566,7 +1488,7 @@ 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); - ui_menu_popup(GTK_MENU(menu), goto_popup_position_func, doc->editor->sci, + ui_menu_popup(GTK_MENU(menu), doc->editor->sci, button_event ? button_event->button : 0, gtk_get_current_event_time ()); g_object_unref(group); Modified: src/ui_utils.c 101 lines changed, 98 insertions(+), 3 deletions(-) =================================================================== @@ -3258,14 +3258,109 @@ 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) + +#if GTK_CHECK_VERSION(3,22,0) +/* positions a popup at the caret from the ScintillaObject in @p data */ +static void position_at_caret(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data) +{ + gint line_height; + GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(menu)); + gint monitor_num; + GdkRectangle monitor; + GtkRequisition req; + GdkEventButton *event_button = g_object_get_data(G_OBJECT(menu), "geany-button-event"); + + if (event_button) + { + /* if we got a mouse click, popup at that position */ + *x = (gint) event_button->x_root; + *y = (gint) event_button->y_root; + line_height = 0; /* we don't want to offset below the line or anything */ + } + else /* keyboard positioning */ + { + ScintillaObject *sci = data; + GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(sci)); + gint pos = sci_get_current_position(sci); + gint line = sci_get_line_from_position(sci, pos); + gint pos_x = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos); + gint pos_y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos); + + line_height = SSM(sci, SCI_TEXTHEIGHT, line, 0); + + gdk_window_get_origin(window, x, y); + *x += pos_x; + *y += pos_y; + } + + monitor_num = gdk_screen_get_monitor_at_point(screen, *x, *y); + + gtk_widget_get_preferred_size(GTK_WIDGET(menu), NULL, &req); + +#if GTK_CHECK_VERSION(3, 4, 0) + gdk_screen_get_monitor_workarea(screen, monitor_num, &monitor); +#else + gdk_screen_get_monitor_geometry(screen, monitor_num, &monitor); +#endif + + /* put on one size of the X position, but within the monitor */ + if (gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL) + { + if (*x - req.width - 1 >= monitor.x) + *x -= req.width + 1; + else if (*x + req.width > monitor.x + monitor.width) + *x = monitor.x; + else + *x += 1; + } + else + { + if (*x + req.width + 1 <= monitor.x + monitor.width) + *x = MAX(monitor.x, *x + 1); + else if (*x - req.width - 1 >= monitor.x) + *x -= req.width + 1; + else + *x = monitor.x + MAX(0, monitor.width - req.width); + } + + /* try to put, in order: + * 1. below the Y position, under the line + * 2. above the Y position + * 3. within the monitor */ + if (*y + line_height + req.height <= monitor.y + monitor.height) + *y = MAX(monitor.y, *y + line_height); + else if (*y - req.height >= monitor.y) + *y = *y - req.height; + else + *y = monitor.y + MAX(0, monitor.height - req.height); + + *push_in = FALSE; +} +#endif + + +/* opens menu at caret position (if ScintillaObject is passed) or at current pointer position */ +void ui_menu_popup(GtkMenu* menu, ScintillaObject *sci, 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); + if (!sci) + gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL); + else + { + GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(sci)); + gint pos = sci_get_current_position(sci); + gint line = sci_get_line_from_position(sci, pos); + gint line_height = SSM(sci, SCI_TEXTHEIGHT, line, 0); + gint x = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos); + gint y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos) + line_height; + GdkRectangle rect = {x, y, 0, 0}; + GdkGravity rect_anchor = gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL ? GDK_GRAVITY_NORTH_EAST : GDK_GRAVITY_NORTH_WEST; + gtk_menu_popup_at_rect(GTK_MENU(menu), window, &rect, rect_anchor, GDK_GRAVITY_NORTH_WEST, NULL); + } #else - gtk_menu_popup(GTK_MENU(menu), NULL, NULL, func, data, button, activate_time); + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, sci ? position_at_caret : NULL, sci, button, activate_time); #endif } Modified: src/ui_utils.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -373,7 +373,7 @@ gchar *ui_get_project_directory(const gchar *path); void ui_menu_sort_by_label(GtkMenu *menu); -void ui_menu_popup(GtkMenu* menu, GtkMenuPositionFunc func, gpointer data, guint button, guint32 activate_time); +void ui_menu_popup(GtkMenu* menu, ScintillaObject *sci, guint button, guint32 activate_time); #endif /* GEANY_PRIVATE */ Modified: src/vte.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -526,7 +526,7 @@ static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpo if (event->button == 3) { gtk_widget_grab_focus(vte_config.vte); - ui_menu_popup(GTK_MENU(vte_config.menu), NULL, NULL, event->button, event->time); + ui_menu_popup(GTK_MENU(vte_config.menu), NULL, event->button, event->time); return TRUE; } else if (event->button == 2) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 956409: Drop support for GTK 3.21 and older
by Jan Dolinar 15 Oct '23

15 Oct '23

Branch: refs/heads/master Author: Jan Dolinar <jan.dolinar(a)firma.seznam.cz> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 10 Oct 2023 13:30:05 UTC Commit: 956409479a4dda51e95357cbb28336c121724238 https://github.com/geany/geany/commit/956409479a4dda51e95357cbb28336c121724… Log Message: ----------- Drop support for GTK 3.21 and older Modified Paths: -------------- src/callbacks.c src/editor.c src/msgwindow.c src/notebook.c src/plugins.c src/prefs.c src/sidebar.c src/symbols.c src/ui_utils.c src/ui_utils.h src/vte.c Modified: src/callbacks.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -634,7 +634,7 @@ gboolean toolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, gpointer u { if (event->button == 3) { - ui_menu_popup(GTK_MENU(ui_widgets.toolbar_menu), NULL, event->button, event->time); + ui_menu_popup(GTK_MENU(ui_widgets.toolbar_menu), NULL); return TRUE; } return FALSE; Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -346,7 +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); - ui_menu_popup(GTK_MENU(main_widgets.editor_menu), NULL, event->button, event->time); + ui_menu_popup(GTK_MENU(main_widgets.editor_menu), NULL); return TRUE; } return FALSE; Modified: src/msgwindow.c 9 lines changed, 3 insertions(+), 6 deletions(-) =================================================================== @@ -1236,20 +1236,17 @@ static gboolean on_msgwin_button_press_event(GtkWidget *widget, GdkEventButton * { case MSG_STATUS: { - ui_menu_popup(GTK_MENU(msgwindow.popup_status_menu), NULL, - event->button, event->time); + ui_menu_popup(GTK_MENU(msgwindow.popup_status_menu), NULL); break; } case MSG_MESSAGE: { - ui_menu_popup(GTK_MENU(msgwindow.popup_msg_menu), NULL, - event->button, event->time); + ui_menu_popup(GTK_MENU(msgwindow.popup_msg_menu), NULL); break; } case MSG_COMPILER: { - ui_menu_popup(GTK_MENU(msgwindow.popup_compiler_menu), NULL, - event->button, event->time); + ui_menu_popup(GTK_MENU(msgwindow.popup_compiler_menu), NULL); break; } } Modified: src/notebook.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -458,7 +458,7 @@ static void on_close_documents_right_activate(GtkMenuItem *menuitem, GeanyDocume } -static void show_tab_bar_popup_menu(GdkEventButton *event, GeanyDocument *doc) +static void show_tab_bar_popup_menu(GeanyDocument *doc) { GtkWidget *menu_item; static GtkWidget *menu = NULL; @@ -512,7 +512,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); - ui_menu_popup(GTK_MENU(menu), NULL, event->button, event->time); + ui_menu_popup(GTK_MENU(menu), NULL); } @@ -541,7 +541,7 @@ static gboolean notebook_tab_bar_click_cb(GtkWidget *widget, GdkEventButton *eve * on a tab directly */ else if (event->button == 3) { - show_tab_bar_popup_menu(event, NULL); + show_tab_bar_popup_menu(NULL); return TRUE; } return FALSE; @@ -676,7 +676,7 @@ static gboolean notebook_tab_click(GtkWidget *widget, GdkEventButton *event, gpo /* right-click is first handled here if it happened on a notebook tab */ if (event->button == 3) { - show_tab_bar_popup_menu(event, doc); + show_tab_bar_popup_menu(doc); return TRUE; } Modified: src/plugins.c 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -1642,8 +1642,7 @@ static gboolean pm_treeview_button_press_cb(GtkWidget *widget, GdkEventButton *e { if (event->button == 3) { - ui_menu_popup(GTK_MENU(pm_widgets.popup_menu), NULL, - event->button, event->time); + ui_menu_popup(GTK_MENU(pm_widgets.popup_menu), NULL); } return FALSE; } Modified: src/prefs.c 21 lines changed, 4 insertions(+), 17 deletions(-) =================================================================== @@ -211,11 +211,9 @@ static void kb_tree_view_change_button_clicked_cb(GtkWidget *button, KbData *kbd } -static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget, GdkEventButton *event) +static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget) { static GtkWidget *menu = NULL; - guint button; - guint32 event_time; if (menu == NULL) { @@ -236,24 +234,13 @@ static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget, GdkEventButton gtk_menu_attach_to_widget(GTK_MENU(menu), widget, NULL); } - if (event != NULL) - { - button = event->button; - event_time = event->time; - } - else - { - button = 0; - event_time = gtk_get_current_event_time(); - } - - ui_menu_popup(GTK_MENU(menu), NULL, button, event_time); + ui_menu_popup(GTK_MENU(menu), NULL); } static gboolean kb_popup_menu_cb(GtkWidget *widget, KbData *kbdata) { - kb_show_popup_menu(kbdata, widget, NULL); + kb_show_popup_menu(kbdata, widget); return TRUE; } @@ -263,7 +250,7 @@ static gboolean kb_tree_view_button_press_event_cb(GtkWidget *widget, GdkEventBu { if (event->button == 3 && event->type == GDK_BUTTON_PRESS) { - kb_show_popup_menu(kbdata, widget, event); + kb_show_popup_menu(kbdata, widget); return TRUE; } else if (event->type == GDK_2BUTTON_PRESS) Modified: src/sidebar.c 8 lines changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -145,7 +145,7 @@ on_default_tag_tree_button_press_event(GtkWidget *widget, GdkEventButton *event, { if (event->button == 3) { - ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL, event->button, event->time); + ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL); return TRUE; } return FALSE; @@ -1513,13 +1513,11 @@ static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event /* update menu item sensitivity */ documents_menu_update(selection); - ui_menu_popup(GTK_MENU(openfiles_popup_menu), NULL, - event->button, event->time); + ui_menu_popup(GTK_MENU(openfiles_popup_menu), NULL); } else { - ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL, - event->button, event->time); + ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL); } handled = TRUE; } Modified: src/symbols.c 13 lines changed, 1 insertions(+), 12 deletions(-) =================================================================== @@ -1413,8 +1413,6 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b GtkWidget *first = NULL; GtkWidget *menu; GtkSizeGroup *group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - GdkEvent *event; - GdkEventButton *button_event = NULL; TMTag *tmtag; guint i; gchar **short_names, **file_names; @@ -1480,16 +1478,7 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b if (first) /* always select the first item for better keyboard navigation */ g_signal_connect(menu, "realize", G_CALLBACK(gtk_menu_shell_select_item), first); - event = gtk_get_current_event(); - if (event && event->type == GDK_BUTTON_PRESS) - button_event = (GdkEventButton *) event; - else - gdk_event_free(event); - - g_object_set_data_full(G_OBJECT(menu), "geany-button-event", button_event, - button_event ? (GDestroyNotify) gdk_event_free : NULL); - ui_menu_popup(GTK_MENU(menu), doc->editor->sci, - button_event ? button_event->button : 0, gtk_get_current_event_time ()); + ui_menu_popup(GTK_MENU(menu), doc->editor->sci); g_object_unref(group); } Modified: src/ui_utils.c 89 lines changed, 1 insertions(+), 88 deletions(-) =================================================================== @@ -3259,93 +3259,9 @@ gboolean ui_encodings_combo_box_set_active_encoding(GtkComboBox *combo, gint enc } -#if GTK_CHECK_VERSION(3,22,0) -/* positions a popup at the caret from the ScintillaObject in @p data */ -static void position_at_caret(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data) -{ - gint line_height; - GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(menu)); - gint monitor_num; - GdkRectangle monitor; - GtkRequisition req; - GdkEventButton *event_button = g_object_get_data(G_OBJECT(menu), "geany-button-event"); - - if (event_button) - { - /* if we got a mouse click, popup at that position */ - *x = (gint) event_button->x_root; - *y = (gint) event_button->y_root; - line_height = 0; /* we don't want to offset below the line or anything */ - } - else /* keyboard positioning */ - { - ScintillaObject *sci = data; - GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(sci)); - gint pos = sci_get_current_position(sci); - gint line = sci_get_line_from_position(sci, pos); - gint pos_x = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos); - gint pos_y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos); - - line_height = SSM(sci, SCI_TEXTHEIGHT, line, 0); - - gdk_window_get_origin(window, x, y); - *x += pos_x; - *y += pos_y; - } - - monitor_num = gdk_screen_get_monitor_at_point(screen, *x, *y); - - gtk_widget_get_preferred_size(GTK_WIDGET(menu), NULL, &req); - -#if GTK_CHECK_VERSION(3, 4, 0) - gdk_screen_get_monitor_workarea(screen, monitor_num, &monitor); -#else - gdk_screen_get_monitor_geometry(screen, monitor_num, &monitor); -#endif - - /* put on one size of the X position, but within the monitor */ - if (gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL) - { - if (*x - req.width - 1 >= monitor.x) - *x -= req.width + 1; - else if (*x + req.width > monitor.x + monitor.width) - *x = monitor.x; - else - *x += 1; - } - else - { - if (*x + req.width + 1 <= monitor.x + monitor.width) - *x = MAX(monitor.x, *x + 1); - else if (*x - req.width - 1 >= monitor.x) - *x -= req.width + 1; - else - *x = monitor.x + MAX(0, monitor.width - req.width); - } - - /* try to put, in order: - * 1. below the Y position, under the line - * 2. above the Y position - * 3. within the monitor */ - if (*y + line_height + req.height <= monitor.y + monitor.height) - *y = MAX(monitor.y, *y + line_height); - else if (*y - req.height >= monitor.y) - *y = *y - req.height; - else - *y = monitor.y + MAX(0, monitor.height - req.height); - - *push_in = FALSE; -} -#endif - - /* opens menu at caret position (if ScintillaObject is passed) or at current pointer position */ -void ui_menu_popup(GtkMenu* menu, ScintillaObject *sci, guint button, guint32 activate_time) +void ui_menu_popup(GtkMenu* menu, ScintillaObject *sci) { - /* 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) if (!sci) gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL); else @@ -3360,7 +3276,4 @@ void ui_menu_popup(GtkMenu* menu, ScintillaObject *sci, guint button, guint32 ac GdkGravity rect_anchor = gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL ? GDK_GRAVITY_NORTH_EAST : GDK_GRAVITY_NORTH_WEST; gtk_menu_popup_at_rect(GTK_MENU(menu), window, &rect, rect_anchor, GDK_GRAVITY_NORTH_WEST, NULL); } -#else - gtk_menu_popup(GTK_MENU(menu), NULL, NULL, sci ? position_at_caret : NULL, sci, button, activate_time); -#endif } Modified: src/ui_utils.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -373,7 +373,7 @@ gchar *ui_get_project_directory(const gchar *path); void ui_menu_sort_by_label(GtkMenu *menu); -void ui_menu_popup(GtkMenu* menu, ScintillaObject *sci, guint button, guint32 activate_time); +void ui_menu_popup(GtkMenu* menu, ScintillaObject *sci); #endif /* GEANY_PRIVATE */ Modified: src/vte.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -526,7 +526,7 @@ static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpo if (event->button == 3) { gtk_widget_grab_focus(vte_config.vte); - ui_menu_popup(GTK_MENU(vte_config.menu), NULL, event->button, event->time); + ui_menu_popup(GTK_MENU(vte_config.menu), NULL); return TRUE; } else if (event->button == 2) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5a5b85: Merge pull request #3316 from dolik-rce/fix-goto-popup-location
by Colomban Wendling 15 Oct '23

15 Oct '23

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: GitHub <noreply(a)github.com> Date: Sun, 15 Oct 2023 20:14:41 UTC Commit: 5a5b85d6c3886c54e18853f3c6df8f48148b9ac5 https://github.com/geany/geany/commit/5a5b85d6c3886c54e18853f3c6df8f48148b9… Log Message: ----------- Merge pull request #3316 from dolik-rce/fix-goto-popup-location Fix goto popup location Modified Paths: -------------- plugins/filebrowser.c src/callbacks.c src/editor.c src/msgwindow.c src/notebook.c src/plugins.c src/prefs.c src/sidebar.c src/symbols.c src/ui_utils.c src/ui_utils.h src/vte.c Modified: plugins/filebrowser.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -743,7 +743,7 @@ static gboolean on_button_press(GtkWidget *widget, GdkEventButton *event, gpoint gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(popup_items.show_hidden_files), show_hidden_files); - gtk_menu_popup(GTK_MENU(popup_menu), NULL, NULL, NULL, NULL, event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(popup_menu), (GdkEvent *) event); /* don't return TRUE here, unless the selection won't be changed */ } return FALSE; Modified: src/callbacks.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -634,7 +634,7 @@ gboolean toolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, gpointer u { if (event->button == 3) { - ui_menu_popup(GTK_MENU(ui_widgets.toolbar_menu), NULL, NULL, event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(ui_widgets.toolbar_menu), (GdkEvent *) event); return TRUE; } return FALSE; Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -346,7 +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); - ui_menu_popup(GTK_MENU(main_widgets.editor_menu), NULL, NULL, event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(main_widgets.editor_menu), (GdkEvent *) event); return TRUE; } return FALSE; Modified: src/msgwindow.c 9 lines changed, 3 insertions(+), 6 deletions(-) =================================================================== @@ -1236,20 +1236,17 @@ static gboolean on_msgwin_button_press_event(GtkWidget *widget, GdkEventButton * { case MSG_STATUS: { - ui_menu_popup(GTK_MENU(msgwindow.popup_status_menu), NULL, NULL, - event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_status_menu), (GdkEvent *) event); break; } case MSG_MESSAGE: { - ui_menu_popup(GTK_MENU(msgwindow.popup_msg_menu), NULL, NULL, - event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_msg_menu), (GdkEvent *) event); break; } case MSG_COMPILER: { - ui_menu_popup(GTK_MENU(msgwindow.popup_compiler_menu), NULL, NULL, - event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(msgwindow.popup_compiler_menu), (GdkEvent *) event); break; } } Modified: src/notebook.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -512,7 +512,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); - ui_menu_popup(GTK_MENU(menu), NULL, NULL, event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(menu), (GdkEvent *) event); } Modified: src/plugins.c 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -1642,8 +1642,7 @@ static gboolean pm_treeview_button_press_cb(GtkWidget *widget, GdkEventButton *e { if (event->button == 3) { - ui_menu_popup(GTK_MENU(pm_widgets.popup_menu), NULL, NULL, - event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(pm_widgets.popup_menu), (GdkEvent *) event); } return FALSE; } Modified: src/prefs.c 15 lines changed, 1 insertions(+), 14 deletions(-) =================================================================== @@ -214,8 +214,6 @@ static void kb_tree_view_change_button_clicked_cb(GtkWidget *button, KbData *kbd static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget, GdkEventButton *event) { static GtkWidget *menu = NULL; - guint button; - guint32 event_time; if (menu == NULL) { @@ -236,18 +234,7 @@ static void kb_show_popup_menu(KbData *kbdata, GtkWidget *widget, GdkEventButton gtk_menu_attach_to_widget(GTK_MENU(menu), widget, NULL); } - if (event != NULL) - { - button = event->button; - event_time = event->time; - } - else - { - button = 0; - event_time = gtk_get_current_event_time(); - } - - ui_menu_popup(GTK_MENU(menu), NULL, NULL, button, event_time); + gtk_menu_popup_at_pointer(GTK_MENU(menu), (GdkEvent *) event); } Modified: src/sidebar.c 8 lines changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -145,7 +145,7 @@ on_default_tag_tree_button_press_event(GtkWidget *widget, GdkEventButton *event, { if (event->button == 3) { - ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(tv.popup_taglist), (GdkEvent *) event); return TRUE; } return FALSE; @@ -1513,13 +1513,11 @@ static gboolean sidebar_button_press_cb(GtkWidget *widget, GdkEventButton *event /* update menu item sensitivity */ documents_menu_update(selection); - ui_menu_popup(GTK_MENU(openfiles_popup_menu), NULL, NULL, - event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(openfiles_popup_menu), (GdkEvent *) event); } else { - ui_menu_popup(GTK_MENU(tv.popup_taglist), NULL, NULL, - event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(tv.popup_taglist), (GdkEvent *) event); } handled = TRUE; } Modified: src/symbols.c 99 lines changed, 18 insertions(+), 81 deletions(-) =================================================================== @@ -1408,81 +1408,22 @@ static guint get_tag_class(const TMTag *tag) } -/* positions a popup at the caret from the ScintillaObject in @p data */ -static void goto_popup_position_func(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data) +/* opens menu at caret position */ +static void show_menu_at_caret(GtkMenu* menu, ScintillaObject *sci) { - gint line_height; - GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(menu)); - gint monitor_num; - GdkRectangle monitor; - GtkRequisition req; - GdkEventButton *event_button = g_object_get_data(G_OBJECT(menu), "geany-button-event"); - - if (event_button) - { - /* if we got a mouse click, popup at that position */ - *x = (gint) event_button->x_root; - *y = (gint) event_button->y_root; - line_height = 0; /* we don't want to offset below the line or anything */ - } - else /* keyboard positioning */ - { - ScintillaObject *sci = data; - GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(sci)); - gint pos = sci_get_current_position(sci); - gint line = sci_get_line_from_position(sci, pos); - gint pos_x = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos); - gint pos_y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos); - - line_height = SSM(sci, SCI_TEXTHEIGHT, line, 0); - - gdk_window_get_origin(window, x, y); - *x += pos_x; - *y += pos_y; - } - - monitor_num = gdk_screen_get_monitor_at_point(screen, *x, *y); - - gtk_widget_get_preferred_size(GTK_WIDGET(menu), NULL, &req); - -#if GTK_CHECK_VERSION(3, 4, 0) - gdk_screen_get_monitor_workarea(screen, monitor_num, &monitor); -#else - gdk_screen_get_monitor_geometry(screen, monitor_num, &monitor); -#endif - - /* put on one size of the X position, but within the monitor */ - if (gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL) - { - if (*x - req.width - 1 >= monitor.x) - *x -= req.width + 1; - else if (*x + req.width > monitor.x + monitor.width) - *x = monitor.x; - else - *x += 1; - } - else - { - if (*x + req.width + 1 <= monitor.x + monitor.width) - *x = MAX(monitor.x, *x + 1); - else if (*x - req.width - 1 >= monitor.x) - *x -= req.width + 1; - else - *x = monitor.x + MAX(0, monitor.width - req.width); - } - - /* try to put, in order: - * 1. below the Y position, under the line - * 2. above the Y position - * 3. within the monitor */ - if (*y + line_height + req.height <= monitor.y + monitor.height) - *y = MAX(monitor.y, *y + line_height); - else if (*y - req.height >= monitor.y) - *y = *y - req.height; - else - *y = monitor.y + MAX(0, monitor.height - req.height); - - *push_in = FALSE; + GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(sci)); + gint pos = sci_get_current_position(sci); + gint line = sci_get_line_from_position(sci, pos); + gint line_height = SSM(sci, SCI_TEXTHEIGHT, line, 0); + gint x = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos); + gint y = SSM(sci, SCI_POINTYFROMPOSITION, 0, pos); + gint pos_next = sci_get_position_after(sci, pos); + gint char_width = 0; + /* if next pos is on the same Y (same line and not after wrapping), diff the X */ + if (pos_next > pos && SSM(sci, SCI_POINTYFROMPOSITION, 0, pos_next) == y) + char_width = SSM(sci, SCI_POINTXFROMPOSITION, 0, pos_next) - x; + GdkRectangle rect = {x, y, char_width, line_height}; + gtk_menu_popup_at_rect(GTK_MENU(menu), window, &rect, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST, NULL); } @@ -1492,7 +1433,6 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b GtkWidget *menu; GtkSizeGroup *group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); GdkEvent *event; - GdkEventButton *button_event = NULL; TMTag *tmtag; guint i; gchar **short_names, **file_names; @@ -1560,15 +1500,12 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b event = gtk_get_current_event(); if (event && event->type == GDK_BUTTON_PRESS) - button_event = (GdkEventButton *) event; + gtk_menu_popup_at_pointer(GTK_MENU(menu), event); else + show_menu_at_caret(GTK_MENU(menu), doc->editor->sci); + if (event) gdk_event_free(event); - g_object_set_data_full(G_OBJECT(menu), "geany-button-event", button_event, - button_event ? (GDestroyNotify) gdk_event_free : NULL); - ui_menu_popup(GTK_MENU(menu), goto_popup_position_func, doc->editor->sci, - button_event ? button_event->button : 0, gtk_get_current_event_time ()); - g_object_unref(group); } Modified: src/ui_utils.c 12 lines changed, 0 insertions(+), 12 deletions(-) =================================================================== @@ -3257,15 +3257,3 @@ 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 -} Modified: src/ui_utils.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -373,8 +373,6 @@ gchar *ui_get_project_directory(const gchar *path); void ui_menu_sort_by_label(GtkMenu *menu); -void ui_menu_popup(GtkMenu* menu, GtkMenuPositionFunc func, gpointer data, guint button, guint32 activate_time); - #endif /* GEANY_PRIVATE */ G_END_DECLS Modified: src/vte.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -526,7 +526,7 @@ static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpo if (event->button == 3) { gtk_widget_grab_focus(vte_config.vte); - ui_menu_popup(GTK_MENU(vte_config.menu), NULL, NULL, event->button, event->time); + gtk_menu_popup_at_pointer(GTK_MENU(vte_config.menu), (GdkEvent *) event); return TRUE; } else if (event->button == 2) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2023