Commits July 2012

commits@lists.geany.org

1 participants
381 discussions

[geany/geany] 308f98: Use gssize to avoid casts for encodings_convert_to_utf8_*()
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Tue, 03 Jan 2012 13:30:38 Commit: 308f98a2b96c96fa5a66d70561e2064e60854dc5 https://github.com/geany/geany/commit/308f98a2b96c96fa5a66d70561e2064e60854… Log Message: ----------- Use gssize to avoid casts for encodings_convert_to_utf8_*() Modified Paths: -------------- src/encodings.c src/encodings.h src/plugindata.h src/socket.c src/symbols.c Modified: src/encodings.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -509,7 +509,7 @@ void encodings_init(void) * @return If the conversion was successful, a newly allocated nul-terminated string, * which must be freed with @c g_free(). Otherwise @c NULL. **/ -gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gsize size, +gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gssize size, const gchar *charset, gboolean fast) { gchar *utf8_content = NULL; @@ -567,7 +567,7 @@ static gchar *encodings_check_regexes(const gchar *buffer, gsize size) } -static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gsize size, +static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gssize size, const gchar *suggested_charset, gchar **used_encoding) { const gchar *locale_charset = NULL; @@ -577,7 +577,7 @@ static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gsi gboolean check_locale = FALSE; gint i, preferred_charset; - if ((gint)size == -1) + if (size == -1) { size = strlen(buffer); } @@ -667,7 +667,7 @@ static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gsi * @return If the conversion was successful, a newly allocated nul-terminated string, * which must be freed with @c g_free(). Otherwise @c NULL. **/ -gchar *encodings_convert_to_utf8(const gchar *buffer, gsize size, gchar **used_encoding) +gchar *encodings_convert_to_utf8(const gchar *buffer, gssize size, gchar **used_encoding) { gchar *regex_charset; gchar *utf8; Modified: src/encodings.h 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -79,11 +79,11 @@ void encodings_init(void); void encodings_finalize(void); -gchar *encodings_convert_to_utf8(const gchar *buffer, gsize size, gchar **used_encoding); +gchar *encodings_convert_to_utf8(const gchar *buffer, gssize size, gchar **used_encoding); /* Converts a string from the given charset to UTF-8. * If fast is set, no further checks are performed. */ -gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gsize size, +gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gssize size, const gchar *charset, gboolean fast); gboolean encodings_is_unicode_charset(const gchar *string); Modified: src/plugindata.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -52,7 +52,7 @@ * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 211 +#define GEANY_API_VERSION 212 /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. @@ -521,8 +521,8 @@ /* See encodings.h */ typedef struct EncodingFuncs { - gchar* (*encodings_convert_to_utf8) (const gchar *buffer, gsize size, gchar **used_encoding); - gchar* (*encodings_convert_to_utf8_from_charset) (const gchar *buffer, gsize size, + gchar* (*encodings_convert_to_utf8) (const gchar *buffer, gssize size, gchar **used_encoding); + gchar* (*encodings_convert_to_utf8_from_charset) (const gchar *buffer, gssize size, const gchar *charset, gboolean fast); const gchar* (*encodings_get_charset_from_index) (gint idx); } Modified: src/socket.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -551,7 +551,7 @@ static void handle_input_filename(const gchar *buf) /* we never know how the input is encoded, so do the best auto detection we can */ if (! g_utf8_validate(buf, -1, NULL)) - utf8_filename = encodings_convert_to_utf8(buf, (gsize) -1, NULL); + utf8_filename = encodings_convert_to_utf8(buf, -1, NULL); else utf8_filename = g_strdup(buf); Modified: src/symbols.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -1023,7 +1023,7 @@ static const gchar *get_symbol_name(GeanyDocument *doc, const TMTag *tag, gboole if (! doc_is_utf8) utf8_name = encodings_convert_to_utf8_from_charset(tag->name, - (gsize) -1, doc->encoding, TRUE); + -1, doc->encoding, TRUE); else utf8_name = tag->name; @@ -1066,7 +1066,7 @@ static gchar *get_symbol_tooltip(GeanyDocument *doc, const TMTag *tag) ! utils_str_equal(doc->encoding, "None")) { setptr(utf8_name, - encodings_convert_to_utf8_from_charset(utf8_name, (gsize) -1, doc->encoding, TRUE)); + encodings_convert_to_utf8_from_charset(utf8_name, -1, doc->encoding, TRUE)); } if (utf8_name != NULL) @@ -1276,12 +1276,12 @@ static void free_iter_slice(gpointer iter) * @param doc a document * @param tags a pointer to a GList* holding the tags to add/update. This * list may be updated, removing updated elements. - * + * * The update is done in two passes: * 1) walking the current tree, update tags that still exist and remove the * obsolescent ones; * 2) walking the remaining (non updated) tags, adds them in the list. - * + * * For better performances, we use 2 hash tables: * - one containing all the tags for lookup in the first pass (actually stores a * reference in the tags list for removing it efficiently), avoiding list search @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] f0ca50: Fix showing Find/Replace regex errors on status bar
by Nick Treleaven 26 Jul '12

26 Jul '12

1 0

[geany/geany] 1b56b6: Update of Swedish translation
by Frank Lanitz 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 30 Dec 2011 17:26:32 Commit: 1b56b6b5a988e3af50b95ccaf972f80a5e09b205 https://github.com/geany/geany/commit/1b56b6b5a988e3af50b95ccaf972f80a5e09b… Log Message: ----------- Update of Swedish translation Modified Paths: -------------- po/ChangeLog po/sv.po Modified: po/ChangeLog 6 files changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,9 @@ +2011-12-30 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * sv.po: Update of Swedish translation. Thanks to Tony Mattsson for + providing the update. + + 2011-11-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * mn.po: Added Mongolian translation. Thanks to Цэцэнцэнгэл. Modified: po/sv.po 5986 files changed, 3012 insertions(+), 2974 deletions(-) =================================================================== No diff available, check online @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 059495: Parse PHP functions with multiline argument list, #3037797
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Sun, 01 Jan 2012 17:03:24 Commit: 05949500380dd6fef22687b5341924d8242790d1 https://github.com/geany/geany/commit/05949500380dd6fef22687b5341924d824279… Log Message: ----------- Parse PHP functions with multiline argument list, #3037797 Modified Paths: -------------- tagmanager/php.c Modified: tagmanager/php.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -78,7 +78,7 @@ static void installPHPRegex (const langType language) addTagRegex(language, "^[ \t]*const[ \t]*([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]", "\\1", "m,macro,macros", NULL); addCallbackRegex(language, - "^[ \t]*((public|protected|private|static|final)[ \t]+)*function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)[[:space:]]*(\$.*\$)", + "^[ \t]*((public|protected|private|static|final)[ \t]+)*function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)[[:space:]]*(\$.*\$|\\(.*)", NULL, function_cb); addTagRegex(language, "^[ \t]*(\\$|::\\$|\\$this->)([" ALPHA "_][" ALNUM "_]*)[ \t]*=", "\\2", "v,variable,variables", NULL); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] e4d2e3: Simplify encoding regex using \s now we have GRegex
by Nick Treleaven 26 Jul '12

26 Jul '12

1 0

[geany/geany] da8160: Fix gcc 'ordered comparison of pointer' warnings
by Nick Treleaven 26 Jul '12

26 Jul '12

1 0

[geany/geany] f86ab3: Merge branch 'techee/mru-patches'
by Colomban Wendling 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 26 Dec 2011 19:08:53 Commit: f86ab3e41990a4fe184511423c2d009ccba2fee9 https://github.com/geany/geany/commit/f86ab3e41990a4fe184511423c2d009ccba2f… Log Message: ----------- Merge branch 'techee/mru-patches' Modified Paths: -------------- data/geany.glade src/document.h src/keybindings.c src/keyfile.c src/main.c src/notebook.c src/notebook.h Modified: data/geany.glade 12 files changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -2117,6 +2117,18 @@ <property name="position">3</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="check_tab_close_switch_to_mru"> + <property name="label" translatable="yes">Switch to last used document after closing a tab</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="position">4</property> + </packing> + </child> </object> </child> </object> Modified: src/document.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -62,6 +62,7 @@ gboolean gio_unsafe_save_backup; gboolean use_gio_unsafe_file_saving; /* whether to use GIO as the unsafe backend */ gchar *extract_filetype_regex; /* regex to extract filetype on opening */ + gboolean tab_close_switch_to_mru; } GeanyFilePrefs; Modified: src/keybindings.c 206 files changed, 2 insertions(+), 204 deletions(-) =================================================================== @@ -52,6 +52,7 @@ #include "vte.h" #include "toolbar.h" #include "sidebar.h" +#include "notebook.h" #include "geanywraplabel.h" #include "main.h" #include "search.h" @@ -71,18 +72,9 @@ static GtkAccelGroup *kb_accel_group = NULL; static const gboolean swap_alt_tab_order = FALSE; -static const gsize MAX_MRU_DOCS = 20; -static GQueue *mru_docs = NULL; -static guint mru_pos = 0; - -static gboolean switch_in_progress = FALSE; -static GtkWidget *switch_dialog = NULL; -static GtkWidget *switch_dialog_label = NULL; - /* central keypress event handler, almost all keypress events go to this function */ static gboolean on_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data); -static gboolean on_key_release_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data); static gboolean check_current_word(GeanyDocument *doc, gboolean sci_word); static gboolean read_current_word(GeanyDocument *doc, gboolean sci_word); @@ -597,55 +589,8 @@ static void init_default_kb(void) } -/* before the tab changes, add the current document to the MRU list */ -static void on_notebook_switch_page(void) -{ - GeanyDocument *old = document_get_current(); - - /* when closing current doc, old is NULL. - * Don't add to the mru list when switch dialog is visible. */ - if (old && !switch_in_progress) - { - g_queue_remove(mru_docs, old); - g_queue_push_head(mru_docs, old); - - if (g_queue_get_length(mru_docs) > MAX_MRU_DOCS) - g_queue_pop_tail(mru_docs); - } -} - - -/* really this should be just after a document was closed, not idle */ -static gboolean on_idle_close(gpointer data) -{ - GeanyDocument *current; - - current = document_get_current(); - if (current && g_queue_peek_head(mru_docs) == current) - g_queue_pop_head(mru_docs); - - return FALSE; -} - - -static void on_document_close(GObject *obj, GeanyDocument *doc) -{ - if (! main_status.quitting) - { - g_queue_remove(mru_docs, doc); - g_idle_add(on_idle_close, NULL); - } -} - - void keybindings_init(void) { - mru_docs = g_queue_new(); - g_signal_connect(main_widgets.notebook, "switch-page", - G_CALLBACK(on_notebook_switch_page), NULL); - g_signal_connect(geany_object, "document-close", - G_CALLBACK(on_document_close), NULL); - memset(binding_ids, 0, sizeof binding_ids); keybinding_groups = g_ptr_array_sized_new(GEANY_KEY_GROUP_COUNT); kb_accel_group = gtk_accel_group_new(); @@ -654,8 +599,6 @@ void keybindings_init(void) gtk_window_add_accel_group(GTK_WINDOW(main_widgets.window), kb_accel_group); g_signal_connect(main_widgets.window, "key-press-event", G_CALLBACK(on_key_press_event), NULL); - /* in case the switch dialog misses an event while drawing the dialog */ - g_signal_connect(main_widgets.window, "key-release-event", G_CALLBACK(on_key_release_event), NULL); } @@ -820,7 +763,6 @@ void keybindings_free(void) keybindings_free_group(group); g_ptr_array_free(keybinding_groups, TRUE); - g_queue_free(mru_docs); } @@ -1265,29 +1207,6 @@ static gboolean on_key_press_event(GtkWidget *widget, GdkEventKey *ev, gpointer } -static gboolean is_modifier_key(guint keyval) -{ - switch (keyval) - { - case GDK_Shift_L: - case GDK_Shift_R: - case GDK_Control_L: - case GDK_Control_R: - case GDK_Meta_L: - case GDK_Meta_R: - case GDK_Alt_L: - case GDK_Alt_R: - case GDK_Super_L: - case GDK_Super_R: - case GDK_Hyper_L: - case GDK_Hyper_R: - return TRUE; - default: - return FALSE; - } -} - - /* group_id must be a core group, e.g. GEANY_KEY_GROUP_EDITOR * key_id e.g. GEANY_KEYS_EDITOR_CALLTIP */ GeanyKeyBinding *keybindings_lookup_item(guint group_id, guint key_id) @@ -1745,130 +1664,9 @@ static void cb_func_switch_tabright(G_GNUC_UNUSED guint key_id) } -static gboolean on_key_release_event(GtkWidget *widget, GdkEventKey *ev, gpointer user_data) -{ - /* user may have rebound keybinding to a different modifier than Ctrl, so check all */ - if (switch_in_progress && is_modifier_key(ev->keyval)) - { - switch_in_progress = FALSE; - - if (switch_dialog) - { - gtk_widget_destroy(switch_dialog); - switch_dialog = NULL; - } - - mru_pos = 0; - } - return FALSE; -} - - -static GtkWidget *ui_minimal_dialog_new(GtkWindow *parent, const gchar *title) -{ - GtkWidget *dialog; - - dialog = gtk_window_new(GTK_WINDOW_POPUP); - - if (parent) - { - gtk_window_set_transient_for(GTK_WINDOW(dialog), parent); - gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); - } - gtk_window_set_title(GTK_WINDOW(dialog), title); - gtk_window_set_type_hint(GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ON_PARENT); - - gtk_widget_set_name(dialog, "GeanyDialog"); - return dialog; -} - - -static GtkWidget *create_switch_dialog(void) -{ - GtkWidget *dialog, *widget, *vbox; - - dialog = ui_minimal_dialog_new(GTK_WINDOW(main_widgets.window), _("Switch to Document")); - gtk_window_set_decorated(GTK_WINDOW(dialog), FALSE); - gtk_window_set_default_size(GTK_WINDOW(dialog), 150, -1); - - vbox = gtk_vbox_new(FALSE, 6); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); - gtk_container_add(GTK_CONTAINER(dialog), vbox); - - widget = gtk_image_new_from_stock(GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON); - gtk_container_add(GTK_CONTAINER(vbox), widget); - - widget = geany_wrap_label_new(NULL); - gtk_label_set_justify(GTK_LABEL(widget), GTK_JUSTIFY_CENTER); - gtk_container_add(GTK_CONTAINER(vbox), widget); - switch_dialog_label = widget; - - g_signal_connect(dialog, "key-release-event", G_CALLBACK(on_key_release_event), NULL); - return dialog; -} - - -static void update_filename_label(void) -{ - if (!switch_dialog) - { - switch_dialog = create_switch_dialog(); - gtk_widget_show_all(switch_dialog); - } - - gtk_label_set_text(GTK_LABEL(switch_dialog_label), DOC_FILENAME(document_get_current())); -} - - -static gboolean on_switch_timeout(G_GNUC_UNUSED gpointer data) -{ - if (!switch_in_progress || switch_dialog) - { - return FALSE; - } - - update_filename_label(); - return FALSE; -} - - static void cb_func_switch_tablastused(G_GNUC_UNUSED guint key_id) { - GeanyDocument *last_doc = g_queue_peek_nth(mru_docs, mru_pos); - - if (! DOC_VALID(last_doc)) - { - utils_beep(); - mru_pos = 0; - last_doc = g_queue_peek_nth(mru_docs, mru_pos); - } - if (! DOC_VALID(last_doc)) - return; - - document_show_tab(last_doc); - - /* if there's a modifier key, we can switch back in MRU order each time unless - * the key is released */ - if (!switch_in_progress) - { - switch_in_progress = TRUE; - - /* because switch_in_progress was not set when we called - * gtk_notebook_set_current_page() above, this function inserted last_doc - * into the queue => on mru_pos = 0 there is last_doc, on mru_pos = 1 - * there is the currently displayed doc, so we want to continue from 2 - * next time this function is called */ - mru_pos = 2; - - /* delay showing dialog to give user time to let go of any modifier keys */ - g_timeout_add(600, on_switch_timeout, NULL); - } - else - { - update_filename_label(); - mru_pos += 1; - } + notebook_switch_tablastused(); } Modified: src/keyfile.c 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -139,6 +139,8 @@ static void init_pref_groups(void) stash_group_add_toggle_button(group, &interface_prefs.notebook_double_click_hides_widgets, "notebook_double_click_hides_widgets", FALSE, "check_double_click_hides_widgets"); + stash_group_add_toggle_button(group, &file_prefs.tab_close_switch_to_mru, + "tab_close_switch_to_mru", FALSE, "check_tab_close_switch_to_mru"); stash_group_add_integer(group, &interface_prefs.tab_pos_sidebar, "tab_pos_sidebar", GTK_POS_TOP); stash_group_add_radio_buttons(group, &interface_prefs.sidebar_pos, "sidebar_pos", GTK_POS_LEFT, Modified: src/main.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1183,6 +1183,7 @@ void main_quit() navqueue_free(); keybindings_free(); + notebook_free(); highlighting_free_styles(); templates_free_templates(); msgwin_finalize(); Modified: src/notebook.c 260 files changed, 256 insertions(+), 4 deletions(-) =================================================================== @@ -24,6 +24,9 @@ */ #include "geany.h" + +#include <gdk/gdkkeysyms.h> + #include "notebook.h" #include "document.h" #include "editor.h" @@ -34,6 +37,7 @@ #include "callbacks.h" #include "utils.h" #include "keybindings.h" +#include "main.h" #define GEANY_DND_NOTEBOOK_TAB_TYPE "geany_dnd_notebook_tab" @@ -49,6 +53,14 @@ { "text/uri-list", 0, 0 } }; +static const gsize MAX_MRU_DOCS = 20; +static GQueue *mru_docs = NULL; +static guint mru_pos = 0; + +static gboolean switch_in_progress = FALSE; +static GtkWidget *switch_dialog = NULL; +static GtkWidget *switch_dialog_label = NULL; + static void notebook_page_reordered_cb(GtkNotebook *notebook, GtkWidget *child, guint page_num, @@ -65,6 +77,218 @@ static void setup_tab_dnd(void); +static void update_mru_docs_head(GeanyDocument *doc) +{ + if (doc) + { + g_queue_remove(mru_docs, doc); + g_queue_push_head(mru_docs, doc); + + if (g_queue_get_length(mru_docs) > MAX_MRU_DOCS) + g_queue_pop_tail(mru_docs); + } +} + + +/* before the tab changes, add the current document to the MRU list */ +static void on_notebook_switch_page(GtkNotebook *notebook, + GtkNotebookPage *page, guint page_num, gpointer user_data) +{ + GeanyDocument *new; + + new = document_get_from_page(page_num); + + /* insert the very first document (when adding the second document + * and switching to it) */ + if (g_queue_get_length(mru_docs) == 0 && gtk_notebook_get_n_pages(notebook) == 2) + update_mru_docs_head(document_get_current()); + + if (!switch_in_progress) + update_mru_docs_head(new); +} + + +static void on_document_close(GObject *obj, GeanyDocument *doc) +{ + if (! main_status.quitting) + { + g_queue_remove(mru_docs, doc); + /* this prevents the pop up window from showing when there's a single + * document */ + if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 2) + g_queue_clear(mru_docs); + } +} + + +static GtkWidget *ui_minimal_dialog_new(GtkWindow *parent, const gchar *title) +{ + GtkWidget *dialog; + + dialog = gtk_window_new(GTK_WINDOW_POPUP); + + if (parent) + { + gtk_window_set_transient_for(GTK_WINDOW(dialog), parent); + gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); + } + gtk_window_set_title(GTK_WINDOW(dialog), title); + gtk_window_set_type_hint(GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG); + gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ON_PARENT); + + gtk_widget_set_name(dialog, "GeanyDialog"); + return dialog; +} + + +static gboolean is_modifier_key(guint keyval) +{ + switch (keyval) + { + case GDK_Shift_L: + case GDK_Shift_R: + case GDK_Control_L: + case GDK_Control_R: + case GDK_Meta_L: + case GDK_Meta_R: + case GDK_Alt_L: + case GDK_Alt_R: + case GDK_Super_L: + case GDK_Super_R: + case GDK_Hyper_L: + case GDK_Hyper_R: + return TRUE; + default: + return FALSE; + } +} + + +static gboolean on_key_release_event(GtkWidget *widget, GdkEventKey *ev, gpointer user_data) +{ + /* user may have rebound keybinding to a different modifier than Ctrl, so check all */ + if (switch_in_progress && is_modifier_key(ev->keyval)) + { + switch_in_progress = FALSE; + + if (switch_dialog) + { + gtk_widget_destroy(switch_dialog); + switch_dialog = NULL; + } + + update_mru_docs_head(document_get_current()); + mru_pos = 0; + } + return FALSE; +} + + +static GtkWidget *create_switch_dialog(void) +{ + GtkWidget *dialog, *widget, *vbox; + + dialog = ui_minimal_dialog_new(GTK_WINDOW(main_widgets.window), _("Switch to Document")); + gtk_window_set_decorated(GTK_WINDOW(dialog), FALSE); + gtk_window_set_default_size(GTK_WINDOW(dialog), 200, -1); + + vbox = gtk_vbox_new(FALSE, 6); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); + gtk_container_add(GTK_CONTAINER(dialog), vbox); + + widget = gtk_image_new_from_stock(GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(vbox), widget); + + widget = gtk_label_new(NULL); + gtk_label_set_justify(GTK_LABEL(widget), GTK_JUSTIFY_CENTER); + gtk_container_add(GTK_CONTAINER(vbox), widget); + switch_dialog_label = widget; + + g_signal_connect(dialog, "key-release-event", G_CALLBACK(on_key_release_event), NULL); + return dialog; +} + + +static void update_filename_label(void) +{ + guint i; + gchar *msg = NULL; + guint queue_length; + GeanyDocument *doc; + + if (!switch_dialog) + { + switch_dialog = create_switch_dialog(); + gtk_widget_show_all(switch_dialog); + } + + queue_length = g_queue_get_length(mru_docs); + for (i = mru_pos; (i <= mru_pos + 3) && (doc = g_queue_peek_nth(mru_docs, i % queue_length)); i++) + { + gchar *basename; + + basename = g_path_get_basename(DOC_FILENAME(doc)); + if (i == mru_pos) + msg = g_markup_printf_escaped ("<b>%s</b>", basename); + else if (i % queue_length == mru_pos) /* && i != mru_pos */ + { + /* We have wrapped around and got to the starting document again */ + g_free(basename); + break; + } + else + { + setptr(basename, g_markup_printf_escaped ("\n%s", basename)); + setptr(msg, g_strconcat(msg, basename, NULL)); + } + g_free(basename); + } + gtk_label_set_markup(GTK_LABEL(switch_dialog_label), msg); + g_free(msg); +} + + +static gboolean on_switch_timeout(G_GNUC_UNUSED gpointer data) +{ + if (!switch_in_progress || switch_dialog) + { + return FALSE; + } + + update_filename_label(); + return FALSE; +} + + +void notebook_switch_tablastused(void) +{ + GeanyDocument *last_doc; + gboolean switch_start = !switch_in_progress; + + mru_pos += 1; + last_doc = g_queue_peek_nth(mru_docs, mru_pos); + + if (! DOC_VALID(last_doc)) + { + utils_beep(); + mru_pos = 0; + last_doc = g_queue_peek_nth(mru_docs, mru_pos); + } + if (! DOC_VALID(last_doc)) + return; + + switch_in_progress = TRUE; + document_show_tab(last_doc); + + /* if there's a modifier key, we can switch back in MRU order each time unless + * the key is released */ + if (switch_start) + g_timeout_add(600, on_switch_timeout, NULL); + else + update_filename_label(); +} + + static gboolean focus_sci(GtkWidget *widget, GdkEventButton *event, gpointer user_data) { GeanyDocument *doc = document_get_current(); @@ -313,10 +537,25 @@ void notebook_init() g_signal_connect(main_widgets.notebook, "drag-data-received", G_CALLBACK(on_window_drag_data_received), NULL); + mru_docs = g_queue_new(); + g_signal_connect(main_widgets.notebook, "switch-page", + G_CALLBACK(on_notebook_switch_page), NULL); + g_signal_connect(geany_object, "document-close", + G_CALLBACK(on_document_close), NULL); + + /* in case the switch dialog misses an event while drawing the dialog */ + g_signal_connect(main_widgets.window, "key-release-event", G_CALLBACK(on_key_release_event), NULL); + setup_tab_dnd(); } +void notebook_free(void) +{ + g_queue_free(mru_docs); +} + + static void setup_tab_dnd() { GtkWidget *notebook = main_widgets.notebook; @@ -493,12 +732,25 @@ gint notebook_new_tab(GeanyDocument *this) /* Always use this instead of gtk_notebook_remove_page(). */ void notebook_remove_page(gint page_num) { - gint curpage = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); + gint page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); - /* Focus the next page, not the previous */ - if (curpage == page_num && file_prefs.tab_order_ltr) + if (page_num == page) { - gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), curpage + 1); + if (file_prefs.tab_order_ltr) + page += 1; + else if (page > 0) /* never go negative, it would select the last page */ + page -= 1; + + if (file_prefs.tab_close_switch_to_mru) + { + GeanyDocument *last_doc; + + last_doc = g_queue_peek_nth(mru_docs, 0); + if (DOC_VALID(last_doc)) + page = document_get_notebook_page(last_doc); + } + + gtk_notebook_set_current_page(GTK_NOTEBOOK(main_widgets.notebook), page); } /* now remove the page (so we don't temporarily switch to the previous page) */ Modified: src/notebook.h 6 files changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -24,10 +24,16 @@ void notebook_init(void); +void notebook_free(void); + /* Returns page number of notebook page, or -1 on error */ gint notebook_new_tab(GeanyDocument *doc); /* Always use this instead of gtk_notebook_remove_page(). */ void notebook_remove_page(gint page_num); +/* Switch notebook to the last used tab. Can be called repeatedly to get to the + * previous tabs. */ +void notebook_switch_tablastused(void); + #endif @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] ab02be: Use GRegex for encoding regex matching
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Fri, 30 Dec 2011 15:55:06 Commit: ab02beff5a0e39bca9e1c5d6cd34ec3d92770b0a https://github.com/geany/geany/commit/ab02beff5a0e39bca9e1c5d6cd34ec3d92770… Log Message: ----------- Use GRegex for encoding regex matching Modified Paths: -------------- src/encodings.c Modified: src/encodings.c 50 files changed, 21 insertions(+), 29 deletions(-) =================================================================== @@ -42,19 +42,13 @@ #include "callbacks.h" #include "ui_utils.h" -#ifdef HAVE_REGEX_H -# include <regex.h> -#else -# include "gnuregex.h" -#endif - /* <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> */ #define PATTERN_HTMLMETA "<meta[ \t\n\r\f]+http-equiv[ \t\n\r\f]*=[ \t\n\r\f]*\"?content-type\"?[ \t\n\r\f]+content[ \t\n\r\f]*=[ \t\n\r\f]*\"text/x?html;[ \t\n\r\f]*charset=([a-z0-9_-]+)\"[ \t\n\r\f]*/?>" /* " geany_encoding=utf-8 " or " coding: utf-8 " */ #define PATTERN_CODING "coding[\t ]*[:=][\t ]*\"?([a-z0-9-]+)\"?[\t ]*" /* precompiled regexps */ -static regex_t pregs[2]; +static GRegex *pregs[2]; static gboolean pregs_loaded = FALSE; @@ -321,42 +315,40 @@ void encodings_select_radio_item(const gchar *charset) * regex_compile() is used to compile regular expressions on program init and keep it in memory * for faster access when opening a file. Pre-compiled regexps will be freed on program exit. */ -static void regex_compile(regex_t *preg, const gchar *pattern) +static GRegex *regex_compile(const gchar *pattern) { - gint retval = regcomp(preg, pattern, REG_EXTENDED | REG_ICASE); - if (retval != 0) + GError *error = NULL; + GRegex *regex = g_regex_new(pattern, G_REGEX_CASELESS, 0, &error); + + if (!regex) { - gchar errmsg[512]; - regerror(retval, preg, errmsg, 512); - geany_debug("regcomp() failed (%s)", errmsg); - regfree(preg); - return; + geany_debug("Failed to compile encoding regex (%s)", error->message); + g_error_free(error); } + return regex; } -static gchar *regex_match(regex_t *preg, const gchar *buffer, gsize size) +static gchar *regex_match(GRegex *preg, const gchar *buffer, gsize size) { - gint retval; - gchar *tmp_buf = NULL; gchar *encoding = NULL; - regmatch_t pmatch[10]; + GMatchInfo *minfo; if (G_UNLIKELY(! pregs_loaded || buffer == NULL)) return NULL; - if (size > 512) - tmp_buf = g_strndup(buffer, 512); /* scan only the first 512 characters in the buffer */ + /* scan only the first 512 characters in the buffer */ + size = MIN(size, 512); - retval = regexec(preg, (tmp_buf != NULL) ? tmp_buf : buffer, 10, pmatch, 0); - if (retval == 0 && pmatch[0].rm_so != -1 && pmatch[1].rm_so != -1) + if (g_regex_match_full(preg, buffer, size, 0, 0, &minfo, NULL) && + g_match_info_get_match_count(minfo) >= 2) { - encoding = g_strndup(&buffer[pmatch[1].rm_so], pmatch[1].rm_eo - pmatch[1].rm_so); + encoding = g_match_info_fetch(minfo, 1); geany_debug("Detected encoding by regex search: %s", encoding); setptr(encoding, g_utf8_strup(encoding, -1)); } - g_free(tmp_buf); + g_match_info_free(minfo); return encoding; } @@ -390,7 +382,7 @@ void encodings_finalize(void) len = G_N_ELEMENTS(pregs); for (i = 0; i < len; i++) { - regfree(&pregs[i]); + g_regex_unref(pregs[i]); } } } @@ -411,8 +403,8 @@ void encodings_init(void) if (! pregs_loaded) { - regex_compile(&pregs[0], PATTERN_HTMLMETA); - regex_compile(&pregs[1], PATTERN_CODING); + pregs[0] = regex_compile(PATTERN_HTMLMETA); + pregs[1] = regex_compile(PATTERN_CODING); pregs_loaded = TRUE; } @@ -568,7 +560,7 @@ static gchar *encodings_check_regexes(const gchar *buffer, gsize size) { gchar *charset; - if ((charset = regex_match(&pregs[i], buffer, size)) != NULL) + if ((charset = regex_match(pregs[i], buffer, size)) != NULL) return charset; } return NULL; @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 7c348e: Fix "vergeany" -> "version" typo in some license headers
by Colomban Wendling 26 Jul '12

26 Jul '12

1 0

[geany/geany] e503f8: Use GRegex for build error regex matching
by Nick Treleaven 26 Jul '12

26 Jul '12

Branch: refs/heads/document-messages Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 26 Dec 2011 17:42:13 Commit: e503f8262a30cbda0cc5dcd69a8e5678deda1f40 https://github.com/geany/geany/commit/e503f8262a30cbda0cc5dcd69a8e5678deda1… Log Message: ----------- Use GRegex for build error regex matching Modified Paths: -------------- src/filetypes.c src/filetypesprivate.h Modified: src/filetypes.c 53 files changed, 23 insertions(+), 30 deletions(-) =================================================================== @@ -1114,10 +1114,10 @@ static void set_error_regex(GeanyFiletype *ft, gchar *string) { setptr(ft->error_regex_string, string); - if (ft->priv->error_regex_compiled) - regfree(&ft->priv->error_regex); + if (ft->priv->error_regex) + g_regex_unref(ft->priv->error_regex); - ft->priv->error_regex_compiled = FALSE; + ft->priv->error_regex = NULL; /* regex will be compiled when needed */ } @@ -1533,26 +1533,18 @@ GeanyFiletype *filetypes_lookup_by_name(const gchar *name) } -static gchar *get_regex_match_string(const gchar *message, regmatch_t *pmatch, guint match_idx) +static void compile_regex(GeanyFiletype *ft, gchar *regstr) { - return g_strndup(&message[pmatch[match_idx].rm_so], - pmatch[match_idx].rm_eo - pmatch[match_idx].rm_so); -} - - -static void compile_regex(GeanyFiletype *ft, regex_t *regex, gchar *regstr) -{ - gint retval = regcomp(regex, regstr, REG_EXTENDED); - - ft->priv->error_regex_compiled = (retval == 0); /* prevent recompilation */ + GError *error = NULL; + GRegex *regex = g_regex_new(regstr, 0, 0, &error); - if (G_UNLIKELY(retval != 0)) + if (!regex) { - gchar buf[256]; - regerror(retval, regex, buf, sizeof buf); ui_set_statusbar(TRUE, _("Bad regex for filetype %s: %s"), - filetypes_get_display_name(ft), buf); + filetypes_get_display_name(ft), error->message); + g_error_free(error); } + ft->priv->error_regex = regex; /* regex will be freed in set_error_regex(). */ } @@ -1563,8 +1555,7 @@ gboolean filetypes_parse_error_message(GeanyFiletype *ft, const gchar *message, gchar *regstr; gchar **tmp; GeanyDocument *doc; - regex_t *regex; - regmatch_t pmatch[3]; + GMatchInfo *minfo; if (ft == NULL) { @@ -1576,7 +1567,6 @@ gboolean filetypes_parse_error_message(GeanyFiletype *ft, const gchar *message, if (tmp == NULL) return FALSE; regstr = *tmp; - regex = &ft->priv->error_regex; *filename = NULL; *line = -1; @@ -1584,24 +1574,26 @@ gboolean filetypes_parse_error_message(GeanyFiletype *ft, const gchar *message, if (G_UNLIKELY(! NZV(regstr))) return FALSE; - if (!ft->priv->error_regex_compiled || regstr != ft->priv->last_string) + if (!ft->priv->error_regex || regstr != ft->priv->last_error_pattern) { - compile_regex(ft, regex, regstr); - ft->priv->last_string = regstr; + compile_regex(ft, regstr); + ft->priv->last_error_pattern = regstr; } - if (!ft->priv->error_regex_compiled) /* regex error */ + if (!ft->priv->error_regex) return FALSE; - if (regexec(regex, message, G_N_ELEMENTS(pmatch), pmatch, 0) != 0) + if (!g_regex_match(ft->priv->error_regex, message, 0, &minfo)) + { + g_match_info_free(minfo); return FALSE; - - if (pmatch[0].rm_so != -1 && pmatch[1].rm_so != -1 && pmatch[2].rm_so != -1) + } + if (g_match_info_get_match_count(minfo) >= 3) { gchar *first, *second, *end; glong l; - first = get_regex_match_string(message, pmatch, 1); - second = get_regex_match_string(message, pmatch, 2); + first = g_match_info_fetch(minfo, 1); + second = g_match_info_fetch(minfo, 2); l = strtol(first, &end, 10); if (*end == '\0') /* first is purely decimals */ { @@ -1625,6 +1617,7 @@ gboolean filetypes_parse_error_message(GeanyFiletype *ft, const gchar *message, } } } + g_match_info_free(minfo); return *filename != NULL; } Modified: src/filetypesprivate.h 12 files changed, 2 insertions(+), 10 deletions(-) =================================================================== @@ -24,21 +24,13 @@ #ifndef GEANY_FILETYPES_PRIVATE_H #define GEANY_FILETYPES_PRIVATE_H -#ifdef HAVE_REGEX_H -# include <regex.h> -#else -# include "gnuregex.h" -#endif - - /* Private GeanyFiletype fields */ typedef struct GeanyFiletypePrivate { GtkWidget *menu_item; /* holds a pointer to the menu item for this filetype */ gboolean keyfile_loaded; - regex_t error_regex; - gboolean error_regex_compiled; - gchar *last_string; /* last one compiled */ + GRegex *error_regex; + gchar *last_error_pattern; gboolean custom; gint symbol_list_sort_mode; gboolean xml_indent_tags; /* XML tag autoindentation, for HTML and XML filetypes */ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
39
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 July 2012