Commits February 2016

commits@lists.geany.org

1 participants
146 discussions

[geany/geany] 1f9bfd: Set push_in parameter to false
by Jiří Techet 26 Feb '16

26 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 25 Feb 2016 23:05:22 UTC Commit: 1f9bfdf65fd43e80975aeb8eea37a427e379785a https://github.com/geany/geany/commit/1f9bfdf65fd43e80975aeb8eea37a427e3797… Log Message: ----------- Set push_in parameter to false This behaves a bit strangely when the list is long and when clicked at the bottom of the screen (the top part of the popup is empty). Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1892,7 +1892,7 @@ static void goto_popup_position_func(GtkMenu *menu, gint *x, gint *y, gboolean * *x += pos_x; *y += pos_y + line_height; - *push_in = TRUE; + *push_in = FALSE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 848a12: Improve placement of the goto tag popup
by Colomban Wendling 26 Feb '16

26 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 25 Feb 2016 23:05:22 UTC Commit: 848a123f00ba519c47af61c584fece1c5bead1e8 https://github.com/geany/geany/commit/848a123f00ba519c47af61c584fece1c5bead… Log Message: ----------- Improve placement of the goto tag popup Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 53 lines changed, 50 insertions(+), 3 deletions(-) =================================================================== @@ -1877,7 +1877,7 @@ static guint get_tag_class(const TMTag *tag) } -/* positions a popup below the caret from the ScintillaObject in @p data */ +/* 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) { ScintillaObject *sci = data; @@ -1887,11 +1887,58 @@ static void goto_popup_position_func(GtkMenu *menu, gint *x, gint *y, gboolean * gint line_height = scintilla_send_message(sci, SCI_TEXTHEIGHT, line, 0); gint pos_x = scintilla_send_message(sci, SCI_POINTXFROMPOSITION, 0, pos); gint pos_y = scintilla_send_message(sci, SCI_POINTYFROMPOSITION, 0, pos); + GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(menu)); + gint monitor_num; + GdkRectangle monitor; + GtkRequisition req; gdk_window_get_origin(window, x, y); - *x += pos_x; - *y += pos_y + line_height; + *y += pos_y; + + monitor_num = gdk_screen_get_monitor_at_point(screen, *x, *y); + +#if GTK_CHECK_VERSION(3, 0, 0) + gtk_widget_get_preferred_size(GTK_WIDGET(menu), NULL, &req); +#else + gtk_widget_size_request(GTK_WIDGET(menu), &req); +#endif + +#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 >= monitor.x) + *x -= req.width; + else if (*x + req.width > monitor.x + monitor.width) + *x = monitor.x; + } + else + { + if (*x + req.width <= monitor.x + monitor.width) + *x = MAX(monitor.x, *x); + else if (*x - req.width >= monitor.x) + *x -= req.width; + 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; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a168f6: Make sure the mouse cursor is out of the popup
by Jiří Techet 26 Feb '16

26 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 25 Feb 2016 23:05:22 UTC Commit: a168f69887ce29345d6592b8df566629f014ed7f https://github.com/geany/geany/commit/a168f69887ce29345d6592b8df566629f014e… Log Message: ----------- Make sure the mouse cursor is out of the popup The x coordinate is now taken from the scintilla caret position. However, when performing ctrl+click, we have to distinguish two cases: 1. the click happens in the second half of a letter - in this case the caret is placed behind the letter and the popup appears behind it - no problem 2. the click happens in the first part of a letter - caret is placed before the letter and the popup appears before the position where the click happened - this means that the mouse cursor is above the popup which causes that the mouse cursor highlights the item at the position of the cursor instead of having the first item in the menu highlighted. The patch calculates offset between caret and the mouse click event position and uses this value to adjust the popup positioning so it's outside the mouse cursor. Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 31 lines changed, 25 insertions(+), 6 deletions(-) =================================================================== @@ -1888,14 +1888,31 @@ static void goto_popup_position_func(GtkMenu *menu, gint *x, gint *y, gboolean * gint pos_x = scintilla_send_message(sci, SCI_POINTXFROMPOSITION, 0, pos); gint pos_y = scintilla_send_message(sci, SCI_POINTYFROMPOSITION, 0, pos); GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(menu)); + gint offset_left = 0; + gint offset_right = 0; gint monitor_num; GdkRectangle monitor; GtkRequisition req; + GdkEvent *event; gdk_window_get_origin(window, x, y); *x += pos_x; *y += pos_y; + event = gtk_get_current_event(); + if (event && event->type == GDK_BUTTON_PRESS) + { + GdkEventButton *event_button = (GdkEventButton *) event; + + /* Caret is placed either before or after the letter which was clicked. + * Compute offset between the caret and click position and make sure + * the popup is shown outside the mouse pointer. */ + if (event_button->x >= pos_x && pos + 1 < sci_get_length(sci)) + offset_right = scintilla_send_message(sci, SCI_POINTXFROMPOSITION, 0, pos + 1) - pos_x; + else if (event_button->x <= pos_x && pos > 0) + offset_left = pos_x - scintilla_send_message(sci, SCI_POINTXFROMPOSITION, 0, pos - 1); + } + monitor_num = gdk_screen_get_monitor_at_point(screen, *x, *y); #if GTK_CHECK_VERSION(3, 0, 0) @@ -1913,17 +1930,19 @@ static void goto_popup_position_func(GtkMenu *menu, gint *x, gint *y, gboolean * /* 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 >= monitor.x) - *x -= req.width; + if (*x - req.width - offset_left >= monitor.x) + *x -= req.width + offset_left; else if (*x + req.width > monitor.x + monitor.width) *x = monitor.x; + else + *x += offset_right; } else { - if (*x + req.width <= monitor.x + monitor.width) - *x = MAX(monitor.x, *x); - else if (*x - req.width >= monitor.x) - *x -= req.width; + if (*x + req.width + offset_right <= monitor.x + monitor.width) + *x = MAX(monitor.x, *x + offset_right); + else if (*x - req.width - offset_left >= monitor.x) + *x -= req.width + offset_left; else *x = monitor.x + MAX(0, monitor.width - req.width); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 653990: Pass the actual event button to gtk_menu_popup()
by Colomban Wendling 26 Feb '16

26 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 25 Feb 2016 23:05:22 UTC Commit: 653990c01137342d5ca1776662594fe976702992 https://github.com/geany/geany/commit/653990c01137342d5ca1776662594fe976702… Log Message: ----------- Pass the actual event button to gtk_menu_popup() In case it's actually useful. Also properly free the GdkEvent returned by gtk_get_current_event(). Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 19 lines changed, 13 insertions(+), 6 deletions(-) =================================================================== @@ -1893,17 +1893,14 @@ static void goto_popup_position_func(GtkMenu *menu, gint *x, gint *y, gboolean * gint monitor_num; GdkRectangle monitor; GtkRequisition req; - GdkEvent *event; + GdkEventButton *event_button = g_object_get_data(G_OBJECT(menu), "geany-button-event"); gdk_window_get_origin(window, x, y); *x += pos_x; *y += pos_y; - event = gtk_get_current_event(); - if (event && event->type == GDK_BUTTON_PRESS) + if (event_button) { - GdkEventButton *event_button = (GdkEventButton *) event; - /* Caret is placed either before or after the letter which was clicked. * Compute offset between the caret and click position and make sure * the popup is shown outside the mouse pointer. */ @@ -1967,6 +1964,7 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b GtkWidget *first = NULL; GtkWidget *menu; GdkEvent *event; + GdkEventButton *button_event = NULL; TMTag *tmtag; guint i; @@ -2003,8 +2001,17 @@ 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); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, goto_popup_position_func, doc->editor->sci, - 0, gtk_get_current_event_time ()); + button_event ? button_event->button : 0, gtk_get_current_event_time ()); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c8dd52: Position the popup at the very click position if any
by Colomban Wendling 26 Feb '16

26 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 25 Feb 2016 23:05:22 UTC Commit: c8dd52eb46ec348bb05539124104db910a45c894 https://github.com/geany/geany/commit/c8dd52eb46ec348bb05539124104db910a45c… Log Message: ----------- Position the popup at the very click position if any Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 54 lines changed, 26 insertions(+), 28 deletions(-) =================================================================== @@ -1880,34 +1880,34 @@ 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) { - 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 line_height = scintilla_send_message(sci, SCI_TEXTHEIGHT, line, 0); - gint pos_x = scintilla_send_message(sci, SCI_POINTXFROMPOSITION, 0, pos); - gint pos_y = scintilla_send_message(sci, SCI_POINTYFROMPOSITION, 0, pos); + gint line_height; GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(menu)); - gint offset_left = 0; - gint offset_right = 0; gint monitor_num; GdkRectangle monitor; GtkRequisition req; GdkEventButton *event_button = g_object_get_data(G_OBJECT(menu), "geany-button-event"); - gdk_window_get_origin(window, x, y); - *x += pos_x; - *y += pos_y; - if (event_button) { - /* Caret is placed either before or after the letter which was clicked. - * Compute offset between the caret and click position and make sure - * the popup is shown outside the mouse pointer. */ - if (event_button->x >= pos_x && pos + 1 < sci_get_length(sci)) - offset_right = scintilla_send_message(sci, SCI_POINTXFROMPOSITION, 0, pos + 1) - pos_x; - else if (event_button->x <= pos_x && pos > 0) - offset_left = pos_x - scintilla_send_message(sci, SCI_POINTXFROMPOSITION, 0, pos - 1); + /* 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 = scintilla_send_message(sci, SCI_POINTXFROMPOSITION, 0, pos); + gint pos_y = scintilla_send_message(sci, SCI_POINTYFROMPOSITION, 0, pos); + + line_height = scintilla_send_message(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); @@ -1927,19 +1927,17 @@ static void goto_popup_position_func(GtkMenu *menu, gint *x, gint *y, gboolean * /* 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 - offset_left >= monitor.x) - *x -= req.width + offset_left; + if (*x - req.width >= monitor.x) + *x -= req.width; else if (*x + req.width > monitor.x + monitor.width) *x = monitor.x; - else - *x += offset_right; } else { - if (*x + req.width + offset_right <= monitor.x + monitor.width) - *x = MAX(monitor.x, *x + offset_right); - else if (*x - req.width - offset_left >= monitor.x) - *x -= req.width + offset_left; + if (*x + req.width <= monitor.x + monitor.width) + *x = MAX(monitor.x, *x); + else if (*x - req.width >= monitor.x) + *x -= req.width; else *x = monitor.x + MAX(0, monitor.width - req.width); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b46e18: Move the popup 1px further so it isn't below mouse pointer
by Jiří Techet 26 Feb '16

26 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 25 Feb 2016 23:05:22 UTC Commit: b46e183cbc689ba7dd69a21d3575c863d762eea5 https://github.com/geany/geany/commit/b46e183cbc689ba7dd69a21d3575c863d762e… Log Message: ----------- Move the popup 1px further so it isn't below mouse pointer Otherwise the mouse pointer highlights a wrong value if the popup is large enough to extend above the mouse pointer. Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 14 lines changed, 8 insertions(+), 6 deletions(-) =================================================================== @@ -1927,17 +1927,19 @@ static void goto_popup_position_func(GtkMenu *menu, gint *x, gint *y, gboolean * /* 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 >= monitor.x) - *x -= req.width; + 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 <= monitor.x + monitor.width) - *x = MAX(monitor.x, *x); - else if (*x - req.width >= monitor.x) - *x -= req.width; + 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); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 943bfa: Re-implement goto tag popup with a poped-up GtkMenu
by Colomban Wendling 26 Feb '16

26 Feb '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 25 Feb 2016 23:05:22 UTC Commit: 943bfa52c5f98e3adc0f8581845e492203c1218c https://github.com/geany/geany/commit/943bfa52c5f98e3adc0f8581845e492203c12… Log Message: ----------- Re-implement goto tag popup with a poped-up GtkMenu Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 171 lines changed, 54 insertions(+), 117 deletions(-) =================================================================== @@ -54,7 +54,6 @@ #include "tm_tag.h" #include "ui_utils.h" #include "utils.h" -#include "keybindings.h" #include "SciLexer.h" @@ -63,7 +62,6 @@ #include <ctype.h> #include <string.h> #include <stdlib.h> -#include <gdk/gdkkeysyms.h> static gchar **html_entities = NULL; @@ -86,13 +84,6 @@ enum /* Geany tag files */ GTF_MAX }; -enum { - PIXBUF_COLUMN, - TEXT_COLUMN, - TAG_COLUMN, - N_COLUMNS -}; - static TagFileInfo tag_file_info[GTF_MAX] = { {FALSE, "c99.tags"}, @@ -147,9 +138,6 @@ static struct } symbol_menu; -static GtkWidget *tag_goto_popup = NULL; -static GtkWidget *tag_goto_tree_view = NULL; - static void html_tags_loaded(void); static void load_user_tags(filetype_id ft_id); @@ -1840,22 +1828,10 @@ static void load_user_tags(filetype_id ft_id) } -static void on_focus_out(GtkWidget *list, GdkEventFocus *unused, gpointer *user_data) -{ - gtk_widget_hide(tag_goto_popup); -} - - -static void on_row_activated(GtkTreeView *tree_view, GtkTreePath *path, - GtkTreeViewColumn *column, gpointer user_data) +static void on_goto_popup_item_activate(GtkMenuItem *item, TMTag *tag) { - GtkTreeModel *model = gtk_tree_view_get_model(tree_view); GeanyDocument *new_doc, *old_doc; - GtkTreeIter iter; - TMTag *tag; - gtk_tree_model_get_iter(model, &iter, path); - gtk_tree_model_get(model, &iter, TAG_COLUMN, &tag, -1); g_return_if_fail(tag); old_doc = document_get_current(); @@ -1863,23 +1839,6 @@ static void on_row_activated(GtkTreeView *tree_view, GtkTreePath *path, if (new_doc) navqueue_goto_line(old_doc, new_doc, tag->line); - - gtk_widget_hide(tag_goto_popup); - tm_tag_unref(tag); -} - - -static gboolean on_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer user_data) -{ - guint state = event->state & gtk_accelerator_get_default_mod_mask(); - - if (event->keyval == GDK_Escape && state == 0) - { - gtk_widget_hide(tag_goto_popup); - keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR); - return TRUE; - } - return FALSE; } @@ -1918,106 +1877,84 @@ static guint get_tag_class(const TMTag *tag) } -static void create_goto_popup(void) +/* positions a popup below 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) { - GtkWidget *frame, *scroller; - GtkListStore *store; - GtkTreeSelection *selection; - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - - tag_goto_popup = g_object_new(GTK_TYPE_WINDOW, "type", GTK_WINDOW_TOPLEVEL, NULL); - gtk_widget_set_can_focus(tag_goto_popup, TRUE); - gtk_window_set_type_hint(GTK_WINDOW(tag_goto_popup), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_window_set_decorated(GTK_WINDOW(tag_goto_popup), FALSE); - gtk_window_set_transient_for(GTK_WINDOW(tag_goto_popup), GTK_WINDOW(main_widgets.window)); - gtk_window_set_destroy_with_parent(GTK_WINDOW(tag_goto_popup), TRUE); - gtk_window_set_position(GTK_WINDOW(tag_goto_popup), GTK_WIN_POS_CENTER_ON_PARENT); - gtk_widget_set_size_request(tag_goto_popup, 250, 150); - - frame = gtk_frame_new(NULL); - gtk_container_add(GTK_CONTAINER(tag_goto_popup), frame); - gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT); - gtk_container_set_border_width(GTK_CONTAINER(frame), 0); - - scroller = gtk_scrolled_window_new(NULL, NULL); - gtk_container_set_border_width(GTK_CONTAINER(scroller), 0); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroller), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(frame), scroller); - - /* TreeView and its model */ - store = gtk_list_store_new(N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG); - tag_goto_tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); - gtk_widget_set_can_focus(tag_goto_tree_view, TRUE); - gtk_container_add(GTK_CONTAINER(scroller), tag_goto_tree_view); - g_signal_connect(tag_goto_tree_view, "focus-out-event", G_CALLBACK(on_focus_out), tag_goto_popup); - g_signal_connect(tag_goto_tree_view, "row-activated", G_CALLBACK(on_row_activated), NULL); - g_signal_connect(tag_goto_tree_view, "key-press-event", G_CALLBACK(on_key_pressed), NULL); + 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 line_height = scintilla_send_message(sci, SCI_TEXTHEIGHT, line, 0); + gint pos_x = scintilla_send_message(sci, SCI_POINTXFROMPOSITION, 0, pos); + gint pos_y = scintilla_send_message(sci, SCI_POINTYFROMPOSITION, 0, pos); - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tag_goto_tree_view)); - gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tag_goto_tree_view), FALSE); - gtk_tree_view_set_reorderable(GTK_TREE_VIEW(tag_goto_tree_view), FALSE); + gdk_window_get_origin(window, x, y); - /* Columns */ - column = gtk_tree_view_column_new(); - gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - - renderer = gtk_cell_renderer_pixbuf_new(); - gtk_tree_view_column_pack_start(column, renderer, FALSE); - gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", PIXBUF_COLUMN); - - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_column_pack_start(column, renderer, TRUE); - gtk_tree_view_column_add_attribute(column, renderer, "markup", TEXT_COLUMN); - - gtk_tree_view_append_column(GTK_TREE_VIEW(tag_goto_tree_view), column); - - gtk_widget_show_all(frame); + *x += pos_x; + *y += pos_y + line_height; + *push_in = TRUE; } -static void show_goto_popup(GPtrArray *tags, gboolean have_best) +static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_best) { - gboolean first = TRUE; - GtkTreePath *path; - GtkTreeModel *model; - GtkTreeIter iter; + GtkWidget *first = NULL; + GtkWidget *menu; + GdkEvent *event; TMTag *tmtag; guint i; - if (!tag_goto_popup) - create_goto_popup(); - - model = gtk_tree_view_get_model(GTK_TREE_VIEW(tag_goto_tree_view)); - gtk_list_store_clear(GTK_LIST_STORE(model)); + menu = gtk_menu_new(); foreach_ptr_array(tmtag, i, tags) { + GtkWidget *item; + GtkWidget *label; + GtkWidget *image; gchar *fname = g_path_get_basename(tmtag->file->file_name); gchar *text; - if (first && have_best) + if (! first && have_best) text = g_markup_printf_escaped("<b>%s: %lu</b>", fname, tmtag->line); else text = g_markup_printf_escaped("%s: %lu", fname, tmtag->line); - gtk_list_store_insert_with_values(GTK_LIST_STORE(model), &iter, -1, - PIXBUF_COLUMN, symbols_icons[get_tag_class(tmtag)].pixbuf, - TEXT_COLUMN, text, - TAG_COLUMN, tmtag, -1); + image = gtk_image_new_from_pixbuf(symbols_icons[get_tag_class(tmtag)].pixbuf); + label = g_object_new(GTK_TYPE_LABEL, "label", text, "use-markup", TRUE, "xalign", 0.0, NULL); + item = g_object_new(GTK_TYPE_IMAGE_MENU_ITEM, "image", image, "child", label, NULL); + g_signal_connect_data(item, "activate", G_CALLBACK(on_goto_popup_item_activate), + tm_tag_ref(tmtag), (GClosureNotify) tm_tag_unref, 0); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); + + if (! first) + first = item; g_free(text); g_free(fname); - first = FALSE; } - path = gtk_tree_path_new_first(); - gtk_tree_view_set_cursor (GTK_TREE_VIEW(tag_goto_tree_view), path, NULL, FALSE); - gtk_tree_path_free(path); + gtk_widget_show_all(menu); - gtk_window_present(GTK_WINDOW(tag_goto_popup)); + /* FIXME: this should get the real event directly instead of looking it up */ + event = gtk_get_current_event(); + if (event && event->type == GDK_BUTTON_PRESS) + { + GdkEventButton *event_button = (GdkEventButton *) event; + /* FIXME: should this also use the position func? as the cursor must be on the location + * under the cursor at this point anyway, it might give prettier alignment. + * But might as well be farther from the pointer or otherwise misaligned with the + * pointer, so maybe not. */ + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event_button->button, event_button->time); + } + else + { + if (first) /* always select the first item for better keyboard navigation */ + g_signal_connect(menu, "realize", G_CALLBACK(gtk_menu_shell_select_item), first); + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, goto_popup_position_func, doc->editor->sci, + 0, gtk_get_current_event_time ()); + } + if (event) + gdk_event_free(event); } @@ -2141,7 +2078,7 @@ static gboolean goto_tag(const gchar *name, gboolean definition) if (tag != best_tag) g_ptr_array_add(tags, tag); } - show_goto_popup(tags, best_tag != NULL); + show_goto_popup(old_doc, tags, best_tag != NULL); g_ptr_array_free(tags, TRUE); found = TRUE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4c0c76: If more tags are found during tag definition/declaration goto, let user select which one to use
by Jiří Techet 26 Feb '16

26 Feb '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 25 Feb 2016 23:03:45 UTC Commit: 4c0c76e6f40e0ad12fa1aac676872200b948a45b https://github.com/geany/geany/commit/4c0c76e6f40e0ad12fa1aac676872200b948a… Log Message: ----------- If more tags are found during tag definition/declaration goto, let user select which one to use If only a single tag is found, just perform the goto. If more tags are found, show them in a popup. Try to help the user find the right file by putting the "best" tag at the first position and emphasizing it. Thanks to Colomban Wendling for various improvements of this patch. Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 365 lines changed, 292 insertions(+), 73 deletions(-) =================================================================== @@ -54,6 +54,7 @@ #include "tm_tag.h" #include "ui_utils.h" #include "utils.h" +#include "keybindings.h" #include "SciLexer.h" @@ -62,6 +63,7 @@ #include <ctype.h> #include <string.h> #include <stdlib.h> +#include <gdk/gdkkeysyms.h> static gchar **html_entities = NULL; @@ -84,6 +86,13 @@ enum /* Geany tag files */ GTF_MAX }; +enum { + PIXBUF_COLUMN, + TEXT_COLUMN, + TAG_COLUMN, + N_COLUMNS +}; + static TagFileInfo tag_file_info[GTF_MAX] = { {FALSE, "c99.tags"}, @@ -138,6 +147,9 @@ static struct } symbol_menu; +static GtkWidget *tag_goto_popup = NULL; +static GtkWidget *tag_goto_tree_view = NULL; + static void html_tags_loaded(void); static void load_user_tags(filetype_id ft_id); @@ -326,66 +338,6 @@ const gchar *symbols_get_context_separator(gint ft_id) } -/* Note: if tags is sorted, we can use bsearch or tm_tags_find() to speed this up. */ -static TMTag * -symbols_find_tm_tag(const GPtrArray *tags, const gchar *tag_name) -{ - guint i; - g_return_val_if_fail(tags != NULL, NULL); - - for (i = 0; i < tags->len; ++i) - { - if (utils_str_equal(TM_TAG(tags->pdata[i])->name, tag_name)) - return TM_TAG(tags->pdata[i]); - } - return NULL; -} - - -static TMTag *find_source_file_tag(GPtrArray *tags_array, - const gchar *tag_name, guint type) -{ - GPtrArray *tags; - TMTag *tmtag; - - tags = tm_tags_extract(tags_array, type); - if (tags != NULL) - { - tmtag = symbols_find_tm_tag(tags, tag_name); - - g_ptr_array_free(tags, TRUE); - - if (tmtag != NULL) - return tmtag; - } - return NULL; /* not found */ -} - - -static TMTag *find_workspace_tag(const gchar *tag_name, guint type) -{ - guint j; - const GPtrArray *source_files = NULL; - - if (app->tm_workspace != NULL) - source_files = app->tm_workspace->source_files; - - if (source_files != NULL) - { - for (j = 0; j < source_files->len; j++) - { - TMSourceFile *srcfile = source_files->pdata[j]; - TMTag *tmtag; - - tmtag = find_source_file_tag(srcfile->tags_array, tag_name, type); - if (tmtag != NULL) - return tmtag; - } - } - return NULL; /* not found */ -} - - const gchar **symbols_get_html_entities(void) { if (html_entities == NULL) @@ -1888,27 +1840,270 @@ static void load_user_tags(filetype_id ft_id) } +static void on_focus_out(GtkWidget *list, GdkEventFocus *unused, gpointer *user_data) +{ + gtk_widget_hide(tag_goto_popup); +} + + +static void on_row_activated(GtkTreeView *tree_view, GtkTreePath *path, + GtkTreeViewColumn *column, gpointer user_data) +{ + GtkTreeModel *model = gtk_tree_view_get_model(tree_view); + GeanyDocument *new_doc, *old_doc; + GtkTreeIter iter; + TMTag *tag; + + gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get(model, &iter, TAG_COLUMN, &tag, -1); + g_return_if_fail(tag); + + old_doc = document_get_current(); + new_doc = document_open_file(tag->file->file_name, FALSE, NULL, NULL); + + if (new_doc) + navqueue_goto_line(old_doc, new_doc, tag->line); + + gtk_widget_hide(tag_goto_popup); + tm_tag_unref(tag); +} + + +static gboolean on_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer user_data) +{ + guint state = event->state & gtk_accelerator_get_default_mod_mask(); + + if (event->keyval == GDK_Escape && state == 0) + { + gtk_widget_hide(tag_goto_popup); + keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR); + return TRUE; + } + return FALSE; +} + + +/* FIXME: use the same icons as in the symbols tree defined in add_top_level_items() */ +static guint get_tag_class(const TMTag *tag) +{ + switch (tag->type) + { + case tm_tag_prototype_t: + case tm_tag_method_t: + case tm_tag_function_t: + return ICON_METHOD; + case tm_tag_variable_t: + case tm_tag_externvar_t: + return ICON_VAR; + case tm_tag_macro_t: + case tm_tag_macro_with_arg_t: + return ICON_MACRO; + case tm_tag_class_t: + return ICON_CLASS; + case tm_tag_member_t: + case tm_tag_field_t: + return ICON_MEMBER; + case tm_tag_typedef_t: + case tm_tag_enum_t: + case tm_tag_union_t: + case tm_tag_struct_t: + return ICON_STRUCT; + case tm_tag_namespace_t: + case tm_tag_package_t: + return ICON_NAMESPACE; + default: + break; + } + return ICON_STRUCT; +} + + +static void create_goto_popup(void) +{ + GtkWidget *frame, *scroller; + GtkListStore *store; + GtkTreeSelection *selection; + GtkTreeViewColumn *column; + GtkCellRenderer *renderer; + + tag_goto_popup = g_object_new(GTK_TYPE_WINDOW, "type", GTK_WINDOW_TOPLEVEL, NULL); + gtk_widget_set_can_focus(tag_goto_popup, TRUE); + gtk_window_set_type_hint(GTK_WINDOW(tag_goto_popup), GDK_WINDOW_TYPE_HINT_DIALOG); + gtk_window_set_decorated(GTK_WINDOW(tag_goto_popup), FALSE); + gtk_window_set_transient_for(GTK_WINDOW(tag_goto_popup), GTK_WINDOW(main_widgets.window)); + gtk_window_set_destroy_with_parent(GTK_WINDOW(tag_goto_popup), TRUE); + gtk_window_set_position(GTK_WINDOW(tag_goto_popup), GTK_WIN_POS_CENTER_ON_PARENT); + gtk_widget_set_size_request(tag_goto_popup, 250, 150); + + frame = gtk_frame_new(NULL); + gtk_container_add(GTK_CONTAINER(tag_goto_popup), frame); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT); + gtk_container_set_border_width(GTK_CONTAINER(frame), 0); + + scroller = gtk_scrolled_window_new(NULL, NULL); + gtk_container_set_border_width(GTK_CONTAINER(scroller), 0); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroller), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_container_add(GTK_CONTAINER(frame), scroller); + + /* TreeView and its model */ + store = gtk_list_store_new(N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG); + tag_goto_tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); + gtk_widget_set_can_focus(tag_goto_tree_view, TRUE); + gtk_container_add(GTK_CONTAINER(scroller), tag_goto_tree_view); + g_signal_connect(tag_goto_tree_view, "focus-out-event", G_CALLBACK(on_focus_out), tag_goto_popup); + g_signal_connect(tag_goto_tree_view, "row-activated", G_CALLBACK(on_row_activated), NULL); + g_signal_connect(tag_goto_tree_view, "key-press-event", G_CALLBACK(on_key_pressed), NULL); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tag_goto_tree_view)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tag_goto_tree_view), FALSE); + gtk_tree_view_set_reorderable(GTK_TREE_VIEW(tag_goto_tree_view), FALSE); + + /* Columns */ + column = gtk_tree_view_column_new(); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); + + renderer = gtk_cell_renderer_pixbuf_new(); + gtk_tree_view_column_pack_start(column, renderer, FALSE); + gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", PIXBUF_COLUMN); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(column, renderer, TRUE); + gtk_tree_view_column_add_attribute(column, renderer, "markup", TEXT_COLUMN); + + gtk_tree_view_append_column(GTK_TREE_VIEW(tag_goto_tree_view), column); + + gtk_widget_show_all(frame); +} + + +static void show_goto_popup(GPtrArray *tags, gboolean have_best) +{ + gboolean first = TRUE; + GtkTreePath *path; + GtkTreeModel *model; + GtkTreeIter iter; + TMTag *tmtag; + guint i; + + if (!tag_goto_popup) + create_goto_popup(); + + model = gtk_tree_view_get_model(GTK_TREE_VIEW(tag_goto_tree_view)); + gtk_list_store_clear(GTK_LIST_STORE(model)); + + foreach_ptr_array(tmtag, i, tags) + { + gchar *fname = g_path_get_basename(tmtag->file->file_name); + gchar *text; + + if (first && have_best) + text = g_markup_printf_escaped("<b>%s: %lu</b>", fname, tmtag->line); + else + text = g_markup_printf_escaped("%s: %lu", fname, tmtag->line); + + gtk_list_store_insert_with_values(GTK_LIST_STORE(model), &iter, -1, + PIXBUF_COLUMN, symbols_icons[get_tag_class(tmtag)].pixbuf, + TEXT_COLUMN, text, + TAG_COLUMN, tmtag, -1); + + g_free(text); + g_free(fname); + first = FALSE; + } + + path = gtk_tree_path_new_first(); + gtk_tree_view_set_cursor (GTK_TREE_VIEW(tag_goto_tree_view), path, NULL, FALSE); + gtk_tree_path_free(path); + + gtk_window_present(GTK_WINDOW(tag_goto_popup)); +} + + +static gint compare_tags_by_name_line(gconstpointer ptr1, gconstpointer ptr2) +{ + gint res; + TMTag *t1 = *((TMTag **) ptr1); + TMTag *t2 = *((TMTag **) ptr2); + + res = g_strcmp0(t1->file->short_name, t2->file->short_name); + if (res != 0) + return res; + return t1->line - t2->line; +} + + +static TMTag *find_best_goto_tag(GeanyDocument *doc, GPtrArray *tags) +{ + TMTag *tag; + guint i; + + /* first check if we have a tag in the current file */ + foreach_ptr_array(tag, i, tags) + { + if (g_strcmp0(doc->real_path, tag->file->file_name) == 0) + return tag; + } + + /* next check if we have a tag for some of the open documents */ + foreach_ptr_array(tag, i, tags) + { + guint j; + + foreach_document(j) + { + if (g_strcmp0(documents[j]->real_path, tag->file->file_name) == 0) + return tag; + } + } + + /* next check if we have a tag for a file inside the current document's directory */ + foreach_ptr_array(tag, i, tags) + { + gchar *dir = g_path_get_dirname(doc->real_path); + + if (g_str_has_prefix(tag->file->file_name, dir)) + { + g_free(dir); + return tag; + } + g_free(dir); + } + + return NULL; +} + + static gboolean goto_tag(const gchar *name, gboolean definition) { const TMTagType forward_types = tm_tag_prototype_t | tm_tag_externvar_t; TMTagType type; TMTag *tmtag = NULL; GeanyDocument *old_doc = document_get_current(); + gboolean found = FALSE; + const GPtrArray *all_tags; + GPtrArray *workspace_tags; + guint i; /* goto tag definition: all except prototypes / forward declarations / externs */ type = (definition) ? tm_tag_max_t - forward_types : forward_types; + all_tags = tm_workspace_find(name, NULL, type, NULL, old_doc->file_type->lang); - /* first look in the current document */ - if (old_doc != NULL && old_doc->tm_file) - tmtag = find_source_file_tag(old_doc->tm_file->tags_array, name, type); - - /* if not found, look in the workspace */ - if (tmtag == NULL) - tmtag = find_workspace_tag(name, type); + /* get rid of global tags */ + workspace_tags = g_ptr_array_new(); + foreach_ptr_array(tmtag, i, all_tags) + { + if (tmtag->file) + g_ptr_array_add(workspace_tags, tmtag); + } - if (tmtag != NULL) + if (workspace_tags->len == 1) { - GeanyDocument *new_doc = document_find_by_real_path( + GeanyDocument *new_doc; + + tmtag = workspace_tags->pdata[0]; + new_doc = document_find_by_real_path( tmtag->file->file_name); if (new_doc) @@ -1918,7 +2113,7 @@ static gboolean goto_tag(const gchar *name, gboolean definition) tmtag->line == (guint)sci_get_current_line(old_doc->editor->sci) + 1) { if (goto_tag(name, !definition)) - return TRUE; + found = TRUE; } } else @@ -1927,10 +2122,34 @@ static gboolean goto_tag(const gchar *name, gboolean definition) new_doc = document_open_file(tmtag->file->file_name, FALSE, NULL, NULL); } - if (navqueue_goto_line(old_doc, new_doc, tmtag->line)) - return TRUE; + if (!found && navqueue_goto_line(old_doc, new_doc, tmtag->line)) + found = TRUE; } - return FALSE; + else if (workspace_tags->len > 1) + { + GPtrArray *tags; + TMTag *tag, *best_tag; + + g_ptr_array_sort(workspace_tags, compare_tags_by_name_line); + best_tag = find_best_goto_tag(old_doc, workspace_tags); + + tags = g_ptr_array_new(); + if (best_tag) + g_ptr_array_add(tags, best_tag); + foreach_ptr_array(tag, i, workspace_tags) + { + if (tag != best_tag) + g_ptr_array_add(tags, tag); + } + show_goto_popup(tags, best_tag != NULL); + + g_ptr_array_free(tags, TRUE); + found = TRUE; + } + + g_ptr_array_free(workspace_tags, TRUE); + + return found; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1f5355: Undo removal of "can be NULL" remark
by Thomas Martitz 25 Feb '16

25 Feb '16

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Thu, 25 Feb 2016 13:50:25 UTC Commit: 1f5355200789dbb0ff393bf7f904b053e71a64cb https://github.com/geany/geany/commit/1f5355200789dbb0ff393bf7f904b053e71a6… Log Message: ----------- Undo removal of "can be NULL" remark Also remove a unecessary empty line. Modified Paths: -------------- src/keybindings.c src/utils.c Modified: src/keybindings.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -217,7 +217,7 @@ GeanyKeyBinding *keybindings_set_item(GeanyKeyGroup *group, gsize key_id, * @param kf_name Key name for the configuration file, such as @c "menu_new". * @param label Label used in the preferences dialog keybindings tab. May contain * underscores - these won't be displayed. - * @param menu_item @nullable Optional widget to set an accelerator for. + * @param menu_item @nullable Optional widget to set an accelerator for, or @c NULL. * @param cb @nullable New-style callback to be called when activated, or @c NULL to use the group callback. * @param pdata Plugin-specific data passed back to the callback @a cb. * @param destroy_notify Function that is invoked to free the plugin data when not needed anymore. Modified: src/utils.c 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -1652,7 +1652,7 @@ const gchar *utils_get_default_dir_utf8(void) * @param env The child's environment, or @c NULL to inherit parent's. * @param flags Ignored. * @param child_setup @girskip Ignored. - * @param user_data Ignored. + * @param user_data @girskip Ignored. * @param std_out The return location for child output, or @c NULL. * @param std_err The return location for child error messages, or @c NULL. * @param exit_status The child exit status, as returned by waitpid(), or @c NULL. @@ -1955,7 +1955,6 @@ static gboolean str_in_array(const gchar **haystack, const gchar *needle) * * The argument list must be @c NULL-terminated. * - * * @param exclude_vars @c NULL-terminated array of variable names to exclude. * @param first_varname Name of the first variable to copy into the new array. * @param ... Key-value pairs of variable names and values, @c NULL-terminated. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3d51d8: GeanyFiletypeGroupID shall be gir-only
by Thomas Martitz 25 Feb '16

25 Feb '16

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Thu, 25 Feb 2016 13:49:18 UTC Commit: 3d51d8f6a64d49ac5b223075cbee530bd678e89c https://github.com/geany/geany/commit/3d51d8f6a64d49ac5b223075cbee530bd678e… Log Message: ----------- GeanyFiletypeGroupID shall be gir-only Modified Paths: -------------- src/filetypes.h Modified: src/filetypes.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -113,7 +113,8 @@ GeanyFiletypeID; #define filetype_id GeanyFiletypeID /* compat define - should be removed in the future */ -/** Filetype categories +/** @gironly + * Filetype categories * * These are used to provide submenus for each category in the GUI */ typedef enum -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2016