Commits April 2015

commits@lists.geany.org

1 participants
100 discussions

[geany/geany] 96cc37: Scintilla update script: strip "a/" and "b/" automatically
by Colomban Wendling 21 Apr '15

21 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 21 Apr 2015 13:34:54 UTC Commit: 96cc37946f24ba8ff203cbfed5e816b966fa95d6 https://github.com/geany/geany/commit/96cc37946f24ba8ff203cbfed5e816b966fa9… Log Message: ----------- Scintilla update script: strip "a/" and "b/" automatically Modified Paths: -------------- scripts/update-scintilla.sh Modified: scripts/update-scintilla.sh 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -56,8 +56,7 @@ done git apply -p0 scintilla/scintilla_changes.patch || { echo "scintilla_changes.patch doesn't apply, please update it and retry." echo "Changes for the catalogue are:" - git diff -p -R scintilla/src/Catalogue.cxx | tee - echo "Make sure to strip the leading a/ and b/!" + git diff -p -R --src-prefix= --dst-prefix= scintilla/src/Catalogue.cxx | cat exit 1 } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1d9bb5: Fix incorrect safety check in non-regex search code
by Colomban Wendling 21 Apr '15

21 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 21 Apr 2015 13:12:44 UTC Commit: 1d9bb56c4a01f758244e86b81a8b0715ae0be4c1 https://github.com/geany/geany/commit/1d9bb56c4a01f758244e86b81a8b0715ae0be… Log Message: ----------- Fix incorrect safety check in non-regex search code Only warn if MULTILINE is passed *together* with REGEX, but simply ignore if it not. Modified Paths: -------------- src/search.c Modified: src/search.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2045,7 +2045,7 @@ static gint find_regex(ScintillaObject *sci, guint pos, GRegex *regex, gboolean static gint geany_find_flags_to_sci_flags(GeanyFindFlags flags) { - g_warn_if_fail(! (flags & GEANY_FIND_MULTILINE)); + g_warn_if_fail(! (flags & GEANY_FIND_REGEXP) || ! (flags & GEANY_FIND_MULTILINE)); return ((flags & GEANY_FIND_MATCHCASE) ? SCFIND_MATCHCASE : 0) | ((flags & GEANY_FIND_WHOLEWORD) ? SCFIND_WHOLEWORD : 0) | -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 97ab68: Fix "select-all" to work with any GtkTextView, not only the scribble
by Colomban Wendling 20 Apr '15

20 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 20 Apr 2015 20:24:50 UTC Commit: 97ab68244cd889730c61842eb94c1d23b20460b6 https://github.com/geany/geany/commit/97ab68244cd889730c61842eb94c1d23b2046… Log Message: ----------- Fix "select-all" to work with any GtkTextView, not only the scribble This makes the code more generic and allows the "select-all" keybinding to work in any GtkTextView, e.g. potentially plugin's ones. Modified Paths: -------------- src/callbacks.c Modified: src/callbacks.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1189,9 +1189,9 @@ void on_menu_select_all1_activate(GtkMenuItem *menuitem, gpointer user_data) GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); /* special case for Select All in the scribble widget */ - if (focusw == msgwindow.scribble) + if (GTK_IS_TEXT_VIEW(focusw)) { - g_signal_emit_by_name(msgwindow.scribble, "select-all", TRUE); + g_signal_emit_by_name(focusw, "select-all", TRUE); } /* special case for Select All in the VTE widget */ #ifdef HAVE_VTE -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2110fc: Merge pull request #467 from pik/splitwindow
by Colomban Wendling 20 Apr '15

20 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 20 Apr 2015 20:19:49 UTC Commit: 2110fc785d77355600229b9d41c399c565d13bf9 https://github.com/geany/geany/commit/2110fc785d77355600229b9d41c399c565d13… Log Message: ----------- Merge pull request #467 from pik/splitwindow Fix basic callbacks to work with splitwindow Closes #460 and #467. Modified Paths: -------------- src/callbacks.c src/keybindings.c Modified: src/callbacks.c 62 lines changed, 33 insertions(+), 29 deletions(-) =================================================================== @@ -228,16 +228,13 @@ void on_redo1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); if (GTK_IS_EDITABLE(focusw)) gtk_editable_cut_clipboard(GTK_EDITABLE(focusw)); - else - if (IS_SCINTILLA(focusw) && doc != NULL) - sci_cut(doc->editor->sci); - else - if (GTK_IS_TEXT_VIEW(focusw)) + else if (IS_SCINTILLA(focusw)) + sci_cut(SCINTILLA(focusw)); + else if (GTK_IS_TEXT_VIEW(focusw)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(focusw)); @@ -248,16 +245,13 @@ void on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); if (GTK_IS_EDITABLE(focusw)) gtk_editable_copy_clipboard(GTK_EDITABLE(focusw)); - else - if (IS_SCINTILLA(focusw) && doc != NULL) - sci_copy(doc->editor->sci); - else - if (GTK_IS_TEXT_VIEW(focusw)) + else if (IS_SCINTILLA(focusw)) + sci_copy(SCINTILLA(focusw)); + else if (GTK_IS_TEXT_VIEW(focusw)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(focusw)); @@ -268,18 +262,13 @@ void on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_paste1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); if (GTK_IS_EDITABLE(focusw)) gtk_editable_paste_clipboard(GTK_EDITABLE(focusw)); - else - if (IS_SCINTILLA(focusw) && doc != NULL) - { - sci_paste(doc->editor->sci); - } - else - if (GTK_IS_TEXT_VIEW(focusw)) + else if (IS_SCINTILLA(focusw)) + sci_paste(SCINTILLA(focusw)); + else if (GTK_IS_TEXT_VIEW(focusw)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(focusw)); @@ -291,16 +280,13 @@ void on_paste1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_delete1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); if (GTK_IS_EDITABLE(focusw)) gtk_editable_delete_selection(GTK_EDITABLE(focusw)); - else - if (IS_SCINTILLA(focusw) && doc != NULL && sci_has_selection(doc->editor->sci)) - sci_clear(doc->editor->sci); - else - if (GTK_IS_TEXT_VIEW(focusw)) + else if (IS_SCINTILLA(focusw) && sci_has_selection(SCINTILLA(focusw))) + sci_clear(SCINTILLA(focusw)); + else if (GTK_IS_TEXT_VIEW(focusw)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(focusw)); @@ -1200,10 +1186,28 @@ void on_print1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_menu_select_all1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); - g_return_if_fail(doc != NULL); + GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); - sci_select_all(doc->editor->sci); + /* special case for Select All in the scribble widget */ + if (focusw == msgwindow.scribble) + { + g_signal_emit_by_name(msgwindow.scribble, "select-all", TRUE); + } + /* special case for Select All in the VTE widget */ +#ifdef HAVE_VTE + else if (vte_info.have_vte && focusw == vc->vte) + { + vte_select_all(); + } +#endif + else if (GTK_IS_EDITABLE(focusw)) + { + gtk_editable_select_region(GTK_EDITABLE(focusw), 0, -1); + } + else if (IS_SCINTILLA(focusw)) + { + sci_select_all(SCINTILLA(focusw)); + } } Modified: src/keybindings.c 65 lines changed, 17 insertions(+), 48 deletions(-) =================================================================== @@ -1831,10 +1831,7 @@ static void goto_matching_brace(GeanyDocument *doc) static gboolean cb_func_clipboard_action(guint key_id) { - GeanyDocument *doc = document_get_current(); - - if (doc == NULL) - return TRUE; + GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); switch (key_id) { @@ -1848,10 +1845,12 @@ static gboolean cb_func_clipboard_action(guint key_id) on_paste1_activate(NULL, NULL); break; case GEANY_KEYS_CLIPBOARD_COPYLINE: - sci_send_command(doc->editor->sci, SCI_LINECOPY); + if (IS_SCINTILLA(focusw)) + sci_send_command(SCINTILLA(focusw), SCI_LINECOPY); break; case GEANY_KEYS_CLIPBOARD_CUTLINE: - sci_send_command(doc->editor->sci, SCI_LINECUT); + if (IS_SCINTILLA(focusw)) + sci_send_command(SCINTILLA(focusw), SCI_LINECUT); break; } return TRUE; @@ -2359,46 +2358,11 @@ static gboolean cb_func_format_action(guint key_id) } -/* common function for select keybindings, only valid when scintilla has focus. */ +/* common function for select keybindings, valid for scintilla and/or gtk_editable objects. */ static gboolean cb_func_select_action(guint key_id) { - GeanyDocument *doc; - ScintillaObject *sci; + GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); - GtkWidget *toolbar_search_entry = toolbar_get_widget_child_by_name("SearchEntry"); - GtkWidget *toolbar_goto_entry = toolbar_get_widget_child_by_name("GotoEntry"); - - /* special case for Select All in the scribble widget */ - if (key_id == GEANY_KEYS_SELECT_ALL && focusw == msgwindow.scribble) - { - g_signal_emit_by_name(msgwindow.scribble, "select-all", TRUE); - return TRUE; - } - /* special case for Select All in the VTE widget */ -#ifdef HAVE_VTE - else if (key_id == GEANY_KEYS_SELECT_ALL && vte_info.have_vte && focusw == vc->vte) - { - vte_select_all(); - return TRUE; - } -#endif - /* special case for Select All in the toolbar search widget */ - else if (key_id == GEANY_KEYS_SELECT_ALL && focusw == toolbar_search_entry) - { - gtk_editable_select_region(GTK_EDITABLE(toolbar_search_entry), 0, -1); - return TRUE; - } - else if (key_id == GEANY_KEYS_SELECT_ALL && focusw == toolbar_goto_entry) - { - gtk_editable_select_region(GTK_EDITABLE(toolbar_goto_entry), 0, -1); - return TRUE; - } - - doc = document_get_current(); - /* keybindings only valid when scintilla widget has focus */ - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) - return TRUE; - sci = doc->editor->sci; switch (key_id) { @@ -2406,19 +2370,24 @@ static gboolean cb_func_select_action(guint key_id) on_menu_select_all1_activate(NULL, NULL); break; case GEANY_KEYS_SELECT_WORD: - editor_select_word(doc->editor); + if (doc != NULL) + editor_select_word(doc->editor); break; case GEANY_KEYS_SELECT_LINE: - editor_select_lines(doc->editor, FALSE); + if (doc != NULL) + editor_select_lines(doc->editor, FALSE); break; case GEANY_KEYS_SELECT_PARAGRAPH: - editor_select_paragraph(doc->editor); + if (doc != NULL) + editor_select_paragraph(doc->editor); break; case GEANY_KEYS_SELECT_WORDPARTLEFT: - sci_send_command(sci, SCI_WORDPARTLEFTEXTEND); + if (IS_SCINTILLA(focusw)) + sci_send_command(SCINTILLA(focusw), SCI_WORDPARTLEFTEXTEND); break; case GEANY_KEYS_SELECT_WORDPARTRIGHT: - sci_send_command(sci, SCI_WORDPARTRIGHTEXTEND); + if (IS_SCINTILLA(focusw)) + sci_send_command(SCINTILLA(focusw), SCI_WORDPARTRIGHTEXTEND); break; } return TRUE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4c504c: Reorganize select callback
by pik 20 Apr '15

20 Apr '15

Branch: refs/heads/master Author: pik <alexander.maznev(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 20 Apr 2015 20:16:35 UTC Commit: 4c504c2be245e3860ad546948f64553263c2fe79 https://github.com/geany/geany/commit/4c504c2be245e3860ad546948f64553263c2f… Log Message: ----------- Reorganize select callback * select_all now works with splitwindow * select_all now works with file-browser pane * menu_select_all now works everywhere select_all hotkey does Modified Paths: -------------- src/callbacks.c src/keybindings.c Modified: src/callbacks.c 22 lines changed, 20 insertions(+), 2 deletions(-) =================================================================== @@ -1187,9 +1187,27 @@ void on_print1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_menu_select_all1_activate(GtkMenuItem *menuitem, gpointer user_data) { GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); - g_return_if_fail(IS_SCINTILLA(focusw)); - sci_select_all(SCINTILLA(focusw)); + /* special case for Select All in the scribble widget */ + if (focusw == msgwindow.scribble) + { + g_signal_emit_by_name(msgwindow.scribble, "select-all", TRUE); + } + /* special case for Select All in the VTE widget */ +#ifdef HAVE_VTE + else if (vte_info.have_vte && focusw == vc->vte) + { + vte_select_all(); + } +#endif + else if (GTK_IS_EDITABLE(focusw)) + { + gtk_editable_select_region(GTK_EDITABLE(focusw), 0, -1); + } + else if (IS_SCINTILLA(focusw)) + { + sci_select_all(SCINTILLA(focusw)); + } } Modified: src/keybindings.c 54 lines changed, 12 insertions(+), 42 deletions(-) =================================================================== @@ -2358,46 +2358,11 @@ static gboolean cb_func_format_action(guint key_id) } -/* common function for select keybindings, only valid when scintilla has focus. */ +/* common function for select keybindings, valid for scintilla and/or gtk_editable objects. */ static gboolean cb_func_select_action(guint key_id) { - GeanyDocument *doc; - ScintillaObject *sci; + GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); - GtkWidget *toolbar_search_entry = toolbar_get_widget_child_by_name("SearchEntry"); - GtkWidget *toolbar_goto_entry = toolbar_get_widget_child_by_name("GotoEntry"); - - /* special case for Select All in the scribble widget */ - if (key_id == GEANY_KEYS_SELECT_ALL && focusw == msgwindow.scribble) - { - g_signal_emit_by_name(msgwindow.scribble, "select-all", TRUE); - return TRUE; - } - /* special case for Select All in the VTE widget */ -#ifdef HAVE_VTE - else if (key_id == GEANY_KEYS_SELECT_ALL && vte_info.have_vte && focusw == vc->vte) - { - vte_select_all(); - return TRUE; - } -#endif - /* special case for Select All in the toolbar search widget */ - else if (key_id == GEANY_KEYS_SELECT_ALL && focusw == toolbar_search_entry) - { - gtk_editable_select_region(GTK_EDITABLE(toolbar_search_entry), 0, -1); - return TRUE; - } - else if (key_id == GEANY_KEYS_SELECT_ALL && focusw == toolbar_goto_entry) - { - gtk_editable_select_region(GTK_EDITABLE(toolbar_goto_entry), 0, -1); - return TRUE; - } - - doc = document_get_current(); - /* keybindings only valid when scintilla widget has focus */ - if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) - return TRUE; - sci = doc->editor->sci; switch (key_id) { @@ -2405,19 +2370,24 @@ static gboolean cb_func_select_action(guint key_id) on_menu_select_all1_activate(NULL, NULL); break; case GEANY_KEYS_SELECT_WORD: - editor_select_word(doc->editor); + if (doc != NULL) + editor_select_word(doc->editor); break; case GEANY_KEYS_SELECT_LINE: - editor_select_lines(doc->editor, FALSE); + if (doc != NULL) + editor_select_lines(doc->editor, FALSE); break; case GEANY_KEYS_SELECT_PARAGRAPH: - editor_select_paragraph(doc->editor); + if (doc != NULL) + editor_select_paragraph(doc->editor); break; case GEANY_KEYS_SELECT_WORDPARTLEFT: - sci_send_command(sci, SCI_WORDPARTLEFTEXTEND); + if (IS_SCINTILLA(focusw)) + sci_send_command(SCINTILLA(focusw), SCI_WORDPARTLEFTEXTEND); break; case GEANY_KEYS_SELECT_WORDPARTRIGHT: - sci_send_command(sci, SCI_WORDPARTRIGHTEXTEND); + if (IS_SCINTILLA(focusw)) + sci_send_command(SCINTILLA(focusw), SCI_WORDPARTRIGHTEXTEND); break; } return TRUE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c21405: Fix callbacks to scintilla functions to work with splitwindow
by pik 20 Apr '15

20 Apr '15

Branch: refs/heads/master Author: pik <alexander.maznev(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 20 Apr 2015 20:16:07 UTC Commit: c214056ea1d000c6e53b158f616b680d1e02eb53 https://github.com/geany/geany/commit/c214056ea1d000c6e53b158f616b680d1e02e… Log Message: ----------- Fix callbacks to scintilla functions to work with splitwindow * Use Scintilla focus object instead of notebook document to fix splitwindow behaviour for cut, copy, paste and delete callbacks. * move else-if to same line (style) Modified Paths: -------------- src/callbacks.c src/keybindings.c Modified: src/callbacks.c 44 lines changed, 15 insertions(+), 29 deletions(-) =================================================================== @@ -228,16 +228,13 @@ void on_redo1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); if (GTK_IS_EDITABLE(focusw)) gtk_editable_cut_clipboard(GTK_EDITABLE(focusw)); - else - if (IS_SCINTILLA(focusw) && doc != NULL) - sci_cut(doc->editor->sci); - else - if (GTK_IS_TEXT_VIEW(focusw)) + else if (IS_SCINTILLA(focusw)) + sci_cut(SCINTILLA(focusw)); + else if (GTK_IS_TEXT_VIEW(focusw)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(focusw)); @@ -248,16 +245,13 @@ void on_cut1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); if (GTK_IS_EDITABLE(focusw)) gtk_editable_copy_clipboard(GTK_EDITABLE(focusw)); - else - if (IS_SCINTILLA(focusw) && doc != NULL) - sci_copy(doc->editor->sci); - else - if (GTK_IS_TEXT_VIEW(focusw)) + else if (IS_SCINTILLA(focusw)) + sci_copy(SCINTILLA(focusw)); + else if (GTK_IS_TEXT_VIEW(focusw)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(focusw)); @@ -268,18 +262,13 @@ void on_copy1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_paste1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); if (GTK_IS_EDITABLE(focusw)) gtk_editable_paste_clipboard(GTK_EDITABLE(focusw)); - else - if (IS_SCINTILLA(focusw) && doc != NULL) - { - sci_paste(doc->editor->sci); - } - else - if (GTK_IS_TEXT_VIEW(focusw)) + else if (IS_SCINTILLA(focusw)) + sci_paste(SCINTILLA(focusw)); + else if (GTK_IS_TEXT_VIEW(focusw)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(focusw)); @@ -291,16 +280,13 @@ void on_paste1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_delete1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); if (GTK_IS_EDITABLE(focusw)) gtk_editable_delete_selection(GTK_EDITABLE(focusw)); - else - if (IS_SCINTILLA(focusw) && doc != NULL && sci_has_selection(doc->editor->sci)) - sci_clear(doc->editor->sci); - else - if (GTK_IS_TEXT_VIEW(focusw)) + else if (IS_SCINTILLA(focusw) && sci_has_selection(SCINTILLA(focusw))) + sci_clear(SCINTILLA(focusw)); + else if (GTK_IS_TEXT_VIEW(focusw)) { GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(focusw)); @@ -1200,10 +1186,10 @@ void on_print1_activate(GtkMenuItem *menuitem, gpointer user_data) void on_menu_select_all1_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); - g_return_if_fail(doc != NULL); + GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); + g_return_if_fail(IS_SCINTILLA(focusw)); - sci_select_all(doc->editor->sci); + sci_select_all(SCINTILLA(focusw)); } Modified: src/keybindings.c 11 lines changed, 5 insertions(+), 6 deletions(-) =================================================================== @@ -1831,10 +1831,7 @@ static void goto_matching_brace(GeanyDocument *doc) static gboolean cb_func_clipboard_action(guint key_id) { - GeanyDocument *doc = document_get_current(); - - if (doc == NULL) - return TRUE; + GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(main_widgets.window)); switch (key_id) { @@ -1848,10 +1845,12 @@ static gboolean cb_func_clipboard_action(guint key_id) on_paste1_activate(NULL, NULL); break; case GEANY_KEYS_CLIPBOARD_COPYLINE: - sci_send_command(doc->editor->sci, SCI_LINECOPY); + if (IS_SCINTILLA(focusw)) + sci_send_command(SCINTILLA(focusw), SCI_LINECOPY); break; case GEANY_KEYS_CLIPBOARD_CUTLINE: - sci_send_command(doc->editor->sci, SCI_LINECUT); + if (IS_SCINTILLA(focusw)) + sci_send_command(SCINTILLA(focusw), SCI_LINECUT); break; } return TRUE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b83961: Merge branch 'ctags/make'
by Colomban Wendling 20 Apr '15

20 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 20 Apr 2015 18:04:47 UTC Commit: b839611e517f9ae853fc1eb9232ff3452a7e36bd https://github.com/geany/geany/commit/b839611e517f9ae853fc1eb9232ff3452a7e3… Log Message: ----------- Merge branch 'ctags/make' Import make parser improvements from fishman/ctags#272 Modified Paths: -------------- tagmanager/ctags/make.c tests/ctags/Makefile.am tests/ctags/make-comment-in-rule.mak tests/ctags/make-comment-in-rule.mak.tags tests/ctags/make-gnumake-pattern-rules.mak tests/ctags/make-gnumake-pattern-rules.mak.tags tests/ctags/make-multi-target.mak tests/ctags/make-multi-target.mak.tags tests/ctags/make-target-with-parentheses.mak tests/ctags/make-target-with-parentheses.mak.tags tests/ctags/make-variable-on-cmdline.mak tests/ctags/make-variable-on-cmdline.mak.tags tests/ctags/simple.mak.tags Modified: tagmanager/ctags/make.c 178 lines changed, 65 insertions(+), 113 deletions(-) =================================================================== @@ -59,25 +59,23 @@ static void skipLine (void) fileUngetc (c); } -static int skipToNonWhite (void) +static int skipToNonWhite (int c) { - int c; - do + while (c != '\n' && isspace (c)) c = nextChar (); - while (c != '\n' && isspace (c)); return c; } static boolean isIdentifier (int c) { - return (boolean)(c != '\0' && (isalnum (c) || strchr (".-_/", c) != NULL)); + return (boolean)(c != '\0' && (isalnum (c) || strchr (".-_/$(){}%", c) != NULL)); } static boolean isSpecialTarget (vString *const name) { size_t i = 0; /* All special targets begin with '.'. */ - if (vStringChar (name, i++) != '.') { + if (vStringLength (name) < 1 || vStringChar (name, i++) != '.') { return FALSE; } while (i < vStringLength (name)) { @@ -105,67 +103,27 @@ static void newMacro (vString *const name) makeSimpleTag (name, MakeKinds, K_MACRO); } -static void newMacroFromDefine (vString *const name) -{ - /* name is something like "define JAVAHPP_RULE", find the space and jump to the next char */ - char *name_val = strchr (vStringValue (name), ' '); - - if (name_val != NULL) { - vStringCopyS (name, name_val + 1); - makeSimpleTag (name, MakeKinds, K_MACRO); - } -} - static void readIdentifier (const int first, vString *const id) { + int depth = 0; int c = first; - int c_prev = first; - int c_next = first; vStringClear (id); - while (isIdentifier (c) || c == ' ') + while (isIdentifier (c) || (depth > 0 && c != EOF && c != '\n')) { - c_next = nextChar (); - if (c == ' ') { - /* add the space character only if the previous and - * next character are valid identifiers */ - if (isIdentifier (c_prev) && isIdentifier (c_next)) - vStringPut (id, c); - } - else { - vStringPut (id, c); - } - c_prev = c; - c = c_next; + if (c == '(' || c == '}') + depth++; + else if (depth > 0 && (c == ')' || c == '}')) + depth--; + vStringPut (id, c); + c = nextChar (); } fileUngetc (c); vStringTerminate (id); } -static void skipToMatch (const char *const pair) -{ - const int begin = pair [0], end = pair [1]; - const unsigned long inputLineNumber = getInputLineNumber (); - int matchLevel = 1; - int c = '\0'; - - while (matchLevel > 0) - { - c = nextChar (); - if (c == begin) - ++matchLevel; - else if (c == end) - --matchLevel; - else if (c == '\n' || c == EOF) - break; - } - if (c == EOF) - verbose ("%s: failed to find match for '%c' at line %lu\n", - getInputFileName (), begin, inputLineNumber); -} - static void findMakeTags (void) { - vString *name = vStringNew (); + stringList *identifiers = stringListNew (); boolean newline = TRUE; boolean in_define = FALSE; boolean in_rule = FALSE; @@ -178,14 +136,15 @@ static void findMakeTags (void) { if (in_rule) { - if (c == '\t') + if (c == '\t' || (c = skipToNonWhite (c)) == '#') { - skipLine (); /* skip rule */ - continue; + skipLine (); /* skip rule or comment */ + c = nextChar (); } - else + else if (c != '\n') in_rule = FALSE; } + stringListClear (identifiers); variable_possible = (boolean)(!in_rule); newline = FALSE; } @@ -195,77 +154,70 @@ static void findMakeTags (void) continue; else if (c == '#') skipLine (); - else if (c == '(') - skipToMatch ("()"); - else if (c == '{') - skipToMatch ("{}"); - else if (c == ':') + else if (variable_possible && c == '?') { - variable_possible = TRUE; - in_rule = TRUE; + c = nextChar (); + fileUngetc (c); + variable_possible = (c == '='); + } + else if (variable_possible && c == ':' && + stringListCount (identifiers) > 0) + { + c = nextChar (); + fileUngetc (c); + if (c != '=') + { + unsigned int i; + for (i = 0; i < stringListCount (identifiers); i++) + newTarget (stringListItem (identifiers, i)); + stringListClear (identifiers); + in_rule = TRUE; + } + } + else if (variable_possible && c == '=' && + stringListCount (identifiers) == 1) + { + newMacro (stringListItem (identifiers, 0)); + skipLine (); + in_rule = FALSE; } else if (variable_possible && isIdentifier (c)) { + vString *name = vStringNew (); readIdentifier (c, name); - if (strncmp (vStringValue (name), "endef", 5) == 0) - in_define = FALSE; - else if (in_define) - skipLine (); - else if (strncmp (vStringValue (name), "define", 6) == 0 && - isIdentifier (c)) + stringListAdd (identifiers, name); + + if (stringListCount (identifiers) == 1) { - in_define = TRUE; - c = skipToNonWhite (); - newMacroFromDefine (name); - skipLine (); - } - else { - c = skipToNonWhite (); - if (strchr (":?+", c) != NULL) + if (in_define && ! strcmp (vStringValue (name), "endef")) + in_define = FALSE; + else if (in_define) + skipLine (); + else if (! strcmp (vStringValue (name), "define")) { - boolean append = (boolean)(c == '+'); - boolean was_colon = (c == ':'); - c = nextChar (); - if (was_colon) + in_define = TRUE; + c = skipToNonWhite (nextChar ()); + vStringClear (name); + /* all remaining characters on the line are the name -- even spaces */ + while (c != EOF && c != '\n') { - if (c == '=') - { - newMacro (name); - in_rule = FALSE; - skipLine (); - } - else - { - in_rule = TRUE; - newTarget (name); - } + vStringPut (name, c); + c = nextChar (); } - else if (append) - { - skipLine (); - continue; - } - else - { + if (c == '\n') fileUngetc (c); - } - } - else if (c == '=') - { + vStringTerminate (name); + vStringStripTrailing (name); newMacro (name); - in_rule = FALSE; - skipLine (); - } - else - { - fileUngetc (c); } + else if (! strcmp (vStringValue (name), "export")) + stringListClear (identifiers); } } else variable_possible = FALSE; } - vStringDelete (name); + stringListDelete (identifiers); } extern parserDefinition* MakefileParser (void) Modified: tests/ctags/Makefile.am 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -200,6 +200,11 @@ test_sources = \ line_directives.c \ local.c \ macros.c \ + make-comment-in-rule.mak \ + make-gnumake-pattern-rules.mak \ + make-multi-target.mak \ + make-target-with-parentheses.mak \ + make-variable-on-cmdline.mak \ masm.asm \ matlab_backtracking.m \ matlab_test.m \ Modified: tests/ctags/make-comment-in-rule.mak 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,17 @@ +# all this is one single rule +all: + a=1; echo "$$a" +# foo + b=2; echo "$$b" + # foo + c=3; echo "$$c" +# foo + d=4; echo "$$d" +# foo + e=5; echo "$$e" + + + f=6; echo "$$f" + # foo + + g=7; echo "$$g" Modified: tests/ctags/make-comment-in-rule.mak.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +# format=tagmanager +all�16�0 Modified: tests/ctags/make-gnumake-pattern-rules.mak 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,8 @@ +%.o: %.c + touch $@ + +%.p %.q: %.d + touch $@ + +%a b%: + touch $@ Modified: tests/ctags/make-gnumake-pattern-rules.mak.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +# format=tagmanager +%.o�16�0 +%.p�16�0 +%.q�16�0 +%a�16�0 +b%�16�0 Modified: tests/ctags/make-multi-target.mak 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,8 @@ + +all: foo bar + +foo bar: baz + echo $@ + +baz: + echo $@ Modified: tests/ctags/make-multi-target.mak.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +all�16�0 +bar�16�0 +baz�16�0 +foo�16�0 Modified: tests/ctags/make-target-with-parentheses.mak 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1 @@ +$(obj)/raid6int1.c: F := 6 Modified: tests/ctags/make-target-with-parentheses.mak.tags 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ +# format=tagmanager +$(obj)/raid6int1.c�16�0 +F�65536�0 Modified: tests/ctags/make-variable-on-cmdline.mak 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +fixme: + cmd -g FOO=BAR Modified: tests/ctags/make-variable-on-cmdline.mak.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +# format=tagmanager +fixme�16�0 Modified: tests/ctags/simple.mak.tags 5 lines changed, 2 insertions(+), 3 deletions(-) =================================================================== @@ -1,15 +1,14 @@ # format=tagmanager +$(obj)/raid6int1.c�16�0 A�65536�0 B�65536�0 C�65536�0 D�65536�0 E�65536�0 -ENV_VAR1�65536�0 -ENV_VAR2�65536�0 F�65536�0 G�65536�0 H�65536�0 +I�65536�0 a.o�16�0 b.o�16�0 default�16�0 -export I�65536�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 04c721: make: Avoid reading an uninitialized value on empty target names
by Colomban Wendling 20 Apr '15

20 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 20 Apr 2015 18:01:18 UTC Commit: 04c721c3b41dee1fbc82e94dab74f35087b60333 https://github.com/geany/geany/commit/04c721c3b41dee1fbc82e94dab74f35087b60… Log Message: ----------- make: Avoid reading an uninitialized value on empty target names Fixing this is however only theoretically useful, as: * no actual code paths can currently lead to it; * even if the code actually ended up reading the uninitialized value, it would still have a fully defined behavior as the result of the check is irrelevant in the only case the uninitialized read can happen. Anyway, fix this to avoid any possible bad surprises in the future. Modified Paths: -------------- tagmanager/ctags/make.c Modified: tagmanager/ctags/make.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -75,7 +75,7 @@ static boolean isSpecialTarget (vString *const name) { size_t i = 0; /* All special targets begin with '.'. */ - if (vStringChar (name, i++) != '.') { + if (vStringLength (name) < 1 || vStringChar (name, i++) != '.') { return FALSE; } while (i < vStringLength (name)) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 39f359: make: Add support for GNU make pattern rules
by Colomban Wendling 20 Apr '15

20 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 20 Apr 2015 17:59:06 UTC Commit: 39f359b09aeeaeca18be4da06ec89bd9d18ea806 https://github.com/geany/geany/commit/39f359b09aeeaeca18be4da06ec89bd9d18ea… Log Message: ----------- make: Add support for GNU make pattern rules Modified Paths: -------------- tagmanager/ctags/make.c tests/ctags/Makefile.am tests/ctags/make-gnumake-pattern-rules.mak tests/ctags/make-gnumake-pattern-rules.mak.tags Modified: tagmanager/ctags/make.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -68,7 +68,7 @@ static int skipToNonWhite (int c) static boolean isIdentifier (int c) { - return (boolean)(c != '\0' && (isalnum (c) || strchr (".-_/$(){}", c) != NULL)); + return (boolean)(c != '\0' && (isalnum (c) || strchr (".-_/$(){}%", c) != NULL)); } static boolean isSpecialTarget (vString *const name) Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -201,6 +201,7 @@ test_sources = \ local.c \ macros.c \ make-comment-in-rule.mak \ + make-gnumake-pattern-rules.mak \ make-multi-target.mak \ make-target-with-parentheses.mak \ make-variable-on-cmdline.mak \ Modified: tests/ctags/make-gnumake-pattern-rules.mak 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,8 @@ +%.o: %.c + touch $@ + +%.p %.q: %.d + touch $@ + +%a b%: + touch $@ Modified: tests/ctags/make-gnumake-pattern-rules.mak.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +# format=tagmanager +%.o�16�0 +%.p�16�0 +%.q�16�0 +%a�16�0 +b%�16�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a11d67: make: Fix handling comments inside rules
by Colomban Wendling 20 Apr '15

20 Apr '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 20 Apr 2015 17:53:28 UTC Commit: a11d67bb0b46a94d08ff32676a724838be97a680 https://github.com/geany/geany/commit/a11d67bb0b46a94d08ff32676a724838be97a… Log Message: ----------- make: Fix handling comments inside rules A line consisting only of blanks or comments should not end a rule, even if it doesn't start with a tabulation character. Modified Paths: -------------- tagmanager/ctags/make.c tests/ctags/Makefile.am tests/ctags/make-comment-in-rule.mak tests/ctags/make-comment-in-rule.mak.tags Modified: tagmanager/ctags/make.c 14 lines changed, 6 insertions(+), 8 deletions(-) =================================================================== @@ -59,12 +59,10 @@ static void skipLine (void) fileUngetc (c); } -static int skipToNonWhite (void) +static int skipToNonWhite (int c) { - int c; - do + while (c != '\n' && isspace (c)) c = nextChar (); - while (c != '\n' && isspace (c)); return c; } @@ -138,12 +136,12 @@ static void findMakeTags (void) { if (in_rule) { - if (c == '\t') + if (c == '\t' || (c = skipToNonWhite (c)) == '#') { - skipLine (); /* skip rule */ + skipLine (); /* skip rule or comment */ c = nextChar (); } - else + else if (c != '\n') in_rule = FALSE; } stringListClear (identifiers); @@ -198,7 +196,7 @@ static void findMakeTags (void) else if (! strcmp (vStringValue (name), "define")) { in_define = TRUE; - c = skipToNonWhite (); + c = skipToNonWhite (nextChar ()); vStringClear (name); /* all remaining characters on the line are the name -- even spaces */ while (c != EOF && c != '\n') Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -200,6 +200,7 @@ test_sources = \ line_directives.c \ local.c \ macros.c \ + make-comment-in-rule.mak \ make-multi-target.mak \ make-target-with-parentheses.mak \ make-variable-on-cmdline.mak \ Modified: tests/ctags/make-comment-in-rule.mak 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,17 @@ +# all this is one single rule +all: + a=1; echo "$$a" +# foo + b=2; echo "$$b" + # foo + c=3; echo "$$c" +# foo + d=4; echo "$$d" +# foo + e=5; echo "$$e" + + + f=6; echo "$$f" + # foo + + g=7; echo "$$g" Modified: tests/ctags/make-comment-in-rule.mak.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +# format=tagmanager +all�16�0 -------------- 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
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2015