From 26d0ac85a0b8f778c8e6a352f0ca082cbc8338c7 Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Wed, 21 Sep 2016 13:44:19 +0100 Subject: [PATCH] Reformated code to conform to Mint coding style As discussed within the team. --- xed/xed-commands-search.c | 30 +- xed/xed-searchbar.c | 444 ++++---- xed/xed-view.c | 656 +++++++----- xed/xed-window.c | 2095 +++++++++++++++++++++---------------- 4 files changed, 1874 insertions(+), 1351 deletions(-) diff --git a/xed/xed-commands-search.c b/xed/xed-commands-search.c index e7c473f..6435389 100644 --- a/xed/xed-commands-search.c +++ b/xed/xed-commands-search.c @@ -14,26 +14,30 @@ #include "xed-searchbar.h" void -_xed_cmd_search_find (GtkAction *action, XedWindow *window) +_xed_cmd_search_find (GtkAction *action, + XedWindow *window) { xed_searchbar_show (xed_window_get_searchbar (window), FALSE); } void -_xed_cmd_search_replace (GtkAction *action, XedWindow *window) +_xed_cmd_search_replace (GtkAction *action, + XedWindow *window) { xed_searchbar_show (xed_window_get_searchbar (window), TRUE); } void -_xed_cmd_search_find_next (GtkAction *action, XedWindow *window) +_xed_cmd_search_find_next (GtkAction *action, + XedWindow *window) { xed_debug (DEBUG_COMMANDS); xed_searchbar_find_again (xed_window_get_searchbar (window), FALSE); } void -_xed_cmd_search_find_prev (GtkAction *action, XedWindow *window) +_xed_cmd_search_find_prev (GtkAction *action, + XedWindow *window) { xed_debug (DEBUG_COMMANDS); xed_searchbar_find_again (xed_window_get_searchbar (window), TRUE); @@ -45,27 +49,29 @@ _xed_cmd_search_clear_highlight (XedWindow *window) XedDocument *doc; xed_debug (DEBUG_COMMANDS); doc = xed_window_get_active_document (window); - if (doc != NULL) { - xed_document_set_search_text (XED_DOCUMENT (doc), "", XED_SEARCH_DONT_SET_FLAGS); + if (doc != NULL) + { + xed_document_set_search_text (XED_DOCUMENT(doc), "", XED_SEARCH_DONT_SET_FLAGS); } } void -_xed_cmd_search_goto_line (GtkAction *action, XedWindow *window) +_xed_cmd_search_goto_line (GtkAction *action, + XedWindow *window) { XedView *active_view; xed_debug (DEBUG_COMMANDS); active_view = xed_window_get_active_view (window); - if (active_view == NULL) { + if (active_view == NULL) + { return; } /* Focus the view if needed: we need to focus the view otherwise - activating the binding for goto line has no effect */ - gtk_widget_grab_focus (GTK_WIDGET (active_view)); - + activating the binding for goto line has no effect */ + gtk_widget_grab_focus (GTK_WIDGET(active_view)); /* Goto line is builtin in XedView, just activate the corresponding binding. */ - gtk_bindings_activate (G_OBJECT (active_view), GDK_KEY_i, GDK_CONTROL_MASK); + gtk_bindings_activate (G_OBJECT(active_view), GDK_KEY_i, GDK_CONTROL_MASK); } diff --git a/xed/xed-searchbar.c b/xed/xed-searchbar.c index 2fddc55..edf0cf3 100755 --- a/xed/xed-searchbar.c +++ b/xed/xed-searchbar.c @@ -1,4 +1,3 @@ - #ifdef HAVE_CONFIG_H #include #endif @@ -22,13 +21,12 @@ /* Signals */ enum { - SHOW_REPLACE, - LAST_SIGNAL + SHOW_REPLACE, LAST_SIGNAL }; struct _XedSearchbarPrivate { - gboolean show_replace; + gboolean show_replace; GtkWidget *revealer; GtkWidget *grid; GtkWidget *search_label; @@ -51,9 +49,9 @@ G_DEFINE_TYPE(XedSearchbar, xed_searchbar, GTK_TYPE_BOX) static void xed_searchbar_class_init (XedSearchbarClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS(klass); GtkBindingSet *binding_set; - g_type_class_add_private (object_class, sizeof (XedSearchbarPrivate)); + g_type_class_add_private (object_class, sizeof(XedSearchbarPrivate)); binding_set = gtk_binding_set_by_class (klass); } @@ -62,45 +60,46 @@ xed_searchbar_class_init (XedSearchbarClass *klass) /* Use occurrences only for Replace All */ static void -text_found (XedWindow *window, gint occurrences) +text_found (XedWindow *window, + gint occurrences) { - if (occurrences > 1) { - xed_statusbar_flash_message (XED_STATUSBAR (window->priv->statusbar), - window->priv->generic_message_cid, - ngettext("Found and replaced %d occurrence", - "Found and replaced %d occurrences", - occurrences), - occurrences); + if (occurrences > 1) + { + xed_statusbar_flash_message (XED_STATUSBAR(window->priv->statusbar), window->priv->generic_message_cid, + ngettext ("Found and replaced %d occurrence", "Found and replaced %d occurrences", occurrences), + occurrences); } else { - if (occurrences == 1) { - xed_statusbar_flash_message (XED_STATUSBAR (window->priv->statusbar), - window->priv->generic_message_cid, + if (occurrences == 1) + { + xed_statusbar_flash_message (XED_STATUSBAR(window->priv->statusbar), window->priv->generic_message_cid, _("Found and replaced one occurrence")); } - else { - xed_statusbar_flash_message (XED_STATUSBAR (window->priv->statusbar), - window->priv->generic_message_cid, + else + { + xed_statusbar_flash_message (XED_STATUSBAR(window->priv->statusbar), window->priv->generic_message_cid, " "); } } } static void -text_not_found (XedWindow *window, const gchar *text) +text_not_found (XedWindow *window, + const gchar *text) { gchar *searched; searched = xed_utils_str_end_truncate (text, MAX_MSG_LENGTH); - xed_statusbar_flash_message (XED_STATUSBAR (window->priv->statusbar), - window->priv->generic_message_cid, + xed_statusbar_flash_message (XED_STATUSBAR(window->priv->statusbar), window->priv->generic_message_cid, _("\"%s\" not found"), searched); g_free (searched); } static gboolean -run_search (XedView *view, gboolean wrap_around, gboolean search_backwards) +run_search (XedView *view, + gboolean wrap_around, + gboolean search_backwards) { XedDocument *doc; GtkTextIter start_iter; @@ -108,42 +107,50 @@ run_search (XedView *view, gboolean wrap_around, gboolean search_backwards) GtkTextIter match_end; gboolean found = FALSE; - doc = XED_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); + doc = XED_DOCUMENT(gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); - if (!search_backwards) { - gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc), NULL, &start_iter); + if (!search_backwards) + { + gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER(doc), NULL, &start_iter); found = xed_document_search_forward (doc, &start_iter, NULL, &match_start, &match_end); } - else { - gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc), &start_iter, NULL); + else + { + gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER(doc), &start_iter, NULL); found = xed_document_search_backward (doc, NULL, &start_iter, &match_start, &match_end); } - if (!found && wrap_around) { - if (!search_backwards) { - found = xed_document_search_forward (doc, NULL, NULL, /* FIXME: set the end_inter */ - &match_start, &match_end); + if (!found && wrap_around) + { + if (!search_backwards) + { + /* FIXME: set the end_inter */ + found = xed_document_search_forward (doc, NULL, NULL, &match_start, &match_end); } - else { - found = xed_document_search_backward (doc, NULL, /* FIXME: set the start_inter */ NULL, - &match_start, &match_end); + else + { + /* FIXME: set the start_inter */ + found = xed_document_search_backward (doc, NULL, NULL, &match_start, &match_end); } } - if (found) { - gtk_text_buffer_place_cursor (GTK_TEXT_BUFFER (doc), &match_start); - gtk_text_buffer_move_mark_by_name (GTK_TEXT_BUFFER (doc), "selection_bound", &match_end); + if (found) + { + gtk_text_buffer_place_cursor (GTK_TEXT_BUFFER(doc), &match_start); + gtk_text_buffer_move_mark_by_name (GTK_TEXT_BUFFER(doc), "selection_bound", &match_end); xed_view_scroll_to_cursor (view); } - else { - gtk_text_buffer_place_cursor (GTK_TEXT_BUFFER (doc), &start_iter); + else + { + gtk_text_buffer_place_cursor (GTK_TEXT_BUFFER(doc), &start_iter); } return found; } static void -do_find (XedSearchbar *searchbar, gboolean search_backwards) +do_find (XedSearchbar *searchbar, + gboolean search_backwards) { XedView *active_view; XedDocument *doc; @@ -159,23 +166,25 @@ do_find (XedSearchbar *searchbar, gboolean search_backwards) /* TODO: make the searchbar insensitive when all the tabs are closed * and assert here that the view is not NULL */ active_view = xed_window_get_active_view (searchbar->window); - if (active_view == NULL) { + if (active_view == NULL) + { return; } - doc = XED_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (active_view))); + doc = XED_DOCUMENT(gtk_text_view_get_buffer (GTK_TEXT_VIEW (active_view))); match_case = xed_searchbar_get_match_case (searchbar); entire_word = xed_searchbar_get_entire_word (searchbar); wrap_around = xed_searchbar_get_wrap_around (searchbar); entry_text = xed_searchbar_get_search_text (searchbar); - XED_SEARCH_SET_CASE_SENSITIVE (flags, match_case); - XED_SEARCH_SET_ENTIRE_WORD (flags, entire_word); + XED_SEARCH_SET_CASE_SENSITIVE(flags, match_case); + XED_SEARCH_SET_ENTIRE_WORD(flags, entire_word); search_text = xed_document_get_search_text (doc, &old_flags); - if ((search_text == NULL) || (strcmp (search_text, entry_text) != 0) || (flags != old_flags)) { + if ((search_text == NULL) || (strcmp (search_text, entry_text) != 0) || (flags != old_flags)) + { xed_document_set_search_text (doc, entry_text, flags); } @@ -183,35 +192,40 @@ do_find (XedSearchbar *searchbar, gboolean search_backwards) found = run_search (active_view, wrap_around, search_backwards); - if (found) { + if (found) + { text_found (searchbar->window, 0); } - else { + else + { text_not_found (searchbar->window, entry_text); } } void -xed_searchbar_find_again (XedSearchbar *searchbar, gboolean backward) +xed_searchbar_find_again (XedSearchbar *searchbar, + gboolean backward) { XedView *active_view; gboolean wrap_around = TRUE; gpointer data; active_view = xed_window_get_active_view (searchbar->window); - g_return_if_fail (active_view != NULL); + g_return_if_fail(active_view != NULL); - data = g_object_get_data (G_OBJECT (searchbar->window), XED_SEARCHBAR_KEY); + data = g_object_get_data (G_OBJECT(searchbar->window), XED_SEARCHBAR_KEY); - if (data != NULL) { - wrap_around = xed_searchbar_get_wrap_around (XED_SEARCHBAR (data)); + if (data != NULL) + { + wrap_around = xed_searchbar_get_wrap_around (XED_SEARCHBAR(data)); } run_search (active_view, wrap_around, backward); } static void -search_buttons_set_sensitive (XedSearchbar *searchbar, gboolean sensitive) +search_buttons_set_sensitive (XedSearchbar *searchbar, + gboolean sensitive) { gtk_widget_set_sensitive (searchbar->priv->find_button, sensitive); gtk_widget_set_sensitive (searchbar->priv->find_prev_button, sensitive); @@ -221,15 +235,19 @@ search_buttons_set_sensitive (XedSearchbar *searchbar, gboolean sensitive) /* FIXME: move in xed-document.c and share it with xed-view */ static gboolean -get_selected_text (GtkTextBuffer *doc, gchar **selected_text, gint *len) +get_selected_text (GtkTextBuffer *doc, + gchar **selected_text, + gint *len) { GtkTextIter start, end; - g_return_val_if_fail (selected_text != NULL, FALSE); - g_return_val_if_fail (*selected_text == NULL, FALSE); + g_return_val_if_fail(selected_text != NULL, FALSE); + g_return_val_if_fail(*selected_text == NULL, FALSE); - if (!gtk_text_buffer_get_selection_bounds (doc, &start, &end)) { - if (len != NULL) { + if (!gtk_text_buffer_get_selection_bounds (doc, &start, &end)) + { + if (len != NULL) + { len = 0; } return FALSE; @@ -237,7 +255,8 @@ get_selected_text (GtkTextBuffer *doc, gchar **selected_text, gint *len) *selected_text = gtk_text_buffer_get_slice (doc, &start, &end, TRUE); - if (len != NULL) { + if (len != NULL) + { *len = g_utf8_strlen (*selected_text, -1); } @@ -245,10 +264,11 @@ get_selected_text (GtkTextBuffer *doc, gchar **selected_text, gint *len) } static void -replace_selected_text (GtkTextBuffer *buffer, const gchar *replace) +replace_selected_text (GtkTextBuffer *buffer, + const gchar *replace) { - g_return_if_fail (gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL)); - g_return_if_fail (replace != NULL); + g_return_if_fail(gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL)); + g_return_if_fail(replace != NULL); gtk_text_buffer_begin_user_action (buffer); gtk_text_buffer_delete_selection (buffer, FALSE, TRUE); @@ -268,30 +288,32 @@ do_replace (XedSearchbar *searchbar) gboolean match_case; doc = xed_window_get_active_document (searchbar->window); - if (doc == NULL) { + if (doc == NULL) + { return; } search_entry_text = xed_searchbar_get_search_text (searchbar); - g_return_if_fail ((search_entry_text) != NULL); - g_return_if_fail ((*search_entry_text) != '\0'); + g_return_if_fail((search_entry_text) != NULL); + g_return_if_fail((*search_entry_text) != '\0'); /* replace text may be "", we just delete */ replace_entry_text = xed_searchbar_get_replace_text (searchbar); - g_return_if_fail ((replace_entry_text) != NULL); + g_return_if_fail((replace_entry_text) != NULL); unescaped_search_text = xed_utils_unescape_search_text (search_entry_text); - get_selected_text (GTK_TEXT_BUFFER (doc), &selected_text, NULL); + get_selected_text (GTK_TEXT_BUFFER(doc), &selected_text, NULL); match_case = xed_searchbar_get_match_case (searchbar); - if ((selected_text == NULL) || - (match_case && (strcmp (selected_text, unescaped_search_text) != 0)) || - (!match_case && !g_utf8_caselessnmatch (selected_text, - unescaped_search_text, - strlen (selected_text), - strlen (unescaped_search_text)) != 0)) { + if ((selected_text == NULL) + || (match_case && (strcmp (selected_text, unescaped_search_text) != 0)) + || (!match_case && !g_utf8_caselessnmatch (selected_text, + unescaped_search_text, + strlen (selected_text), + strlen (unescaped_search_text)) != 0)) + { do_find (searchbar, FALSE); g_free (unescaped_search_text); g_free (selected_text); @@ -300,7 +322,7 @@ do_replace (XedSearchbar *searchbar) } unescaped_replace_text = xed_utils_unescape_search_text (replace_entry_text); - replace_selected_text (GTK_TEXT_BUFFER (doc), unescaped_replace_text); + replace_selected_text (GTK_TEXT_BUFFER(doc), unescaped_replace_text); g_free (unescaped_search_text); g_free (selected_text); @@ -322,46 +344,54 @@ do_replace_all (XedSearchbar *searchbar) gint count; active_view = xed_window_get_active_view (searchbar->window); - if (active_view == NULL) { + if (active_view == NULL) + { return; } - doc = XED_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (active_view))); + doc = XED_DOCUMENT(gtk_text_view_get_buffer (GTK_TEXT_VIEW (active_view))); search_entry_text = xed_searchbar_get_search_text (searchbar); - g_return_if_fail ((search_entry_text) != NULL); - g_return_if_fail ((*search_entry_text) != '\0'); + g_return_if_fail((search_entry_text) != NULL); + g_return_if_fail((*search_entry_text) != '\0'); /* replace text may be "", we just delete all occurrences */ replace_entry_text = xed_searchbar_get_replace_text (searchbar); - g_return_if_fail ((replace_entry_text) != NULL); + g_return_if_fail((replace_entry_text) != NULL); match_case = xed_searchbar_get_match_case (searchbar); entire_word = xed_searchbar_get_entire_word (searchbar); - XED_SEARCH_SET_CASE_SENSITIVE (flags, match_case); - XED_SEARCH_SET_ENTIRE_WORD (flags, entire_word); + XED_SEARCH_SET_CASE_SENSITIVE(flags, match_case); + XED_SEARCH_SET_ENTIRE_WORD(flags, entire_word); count = xed_document_replace_all (doc, search_entry_text, replace_entry_text, flags); - if (count > 0) { + if (count > 0) + { text_found (searchbar->window, count); } - else { + else + { text_not_found (searchbar->window, search_entry_text); } } static void -insert_text_handler (GtkEditable *editable, const gchar *text, gint length, gint *position, gpointer data) +insert_text_handler (GtkEditable *editable, + const gchar *text, + gint length, + gint *position, + gpointer data) { static gboolean insert_text = FALSE; gchar *escaped_text; gint new_len; /* To avoid recursive behavior */ - if (insert_text) { + if (insert_text) + { return; } @@ -369,7 +399,8 @@ insert_text_handler (GtkEditable *editable, const gchar *text, gint length, gint new_len = strlen (escaped_text); - if (new_len == length) { + if (new_len == length) + { g_free (escaped_text); return; } @@ -386,19 +417,22 @@ insert_text_handler (GtkEditable *editable, const gchar *text, gint length, gint } static void -search_text_entry_changed (GtkEditable *editable, XedSearchbar *searchbar) +search_text_entry_changed (GtkEditable *editable, + XedSearchbar *searchbar) { const gchar *search_string; - search_string = gtk_entry_get_text (GTK_ENTRY (editable)); - g_return_if_fail (search_string != NULL); + search_string = gtk_entry_get_text (GTK_ENTRY(editable)); + g_return_if_fail(search_string != NULL); - if (*search_string != '\0') { - search_buttons_set_sensitive(searchbar, TRUE); + if (*search_string != '\0') + { + search_buttons_set_sensitive (searchbar, TRUE); do_find (searchbar, FALSE); } - else { - search_buttons_set_sensitive(searchbar, FALSE); + else + { + search_buttons_set_sensitive (searchbar, FALSE); } } @@ -406,11 +440,12 @@ static void remember_search_entry (XedSearchbar *searchbar) { const gchar *str; - str = gtk_entry_get_text (GTK_ENTRY (searchbar->priv->search_text_entry)); - if (*str != '\0') { + str = gtk_entry_get_text (GTK_ENTRY(searchbar->priv->search_text_entry)); + if (*str != '\0') + { gchar *text; text = xed_utils_unescape_search_text (str); - xed_history_entry_prepend_text (XED_HISTORY_ENTRY (searchbar->priv->search_entry), text); + xed_history_entry_prepend_text (XED_HISTORY_ENTRY(searchbar->priv->search_entry), text); g_free (text); } } @@ -419,31 +454,35 @@ static void remember_replace_entry (XedSearchbar *searchbar) { const gchar *str; - str = gtk_entry_get_text (GTK_ENTRY (searchbar->priv->replace_text_entry)); - if (*str != '\0') { + str = gtk_entry_get_text (GTK_ENTRY(searchbar->priv->replace_text_entry)); + if (*str != '\0') + { gchar *text; text = xed_utils_unescape_search_text (str); - xed_history_entry_prepend_text (XED_HISTORY_ENTRY (searchbar->priv->replace_entry), text); + xed_history_entry_prepend_text (XED_HISTORY_ENTRY(searchbar->priv->replace_entry), text); g_free (text); } } static void -find_button_clicked_callback (GtkWidget *button, XedSearchbar *searchbar) +find_button_clicked_callback (GtkWidget *button, + XedSearchbar *searchbar) { remember_search_entry (searchbar); do_find (searchbar, FALSE); } static void -find_prev_button_clicked_callback (GtkWidget *button, XedSearchbar *searchbar) +find_prev_button_clicked_callback (GtkWidget *button, + XedSearchbar *searchbar) { remember_search_entry (searchbar); do_find (searchbar, TRUE); } static void -replace_button_clicked_callback (GtkWidget *button, XedSearchbar *searchbar) +replace_button_clicked_callback (GtkWidget *button, + XedSearchbar *searchbar) { remember_search_entry (searchbar); remember_replace_entry (searchbar); @@ -451,7 +490,8 @@ replace_button_clicked_callback (GtkWidget *button, XedSearchbar *searchbar) } static void -replace_all_button_clicked_callback (GtkWidget *button, XedSearchbar *searchbar) +replace_all_button_clicked_callback (GtkWidget *button, + XedSearchbar *searchbar) { remember_search_entry (searchbar); remember_replace_entry (searchbar); @@ -459,7 +499,8 @@ replace_all_button_clicked_callback (GtkWidget *button, XedSearchbar *searchbar) } static void -on_search_text_entry_activated (GtkEntry *widget, XedSearchbar *searchbar) +on_search_text_entry_activated (GtkEntry *widget, + XedSearchbar *searchbar) { remember_search_entry (searchbar); do_find (searchbar, FALSE); @@ -472,9 +513,9 @@ xed_searchbar_init (XedSearchbar *searchbar) GtkSizeGroup *size_group; GtkWidget *error_widget; gchar *file; - gchar *root_objects[] = {"searchbar_content", NULL}; + gchar *root_objects[] = { "searchbar_content", NULL }; - searchbar->priv = XED_SEARCHBAR_GET_PRIVATE (searchbar); + searchbar->priv = XED_SEARCHBAR_GET_PRIVATE(searchbar); file = xed_dirs_get_ui_file ("xed-searchbar.ui"); xed_utils_get_ui_objects (file, @@ -497,83 +538,83 @@ xed_searchbar_init (XedSearchbar *searchbar) searchbar->priv->search_entry = xed_history_entry_new ("history-search-for", TRUE); gtk_widget_set_hexpand (searchbar->priv->search_entry, TRUE); - xed_history_entry_set_escape_func ( - XED_HISTORY_ENTRY (searchbar->priv->search_entry), - (XedHistoryEntryEscapeFunc) xed_utils_escape_search_text); + xed_history_entry_set_escape_func (XED_HISTORY_ENTRY(searchbar->priv->search_entry), + (XedHistoryEntryEscapeFunc) xed_utils_escape_search_text); - searchbar->priv->search_text_entry = xed_history_entry_get_entry ( - XED_HISTORY_ENTRY (searchbar->priv->search_entry)); - gtk_entry_set_activates_default (GTK_ENTRY (searchbar->priv->search_text_entry), TRUE); + searchbar->priv->search_text_entry = xed_history_entry_get_entry (XED_HISTORY_ENTRY(searchbar->priv->search_entry)); + gtk_entry_set_activates_default (GTK_ENTRY(searchbar->priv->search_text_entry), TRUE); gtk_widget_show (searchbar->priv->search_entry); - gtk_grid_attach (GTK_GRID (searchbar->priv->grid), searchbar->priv->search_entry, 2, 0, 1, 1); + gtk_grid_attach (GTK_GRID(searchbar->priv->grid), searchbar->priv->search_entry, 2, 0, 1, 1); searchbar->priv->replace_entry = xed_history_entry_new ("history-replace-with", TRUE); - xed_history_entry_set_escape_func ( - XED_HISTORY_ENTRY (searchbar->priv->replace_entry), - (XedHistoryEntryEscapeFunc) xed_utils_escape_search_text); + xed_history_entry_set_escape_func (XED_HISTORY_ENTRY(searchbar->priv->replace_entry), + (XedHistoryEntryEscapeFunc) xed_utils_escape_search_text); searchbar->priv->replace_text_entry = xed_history_entry_get_entry ( - XED_HISTORY_ENTRY (searchbar->priv->replace_entry)); - gtk_entry_set_activates_default (GTK_ENTRY (searchbar->priv->replace_text_entry), TRUE); + XED_HISTORY_ENTRY(searchbar->priv->replace_entry)); + gtk_entry_set_activates_default (GTK_ENTRY(searchbar->priv->replace_text_entry), TRUE); gtk_widget_show (searchbar->priv->replace_entry); - gtk_grid_attach (GTK_GRID (searchbar->priv->grid), searchbar->priv->replace_entry, 2, 1, 1, 1); + gtk_grid_attach (GTK_GRID(searchbar->priv->grid), searchbar->priv->replace_entry, 2, 1, 1, 1); - gtk_label_set_mnemonic_widget (GTK_LABEL (searchbar->priv->search_label), searchbar->priv->search_entry); - gtk_label_set_mnemonic_widget (GTK_LABEL (searchbar->priv->replace_label), searchbar->priv->replace_entry); + gtk_label_set_mnemonic_widget (GTK_LABEL(searchbar->priv->search_label), searchbar->priv->search_entry); + gtk_label_set_mnemonic_widget (GTK_LABEL(searchbar->priv->replace_label), searchbar->priv->replace_entry); size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - gtk_size_group_add_widget (size_group, GTK_WIDGET (searchbar->priv->find_button)); - gtk_size_group_add_widget (size_group, GTK_WIDGET (searchbar->priv->find_prev_button)); - gtk_size_group_add_widget (size_group, GTK_WIDGET (searchbar->priv->replace_button)); - gtk_size_group_add_widget (size_group, GTK_WIDGET (searchbar->priv->replace_all_button)); + gtk_size_group_add_widget (size_group, GTK_WIDGET(searchbar->priv->find_button)); + gtk_size_group_add_widget (size_group, GTK_WIDGET(searchbar->priv->find_prev_button)); + gtk_size_group_add_widget (size_group, GTK_WIDGET(searchbar->priv->replace_button)); + gtk_size_group_add_widget (size_group, GTK_WIDGET(searchbar->priv->replace_all_button)); /* insensitive by default */ - search_buttons_set_sensitive(searchbar, FALSE); + search_buttons_set_sensitive (searchbar, FALSE); xed_searchbar_hide (searchbar); - gtk_box_pack_start (GTK_BOX (searchbar), content, TRUE, TRUE, 0); - gtk_widget_show (GTK_WIDGET (searchbar)); + gtk_box_pack_start (GTK_BOX(searchbar), content, TRUE, TRUE, 0); + gtk_widget_show (GTK_WIDGET(searchbar)); g_object_unref (content); - g_signal_connect (searchbar->priv->search_text_entry, "insert_text", - G_CALLBACK (insert_text_handler), NULL); + g_signal_connect(searchbar->priv->search_text_entry, "insert_text", + G_CALLBACK (insert_text_handler), NULL); - g_signal_connect (searchbar->priv->replace_text_entry, "insert_text", - G_CALLBACK (insert_text_handler), NULL); + g_signal_connect(searchbar->priv->replace_text_entry, "insert_text", + G_CALLBACK (insert_text_handler), NULL); - g_signal_connect (searchbar->priv->search_text_entry, "changed", - G_CALLBACK (search_text_entry_changed), searchbar); + g_signal_connect(searchbar->priv->search_text_entry, "changed", + G_CALLBACK (search_text_entry_changed), searchbar); - g_signal_connect (searchbar->priv->search_text_entry, "activate", - G_CALLBACK (on_search_text_entry_activated), searchbar); + g_signal_connect(searchbar->priv->search_text_entry, "activate", + G_CALLBACK (on_search_text_entry_activated), searchbar); - g_signal_connect (searchbar->priv->find_button, "clicked", - G_CALLBACK (find_button_clicked_callback), searchbar); + g_signal_connect(searchbar->priv->find_button, "clicked", + G_CALLBACK (find_button_clicked_callback), searchbar); - g_signal_connect (searchbar->priv->find_prev_button, "clicked", - G_CALLBACK (find_prev_button_clicked_callback), searchbar); + g_signal_connect(searchbar->priv->find_prev_button, "clicked", + G_CALLBACK (find_prev_button_clicked_callback), searchbar); - g_signal_connect (searchbar->priv->replace_button, "clicked", - G_CALLBACK (replace_button_clicked_callback), searchbar); + g_signal_connect(searchbar->priv->replace_button, "clicked", + G_CALLBACK (replace_button_clicked_callback), searchbar); - g_signal_connect (searchbar->priv->replace_all_button, "clicked", - G_CALLBACK (replace_all_button_clicked_callback), searchbar); + g_signal_connect(searchbar->priv->replace_all_button, "clicked", + G_CALLBACK (replace_all_button_clicked_callback), searchbar); } GtkWidget * -xed_searchbar_new (GtkWindow *parent, gboolean show_replace) +xed_searchbar_new (GtkWindow *parent, + gboolean show_replace) { XedSearchbar *searchbar; searchbar = g_object_new (XED_TYPE_SEARCHBAR, NULL); searchbar->window = parent; - return GTK_WIDGET (searchbar); + return GTK_WIDGET(searchbar); } -void xed_searchbar_show (XedSearchbar *searchbar, gboolean show_replace) +void +xed_searchbar_show (XedSearchbar *searchbar, + gboolean show_replace) { XedDocument *doc; gboolean selection_exists; @@ -582,11 +623,12 @@ void xed_searchbar_show (XedSearchbar *searchbar, gboolean show_replace) gint sel_len; doc = xed_window_get_active_document (searchbar->window); - g_return_if_fail (doc != NULL); + g_return_if_fail(doc != NULL); - selection_exists = get_selected_text (GTK_TEXT_BUFFER (doc), &find_text, &sel_len); + selection_exists = get_selected_text (GTK_TEXT_BUFFER(doc), &find_text, &sel_len); - if (selection_exists && find_text != NULL && sel_len < 80) { + if (selection_exists && find_text != NULL && sel_len < 80) + { /* * Special case: if the currently selected text * is the same as the unescaped search text, use the @@ -594,47 +636,52 @@ void xed_searchbar_show (XedSearchbar *searchbar, gboolean show_replace) * search for '\n' and then open the search searchbar again, * you'll get an unprintable single-character literal '\n' in the "search for" box). */ - search_text = xed_searchbar_get_search_text (XED_SEARCHBAR (searchbar)); - if (!(search_text != NULL && !strcmp(xed_utils_unescape_search_text(search_text), find_text))) { + search_text = xed_searchbar_get_search_text (XED_SEARCHBAR(searchbar)); + if (!(search_text != NULL && !strcmp (xed_utils_unescape_search_text (search_text), find_text))) + { /* General case */ - xed_searchbar_set_search_text (XED_SEARCHBAR (searchbar), find_text); + xed_searchbar_set_search_text (XED_SEARCHBAR(searchbar), find_text); } g_free (find_text); } - else { + else + { g_free (find_text); } - gtk_revealer_set_transition_type (GTK_REVEALER (searchbar->priv->revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP); - gtk_revealer_set_reveal_child (GTK_REVEALER (searchbar->priv->revealer), TRUE); - if (show_replace) { + gtk_revealer_set_transition_type (GTK_REVEALER(searchbar->priv->revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_UP); + gtk_revealer_set_reveal_child (GTK_REVEALER(searchbar->priv->revealer), TRUE); + if (show_replace) + { gtk_widget_show (searchbar->priv->replace_label); gtk_widget_show (searchbar->priv->replace_entry); gtk_widget_show (searchbar->priv->replace_all_button); gtk_widget_show (searchbar->priv->replace_button); - gtk_grid_set_row_spacing (GTK_GRID (searchbar->priv->grid), 10); + gtk_grid_set_row_spacing (GTK_GRID(searchbar->priv->grid), 10); } - else { + else + { gtk_widget_hide (searchbar->priv->replace_label); gtk_widget_hide (searchbar->priv->replace_entry); gtk_widget_hide (searchbar->priv->replace_all_button); gtk_widget_hide (searchbar->priv->replace_button); - gtk_grid_set_row_spacing (GTK_GRID (searchbar->priv->grid), 0); + gtk_grid_set_row_spacing (GTK_GRID(searchbar->priv->grid), 0); } gtk_widget_show (searchbar->priv->find_button); gtk_widget_grab_focus (searchbar->priv->search_text_entry); } -void xed_searchbar_hide (XedSearchbar *searchbar) +void +xed_searchbar_hide (XedSearchbar *searchbar) { - gtk_revealer_set_transition_type (GTK_REVEALER (searchbar->priv->revealer), - GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN); - gtk_revealer_set_reveal_child (GTK_REVEALER (searchbar->priv->revealer), FALSE); + gtk_revealer_set_transition_type (GTK_REVEALER(searchbar->priv->revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN); + gtk_revealer_set_reveal_child (GTK_REVEALER(searchbar->priv->revealer), FALSE); // focus document XedView *active_view = xed_window_get_active_view (searchbar->window); - if (active_view != NULL) { - gtk_widget_grab_focus (GTK_WIDGET (active_view)); + if (active_view != NULL) + { + gtk_widget_grab_focus (GTK_WIDGET(active_view)); } // remove highlighting @@ -642,12 +689,13 @@ void xed_searchbar_hide (XedSearchbar *searchbar) } void -xed_searchbar_set_search_text (XedSearchbar *searchbar, const gchar *text) +xed_searchbar_set_search_text (XedSearchbar *searchbar, + const gchar *text) { - g_return_if_fail (XED_IS_SEARCHBAR (searchbar)); - g_return_if_fail (text != NULL); - gtk_entry_set_text (GTK_ENTRY (searchbar->priv->search_text_entry), text); - search_buttons_set_sensitive(searchbar, (text != '\0')); + g_return_if_fail(XED_IS_SEARCHBAR (searchbar)); + g_return_if_fail(text != NULL); + gtk_entry_set_text (GTK_ENTRY(searchbar->priv->search_text_entry), text); + search_buttons_set_sensitive (searchbar, (text != '\0')); } /* @@ -656,64 +704,68 @@ xed_searchbar_set_search_text (XedSearchbar *searchbar, const gchar *text) const gchar * xed_searchbar_get_search_text (XedSearchbar *searchbar) { - g_return_val_if_fail (XED_IS_SEARCHBAR (searchbar), NULL); - return gtk_entry_get_text (GTK_ENTRY (searchbar->priv->search_text_entry)); + g_return_val_if_fail(XED_IS_SEARCHBAR (searchbar), NULL); + return gtk_entry_get_text (GTK_ENTRY(searchbar->priv->search_text_entry)); } void -xed_searchbar_set_replace_text (XedSearchbar *searchbar, const gchar *text) +xed_searchbar_set_replace_text (XedSearchbar *searchbar, + const gchar *text) { - g_return_if_fail (XED_IS_SEARCHBAR (searchbar)); - g_return_if_fail (text != NULL); + g_return_if_fail(XED_IS_SEARCHBAR (searchbar)); + g_return_if_fail(text != NULL); - gtk_entry_set_text (GTK_ENTRY (searchbar->priv->replace_text_entry), text); + gtk_entry_set_text (GTK_ENTRY(searchbar->priv->replace_text_entry), text); } const gchar * xed_searchbar_get_replace_text (XedSearchbar *searchbar) { - g_return_val_if_fail (XED_IS_SEARCHBAR (searchbar), NULL); - return gtk_entry_get_text (GTK_ENTRY (searchbar->priv->replace_text_entry)); + g_return_val_if_fail(XED_IS_SEARCHBAR (searchbar), NULL); + return gtk_entry_get_text (GTK_ENTRY(searchbar->priv->replace_text_entry)); } void -xed_searchbar_set_match_case (XedSearchbar *searchbar, gboolean match_case) +xed_searchbar_set_match_case (XedSearchbar *searchbar, + gboolean match_case) { - g_return_if_fail (XED_IS_SEARCHBAR (searchbar)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (searchbar->priv->match_case_checkbutton), match_case); + g_return_if_fail(XED_IS_SEARCHBAR (searchbar)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(searchbar->priv->match_case_checkbutton), match_case); } gboolean xed_searchbar_get_match_case (XedSearchbar *searchbar) { - g_return_val_if_fail (XED_IS_SEARCHBAR (searchbar), FALSE); - return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (searchbar->priv->match_case_checkbutton)); + g_return_val_if_fail(XED_IS_SEARCHBAR (searchbar), FALSE); + return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(searchbar->priv->match_case_checkbutton)); } void -xed_searchbar_set_entire_word (XedSearchbar *searchbar, gboolean entire_word) +xed_searchbar_set_entire_word (XedSearchbar *searchbar, + gboolean entire_word) { - g_return_if_fail (XED_IS_SEARCHBAR (searchbar)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (searchbar->priv->entire_word_checkbutton), entire_word); + g_return_if_fail(XED_IS_SEARCHBAR (searchbar)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(searchbar->priv->entire_word_checkbutton), entire_word); } gboolean xed_searchbar_get_entire_word (XedSearchbar *searchbar) { - g_return_val_if_fail (XED_IS_SEARCHBAR (searchbar), FALSE); - return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (searchbar->priv->entire_word_checkbutton)); + g_return_val_if_fail(XED_IS_SEARCHBAR (searchbar), FALSE); + return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(searchbar->priv->entire_word_checkbutton)); } void -xed_searchbar_set_wrap_around (XedSearchbar *searchbar, gboolean wrap_around) +xed_searchbar_set_wrap_around (XedSearchbar *searchbar, + gboolean wrap_around) { - g_return_if_fail (XED_IS_SEARCHBAR (searchbar)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (searchbar->priv->wrap_around_checkbutton), wrap_around); + g_return_if_fail(XED_IS_SEARCHBAR (searchbar)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(searchbar->priv->wrap_around_checkbutton), wrap_around); } gboolean xed_searchbar_get_wrap_around (XedSearchbar *searchbar) { - g_return_val_if_fail (XED_IS_SEARCHBAR (searchbar), FALSE); - return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (searchbar->priv->wrap_around_checkbutton)); + g_return_val_if_fail(XED_IS_SEARCHBAR (searchbar), FALSE); + return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(searchbar->priv->wrap_around_checkbutton)); } diff --git a/xed/xed-view.c b/xed/xed-view.c index 0a5e8a1..01129a8 100644 --- a/xed/xed-view.c +++ b/xed/xed-view.c @@ -27,12 +27,12 @@ enum struct _XedViewPrivate { - GtkTextIter start_search_iter; - GtkWidget *search_window; - GtkWidget *search_entry; - guint typeselect_flush_timeout; - guint search_entry_changed_id; - gboolean disable_popdown; + GtkTextIter start_search_iter; + GtkWidget *search_window; + GtkWidget *search_entry; + guint typeselect_flush_timeout; + guint search_entry_changed_id; + gboolean disable_popdown; GtkTextBuffer *current_buffer; }; @@ -41,13 +41,13 @@ static void xed_view_finalize (GObject *object); static gint xed_view_focus_out (GtkWidget *widget, GdkEventFocus *event); static gboolean xed_view_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint timestamp); static void xed_view_drag_data_received (GtkWidget *widget, GdkDragContext *context, gint x, gint y, - GtkSelectionData *selection_data, guint info, guint timestamp); + GtkSelectionData *selection_data, guint info, guint timestamp); static gboolean xed_view_drag_drop (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint timestamp); static gboolean xed_view_button_press_event (GtkWidget *widget, GdkEventButton *event); static gboolean start_interactive_goto_line (XedView *view); static void hide_search_window (XedView *view, gboolean cancel); static gboolean xed_view_draw (GtkWidget *widget, cairo_t *cr); -static void search_highlight_updated_cb (XedDocument *doc, GtkTextIter *start, GtkTextIter *end, XedView *view); +static void search_highlight_updated_cb (XedDocument *doc, GtkTextIter *start, GtkTextIter *end, XedView *view); static void xed_view_delete_from_cursor (GtkTextView *text_view, GtkDeleteType type, gint count); G_DEFINE_TYPE(XedView, xed_view, GTK_SOURCE_TYPE_VIEW) @@ -55,34 +55,33 @@ G_DEFINE_TYPE(XedView, xed_view, GTK_SOURCE_TYPE_VIEW) /* Signals */ enum { - START_INTERACTIVE_GOTO_LINE, - DROP_URIS, - LAST_SIGNAL + START_INTERACTIVE_GOTO_LINE, DROP_URIS, LAST_SIGNAL }; -static guint view_signals [LAST_SIGNAL] = { 0 }; +static guint view_signals[LAST_SIGNAL] = { 0 }; typedef enum { - XED_SEARCH_ENTRY_NORMAL, - XED_SEARCH_ENTRY_NOT_FOUND + XED_SEARCH_ENTRY_NORMAL, XED_SEARCH_ENTRY_NOT_FOUND } XedSearchEntryState; static void -document_read_only_notify_handler (XedDocument *document, GParamSpec *pspec, XedView *view) +document_read_only_notify_handler (XedDocument *document, + GParamSpec *pspec, + XedView *view) { xed_debug (DEBUG_VIEW); - gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !xed_document_get_readonly (document)); + gtk_text_view_set_editable (GTK_TEXT_VIEW(view), !xed_document_get_readonly (document)); } static void xed_view_class_init (XedViewClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - GtkTextViewClass *text_view_class = GTK_TEXT_VIEW_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); + GtkTextViewClass *text_view_class = GTK_TEXT_VIEW_CLASS(klass); - GtkBindingSet *binding_set; + GtkBindingSet *binding_set; object_class->dispose = xed_view_dispose; object_class->finalize = xed_view_finalize; @@ -113,9 +112,9 @@ xed_view_class_init (XedViewClass *klass) text_view_class->delete_from_cursor = xed_view_delete_from_cursor; view_signals[START_INTERACTIVE_GOTO_LINE] = g_signal_new ("start_interactive_goto_line", - G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (XedViewClass, start_interactive_goto_line), NULL, NULL, xed_marshal_BOOLEAN__NONE, - G_TYPE_BOOLEAN, 0); + G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET(XedViewClass, start_interactive_goto_line), + NULL, NULL, xed_marshal_BOOLEAN__NONE, G_TYPE_BOOLEAN, 0); /* A new signal DROP_URIS has been added to allow plugins to intercept * the default dnd behaviour of 'text/uri-list'. XedView now handles @@ -126,49 +125,54 @@ xed_view_class_init (XedViewClass *klass) * default behaviour. They should _NOT_ use this signal because this * will not prevent xed from loading the uri */ - view_signals[DROP_URIS] = g_signal_new ("drop_uris", G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (XedViewClass, drop_uris),NULL, NULL, - g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, G_TYPE_STRV); + view_signals[DROP_URIS] = g_signal_new ("drop_uris", G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET(XedViewClass, drop_uris), + NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, G_TYPE_STRV); - g_type_class_add_private (klass, sizeof (XedViewPrivate)); + g_type_class_add_private (klass, sizeof(XedViewPrivate)); binding_set = gtk_binding_set_by_class (klass); gtk_binding_entry_add_signal (binding_set, GDK_KEY_i, GDK_CONTROL_MASK, "start_interactive_goto_line", 0); gtk_binding_entry_add_signal (binding_set, GDK_KEY_d, GDK_CONTROL_MASK, "delete_from_cursor", 2, G_TYPE_ENUM, - GTK_DELETE_PARAGRAPHS, G_TYPE_INT, 1); + GTK_DELETE_PARAGRAPHS, G_TYPE_INT, 1); } static void current_buffer_removed (XedView *view) { - if (view->priv->current_buffer) { - g_signal_handlers_disconnect_by_func (view->priv->current_buffer, document_read_only_notify_handler, view); - g_signal_handlers_disconnect_by_func (view->priv->current_buffer, search_highlight_updated_cb, view); + if (view->priv->current_buffer) + { + g_signal_handlers_disconnect_by_func(view->priv->current_buffer, document_read_only_notify_handler, view); + g_signal_handlers_disconnect_by_func(view->priv->current_buffer, search_highlight_updated_cb, view); g_object_unref (view->priv->current_buffer); view->priv->current_buffer = NULL; } } static void -on_notify_buffer_cb (XedView *view, GParamSpec *arg1, gpointer userdata) +on_notify_buffer_cb (XedView *view, + GParamSpec *arg1, + gpointer userdata) { GtkTextBuffer *buffer; current_buffer_removed (view); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(view)); - if (buffer == NULL || !XED_IS_DOCUMENT (buffer)) { + if (buffer == NULL || !XED_IS_DOCUMENT(buffer)) + { return; } view->priv->current_buffer = g_object_ref (buffer); - g_signal_connect (buffer, "notify::read-only", G_CALLBACK (document_read_only_notify_handler), view); + g_signal_connect(buffer, "notify::read-only", G_CALLBACK (document_read_only_notify_handler), view); - gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !xed_document_get_readonly (XED_DOCUMENT (buffer))); + gtk_text_view_set_editable (GTK_TEXT_VIEW(view), !xed_document_get_readonly (XED_DOCUMENT(buffer))); - g_signal_connect (buffer, "search_highlight_updated", G_CALLBACK (search_highlight_updated_cb), view); + g_signal_connect(buffer, "search_highlight_updated", G_CALLBACK (search_highlight_updated_cb), view); } static void @@ -178,46 +182,49 @@ xed_view_init (XedView *view) xed_debug (DEBUG_VIEW); - view->priv = XED_VIEW_GET_PRIVATE (view); + view->priv = XED_VIEW_GET_PRIVATE(view); /* * Set tab, fonts, wrap mode, colors, etc. according * to preferences */ - if (!xed_prefs_manager_get_use_default_font ()) { + if (!xed_prefs_manager_get_use_default_font ()) + { gchar *editor_font; editor_font = xed_prefs_manager_get_editor_font (); xed_view_set_font (view, FALSE, editor_font); g_free (editor_font); } - else { + else + { xed_view_set_font (view, TRUE, NULL); } - g_object_set (G_OBJECT (view), - "wrap_mode", xed_prefs_manager_get_wrap_mode (), - "show_line_numbers", xed_prefs_manager_get_display_line_numbers (), - "auto_indent", xed_prefs_manager_get_auto_indent (), - "tab_width", xed_prefs_manager_get_tabs_size (), - "insert_spaces_instead_of_tabs", xed_prefs_manager_get_insert_spaces (), - "show_right_margin", xed_prefs_manager_get_display_right_margin (), - "right_margin_position", xed_prefs_manager_get_right_margin_position (), - "highlight_current_line", xed_prefs_manager_get_highlight_current_line (), - "smart_home_end", xed_prefs_manager_get_smart_home_end (), - "indent_on_tab", TRUE, - NULL); + g_object_set (G_OBJECT(view), + "wrap_mode", xed_prefs_manager_get_wrap_mode (), + "show_line_numbers", xed_prefs_manager_get_display_line_numbers (), + "auto_indent", xed_prefs_manager_get_auto_indent (), + "tab_width", xed_prefs_manager_get_tabs_size (), + "insert_spaces_instead_of_tabs", xed_prefs_manager_get_insert_spaces (), + "show_right_margin", xed_prefs_manager_get_display_right_margin (), + "right_margin_position", xed_prefs_manager_get_right_margin_position (), + "highlight_current_line", xed_prefs_manager_get_highlight_current_line (), + "smart_home_end", xed_prefs_manager_get_smart_home_end (), + "indent_on_tab", TRUE, + NULL); view->priv->typeselect_flush_timeout = 0; /* Drag and drop support */ - tl = gtk_drag_dest_get_target_list (GTK_WIDGET (view)); + tl = gtk_drag_dest_get_target_list (GTK_WIDGET(view)); - if (tl != NULL) { + if (tl != NULL) + { gtk_target_list_add_uri_targets (tl, TARGET_URI_LIST); } /* Act on buffer change */ - g_signal_connect (view, "notify::buffer", G_CALLBACK (on_notify_buffer_cb), NULL); + g_signal_connect(view, "notify::buffer", G_CALLBACK (on_notify_buffer_cb), NULL); } static void @@ -225,23 +232,25 @@ xed_view_dispose (GObject *object) { XedView *view; - view = XED_VIEW (object); + view = XED_VIEW(object); - if (view->priv->search_window != NULL) { + if (view->priv->search_window != NULL) + { gtk_widget_destroy (view->priv->search_window); view->priv->search_window = NULL; view->priv->search_entry = NULL; - if (view->priv->typeselect_flush_timeout != 0) { + if (view->priv->typeselect_flush_timeout != 0) + { g_source_remove (view->priv->typeselect_flush_timeout); view->priv->typeselect_flush_timeout = 0; } } /* Disconnect notify buffer because the destroy of the textview will - set the buffer to NULL, and we call get_buffer in the notify which - would reinstate a GtkTextBuffer which we don't want */ + set the buffer to NULL, and we call get_buffer in the notify which + would reinstate a GtkTextBuffer which we don't want */ current_buffer_removed (view); - g_signal_handlers_disconnect_by_func (view, on_notify_buffer_cb, NULL); + g_signal_handlers_disconnect_by_func(view, on_notify_buffer_cb, NULL); (* G_OBJECT_CLASS (xed_view_parent_class)->dispose) (object); } @@ -250,20 +259,22 @@ static void xed_view_finalize (GObject *object) { XedView *view; - view = XED_VIEW (object); + view = XED_VIEW(object); current_buffer_removed (view); (* G_OBJECT_CLASS (xed_view_parent_class)->finalize) (object); } static gint -xed_view_focus_out (GtkWidget *widget, GdkEventFocus *event) +xed_view_focus_out (GtkWidget *widget, + GdkEventFocus *event) { - XedView *view = XED_VIEW (widget); + XedView *view = XED_VIEW(widget); gtk_widget_queue_draw (widget); /* hide interactive search dialog */ - if (view->priv->search_window != NULL) { + if (view->priv->search_window != NULL) + { hide_search_window (view, FALSE); } @@ -287,8 +298,8 @@ xed_view_new (XedDocument *doc) GtkWidget *view; xed_debug_message (DEBUG_VIEW, "START"); - g_return_val_if_fail (XED_IS_DOCUMENT (doc), NULL); - view = GTK_WIDGET (g_object_new (XED_TYPE_VIEW, "buffer", doc, NULL)); + g_return_val_if_fail(XED_IS_DOCUMENT (doc), NULL); + view = GTK_WIDGET(g_object_new (XED_TYPE_VIEW, "buffer", doc, NULL)); xed_debug_message (DEBUG_VIEW, "END: %d", G_OBJECT (view)->ref_count); gtk_widget_show_all (view); return view; @@ -301,18 +312,18 @@ xed_view_cut_clipboard (XedView *view) GtkClipboard *clipboard; xed_debug (DEBUG_VIEW); - g_return_if_fail (XED_IS_VIEW (view)); + g_return_if_fail(XED_IS_VIEW (view)); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - g_return_if_fail (buffer != NULL); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(view)); + g_return_if_fail(buffer != NULL); - clipboard = gtk_widget_get_clipboard (GTK_WIDGET (view), GDK_SELECTION_CLIPBOARD); + clipboard = gtk_widget_get_clipboard (GTK_WIDGET(view), GDK_SELECTION_CLIPBOARD); /* FIXME: what is default editability of a buffer? */ - gtk_text_buffer_cut_clipboard (buffer, clipboard, !xed_document_get_readonly (XED_DOCUMENT (buffer))); + gtk_text_buffer_cut_clipboard (buffer, clipboard, !xed_document_get_readonly (XED_DOCUMENT(buffer))); - gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (view), gtk_text_buffer_get_insert (buffer), XED_VIEW_SCROLL_MARGIN, - FALSE, 0.0, 0.0); + gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW(view), gtk_text_buffer_get_insert (buffer), XED_VIEW_SCROLL_MARGIN, + FALSE, 0.0, 0.0); } void @@ -322,12 +333,12 @@ xed_view_copy_clipboard (XedView *view) GtkClipboard *clipboard; xed_debug (DEBUG_VIEW); - g_return_if_fail (XED_IS_VIEW (view)); + g_return_if_fail(XED_IS_VIEW (view)); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - g_return_if_fail (buffer != NULL); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(view)); + g_return_if_fail(buffer != NULL); - clipboard = gtk_widget_get_clipboard (GTK_WIDGET (view), GDK_SELECTION_CLIPBOARD); + clipboard = gtk_widget_get_clipboard (GTK_WIDGET(view), GDK_SELECTION_CLIPBOARD); gtk_text_buffer_copy_clipboard (buffer, clipboard); } @@ -339,18 +350,18 @@ xed_view_paste_clipboard (XedView *view) xed_debug (DEBUG_VIEW); - g_return_if_fail (XED_IS_VIEW (view)); + g_return_if_fail(XED_IS_VIEW (view)); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - g_return_if_fail (buffer != NULL); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(view)); + g_return_if_fail(buffer != NULL); - clipboard = gtk_widget_get_clipboard (GTK_WIDGET (view), GDK_SELECTION_CLIPBOARD); + clipboard = gtk_widget_get_clipboard (GTK_WIDGET(view), GDK_SELECTION_CLIPBOARD); /* FIXME: what is default editability of a buffer? */ - gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, !xed_document_get_readonly (XED_DOCUMENT (buffer))); + gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, !xed_document_get_readonly (XED_DOCUMENT(buffer))); - gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (view), gtk_text_buffer_get_insert (buffer), XED_VIEW_SCROLL_MARGIN, - FALSE, 0.0, 0.0); + gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW(view), gtk_text_buffer_get_insert (buffer), XED_VIEW_SCROLL_MARGIN, + FALSE, 0.0, 0.0); } /** @@ -367,16 +378,16 @@ xed_view_delete_selection (XedView *view) xed_debug (DEBUG_VIEW); - g_return_if_fail (XED_IS_VIEW (view)); + g_return_if_fail(XED_IS_VIEW (view)); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - g_return_if_fail (buffer != NULL); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(view)); + g_return_if_fail(buffer != NULL); /* FIXME: what is default editability of a buffer? */ - gtk_text_buffer_delete_selection (buffer, TRUE, !xed_document_get_readonly (XED_DOCUMENT (buffer))); + gtk_text_buffer_delete_selection (buffer, TRUE, !xed_document_get_readonly (XED_DOCUMENT(buffer))); - gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (view), gtk_text_buffer_get_insert (buffer), XED_VIEW_SCROLL_MARGIN, - FALSE, 0.0, 0.0); + gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW(view), gtk_text_buffer_get_insert (buffer), XED_VIEW_SCROLL_MARGIN, + FALSE, 0.0, 0.0); } /** @@ -393,10 +404,10 @@ xed_view_select_all (XedView *view) xed_debug (DEBUG_VIEW); - g_return_if_fail (XED_IS_VIEW (view)); + g_return_if_fail(XED_IS_VIEW (view)); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - g_return_if_fail (buffer != NULL); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(view)); + g_return_if_fail(buffer != NULL); gtk_text_buffer_get_bounds (buffer, &start, &end); gtk_text_buffer_select_range (buffer, &start, &end); @@ -415,12 +426,12 @@ xed_view_scroll_to_cursor (XedView *view) xed_debug (DEBUG_VIEW); - g_return_if_fail (XED_IS_VIEW (view)); + g_return_if_fail(XED_IS_VIEW (view)); - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - g_return_if_fail (buffer != NULL); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(view)); + g_return_if_fail(buffer != NULL); - gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (view), gtk_text_buffer_get_insert (buffer), 0.25, FALSE, 0.0, 0.0); + gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW(view), gtk_text_buffer_get_insert (buffer), 0.25, FALSE, 0.0, 0.0); } /* FIXME this is an issue for introspection */ @@ -434,46 +445,54 @@ xed_view_scroll_to_cursor (XedView *view) * otherwise sets it to @font_name. **/ void -xed_view_set_font (XedView *view, gboolean def, const gchar *font_name) +xed_view_set_font (XedView *view, + gboolean def, + const gchar *font_name) { PangoFontDescription *font_desc = NULL; xed_debug (DEBUG_VIEW); - g_return_if_fail (XED_IS_VIEW (view)); + g_return_if_fail(XED_IS_VIEW (view)); - if (def) { + if (def) + { gchar *font; font = xed_prefs_manager_get_system_font (); font_desc = pango_font_description_from_string (font); g_free (font); } - else { - g_return_if_fail (font_name != NULL); + else + { + g_return_if_fail(font_name != NULL); font_desc = pango_font_description_from_string (font_name); } - g_return_if_fail (font_desc != NULL); - gtk_widget_modify_font (GTK_WIDGET (view), font_desc); + g_return_if_fail(font_desc != NULL); + gtk_widget_modify_font (GTK_WIDGET(view), font_desc); pango_font_description_free (font_desc); } static void -set_entry_state (GtkWidget *entry, XedSearchEntryState state) +set_entry_state (GtkWidget *entry, + XedSearchEntryState state) { - GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (entry)); + GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET(entry)); - if (state == XED_SEARCH_ENTRY_NOT_FOUND) { + if (state == XED_SEARCH_ENTRY_NOT_FOUND) + { gtk_style_context_add_class (context, GTK_STYLE_CLASS_ERROR); } - else { + else + { gtk_style_context_remove_class (context, GTK_STYLE_CLASS_ERROR); } } /* Cut and paste from gtkwindow.c */ static void -send_focus_change (GtkWidget *widget, gboolean in) +send_focus_change (GtkWidget *widget, + gboolean in) { GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE); @@ -485,43 +504,48 @@ send_focus_change (GtkWidget *widget, gboolean in) gtk_widget_event (widget, fevent); - g_object_notify (G_OBJECT (widget), "has-focus"); + g_object_notify (G_OBJECT(widget), "has-focus"); g_object_unref (widget); gdk_event_free (fevent); } static void -hide_search_window (XedView *view, gboolean cancel) +hide_search_window (XedView *view, + gboolean cancel) { - if (view->priv->disable_popdown) { + if (view->priv->disable_popdown) + { return; } - if (view->priv->search_entry_changed_id != 0) { + if (view->priv->search_entry_changed_id != 0) + { g_signal_handler_disconnect (view->priv->search_entry, view->priv->search_entry_changed_id); view->priv->search_entry_changed_id = 0; } - if (view->priv->typeselect_flush_timeout != 0) { + if (view->priv->typeselect_flush_timeout != 0) + { g_source_remove (view->priv->typeselect_flush_timeout); view->priv->typeselect_flush_timeout = 0; } /* send focus-in event */ - send_focus_change (GTK_WIDGET (view->priv->search_entry), FALSE); - gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), TRUE); + send_focus_change (GTK_WIDGET(view->priv->search_entry), FALSE); + gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW(view), TRUE); gtk_widget_hide (view->priv->search_window); - if (cancel) { + if (cancel) + { GtkTextBuffer *buffer; - buffer = GTK_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); + buffer = GTK_TEXT_BUFFER(gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); gtk_text_buffer_place_cursor (buffer, &view->priv->start_search_iter); xed_view_scroll_to_cursor (view); } /* make sure a focus event is sent for the edit area */ - send_focus_change (GTK_WIDGET (view), TRUE); + send_focus_change (GTK_WIDGET(view), TRUE); } static gboolean @@ -538,34 +562,40 @@ update_search_window_position (XedView *view) { gint x, y; gint view_x, view_y; - GdkWindow *view_window = gtk_widget_get_window (GTK_WIDGET (view)); + GdkWindow *view_window = gtk_widget_get_window (GTK_WIDGET(view)); gtk_widget_realize (view->priv->search_window); gdk_window_get_origin (view_window, &view_x, &view_y); - x = MAX (12, view_x + 12); - y = MAX (12, view_y - 12); + x = MAX(12, view_x + 12); + y = MAX(12, view_y - 12); - gtk_window_move (GTK_WINDOW (view->priv->search_window), x, y); + gtk_window_move (GTK_WINDOW(view->priv->search_window), x, y); } static gboolean -search_window_deleted (GtkWidget *widget, GdkEventAny *event, XedView *view) +search_window_deleted (GtkWidget *widget, + GdkEventAny *event, + XedView *view) { hide_search_window (view, FALSE); return TRUE; } static gboolean -search_window_button_pressed (GtkWidget *widget, GdkEventButton *event, XedView *view) +search_window_button_pressed (GtkWidget *widget, + GdkEventButton *event, + XedView *view) { hide_search_window (view, FALSE); - gtk_propagate_event (GTK_WIDGET (view), (GdkEvent *)event); + gtk_propagate_event (GTK_WIDGET(view), (GdkEvent *) event); return FALSE; } static gboolean -search_window_key_pressed (GtkWidget *widget, GdkEventKey *event, XedView *view) +search_window_key_pressed (GtkWidget *widget, + GdkEventKey *event, + XedView *view) { gboolean retval = FALSE; guint modifiers; @@ -573,13 +603,15 @@ search_window_key_pressed (GtkWidget *widget, GdkEventKey *event, XedView *view) modifiers = gtk_accelerator_get_default_mod_mask (); /* Close window */ - if (event->keyval == GDK_KEY_Tab) { + if (event->keyval == GDK_KEY_Tab) + { hide_search_window (view, FALSE); retval = TRUE; } /* Close window and cancel the search */ - if (event->keyval == GDK_KEY_Escape) { + if (event->keyval == GDK_KEY_Escape) + { hide_search_window (view, TRUE); retval = TRUE; } @@ -588,7 +620,8 @@ search_window_key_pressed (GtkWidget *widget, GdkEventKey *event, XedView *view) } static void -search_entry_activate (GtkEntry *entry, XedView *view) +search_entry_activate (GtkEntry *entry, + XedView *view) { hide_search_window (view, FALSE); } @@ -596,35 +629,43 @@ search_entry_activate (GtkEntry *entry, XedView *view) static gboolean real_search_enable_popdown (gpointer data) { - XedView *view = (XedView *)data; + XedView *view = (XedView *) data; view->priv->disable_popdown = FALSE; return FALSE; } static void -search_enable_popdown (GtkWidget *widget, XedView *view) +search_enable_popdown (GtkWidget *widget, + XedView *view) { g_timeout_add (200, real_search_enable_popdown, view); /* renew the flush timeout */ - if (view->priv->typeselect_flush_timeout != 0) { + if (view->priv->typeselect_flush_timeout != 0) + { g_source_remove (view->priv->typeselect_flush_timeout); } - view->priv->typeselect_flush_timeout = - g_timeout_add (XED_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc)search_entry_flush_timeout, view); + view->priv->typeselect_flush_timeout = g_timeout_add (XED_VIEW_SEARCH_DIALOG_TIMEOUT, + (GSourceFunc) search_entry_flush_timeout, view); } static void -search_entry_populate_popup (GtkEntry *entry, GtkMenu *menu, XedView *view) +search_entry_populate_popup (GtkEntry *entry, + GtkMenu *menu, + XedView *view) { GtkWidget *menu_item; view->priv->disable_popdown = TRUE; - g_signal_connect (menu, "hide", G_CALLBACK (search_enable_popdown), view); + g_signal_connect(menu, "hide", G_CALLBACK (search_enable_popdown), view); } static void -search_entry_insert_text (GtkEditable *editable, const gchar *text, gint length, gint *position, XedView *view) +search_entry_insert_text (GtkEditable *editable, + const gchar *text, + gint length, + gint *position, + XedView *view) { gunichar c; const gchar *p; @@ -634,29 +675,35 @@ search_entry_insert_text (GtkEditable *editable, const gchar *text, gint length, p = text; end = text + length; - if (p == end) { + if (p == end) + { return; } c = g_utf8_get_char (p); - if (((c == '-' || c == '+') && *position == 0) || (c == ':' && *position != 0)) { + if (((c == '-' || c == '+') && *position == 0) || (c == ':' && *position != 0)) + { gchar *s = NULL; - if (c == ':') { + if (c == ':') + { s = gtk_editable_get_chars (editable, 0, -1); s = g_utf8_strchr (s, -1, ':'); } - if (s == NULL || s == p) { - next = g_utf8_next_char (p); + if (s == NULL || s == p) + { + next = g_utf8_next_char(p); p = next; } g_free (s); } - while (p != end) { - next = g_utf8_next_char (p); + while (p != end) + { + next = g_utf8_next_char(p); c = g_utf8_get_char (p); - if (!g_unichar_isdigit (c)) { + if (!g_unichar_isdigit (c)) + { g_signal_stop_emission_by_name (editable, "insert_text"); gtk_widget_error_bell (view->priv->search_entry); break; @@ -668,31 +715,35 @@ search_entry_insert_text (GtkEditable *editable, const gchar *text, gint length, static void customize_for_search_mode (XedView *view) { - gtk_entry_set_icon_from_stock (GTK_ENTRY (view->priv->search_entry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_JUMP_TO); + gtk_entry_set_icon_from_stock (GTK_ENTRY(view->priv->search_entry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_JUMP_TO); gtk_widget_set_tooltip_text (view->priv->search_entry, _("Line you want to move the cursor to")); } static void ensure_search_window (XedView *view) { - GtkWidget *frame; - GtkWidget *vbox; - GtkWidget *toplevel; + GtkWidget *frame; + GtkWidget *vbox; + GtkWidget *toplevel; GtkWindowGroup *group; GtkWindowGroup *search_group; - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view)); - group = gtk_window_get_group (GTK_WINDOW (toplevel)); - if (view->priv->search_window != NULL) { - search_group = gtk_window_get_group (GTK_WINDOW (view->priv->search_window)); + toplevel = gtk_widget_get_toplevel (GTK_WIDGET(view)); + group = gtk_window_get_group (GTK_WINDOW(toplevel)); + if (view->priv->search_window != NULL) + { + search_group = gtk_window_get_group (GTK_WINDOW(view->priv->search_window)); } - if (view->priv->search_window != NULL) { - if (group) { - gtk_window_group_add_window (group, GTK_WINDOW (view->priv->search_window)); + if (view->priv->search_window != NULL) + { + if (group) + { + gtk_window_group_add_window (group, GTK_WINDOW(view->priv->search_window)); } - else if (search_group) { - gtk_window_group_remove_window (search_group, GTK_WINDOW (view->priv->search_window)); + else if (search_group) + { + gtk_window_group_remove_window (search_group, GTK_WINDOW(view->priv->search_window)); } customize_for_search_mode (view); return; @@ -700,50 +751,55 @@ ensure_search_window (XedView *view) view->priv->search_window = gtk_window_new (GTK_WINDOW_POPUP); - if (group) { - gtk_window_group_add_window (group, GTK_WINDOW (view->priv->search_window)); + if (group) + { + gtk_window_group_add_window (group, GTK_WINDOW(view->priv->search_window)); } - gtk_window_set_modal (GTK_WINDOW (view->priv->search_window), TRUE); + gtk_window_set_modal (GTK_WINDOW(view->priv->search_window), TRUE); - g_signal_connect (view->priv->search_window, "delete_event", G_CALLBACK (search_window_deleted), view); - g_signal_connect (view->priv->search_window, "key_press_event", G_CALLBACK (search_window_key_pressed), view); - g_signal_connect (view->priv->search_window, "button_press_event", G_CALLBACK (search_window_button_pressed), view); + g_signal_connect(view->priv->search_window, "delete_event", G_CALLBACK (search_window_deleted), view); + g_signal_connect(view->priv->search_window, "key_press_event", G_CALLBACK (search_window_key_pressed), view); + g_signal_connect(view->priv->search_window, "button_press_event", G_CALLBACK (search_window_button_pressed), view); frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN); + gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN); gtk_widget_show (frame); - gtk_container_add (GTK_CONTAINER (view->priv->search_window), frame); + gtk_container_add (GTK_CONTAINER(view->priv->search_window), frame); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox); - gtk_container_add (GTK_CONTAINER (frame), vbox); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 3); + gtk_container_add (GTK_CONTAINER(frame), vbox); + gtk_container_set_border_width (GTK_CONTAINER(vbox), 3); /* add entry */ view->priv->search_entry = gtk_entry_new (); gtk_widget_show (view->priv->search_entry); - g_signal_connect (view->priv->search_entry, "populate_popup", G_CALLBACK (search_entry_populate_popup), view); - g_signal_connect (view->priv->search_entry, "activate", G_CALLBACK (search_entry_activate), view); - g_signal_connect (view->priv->search_entry, "insert_text", G_CALLBACK (search_entry_insert_text), view); + g_signal_connect(view->priv->search_entry, "populate_popup", G_CALLBACK (search_entry_populate_popup), view); + g_signal_connect(view->priv->search_entry, "activate", G_CALLBACK (search_entry_activate), view); + g_signal_connect(view->priv->search_entry, "insert_text", G_CALLBACK (search_entry_insert_text), view); - gtk_container_add (GTK_CONTAINER (vbox), view->priv->search_entry); + gtk_container_add (GTK_CONTAINER(vbox), view->priv->search_entry); gtk_widget_realize (view->priv->search_entry); customize_for_search_mode (view); } static gboolean -get_selected_text (GtkTextBuffer *doc, gchar **selected_text, gint *len) +get_selected_text (GtkTextBuffer *doc, + gchar **selected_text, + gint *len) { GtkTextIter start, end; - g_return_val_if_fail (selected_text != NULL, FALSE); - g_return_val_if_fail (*selected_text == NULL, FALSE); + g_return_val_if_fail(selected_text != NULL, FALSE); + g_return_val_if_fail(*selected_text == NULL, FALSE); - if (!gtk_text_buffer_get_selection_bounds (doc, &start, &end)) { - if (len != NULL) { + if (!gtk_text_buffer_get_selection_bounds (doc, &start, &end)) + { + if (len != NULL) + { len = 0; } return FALSE; @@ -751,7 +807,8 @@ get_selected_text (GtkTextBuffer *doc, gchar **selected_text, gint *len) *selected_text = gtk_text_buffer_get_slice (doc, &start, &end, TRUE); - if (len != NULL) { + if (len != NULL) + { *len = g_utf8_strlen (*selected_text, -1); } @@ -761,34 +818,37 @@ get_selected_text (GtkTextBuffer *doc, gchar **selected_text, gint *len) static void init_search_entry (XedView *view) { - gint line; + gint line; gchar *line_str; line = gtk_text_iter_get_line (&view->priv->start_search_iter); line_str = g_strdup_printf ("%d", line + 1); - gtk_entry_set_text (GTK_ENTRY (view->priv->search_entry), line_str); + gtk_entry_set_text (GTK_ENTRY(view->priv->search_entry), line_str); g_free (line_str); return; } static void -search_init (GtkWidget *entry, XedView *view) +search_init (GtkWidget *entry, + XedView *view) { XedDocument *doc; const gchar *entry_text; /* renew the flush timeout */ - if (view->priv->typeselect_flush_timeout != 0) { + if (view->priv->typeselect_flush_timeout != 0) + { g_source_remove (view->priv->typeselect_flush_timeout); - view->priv->typeselect_flush_timeout = - g_timeout_add (XED_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc)search_entry_flush_timeout, view); + view->priv->typeselect_flush_timeout = g_timeout_add (XED_VIEW_SEARCH_DIALOG_TIMEOUT, + (GSourceFunc) search_entry_flush_timeout, view); } - doc = XED_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); + doc = XED_DOCUMENT(gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); - entry_text = gtk_entry_get_text (GTK_ENTRY (entry)); + entry_text = gtk_entry_get_text (GTK_ENTRY(entry)); - if (*entry_text != '\0') { + if (*entry_text != '\0') + { gboolean moved, moved_offset; gint line; gint offset_line = 0; @@ -798,33 +858,40 @@ search_init (GtkWidget *entry, XedView *view) split_text = g_strsplit (entry_text, ":", -1); - if (g_strv_length (split_text) > 1) { + if (g_strv_length (split_text) > 1) + { text = split_text[0]; } - else { + else + { text = entry_text; } - if (*text == '-') { + if (*text == '-') + { gint cur_line = gtk_text_iter_get_line (&view->priv->start_search_iter); - if (*(text + 1) != '\0') { - offset_line = MAX (atoi (text + 1), 0); + if (*(text + 1) != '\0') + { + offset_line = MAX(atoi (text + 1), 0); } - line = MAX (cur_line - offset_line, 0); + line = MAX(cur_line - offset_line, 0); } - else if (*entry_text == '+') { + else if (*entry_text == '+') + { gint cur_line = gtk_text_iter_get_line (&view->priv->start_search_iter); - if (*(text + 1) != '\0') { - offset_line = MAX (atoi (text + 1), 0); + if (*(text + 1) != '\0') + { + offset_line = MAX(atoi (text + 1), 0); } line = cur_line + offset_line; } - else { - line = MAX (atoi (text) - 1, 0); + else + { + line = MAX(atoi (text) - 1, 0); } if (split_text[1] != NULL) @@ -839,10 +906,12 @@ search_init (GtkWidget *entry, XedView *view) xed_view_scroll_to_cursor (view); - if (!moved || !moved_offset) { + if (!moved || !moved_offset) + { set_entry_state (view->priv->search_entry, XED_SEARCH_ENTRY_NOT_FOUND); } - else { + else + { set_entry_state (view->priv->search_entry, XED_SEARCH_ENTRY_NORMAL); } } @@ -853,15 +922,17 @@ start_interactive_goto_line (XedView *view) { GtkTextBuffer *buffer; - if ((view->priv->search_window != NULL) && gtk_widget_get_visible (view->priv->search_window)) { + if ((view->priv->search_window != NULL) && gtk_widget_get_visible (view->priv->search_window)) + { return TRUE; } - if (!gtk_widget_has_focus (GTK_WIDGET (view))) { + if (!gtk_widget_has_focus (GTK_WIDGET(view))) + { return FALSE; } - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(view)); gtk_text_buffer_get_iter_at_mark (buffer, &view->priv->start_search_iter, gtk_text_buffer_get_insert (buffer)); @@ -871,17 +942,18 @@ start_interactive_goto_line (XedView *view) update_search_window_position (view); gtk_widget_show (view->priv->search_window); - if (view->priv->search_entry_changed_id == 0) { - view->priv->search_entry_changed_id = - g_signal_connect (view->priv->search_entry, "changed", G_CALLBACK (search_init), view); + if (view->priv->search_entry_changed_id == 0) + { + view->priv->search_entry_changed_id = g_signal_connect(view->priv->search_entry, "changed", + G_CALLBACK (search_init), view); } init_search_entry (view); - view->priv->typeselect_flush_timeout = - g_timeout_add (XED_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) search_entry_flush_timeout, view); + view->priv->typeselect_flush_timeout = g_timeout_add (XED_VIEW_SEARCH_DIALOG_TIMEOUT, + (GSourceFunc) search_entry_flush_timeout, view); - gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE); + gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW(view), FALSE); gtk_widget_grab_focus (view->priv->search_entry); send_focus_change (view->priv->search_entry, TRUE); @@ -890,17 +962,19 @@ start_interactive_goto_line (XedView *view) } static gboolean -xed_view_draw (GtkWidget *widget, cairo_t *cr) +xed_view_draw (GtkWidget *widget, + cairo_t *cr) { GtkTextView *text_view; XedDocument *doc; GdkWindow *window; - text_view = GTK_TEXT_VIEW (widget); + text_view = GTK_TEXT_VIEW(widget); - doc = XED_DOCUMENT (gtk_text_view_get_buffer (text_view)); + doc = XED_DOCUMENT(gtk_text_view_get_buffer (text_view)); window = gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT); - if (gtk_cairo_should_draw_window (cr, window) && xed_document_get_enable_search_highlighting (doc)) { + if (gtk_cairo_should_draw_window (cr, window) && xed_document_get_enable_search_highlighting (doc)) + { GdkRectangle visible_rect; GtkTextIter iter1, iter2; @@ -916,7 +990,8 @@ xed_view_draw (GtkWidget *widget, cairo_t *cr) } static GdkAtom -drag_get_uri_target (GtkWidget *widget, GdkDragContext *context) +drag_get_uri_target (GtkWidget *widget, + GdkDragContext *context) { GdkAtom target; GtkTargetList *tl; @@ -930,7 +1005,11 @@ drag_get_uri_target (GtkWidget *widget, GdkDragContext *context) } static gboolean -xed_view_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint timestamp) +xed_view_drag_motion (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint timestamp) { gboolean result; @@ -940,7 +1019,8 @@ xed_view_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y result = GTK_WIDGET_CLASS (xed_view_parent_class)->drag_motion (widget, context, x, y, timestamp); /* If this is a URL, deal with it here */ - if (drag_get_uri_target (widget, context) != GDK_NONE) { + if (drag_get_uri_target (widget, context) != GDK_NONE) + { gdk_drag_status (context, gdk_drag_context_get_suggested_action (context), timestamp); result = TRUE; } @@ -949,29 +1029,41 @@ xed_view_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y } static void -xed_view_drag_data_received (GtkWidget *widget, GdkDragContext *context, gint x, gint y, - GtkSelectionData *selection_data, guint info, guint timestamp) +xed_view_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint timestamp) { gchar **uri_list; /* If this is an URL emit DROP_URIS, otherwise chain up the signal */ - if (info == TARGET_URI_LIST) { + if (info == TARGET_URI_LIST) + { uri_list = xed_utils_drop_get_uris (selection_data); - if (uri_list != NULL) { + if (uri_list != NULL) + { g_signal_emit (widget, view_signals[DROP_URIS], 0, uri_list); g_strfreev (uri_list); gtk_drag_finish (context, TRUE, FALSE, timestamp); } } - else { + else + { GTK_WIDGET_CLASS (xed_view_parent_class)->drag_data_received (widget, context, x, y, selection_data, info, - timestamp); + timestamp); } } static gboolean -xed_view_drag_drop (GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint timestamp) +xed_view_drag_drop (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint timestamp) { gboolean result; GdkAtom target; @@ -979,11 +1071,13 @@ xed_view_drag_drop (GtkWidget *widget, GdkDragContext *context, gint x, gint y, /* If this is a URL, just get the drag data */ target = drag_get_uri_target (widget, context); - if (target != GDK_NONE) { + if (target != GDK_NONE) + { gtk_drag_get_data (widget, context, target, timestamp); result = TRUE; } - else { + else + { /* Chain up */ result = GTK_WIDGET_CLASS (xed_view_parent_class)->drag_drop (widget, context, x, y, timestamp); } @@ -992,11 +1086,12 @@ xed_view_drag_drop (GtkWidget *widget, GdkDragContext *context, gint x, gint y, } static void -show_line_numbers_toggled (GtkMenu *menu, XedView *view) +show_line_numbers_toggled (GtkMenu *menu, + XedView *view) { gboolean show; - show = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menu)); + show = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(menu)); xed_prefs_manager_set_display_line_numbers (show); } @@ -1009,10 +1104,10 @@ create_line_numbers_menu (GtkWidget *view) menu = gtk_menu_new (); item = gtk_check_menu_item_new_with_mnemonic (_("_Display line numbers")); - gtk_check_menu_item_set_active ( - GTK_CHECK_MENU_ITEM (item), gtk_source_view_get_show_line_numbers (GTK_SOURCE_VIEW (view))); - g_signal_connect (item, "toggled", G_CALLBACK (show_line_numbers_toggled), view); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), + gtk_source_view_get_show_line_numbers (GTK_SOURCE_VIEW(view))); + g_signal_connect(item, "toggled", G_CALLBACK (show_line_numbers_toggled), view); + gtk_menu_shell_append (GTK_MENU_SHELL(menu), item); gtk_widget_show_all (menu); @@ -1020,19 +1115,23 @@ create_line_numbers_menu (GtkWidget *view) } static void -show_line_numbers_menu (GtkWidget *view, GdkEventButton *event) +show_line_numbers_menu (GtkWidget *view, + GdkEventButton *event) { GtkWidget *menu; menu = create_line_numbers_menu (view); - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time); + gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time); } static gboolean -xed_view_button_press_event (GtkWidget *widget, GdkEventButton *event) +xed_view_button_press_event (GtkWidget *widget, + GdkEventButton *event) { - if ((event->type == GDK_BUTTON_PRESS) && (event->button == 3) && - (event->window == gtk_text_view_get_window (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_LEFT))) { + if ((event->type == GDK_BUTTON_PRESS) + && (event->button == 3) + && (event->window == gtk_text_view_get_window (GTK_TEXT_VIEW(widget), GTK_TEXT_WINDOW_LEFT))) + { show_line_numbers_menu (widget, event); @@ -1043,7 +1142,10 @@ xed_view_button_press_event (GtkWidget *widget, GdkEventButton *event) } static void -search_highlight_updated_cb (XedDocument *doc, GtkTextIter *start, GtkTextIter *end, XedView *view) +search_highlight_updated_cb (XedDocument *doc, + GtkTextIter *start, + GtkTextIter *end, + XedView *view) { GdkRectangle visible_rect; GdkRectangle updated_rect; @@ -1052,10 +1154,9 @@ search_highlight_updated_cb (XedDocument *doc, GtkTextIter *start, GtkTextIter * gint height; GtkTextView *text_view; - text_view = GTK_TEXT_VIEW (view); + text_view = GTK_TEXT_VIEW(view); - g_return_if_fail ( - xed_document_get_enable_search_highlighting (XED_DOCUMENT (gtk_text_view_get_buffer (text_view)))); + g_return_if_fail(xed_document_get_enable_search_highlighting (XED_DOCUMENT (gtk_text_view_get_buffer (text_view)))); /* get visible area */ gtk_text_view_get_visible_rect (text_view, &visible_rect); @@ -1069,22 +1170,23 @@ search_highlight_updated_cb (XedDocument *doc, GtkTextIter *start, GtkTextIter * updated_rect.width = visible_rect.width; /* intersect both rectangles to see whether we need to queue a redraw */ - if (gdk_rectangle_intersect (&updated_rect, &visible_rect, &redraw_rect)) { + if (gdk_rectangle_intersect (&updated_rect, &visible_rect, &redraw_rect)) + { GdkRectangle widget_rect; gtk_text_view_buffer_to_window_coords (text_view, GTK_TEXT_WINDOW_WIDGET, redraw_rect.x, redraw_rect.y, - &widget_rect.x, &widget_rect.y); + &widget_rect.x, &widget_rect.y); widget_rect.width = redraw_rect.width; widget_rect.height = redraw_rect.height; - gtk_widget_queue_draw_area (GTK_WIDGET (text_view), widget_rect.x, widget_rect.y, widget_rect.width, - widget_rect.height); + gtk_widget_queue_draw_area (GTK_WIDGET(text_view), widget_rect.x, widget_rect.y, widget_rect.width, + widget_rect.height); } } static void delete_line (GtkTextView *text_view, - gint count) + gint count) { GtkTextIter start; GtkTextIter end; @@ -1096,51 +1198,65 @@ delete_line (GtkTextView *text_view, /* If there is a selection delete the selected lines and * ignore count */ - if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end)) { + if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end)) + { gtk_text_iter_order (&start, &end); - if (gtk_text_iter_starts_line (&end)) { + if (gtk_text_iter_starts_line (&end)) + { /* Do no delete the line with the cursor if the cursor * is at the beginning of the line */ count = 0; } - else { + else + { count = 1; } } gtk_text_iter_set_line_offset (&start, 0); - if (count > 0) { + if (count > 0) + { gtk_text_iter_forward_lines (&end, count); - if (gtk_text_iter_is_end (&end)) { - if (gtk_text_iter_backward_line (&start) && !gtk_text_iter_ends_line (&start)) { + if (gtk_text_iter_is_end (&end)) + { + if (gtk_text_iter_backward_line (&start) && !gtk_text_iter_ends_line (&start)) + { gtk_text_iter_forward_to_line_end (&start); } } } - else if (count < 0) { - if (!gtk_text_iter_ends_line (&end)) { + else if (count < 0) + { + if (!gtk_text_iter_ends_line (&end)) + { gtk_text_iter_forward_to_line_end (&end); } - while (count < 0) { - if (!gtk_text_iter_backward_line (&start)) { + while (count < 0) + { + if (!gtk_text_iter_backward_line (&start)) + { break; } ++count; } - if (count == 0) { - if (!gtk_text_iter_ends_line (&start)) { + if (count == 0) + { + if (!gtk_text_iter_ends_line (&start)) + { gtk_text_iter_forward_to_line_end (&start); } } - else { + else + { gtk_text_iter_forward_line (&end); } } - if (!gtk_text_iter_equal (&start, &end)) { + if (!gtk_text_iter_equal (&start, &end)) + { GtkTextIter cur = start; gtk_text_iter_set_line_offset (&cur, 0); gtk_text_buffer_begin_user_action (buffer); @@ -1149,24 +1265,28 @@ delete_line (GtkTextView *text_view, gtk_text_buffer_end_user_action (buffer); gtk_text_view_scroll_mark_onscreen (text_view, gtk_text_buffer_get_insert (buffer)); } - else { - gtk_widget_error_bell (GTK_WIDGET (text_view)); + else + { + gtk_widget_error_bell (GTK_WIDGET(text_view)); } } static void -xed_view_delete_from_cursor (GtkTextView *text_view, GtkDeleteType type, gint count) +xed_view_delete_from_cursor (GtkTextView *text_view, + GtkDeleteType type, + gint count) { /* We override the standard handler for delete_from_cursor since - the GTK_DELETE_PARAGRAPHS case is not implemented as we like (i.e. it - does not remove the carriage return in the previous line) + the GTK_DELETE_PARAGRAPHS case is not implemented as we like (i.e. it + does not remove the carriage return in the previous line) */ - switch (type) { + switch (type) + { case GTK_DELETE_PARAGRAPHS: delete_line (text_view, count); break; default: - GTK_TEXT_VIEW_CLASS (xed_view_parent_class)->delete_from_cursor(text_view, type, count); + GTK_TEXT_VIEW_CLASS (xed_view_parent_class)->delete_from_cursor (text_view, type, count); break; } } diff --git a/xed/xed-window.c b/xed/xed-window.c index b717b08..1c1181e 100644 --- a/xed/xed-window.c +++ b/xed/xed-window.c @@ -41,20 +41,14 @@ /* Signals */ enum { - TAB_ADDED, - TAB_REMOVED, - TABS_REORDERED, - ACTIVE_TAB_CHANGED, - ACTIVE_TAB_STATE_CHANGED, - LAST_SIGNAL + TAB_ADDED, TAB_REMOVED, TABS_REORDERED, ACTIVE_TAB_CHANGED, ACTIVE_TAB_STATE_CHANGED, LAST_SIGNAL }; static guint signals[LAST_SIGNAL] = { 0 }; enum { - PROP_0, - PROP_STATE + PROP_0, PROP_STATE }; enum @@ -64,19 +58,23 @@ enum G_DEFINE_TYPE(XedWindow, xed_window, GTK_TYPE_WINDOW) -static void recent_manager_changed (GtkRecentManager *manager, XedWindow *window); +static void recent_manager_changed (GtkRecentManager *manager, XedWindow *window); static void -xed_window_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +xed_window_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { - XedWindow *window = XED_WINDOW (object); + XedWindow *window = XED_WINDOW(object); - switch (prop_id) { + switch (prop_id) + { case PROP_STATE: g_value_set_enum (value, xed_window_get_state (window)); break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; } } @@ -88,38 +86,47 @@ save_panes_state (XedWindow *window) xed_debug (DEBUG_WINDOW); - if (xed_prefs_manager_window_size_can_set ()) { + if (xed_prefs_manager_window_size_can_set ()) + { xed_prefs_manager_set_window_size (window->priv->width, window->priv->height); } - if (xed_prefs_manager_window_state_can_set ()) { + if (xed_prefs_manager_window_state_can_set ()) + { xed_prefs_manager_set_window_state (window->priv->window_state); } - if ((window->priv->side_panel_size > 0) && xed_prefs_manager_side_panel_size_can_set ()) { + if ((window->priv->side_panel_size > 0) && xed_prefs_manager_side_panel_size_can_set ()) + { xed_prefs_manager_set_side_panel_size (window->priv->side_panel_size); } - pane_page = _xed_panel_get_active_item_id (XED_PANEL (window->priv->side_panel)); - if (pane_page != 0 && xed_prefs_manager_side_panel_active_page_can_set ()) { + pane_page = _xed_panel_get_active_item_id (XED_PANEL(window->priv->side_panel)); + if (pane_page != 0 && xed_prefs_manager_side_panel_active_page_can_set ()) + { xed_prefs_manager_set_side_panel_active_page (pane_page); } - if ((window->priv->bottom_panel_size > 0) && xed_prefs_manager_bottom_panel_size_can_set ()) { + if ((window->priv->bottom_panel_size > 0) && xed_prefs_manager_bottom_panel_size_can_set ()) + { xed_prefs_manager_set_bottom_panel_size (window->priv->bottom_panel_size); } - pane_page = _xed_panel_get_active_item_id (XED_PANEL (window->priv->bottom_panel)); - if (pane_page != 0 && xed_prefs_manager_bottom_panel_active_page_can_set ()) { + pane_page = _xed_panel_get_active_item_id (XED_PANEL(window->priv->bottom_panel)); + if (pane_page != 0 && xed_prefs_manager_bottom_panel_active_page_can_set ()) + { xed_prefs_manager_set_bottom_panel_active_page (pane_page); } } static gint -on_key_pressed (GtkWidget *widget, GdkEventKey *event, XedWindow *window) +on_key_pressed (GtkWidget *widget, + GdkEventKey *event, + XedWindow *window) { gint handled = FALSE; - if (event->keyval == GDK_KEY_Escape) { + if (event->keyval == GDK_KEY_Escape) + { xed_searchbar_hide (window->priv->searchbar); handled = TRUE; } @@ -133,12 +140,13 @@ xed_window_dispose (GObject *object) xed_debug (DEBUG_WINDOW); - window = XED_WINDOW (object); + window = XED_WINDOW(object); /* Stop tracking removal of panes otherwise we always * end up with thinking we had no pane active, since they * should all be removed below */ - if (window->priv->bottom_panel_item_removed_handler_id != 0) { + if (window->priv->bottom_panel_item_removed_handler_id != 0) + { g_signal_handler_disconnect (window->priv->bottom_panel, window->priv->bottom_panel_item_removed_handler_id); window->priv->bottom_panel_item_removed_handler_id = 0; } @@ -150,40 +158,47 @@ xed_window_dispose (GObject *object) /* save the panes position and make sure to deactivate plugins * for this window, but only once */ - if (!window->priv->dispose_has_run) { + if (!window->priv->dispose_has_run) + { save_panes_state (window); xed_plugins_engine_deactivate_plugins (xed_plugins_engine_get_default (), window); window->priv->dispose_has_run = TRUE; } - if (window->priv->fullscreen_animation_timeout_id != 0) { + if (window->priv->fullscreen_animation_timeout_id != 0) + { g_source_remove (window->priv->fullscreen_animation_timeout_id); window->priv->fullscreen_animation_timeout_id = 0; } - if (window->priv->fullscreen_controls != NULL) { + if (window->priv->fullscreen_controls != NULL) + { gtk_widget_destroy (window->priv->fullscreen_controls); window->priv->fullscreen_controls = NULL; } - if (window->priv->recents_handler_id != 0) { + if (window->priv->recents_handler_id != 0) + { GtkRecentManager *recent_manager; - recent_manager = gtk_recent_manager_get_default (); + recent_manager = gtk_recent_manager_get_default (); g_signal_handler_disconnect (recent_manager, window->priv->recents_handler_id); window->priv->recents_handler_id = 0; } - if (window->priv->manager != NULL) { + if (window->priv->manager != NULL) + { g_object_unref (window->priv->manager); window->priv->manager = NULL; } - if (window->priv->message_bus != NULL) { + if (window->priv->message_bus != NULL) + { g_object_unref (window->priv->message_bus); window->priv->message_bus = NULL; } - if (window->priv->window_group != NULL) { + if (window->priv->window_group != NULL) + { g_object_unref (window->priv->window_group); window->priv->window_group = NULL; } @@ -200,19 +215,22 @@ xed_window_finalize (GObject *object) { XedWindow *window; xed_debug (DEBUG_WINDOW); - window = XED_WINDOW (object); - if (window->priv->default_location != NULL) { + window = XED_WINDOW(object); + if (window->priv->default_location != NULL) + { g_object_unref (window->priv->default_location); } G_OBJECT_CLASS (xed_window_parent_class)->finalize (object); } static gboolean -xed_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event) +xed_window_window_state_event (GtkWidget *widget, + GdkEventWindowState *event) { - XedWindow *window = XED_WINDOW (widget); + XedWindow *window = XED_WINDOW(widget); window->priv->window_state = event->new_window_state; - if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) { + if (event->changed_mask & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) + { gboolean show; show = !(event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)); } @@ -220,9 +238,10 @@ xed_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event) } static gboolean -xed_window_configure_event (GtkWidget *widget, GdkEventConfigure *event) +xed_window_configure_event (GtkWidget *widget, + GdkEventConfigure *event) { - XedWindow *window = XED_WINDOW (widget); + XedWindow *window = XED_WINDOW(widget); window->priv->width = event->width; window->priv->height = event->height; return GTK_WIDGET_CLASS (xed_window_parent_class)->configure_event (widget, event); @@ -237,28 +256,33 @@ xed_window_configure_event (GtkWidget *widget, GdkEventConfigure *event) * parent handler, skipping gtk_window_key_press_event. */ static gboolean -xed_window_key_press_event (GtkWidget *widget, GdkEventKey *event) +xed_window_key_press_event (GtkWidget *widget, + GdkEventKey *event) { static gpointer grand_parent_class = NULL; - GtkWindow *window = GTK_WINDOW (widget); + GtkWindow *window = GTK_WINDOW(widget); gboolean handled = FALSE; - if (grand_parent_class == NULL) { + if (grand_parent_class == NULL) + { grand_parent_class = g_type_class_peek_parent (xed_window_parent_class); } /* handle focus widget key events */ - if (!handled) { + if (!handled) + { handled = gtk_window_propagate_key_event (window, event); } /* handle mnemonics and accelerators */ - if (!handled) { + if (!handled) + { handled = gtk_window_activate_key (window, event); } /* Chain up, invokes binding set */ - if (!handled) { + if (!handled) + { handled = GTK_WIDGET_CLASS (grand_parent_class)->key_press_event (widget, event); } @@ -266,7 +290,8 @@ xed_window_key_press_event (GtkWidget *widget, GdkEventKey *event) } static void -xed_window_tab_removed (XedWindow *window, XedTab *tab) +xed_window_tab_removed (XedWindow *window, + XedTab *tab) { xed_plugins_engine_garbage_collect (xed_plugins_engine_get_default ()); } @@ -274,8 +299,8 @@ xed_window_tab_removed (XedWindow *window, XedTab *tab) static void xed_window_class_init (XedWindowClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); klass->tab_removed = xed_window_tab_removed; @@ -287,133 +312,157 @@ xed_window_class_init (XedWindowClass *klass) widget_class->configure_event = xed_window_configure_event; widget_class->key_press_event = xed_window_key_press_event; - signals[TAB_ADDED] = g_signal_new ("tab_added", G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (XedWindowClass, tab_added), NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, XED_TYPE_TAB); + signals[TAB_ADDED] = g_signal_new ("tab_added", G_OBJECT_CLASS_TYPE(object_class), + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(XedWindowClass, tab_added), + NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, XED_TYPE_TAB); - signals[TAB_REMOVED] = g_signal_new ("tab_removed", G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (XedWindowClass, tab_removed), NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, XED_TYPE_TAB); + signals[TAB_REMOVED] = g_signal_new ("tab_removed", G_OBJECT_CLASS_TYPE(object_class), + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(XedWindowClass, tab_removed), + NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, XED_TYPE_TAB); - signals[TABS_REORDERED] = g_signal_new ("tabs_reordered", G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (XedWindowClass, tabs_reordered), NULL, NULL, - g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + signals[TABS_REORDERED] = g_signal_new ("tabs_reordered", G_OBJECT_CLASS_TYPE(object_class), + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(XedWindowClass, tabs_reordered), + NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - signals[ACTIVE_TAB_CHANGED] = g_signal_new ("active_tab_changed", G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (XedWindowClass, active_tab_changed), NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, XED_TYPE_TAB); + signals[ACTIVE_TAB_CHANGED] = g_signal_new ("active_tab_changed", G_OBJECT_CLASS_TYPE(object_class), + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(XedWindowClass, active_tab_changed), + NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, XED_TYPE_TAB); - signals[ACTIVE_TAB_STATE_CHANGED] = g_signal_new ("active_tab_state_changed", G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (XedWindowClass, active_tab_state_changed), NULL, NULL, - g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + signals[ACTIVE_TAB_STATE_CHANGED] = g_signal_new ("active_tab_state_changed", G_OBJECT_CLASS_TYPE(object_class), + G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(XedWindowClass, active_tab_state_changed), + NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_object_class_install_property (object_class, PROP_STATE, - g_param_spec_flags ("state", "State", "The window's state", - XED_TYPE_WINDOW_STATE, XED_WINDOW_STATE_NORMAL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (object_class, PROP_STATE, g_param_spec_flags ("state", + "State", + "The window's state", + XED_TYPE_WINDOW_STATE, + XED_WINDOW_STATE_NORMAL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_type_class_add_private (object_class, sizeof(XedWindowPrivate)); } static void -menu_item_select_cb (GtkMenuItem *proxy, XedWindow *window) +menu_item_select_cb (GtkMenuItem *proxy, + XedWindow *window) { GtkAction *action; char *message; - action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (proxy)); - g_return_if_fail (action != NULL); + action = gtk_activatable_get_related_action (GTK_ACTIVATABLE(proxy)); + g_return_if_fail(action != NULL); - g_object_get (G_OBJECT (action), "tooltip", &message, NULL); - if (message) { - gtk_statusbar_push (GTK_STATUSBAR (window->priv->statusbar), window->priv->tip_message_cid, message); + g_object_get (G_OBJECT(action), "tooltip", &message, NULL); + if (message) + { + gtk_statusbar_push (GTK_STATUSBAR(window->priv->statusbar), window->priv->tip_message_cid, message); g_free (message); } } static void -menu_item_deselect_cb (GtkMenuItem *proxy, XedWindow *window) +menu_item_deselect_cb (GtkMenuItem *proxy, + XedWindow *window) { - gtk_statusbar_pop (GTK_STATUSBAR (window->priv->statusbar), window->priv->tip_message_cid); + gtk_statusbar_pop (GTK_STATUSBAR(window->priv->statusbar), window->priv->tip_message_cid); } static void -connect_proxy_cb (GtkUIManager *manager, GtkAction *action, GtkWidget *proxy, XedWindow *window) +connect_proxy_cb (GtkUIManager *manager, + GtkAction *action, + GtkWidget *proxy, + XedWindow *window) { - if (GTK_IS_MENU_ITEM (proxy)) { - g_signal_connect (proxy, "select", G_CALLBACK (menu_item_select_cb), window); - g_signal_connect (proxy, "deselect", G_CALLBACK (menu_item_deselect_cb), window); + if (GTK_IS_MENU_ITEM(proxy)) + { + g_signal_connect(proxy, "select", G_CALLBACK (menu_item_select_cb), window); + g_signal_connect(proxy, "deselect", G_CALLBACK (menu_item_deselect_cb), window); } } static void -disconnect_proxy_cb (GtkUIManager *manager, GtkAction *action, GtkWidget *proxy, XedWindow *window) +disconnect_proxy_cb (GtkUIManager *manager, + GtkAction *action, + GtkWidget *proxy, + XedWindow *window) { - if (GTK_IS_MENU_ITEM (proxy)) { - g_signal_handlers_disconnect_by_func (proxy, G_CALLBACK (menu_item_select_cb), window); - g_signal_handlers_disconnect_by_func (proxy, G_CALLBACK (menu_item_deselect_cb), window); + if (GTK_IS_MENU_ITEM(proxy)) + { + g_signal_handlers_disconnect_by_func(proxy, G_CALLBACK (menu_item_select_cb), window); + g_signal_handlers_disconnect_by_func(proxy, G_CALLBACK (menu_item_deselect_cb), window); } } static void -apply_toolbar_style (XedWindow *window, GtkWidget *toolbar) +apply_toolbar_style (XedWindow *window, + GtkWidget *toolbar) { - switch (window->priv->toolbar_style) { + switch (window->priv->toolbar_style) + { case XED_TOOLBAR_SYSTEM: xed_debug_message (DEBUG_WINDOW, "XED: SYSTEM"); - gtk_toolbar_unset_style (GTK_TOOLBAR (toolbar)); + gtk_toolbar_unset_style (GTK_TOOLBAR(toolbar)); break; case XED_TOOLBAR_ICONS: xed_debug_message (DEBUG_WINDOW, "XED: ICONS"); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS); + gtk_toolbar_set_style (GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); break; case XED_TOOLBAR_ICONS_AND_TEXT: xed_debug_message (DEBUG_WINDOW, "XED: ICONS_AND_TEXT"); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH); + gtk_toolbar_set_style (GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); break; case XED_TOOLBAR_ICONS_BOTH_HORIZ: xed_debug_message (DEBUG_WINDOW, "XED: ICONS_BOTH_HORIZ"); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_style (GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ); break; } } /* Returns TRUE if toolbar is visible */ static gboolean -set_toolbar_style (XedWindow *window, XedWindow *origin) +set_toolbar_style (XedWindow *window, + XedWindow *origin) { gboolean visible; XedToolbarSetting style; GtkAction *action; - if (origin == NULL) { + if (origin == NULL) + { visible = xed_prefs_manager_get_toolbar_visible (); } - else { + else + { visible = gtk_widget_get_visible (origin->priv->toolbar); } /* Set visibility */ - if (visible) { + if (visible) + { gtk_widget_show (window->priv->toolbar); } - else { + else + { gtk_widget_hide (window->priv->toolbar); } action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, "ViewToolbar"); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) { - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action)) != visible) + { + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), visible); } /* Set style */ - if (origin == NULL) { + if (origin == NULL) + { style = xed_prefs_manager_get_toolbar_buttons_style (); } - else { + else + { style = origin->priv->toolbar_style; } @@ -425,18 +474,19 @@ set_toolbar_style (XedWindow *window, XedWindow *origin) } static void -update_next_prev_doc_sensitivity (XedWindow *window, XedTab *tab) +update_next_prev_doc_sensitivity (XedWindow *window, + XedTab *tab) { - gint tab_number; + gint tab_number; GtkNotebook *notebook; - GtkAction *action; + GtkAction *action; xed_debug (DEBUG_WINDOW); - notebook = GTK_NOTEBOOK (_xed_window_get_notebook (window)); + notebook = GTK_NOTEBOOK(_xed_window_get_notebook (window)); - tab_number = gtk_notebook_page_num (notebook, GTK_WIDGET (tab)); - g_return_if_fail (tab_number >= 0); + tab_number = gtk_notebook_page_num (notebook, GTK_WIDGET(tab)); + g_return_if_fail(tab_number >= 0); action = gtk_action_group_get_action (window->priv->action_group, "DocumentsPreviousDocument"); gtk_action_set_sensitive (action, tab_number != 0); @@ -448,13 +498,14 @@ update_next_prev_doc_sensitivity (XedWindow *window, XedTab *tab) static void update_next_prev_doc_sensitivity_per_window (XedWindow *window) { - XedTab *tab; + XedTab *tab; GtkAction *action; xed_debug (DEBUG_WINDOW); tab = xed_window_get_active_tab (window); - if (tab != NULL) { + if (tab != NULL) + { update_next_prev_doc_sensitivity (window, tab); return; } @@ -468,7 +519,9 @@ update_next_prev_doc_sensitivity_per_window (XedWindow *window) } static void -received_clipboard_contents (GtkClipboard *clipboard, GtkSelectionData *selection_data, XedWindow *window) +received_clipboard_contents (GtkClipboard *clipboard, + GtkSelectionData *selection_data, + XedWindow *window) { gboolean sens; GtkAction *action; @@ -476,14 +529,16 @@ received_clipboard_contents (GtkClipboard *clipboard, GtkSelectionData *selectio /* getting clipboard contents is async, so we need to * get the current tab and its state */ - if (window->priv->active_tab != NULL) { + if (window->priv->active_tab != NULL) + { XedTabState state; gboolean state_normal; state = xed_tab_get_state (window->priv->active_tab); state_normal = (state == XED_TAB_STATE_NORMAL); sens = state_normal && gtk_selection_data_targets_include_text (selection_data); } - else { + else + { sens = FALSE; } @@ -493,38 +548,42 @@ received_clipboard_contents (GtkClipboard *clipboard, GtkSelectionData *selectio } static void -set_paste_sensitivity_according_to_clipboard (XedWindow *window, GtkClipboard *clipboard) +set_paste_sensitivity_according_to_clipboard (XedWindow *window, + GtkClipboard *clipboard) { GdkDisplay *display; display = gtk_clipboard_get_display (clipboard); - if (gdk_display_supports_selection_notification (display)) { + if (gdk_display_supports_selection_notification (display)) + { gtk_clipboard_request_contents (clipboard, gdk_atom_intern_static_string ("TARGETS"), - (GtkClipboardReceivedFunc) received_clipboard_contents, g_object_ref (window)); + (GtkClipboardReceivedFunc) received_clipboard_contents, g_object_ref (window)); } - else { + else + { GtkAction *action; action = gtk_action_group_get_action (window->priv->action_group, "EditPaste"); - /* XFIXES extension not availbale, make + /* XFIXES extension not available, make * Paste always sensitive */ gtk_action_set_sensitive (action, TRUE); } } static void -set_sensitivity_according_to_tab (XedWindow *window, XedTab *tab) +set_sensitivity_according_to_tab (XedWindow *window, + XedTab *tab) { - XedDocument *doc; - XedView *view; - GtkAction *action; - gboolean b; - gboolean state_normal; - gboolean editable; - XedTabState state; + XedDocument *doc; + XedView *view; + GtkAction *action; + gboolean b; + gboolean state_normal; + gboolean editable; + XedTabState state; GtkClipboard *clipboard; - g_return_if_fail (XED_TAB (tab)); + g_return_if_fail(XED_TAB (tab)); xed_debug (DEBUG_WINDOW); @@ -532,100 +591,96 @@ set_sensitivity_according_to_tab (XedWindow *window, XedTab *tab) state_normal = (state == XED_TAB_STATE_NORMAL); view = xed_tab_get_view (tab); - editable = gtk_text_view_get_editable (GTK_TEXT_VIEW (view)); + editable = gtk_text_view_get_editable (GTK_TEXT_VIEW(view)); - doc = XED_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); + doc = XED_DOCUMENT(gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); - clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD); + clipboard = gtk_widget_get_clipboard (GTK_WIDGET(window), + GDK_SELECTION_CLIPBOARD); action = gtk_action_group_get_action (window->priv->action_group, "FileSave"); - gtk_action_set_sensitive (action, - (state_normal || - (state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) || - (state == XED_TAB_STATE_SHOWING_PRINT_PREVIEW)) && - !xed_document_get_readonly (doc)); + gtk_action_set_sensitive ( + action, + (state_normal || (state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) + || (state == XED_TAB_STATE_SHOWING_PRINT_PREVIEW)) + && !xed_document_get_readonly (doc)); action = gtk_action_group_get_action (window->priv->action_group, "FileSaveAs"); - gtk_action_set_sensitive (action, - (state_normal || - (state == XED_TAB_STATE_SAVING_ERROR) || - (state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) || - (state == XED_TAB_STATE_SHOWING_PRINT_PREVIEW))); + gtk_action_set_sensitive ( + action, + (state_normal || (state == XED_TAB_STATE_SAVING_ERROR) + || (state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) + || (state == XED_TAB_STATE_SHOWING_PRINT_PREVIEW))); action = gtk_action_group_get_action (window->priv->action_group, "FileRevert"); - gtk_action_set_sensitive (action, - (state_normal || - (state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION)) && - !xed_document_is_untitled (doc)); + gtk_action_set_sensitive ( + action, + (state_normal || (state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION)) + && !xed_document_is_untitled (doc)); action = gtk_action_group_get_action (window->priv->action_group, "FilePrintPreview"); gtk_action_set_sensitive (action, state_normal); action = gtk_action_group_get_action (window->priv->action_group, "FilePrint"); - gtk_action_set_sensitive (action, - (state_normal || (state == XED_TAB_STATE_SHOWING_PRINT_PREVIEW))); + gtk_action_set_sensitive (action, (state_normal || (state == XED_TAB_STATE_SHOWING_PRINT_PREVIEW))); action = gtk_action_group_get_action (window->priv->close_action_group, "FileClose"); - gtk_action_set_sensitive (action, - (state != XED_TAB_STATE_CLOSING) && - (state != XED_TAB_STATE_SAVING) && - (state != XED_TAB_STATE_SHOWING_PRINT_PREVIEW) && - (state != XED_TAB_STATE_PRINTING) && - (state != XED_TAB_STATE_PRINT_PREVIEWING) && - (state != XED_TAB_STATE_SAVING_ERROR)); + gtk_action_set_sensitive ( + action, + (state != XED_TAB_STATE_CLOSING) && (state != XED_TAB_STATE_SAVING) + && (state != XED_TAB_STATE_SHOWING_PRINT_PREVIEW) + && (state != XED_TAB_STATE_PRINTING) && (state != XED_TAB_STATE_PRINT_PREVIEWING) + && (state != XED_TAB_STATE_SAVING_ERROR)); action = gtk_action_group_get_action (window->priv->action_group, "EditUndo"); - gtk_action_set_sensitive (action, state_normal && gtk_source_buffer_can_undo (GTK_SOURCE_BUFFER (doc))); + gtk_action_set_sensitive (action, state_normal && gtk_source_buffer_can_undo (GTK_SOURCE_BUFFER(doc))); action = gtk_action_group_get_action (window->priv->action_group, "EditRedo"); - gtk_action_set_sensitive (action, state_normal && gtk_source_buffer_can_redo (GTK_SOURCE_BUFFER (doc))); + gtk_action_set_sensitive (action, state_normal && gtk_source_buffer_can_redo (GTK_SOURCE_BUFFER(doc))); action = gtk_action_group_get_action (window->priv->action_group, "EditCut"); gtk_action_set_sensitive (action, - state_normal && editable && gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (doc))); + state_normal && editable && gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER(doc))); action = gtk_action_group_get_action (window->priv->action_group, "EditCopy"); gtk_action_set_sensitive (action, - (state_normal || - state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) && - gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (doc))); + (state_normal || state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) + && gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER(doc))); action = gtk_action_group_get_action (window->priv->action_group, "EditPaste"); - if (state_normal && editable) { + if (state_normal && editable) + { set_paste_sensitivity_according_to_clipboard (window, clipboard); } - else { + else + { gtk_action_set_sensitive (action, FALSE); } action = gtk_action_group_get_action (window->priv->action_group, "EditDelete"); gtk_action_set_sensitive (action, - state_normal && editable && gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (doc))); + state_normal && editable && gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER(doc))); action = gtk_action_group_get_action (window->priv->action_group, "SearchFind"); - gtk_action_set_sensitive (action, - (state_normal || state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION)); + gtk_action_set_sensitive (action, (state_normal || state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION)); action = gtk_action_group_get_action (window->priv->action_group, "SearchReplace"); gtk_action_set_sensitive (action, state_normal && editable); b = xed_document_get_can_search_again (doc); action = gtk_action_group_get_action (window->priv->action_group, "SearchFindNext"); - gtk_action_set_sensitive (action, - (state_normal || state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) && b); + gtk_action_set_sensitive (action, (state_normal || state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) && b); action = gtk_action_group_get_action (window->priv->action_group, "SearchFindPrevious"); - gtk_action_set_sensitive (action, - (state_normal || state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) && b); + gtk_action_set_sensitive (action, (state_normal || state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) && b); action = gtk_action_group_get_action (window->priv->action_group, "SearchGoToLine"); - gtk_action_set_sensitive (action, - (state_normal || state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION)); + gtk_action_set_sensitive (action, (state_normal || state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION)); action = gtk_action_group_get_action (window->priv->action_group, "ViewHighlightMode"); gtk_action_set_sensitive (action, - (state != XED_TAB_STATE_CLOSING) && xed_prefs_manager_get_enable_syntax_highlighting ()); + (state != XED_TAB_STATE_CLOSING) && xed_prefs_manager_get_enable_syntax_highlighting ()); update_next_prev_doc_sensitivity (window, tab); @@ -633,31 +688,37 @@ set_sensitivity_according_to_tab (XedWindow *window, XedTab *tab) } static void -language_toggled (GtkToggleAction *action, XedWindow *window) +language_toggled (GtkToggleAction *action, + XedWindow *window) { XedDocument *doc; GtkSourceLanguage *lang; const gchar *lang_id; - if (gtk_toggle_action_get_active (action) == FALSE) { + if (gtk_toggle_action_get_active (action) == FALSE) + { return; } doc = xed_window_get_active_document (window); - if (doc == NULL) { + if (doc == NULL) + { return; } - lang_id = gtk_action_get_name (GTK_ACTION (action)); + lang_id = gtk_action_get_name (GTK_ACTION(action)); - if (strcmp (lang_id, LANGUAGE_NONE) == 0) { + if (strcmp (lang_id, LANGUAGE_NONE) == 0) + { /* Normal (no highlighting) */ lang = NULL; } - else { + else + { lang = gtk_source_language_manager_get_language (xed_get_language_manager (), lang_id); - if (lang == NULL) { - g_warning ("Could not get language %s\n", lang_id); + if (lang == NULL) + { + g_warning("Could not get language %s\n", lang_id); } } @@ -675,7 +736,10 @@ escape_section_name (const gchar *name) } static void -create_language_menu_item (GtkSourceLanguage *lang, gint index, guint ui_id, XedWindow *window) +create_language_menu_item (GtkSourceLanguage *lang, + gint index, + guint ui_id, + XedWindow *window) { GtkAction *section_action; GtkRadioAction *action; @@ -695,10 +759,12 @@ create_language_menu_item (GtkSourceLanguage *lang, gint index, guint ui_id, Xed /* check if the section submenu exists or create it */ section_action = gtk_action_group_get_action (window->priv->languages_action_group, escaped_section); - if (section_action == NULL) { + if (section_action == NULL) + { gchar *section_name; section_name = xed_utils_escape_underscores (section, -1); - section_action = gtk_action_new (escaped_section, section_name, NULL, NULL); + section_action = gtk_action_new (escaped_section, section_name, NULL, + NULL); g_free (section_name); @@ -706,8 +772,8 @@ create_language_menu_item (GtkSourceLanguage *lang, gint index, guint ui_id, Xed g_object_unref (section_action); gtk_ui_manager_add_ui (window->priv->manager, ui_id, - "/MenuBar/ViewMenu/ViewHighlightModeMenu/LanguagesMenuPlaceholder", - escaped_section, escaped_section, GTK_UI_MANAGER_MENU, FALSE); + "/MenuBar/ViewMenu/ViewHighlightModeMenu/LanguagesMenuPlaceholder", escaped_section, + escaped_section, GTK_UI_MANAGER_MENU, FALSE); } /* now add the language item to the section */ @@ -724,15 +790,15 @@ create_language_menu_item (GtkSourceLanguage *lang, gint index, guint ui_id, Xed g_free (escaped_lang_name); /* Action is added with a NULL accel to make the accel overridable */ - gtk_action_group_add_action_with_accel (window->priv->languages_action_group, GTK_ACTION (action), NULL); + gtk_action_group_add_action_with_accel (window->priv->languages_action_group, GTK_ACTION(action), NULL); g_object_unref (action); /* add the action to the same radio group of the "Normal" action */ normal_action = gtk_action_group_get_action (window->priv->languages_action_group, LANGUAGE_NONE); - group = gtk_radio_action_get_group (GTK_RADIO_ACTION (normal_action)); + group = gtk_radio_action_get_group (GTK_RADIO_ACTION(normal_action)); gtk_radio_action_set_group (action, group); - g_signal_connect (action, "activate", G_CALLBACK (language_toggled), window); + g_signal_connect(action, "activate", G_CALLBACK (language_toggled), window); gtk_ui_manager_add_ui (window->priv->manager, ui_id, path, lang_id, lang_id, GTK_UI_MANAGER_MENUITEM, FALSE); @@ -758,23 +824,24 @@ create_languages_menu (XedWindow *window) * "View->Highlight Mode" submenu and so syntax highlighting is disabled */ action_none = gtk_radio_action_new (LANGUAGE_NONE, _("Plain Text"), _("Disable syntax highlighting"), NULL, -1); - gtk_action_group_add_action (window->priv->languages_action_group, GTK_ACTION (action_none)); + gtk_action_group_add_action (window->priv->languages_action_group, GTK_ACTION(action_none)); g_object_unref (action_none); - g_signal_connect (action_none, "activate", G_CALLBACK (language_toggled), window); + g_signal_connect(action_none, "activate", G_CALLBACK (language_toggled), window); id = gtk_ui_manager_new_merge_id (window->priv->manager); gtk_ui_manager_add_ui (window->priv->manager, id, - "/MenuBar/ViewMenu/ViewHighlightModeMenu/LanguagesMenuPlaceholder", - LANGUAGE_NONE, LANGUAGE_NONE, GTK_UI_MANAGER_MENUITEM, TRUE); + "/MenuBar/ViewMenu/ViewHighlightModeMenu/LanguagesMenuPlaceholder", + LANGUAGE_NONE, LANGUAGE_NONE, GTK_UI_MANAGER_MENUITEM, TRUE); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action_none), TRUE); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action_none), TRUE); /* now add all the known languages */ languages = xed_language_manager_list_languages_sorted (xed_get_language_manager (), FALSE); - for (l = languages, i = 0; l != NULL; l = l->next, ++i) { + for (l = languages, i = 0; l != NULL; l = l->next, ++i) + { create_language_menu_item (l->data, i, id, window); } @@ -792,47 +859,54 @@ update_languages_menu (XedWindow *window) const gchar *lang_id; doc = xed_window_get_active_document (window); - if (doc == NULL) { + if (doc == NULL) + { return; } lang = xed_document_get_language (doc); - if (lang != NULL) { + if (lang != NULL) + { lang_id = gtk_source_language_get_id (lang); } - else { + else + { lang_id = LANGUAGE_NONE; } actions = gtk_action_group_list_actions (window->priv->languages_action_group); /* prevent recursion */ - for (l = actions; l != NULL; l = l->next) { - g_signal_handlers_block_by_func (GTK_ACTION (l->data), G_CALLBACK (language_toggled), window); + for (l = actions; l != NULL; l = l->next) + { + g_signal_handlers_block_by_func(GTK_ACTION (l->data), G_CALLBACK (language_toggled), window); } action = gtk_action_group_get_action (window->priv->languages_action_group, lang_id); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), TRUE); - for (l = actions; l != NULL; l = l->next) { - g_signal_handlers_unblock_by_func (GTK_ACTION (l->data), G_CALLBACK (language_toggled), window); + for (l = actions; l != NULL; l = l->next) + { + g_signal_handlers_unblock_by_func(GTK_ACTION (l->data), G_CALLBACK (language_toggled), window); } g_list_free (actions); } void -_xed_recent_add (XedWindow *window, const gchar *uri, const gchar *mime) +_xed_recent_add (XedWindow *window, + const gchar *uri, + const gchar *mime) { GtkRecentManager *recent_manager; GtkRecentData *recent_data; static gchar *groups[2] = { "xed", NULL }; - recent_manager = gtk_recent_manager_get_default (); + recent_manager = gtk_recent_manager_get_default (); - recent_data = g_slice_new (GtkRecentData); + recent_data = g_slice_new(GtkRecentData); recent_data->display_name = NULL; recent_data->description = NULL; @@ -846,27 +920,30 @@ _xed_recent_add (XedWindow *window, const gchar *uri, const gchar *mime) g_free (recent_data->app_exec); - g_slice_free (GtkRecentData, recent_data); + g_slice_free(GtkRecentData, recent_data); } void -_xed_recent_remove (XedWindow *window, const gchar *uri) +_xed_recent_remove (XedWindow *window, + const gchar *uri) { GtkRecentManager *recent_manager; - recent_manager = gtk_recent_manager_get_default (); + recent_manager = gtk_recent_manager_get_default (); gtk_recent_manager_remove_item (recent_manager, uri, NULL); } static void -open_recent_file (const gchar *uri, XedWindow *window) +open_recent_file (const gchar *uri, + XedWindow *window) { GSList *uris = NULL; uris = g_slist_prepend (uris, (gpointer) uri); - if (xed_commands_load_uris (window, uris, NULL, 0) != 1) { + if (xed_commands_load_uris (window, uris, NULL, 0) != 1) + { _xed_recent_remove (window, uri); } @@ -874,7 +951,8 @@ open_recent_file (const gchar *uri, XedWindow *window) } static void -recent_chooser_item_activated (GtkRecentChooser *chooser, XedWindow *window) +recent_chooser_item_activated (GtkRecentChooser *chooser, + XedWindow *window) { gchar *uri; @@ -886,13 +964,14 @@ recent_chooser_item_activated (GtkRecentChooser *chooser, XedWindow *window) } static void -recents_menu_activate (GtkAction *action, XedWindow *window) +recents_menu_activate (GtkAction *action, + XedWindow *window) { GtkRecentInfo *info; const gchar *uri; - info = g_object_get_data (G_OBJECT (action), "gtk-recent-info"); - g_return_if_fail (info != NULL); + info = g_object_get_data (G_OBJECT(action), "gtk-recent-info"); + g_return_if_fail(info != NULL); uri = gtk_recent_info_get_uri (info); @@ -900,15 +979,18 @@ recents_menu_activate (GtkAction *action, XedWindow *window) } static gint -sort_recents_mru (GtkRecentInfo *a, GtkRecentInfo *b) +sort_recents_mru (GtkRecentInfo *a, + GtkRecentInfo *b) { return (gtk_recent_info_get_modified (b) - gtk_recent_info_get_modified (a)); } -static void update_recent_files_menu (XedWindow *window); +static void +update_recent_files_menu (XedWindow *window); static void -recent_manager_changed (GtkRecentManager *manager, XedWindow *window) +recent_manager_changed (GtkRecentManager *manager, + XedWindow *window) { /* regenerate the menu when the model changes */ update_recent_files_menu (window); @@ -932,28 +1014,32 @@ update_recent_files_menu (XedWindow *window) max_recents = xed_prefs_manager_get_max_recents (); - g_return_if_fail (p->recents_action_group != NULL); + g_return_if_fail(p->recents_action_group != NULL); - if (p->recents_menu_ui_id != 0) { + if (p->recents_menu_ui_id != 0) + { gtk_ui_manager_remove_ui (p->manager, p->recents_menu_ui_id); } actions = gtk_action_group_list_actions (p->recents_action_group); - for (l = actions; l != NULL; l = l->next) { - g_signal_handlers_disconnect_by_func (GTK_ACTION (l->data), G_CALLBACK (recents_menu_activate), window); - gtk_action_group_remove_action (p->recents_action_group, GTK_ACTION (l->data)); + for (l = actions; l != NULL; l = l->next) + { + g_signal_handlers_disconnect_by_func(GTK_ACTION (l->data), G_CALLBACK (recents_menu_activate), window); + gtk_action_group_remove_action (p->recents_action_group, GTK_ACTION(l->data)); } g_list_free (actions); p->recents_menu_ui_id = gtk_ui_manager_new_merge_id (p->manager); - recent_manager = gtk_recent_manager_get_default (); + recent_manager = gtk_recent_manager_get_default (); items = gtk_recent_manager_get_items (recent_manager); /* filter */ - for (l = items; l != NULL; l = l->next) { + for (l = items; l != NULL; l = l->next) + { GtkRecentInfo *info = l->data; - if (!gtk_recent_info_has_group (info, "xed")) { + if (!gtk_recent_info_has_group (info, "xed")) + { continue; } @@ -964,7 +1050,8 @@ update_recent_files_menu (XedWindow *window) filtered_items = g_list_sort (filtered_items, (GCompareFunc) sort_recents_mru); i = 0; - for (l = filtered_items; l != NULL; l = l->next) { + for (l = filtered_items; l != NULL; l = l->next) + { gchar *action_name; const gchar *display_name; gchar *escaped; @@ -976,7 +1063,8 @@ update_recent_files_menu (XedWindow *window) GtkRecentInfo *info = l->data; /* clamp */ - if (i >= max_recents) { + if (i >= max_recents) + { break; } @@ -986,7 +1074,8 @@ update_recent_files_menu (XedWindow *window) display_name = gtk_recent_info_get_display_name (info); escaped = xed_utils_escape_underscores (display_name, -1); - if (i >= 10) { + if (i >= 10) + { label = g_strdup_printf ("%d. %s", i, escaped); } else @@ -1005,17 +1094,16 @@ update_recent_files_menu (XedWindow *window) action = gtk_action_new (action_name, label, tip, NULL); - g_object_set_data_full (G_OBJECT (action), - "gtk-recent-info", gtk_recent_info_ref (info), (GDestroyNotify) gtk_recent_info_unref); + g_object_set_data_full (G_OBJECT(action), "gtk-recent-info", gtk_recent_info_ref (info), + (GDestroyNotify) gtk_recent_info_unref); - g_signal_connect (action, "activate", G_CALLBACK (recents_menu_activate), window); + g_signal_connect(action, "activate", G_CALLBACK (recents_menu_activate), window); gtk_action_group_add_action (p->recents_action_group, action); g_object_unref (action); - gtk_ui_manager_add_ui (p->manager, p->recents_menu_ui_id, - "/MenuBar/FileMenu/FileRecentsPlaceholder", - action_name, action_name, GTK_UI_MANAGER_MENUITEM, FALSE); + gtk_ui_manager_add_ui (p->manager, p->recents_menu_ui_id, "/MenuBar/FileMenu/FileRecentsPlaceholder", + action_name, action_name, GTK_UI_MANAGER_MENUITEM, FALSE); g_free (action_name); g_free (label); @@ -1029,32 +1117,37 @@ update_recent_files_menu (XedWindow *window) } static void -set_non_homogeneus (GtkWidget *widget, gpointer data) +set_non_homogeneus (GtkWidget *widget, + gpointer data) { - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM(widget), FALSE); } static void -toolbar_visibility_changed (GtkWidget *toolbar, XedWindow *window) +toolbar_visibility_changed (GtkWidget *toolbar, + XedWindow *window) { gboolean visible; GtkAction *action; visible = gtk_widget_get_visible (toolbar); - if (xed_prefs_manager_toolbar_visible_can_set ()) { + if (xed_prefs_manager_toolbar_visible_can_set ()) + { xed_prefs_manager_set_toolbar_visible (visible); } action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, "ViewToolbar"); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) { - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action)) != visible) + { + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), visible); } } static GtkWidget * -setup_toolbar_open_button (XedWindow *window, GtkWidget *toolbar) +setup_toolbar_open_button (XedWindow *window, + GtkWidget *toolbar) { GtkRecentManager *recent_manager; GtkRecentFilter *filter; @@ -1067,34 +1160,36 @@ setup_toolbar_open_button (XedWindow *window, GtkWidget *toolbar) /* recent files menu tool button */ toolbar_recent_menu = gtk_recent_chooser_menu_new_for_manager (recent_manager); - gtk_recent_chooser_set_local_only (GTK_RECENT_CHOOSER (toolbar_recent_menu), FALSE); - gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (toolbar_recent_menu), GTK_RECENT_SORT_MRU); - gtk_recent_chooser_set_limit (GTK_RECENT_CHOOSER (toolbar_recent_menu), xed_prefs_manager_get_max_recents ()); + gtk_recent_chooser_set_local_only (GTK_RECENT_CHOOSER(toolbar_recent_menu), + FALSE); + gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER(toolbar_recent_menu), GTK_RECENT_SORT_MRU); + gtk_recent_chooser_set_limit (GTK_RECENT_CHOOSER(toolbar_recent_menu), xed_prefs_manager_get_max_recents ()); filter = gtk_recent_filter_new (); gtk_recent_filter_add_group (filter, "xed"); - gtk_recent_chooser_set_filter (GTK_RECENT_CHOOSER (toolbar_recent_menu), filter); + gtk_recent_chooser_set_filter (GTK_RECENT_CHOOSER(toolbar_recent_menu), filter); - g_signal_connect (toolbar_recent_menu, "item_activated", G_CALLBACK (recent_chooser_item_activated), window); + g_signal_connect(toolbar_recent_menu, "item_activated", G_CALLBACK (recent_chooser_item_activated), window); /* add the custom Open button to the toolbar */ open_button = gtk_menu_tool_button_new_from_stock (GTK_STOCK_OPEN); - gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (open_button), toolbar_recent_menu); + gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON(open_button), toolbar_recent_menu); gtk_tool_item_set_tooltip_text (open_button, _("Open a file")); - gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (open_button), _("Open a recently used file")); + gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON(open_button), _("Open a recently used file")); action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, "FileOpen"); g_object_set (action, "short_label", _("Open"), NULL); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (open_button), action); + gtk_activatable_set_related_action (GTK_ACTIVATABLE(open_button), action); - gtk_toolbar_insert (GTK_TOOLBAR (toolbar), open_button, 1); + gtk_toolbar_insert (GTK_TOOLBAR(toolbar), open_button, 1); return toolbar_recent_menu; } static void -create_menu_bar_and_toolbar (XedWindow *window, GtkWidget *main_box) +create_menu_bar_and_toolbar (XedWindow *window, + GtkWidget *main_box) { GtkActionGroup *action_group; GtkAction *action; @@ -1108,14 +1203,14 @@ create_menu_bar_and_toolbar (XedWindow *window, GtkWidget *main_box) manager = gtk_ui_manager_new (); window->priv->manager = manager; - gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (manager)); + gtk_window_add_accel_group (GTK_WINDOW(window), gtk_ui_manager_get_accel_group (manager)); action_group = gtk_action_group_new ("XedWindowAlwaysSensitiveActions"); gtk_action_group_set_translation_domain (action_group, NULL); gtk_action_group_add_actions (action_group, xed_always_sensitive_menu_entries, - G_N_ELEMENTS (xed_always_sensitive_menu_entries), window); + G_N_ELEMENTS(xed_always_sensitive_menu_entries), window); gtk_action_group_add_toggle_actions (action_group, xed_always_sensitive_toggle_menu_entries, - G_N_ELEMENTS (xed_always_sensitive_toggle_menu_entries), window); + G_N_ELEMENTS(xed_always_sensitive_toggle_menu_entries), window); gtk_ui_manager_insert_action_group (manager, action_group, 0); g_object_unref (action_group); @@ -1123,7 +1218,7 @@ create_menu_bar_and_toolbar (XedWindow *window, GtkWidget *main_box) action_group = gtk_action_group_new ("XedWindowActions"); gtk_action_group_set_translation_domain (action_group, NULL); - gtk_action_group_add_actions (action_group, xed_menu_entries, G_N_ELEMENTS (xed_menu_entries), window); + gtk_action_group_add_actions (action_group, xed_menu_entries, G_N_ELEMENTS(xed_menu_entries), window); gtk_ui_manager_insert_action_group (manager, action_group, 0); g_object_unref (action_group); window->priv->action_group = action_group; @@ -1140,7 +1235,7 @@ create_menu_bar_and_toolbar (XedWindow *window, GtkWidget *main_box) action_group = gtk_action_group_new ("XedQuitWindowActions"); gtk_action_group_set_translation_domain (action_group, NULL); - gtk_action_group_add_actions (action_group, xed_quit_menu_entries, G_N_ELEMENTS (xed_quit_menu_entries), window); + gtk_action_group_add_actions (action_group, xed_quit_menu_entries, G_N_ELEMENTS(xed_quit_menu_entries), window); gtk_ui_manager_insert_action_group (manager, action_group, 0); g_object_unref (action_group); @@ -1148,7 +1243,7 @@ create_menu_bar_and_toolbar (XedWindow *window, GtkWidget *main_box) action_group = gtk_action_group_new ("XedCloseWindowActions"); gtk_action_group_set_translation_domain (action_group, NULL); - gtk_action_group_add_actions (action_group, xed_close_menu_entries, G_N_ELEMENTS (xed_close_menu_entries), window); + gtk_action_group_add_actions (action_group, xed_close_menu_entries, G_N_ELEMENTS(xed_close_menu_entries), window); gtk_ui_manager_insert_action_group (manager, action_group, 0); g_object_unref (action_group); @@ -1157,7 +1252,7 @@ create_menu_bar_and_toolbar (XedWindow *window, GtkWidget *main_box) action_group = gtk_action_group_new ("XedWindowPanesActions"); gtk_action_group_set_translation_domain (action_group, NULL); gtk_action_group_add_toggle_actions (action_group, xed_panes_toggle_menu_entries, - G_N_ELEMENTS (xed_panes_toggle_menu_entries), window); + G_N_ELEMENTS(xed_panes_toggle_menu_entries), window); gtk_ui_manager_insert_action_group (manager, action_group, 0); g_object_unref (action_group); @@ -1166,15 +1261,16 @@ create_menu_bar_and_toolbar (XedWindow *window, GtkWidget *main_box) /* now load the UI definition */ ui_file = xed_dirs_get_ui_file (XED_UIFILE); gtk_ui_manager_add_ui_from_file (manager, ui_file, &error); - if (error != NULL) { - g_warning ("Could not merge %s: %s", ui_file, error->message); + if (error != NULL) + { + g_warning("Could not merge %s: %s", ui_file, error->message); g_error_free (error); } g_free (ui_file); /* show tooltips in the statusbar */ - g_signal_connect (manager, "connect_proxy", G_CALLBACK (connect_proxy_cb), window); - g_signal_connect (manager, "disconnect_proxy", G_CALLBACK (disconnect_proxy_cb), window); + g_signal_connect(manager, "connect_proxy", G_CALLBACK (connect_proxy_cb), window); + g_signal_connect(manager, "disconnect_proxy", G_CALLBACK (disconnect_proxy_cb), window); /* recent files menu */ action_group = gtk_action_group_new ("RecentFilesActions"); @@ -1184,8 +1280,8 @@ create_menu_bar_and_toolbar (XedWindow *window, GtkWidget *main_box) g_object_unref (action_group); recent_manager = gtk_recent_manager_get_default (); - window->priv->recents_handler_id = g_signal_connect (recent_manager, "changed", - G_CALLBACK (recent_manager_changed), window); + window->priv->recents_handler_id = g_signal_connect(recent_manager, "changed", G_CALLBACK (recent_manager_changed), + window); update_recent_files_menu (window); /* languages menu */ @@ -1204,31 +1300,34 @@ create_menu_bar_and_toolbar (XedWindow *window, GtkWidget *main_box) g_object_unref (action_group); window->priv->menubar = gtk_ui_manager_get_widget (manager, "/MenuBar"); - gtk_box_pack_start (GTK_BOX (main_box), window->priv->menubar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(main_box), window->priv->menubar, FALSE, FALSE, 0); window->priv->toolbar = gtk_ui_manager_get_widget (manager, "/ToolBar"); - gtk_style_context_add_class (gtk_widget_get_style_context (window->priv->toolbar), GTK_STYLE_CLASS_PRIMARY_TOOLBAR); - gtk_box_pack_start (GTK_BOX (main_box), window->priv->toolbar, FALSE, FALSE, 0); + gtk_style_context_add_class (gtk_widget_get_style_context (window->priv->toolbar), + GTK_STYLE_CLASS_PRIMARY_TOOLBAR); + gtk_box_pack_start (GTK_BOX(main_box), window->priv->toolbar, FALSE, FALSE, 0); set_toolbar_style (window, NULL); window->priv->toolbar_recent_menu = setup_toolbar_open_button (window, window->priv->toolbar); - gtk_container_foreach (GTK_CONTAINER (window->priv->toolbar), (GtkCallback)set_non_homogeneus, NULL); + gtk_container_foreach (GTK_CONTAINER(window->priv->toolbar), (GtkCallback) set_non_homogeneus, NULL); - g_signal_connect_after (G_OBJECT (window->priv->toolbar), "show", G_CALLBACK (toolbar_visibility_changed), window); - g_signal_connect_after (G_OBJECT (window->priv->toolbar), "hide", G_CALLBACK (toolbar_visibility_changed), window); + g_signal_connect_after(G_OBJECT (window->priv->toolbar), "show", G_CALLBACK (toolbar_visibility_changed), window); + g_signal_connect_after(G_OBJECT (window->priv->toolbar), "hide", G_CALLBACK (toolbar_visibility_changed), window); } static void -documents_list_menu_activate (GtkToggleAction *action, XedWindow *window) +documents_list_menu_activate (GtkToggleAction *action, + XedWindow *window) { gint n; - if (gtk_toggle_action_get_active (action) == FALSE) { + if (gtk_toggle_action_get_active (action) == FALSE) + { return; } - n = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action)); - gtk_notebook_set_current_page (GTK_NOTEBOOK (window->priv->notebook), n); + n = gtk_radio_action_get_current_value (GTK_RADIO_ACTION(action)); + gtk_notebook_set_current_page (GTK_NOTEBOOK(window->priv->notebook), n); } static gchar * @@ -1246,7 +1345,7 @@ get_menu_tip_for_tab (XedTab *tab) g_free (uri); /* Translators: %s is a URI */ - tip = g_strdup_printf (_("Activate '%s'"), ruri); + tip = g_strdup_printf (_("Activate '%s'"), ruri); g_free (ruri); return tip; @@ -1263,24 +1362,27 @@ update_documents_list_menu (XedWindow *window) xed_debug (DEBUG_WINDOW); - g_return_if_fail (p->documents_list_action_group != NULL); + g_return_if_fail(p->documents_list_action_group != NULL); - if (p->documents_list_menu_ui_id != 0) { + if (p->documents_list_menu_ui_id != 0) + { gtk_ui_manager_remove_ui (p->manager, p->documents_list_menu_ui_id); } actions = gtk_action_group_list_actions (p->documents_list_action_group); - for (l = actions; l != NULL; l = l->next) { - g_signal_handlers_disconnect_by_func (GTK_ACTION (l->data), G_CALLBACK (documents_list_menu_activate), window); - gtk_action_group_remove_action (p->documents_list_action_group, GTK_ACTION (l->data)); + for (l = actions; l != NULL; l = l->next) + { + g_signal_handlers_disconnect_by_func(GTK_ACTION (l->data), G_CALLBACK (documents_list_menu_activate), window); + gtk_action_group_remove_action (p->documents_list_action_group, GTK_ACTION(l->data)); } g_list_free (actions); - n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (p->notebook)); + n = gtk_notebook_get_n_pages (GTK_NOTEBOOK(p->notebook)); id = (n > 0) ? gtk_ui_manager_new_merge_id (p->manager) : 0; - for (i = 0; i < n; i++) { + for (i = 0; i < n; i++) + { GtkWidget *tab; GtkRadioAction *action; gchar *action_name; @@ -1289,7 +1391,7 @@ update_documents_list_menu (XedWindow *window) gchar *tip; gchar *accel; - tab = gtk_notebook_get_nth_page (GTK_NOTEBOOK (p->notebook), i); + tab = gtk_notebook_get_nth_page (GTK_NOTEBOOK(p->notebook), i); /* NOTE: the action is associated to the position of the tab in * the notebook not to the tab itself! This is needed to work @@ -1299,31 +1401,33 @@ update_documents_list_menu (XedWindow *window) * get the same accel. */ action_name = g_strdup_printf ("Tab_%d", i); - tab_name = _xed_tab_get_name (XED_TAB (tab)); + tab_name = _xed_tab_get_name (XED_TAB(tab)); name = xed_utils_escape_underscores (tab_name, -1); - tip = get_menu_tip_for_tab (XED_TAB (tab)); + tip = get_menu_tip_for_tab (XED_TAB(tab)); /* alt + 1, 2, 3... 0 to switch to the first ten tabs */ accel = (i < 10) ? g_strdup_printf ("%d", (i + 1) % 10) : NULL; action = gtk_radio_action_new (action_name, name, tip, NULL, i); - if (group != NULL) { + if (group != NULL) + { gtk_radio_action_set_group (action, group); } /* note that group changes each time we add an action, so it must be updated */ group = gtk_radio_action_get_group (action); - gtk_action_group_add_action_with_accel (p->documents_list_action_group, GTK_ACTION (action), accel); + gtk_action_group_add_action_with_accel (p->documents_list_action_group, GTK_ACTION(action), accel); - g_signal_connect (action, "activate", G_CALLBACK (documents_list_menu_activate), window); + g_signal_connect(action, "activate", G_CALLBACK (documents_list_menu_activate), window); - gtk_ui_manager_add_ui (p->manager, id, "/MenuBar/DocumentsMenu/DocumentsListPlaceholder", - action_name, action_name, GTK_UI_MANAGER_MENUITEM, FALSE); + gtk_ui_manager_add_ui (p->manager, id, "/MenuBar/DocumentsMenu/DocumentsListPlaceholder", action_name, + action_name, GTK_UI_MANAGER_MENUITEM, FALSE); - if (XED_TAB (tab) == p->active_tab) { - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); + if (XED_TAB (tab) == p->active_tab) + { + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), TRUE); } g_object_unref (action); @@ -1340,100 +1444,117 @@ update_documents_list_menu (XedWindow *window) /* Returns TRUE if status bar is visible */ static gboolean -set_statusbar_style (XedWindow *window, XedWindow *origin) +set_statusbar_style (XedWindow *window, + XedWindow *origin) { GtkAction *action; gboolean visible; - if (origin == NULL) { + if (origin == NULL) + { visible = xed_prefs_manager_get_statusbar_visible (); } - else { + else + { visible = gtk_widget_get_visible (origin->priv->statusbar); } - if (visible) { + if (visible) + { gtk_widget_show (window->priv->statusbar); } - else { + else + { gtk_widget_hide (window->priv->statusbar); } action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, "ViewStatusbar"); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) { - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action)) != visible) + { + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), visible); } return visible; } static void -statusbar_visibility_changed (GtkWidget *statusbar, XedWindow *window) +statusbar_visibility_changed (GtkWidget *statusbar, + XedWindow *window) { gboolean visible; GtkAction *action; visible = gtk_widget_get_visible (statusbar); - if (xed_prefs_manager_statusbar_visible_can_set ()) { + if (xed_prefs_manager_statusbar_visible_can_set ()) + { xed_prefs_manager_set_statusbar_visible (visible); } action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, "ViewStatusbar"); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) { - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action)) != visible) + { + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), visible); } } static void -tab_width_combo_changed (XedStatusComboBox *combo, GtkMenuItem *item, XedWindow *window) +tab_width_combo_changed (XedStatusComboBox *combo, + GtkMenuItem *item, + XedWindow *window) { XedView *view; guint width_data = 0; view = xed_window_get_active_view (window); - if (!view) { + if (!view) + { return; } - width_data = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), TAB_WIDTH_DATA)); + width_data = GPOINTER_TO_INT(g_object_get_data (G_OBJECT (item), TAB_WIDTH_DATA)); - if (width_data == 0) { + if (width_data == 0) + { return; } g_signal_handler_block (view, window->priv->tab_width_id); - gtk_source_view_set_tab_width (GTK_SOURCE_VIEW (view), width_data); + gtk_source_view_set_tab_width (GTK_SOURCE_VIEW(view), width_data); g_signal_handler_unblock (view, window->priv->tab_width_id); } static void -use_spaces_toggled (GtkCheckMenuItem *item, XedWindow *window) +use_spaces_toggled (GtkCheckMenuItem *item, + XedWindow *window) { XedView *view; view = xed_window_get_active_view (window); g_signal_handler_block (view, window->priv->spaces_instead_of_tabs_id); - gtk_source_view_set_insert_spaces_instead_of_tabs (GTK_SOURCE_VIEW (view), gtk_check_menu_item_get_active (item)); + gtk_source_view_set_insert_spaces_instead_of_tabs (GTK_SOURCE_VIEW(view), gtk_check_menu_item_get_active (item)); g_signal_handler_unblock (view, window->priv->spaces_instead_of_tabs_id); } static void -language_combo_changed (XedStatusComboBox *combo, GtkMenuItem *item, XedWindow *window) +language_combo_changed (XedStatusComboBox *combo, + GtkMenuItem *item, + XedWindow *window) { XedDocument *doc; GtkSourceLanguage *language; doc = xed_window_get_active_document (window); - if (!doc) { + if (!doc) + { return; } - language = GTK_SOURCE_LANGUAGE (g_object_get_data (G_OBJECT (item), LANGUAGE_DATA)); + language = GTK_SOURCE_LANGUAGE(g_object_get_data (G_OBJECT (item), LANGUAGE_DATA)); g_signal_handler_block (doc, window->priv->language_changed_id); xed_document_set_language (doc, language); @@ -1449,25 +1570,22 @@ typedef struct static void fill_tab_width_combo (XedWindow *window) { - static TabWidthDefinition defs[] = { - {"2", 2}, - {"4", 4}, - {"8", 8}, - {"", 0}, /* custom size */ - {NULL, 0} - }; + static TabWidthDefinition defs[] = { { "2", 2 }, { "4", 4 }, { "8", 8 }, { "", 0 }, /* custom size */ + { NULL, 0 } }; - XedStatusComboBox *combo = XED_STATUS_COMBO_BOX (window->priv->tab_width_combo); + XedStatusComboBox *combo = XED_STATUS_COMBO_BOX(window->priv->tab_width_combo); guint i = 0; GtkWidget *item; - while (defs[i].label != NULL) { + while (defs[i].label != NULL) + { item = gtk_menu_item_new_with_label (defs[i].label); - g_object_set_data (G_OBJECT (item), TAB_WIDTH_DATA, GINT_TO_POINTER (defs[i].width)); + g_object_set_data (G_OBJECT(item), TAB_WIDTH_DATA, GINT_TO_POINTER(defs[i].width)); - xed_status_combo_box_add_item (combo, GTK_MENU_ITEM (item), defs[i].label); + xed_status_combo_box_add_item (combo, GTK_MENU_ITEM(item), defs[i].label); - if (defs[i].width != 0) { + if (defs[i].width != 0) + { gtk_widget_show (item); } @@ -1475,14 +1593,14 @@ fill_tab_width_combo (XedWindow *window) } item = gtk_separator_menu_item_new (); - xed_status_combo_box_add_item (combo, GTK_MENU_ITEM (item), NULL); + xed_status_combo_box_add_item (combo, GTK_MENU_ITEM(item), NULL); gtk_widget_show (item); item = gtk_check_menu_item_new_with_label (_("Use Spaces")); - xed_status_combo_box_add_item (combo, GTK_MENU_ITEM (item), NULL); + xed_status_combo_box_add_item (combo, GTK_MENU_ITEM(item), NULL); gtk_widget_show (item); - g_signal_connect (item, "toggled", G_CALLBACK (use_spaces_toggled), window); + g_signal_connect(item, "toggled", G_CALLBACK (use_spaces_toggled), window); } static void @@ -1501,19 +1619,19 @@ fill_language_combo (XedWindow *window) menu_item = gtk_menu_item_new_with_label (name); gtk_widget_show (menu_item); - g_object_set_data (G_OBJECT (menu_item), LANGUAGE_DATA, NULL); - xed_status_combo_box_add_item ( - XED_STATUS_COMBO_BOX (window->priv->language_combo), GTK_MENU_ITEM (menu_item), name); + g_object_set_data (G_OBJECT(menu_item), LANGUAGE_DATA, NULL); + xed_status_combo_box_add_item (XED_STATUS_COMBO_BOX(window->priv->language_combo), GTK_MENU_ITEM(menu_item), name); - for (item = languages; item; item = item->next) { - GtkSourceLanguage *lang = GTK_SOURCE_LANGUAGE (item->data); + for (item = languages; item; item = item->next) + { + GtkSourceLanguage *lang = GTK_SOURCE_LANGUAGE(item->data); name = gtk_source_language_get_name (lang); menu_item = gtk_menu_item_new_with_label (name); gtk_widget_show (menu_item); - g_object_set_data_full ( - G_OBJECT (menu_item), LANGUAGE_DATA, g_object_ref (lang), (GDestroyNotify)g_object_unref); - xed_status_combo_box_add_item ( - XED_STATUS_COMBO_BOX (window->priv->language_combo), GTK_MENU_ITEM (menu_item), name); + g_object_set_data_full (G_OBJECT(menu_item), LANGUAGE_DATA, g_object_ref (lang), + (GDestroyNotify) g_object_unref); + xed_status_combo_box_add_item (XED_STATUS_COMBO_BOX(window->priv->language_combo), + GTK_MENU_ITEM(menu_item), name); } g_slist_free (languages); @@ -1521,47 +1639,47 @@ fill_language_combo (XedWindow *window) static void create_statusbar (XedWindow *window, - GtkWidget *main_box) + GtkWidget *main_box) { xed_debug (DEBUG_WINDOW); window->priv->statusbar = xed_statusbar_new (); window->priv->searchbar = xed_searchbar_new (window, TRUE); - window->priv->generic_message_cid = - gtk_statusbar_get_context_id (GTK_STATUSBAR (window->priv->statusbar), "generic_message"); - window->priv->tip_message_cid = - gtk_statusbar_get_context_id(GTK_STATUSBAR (window->priv->statusbar), "tip_message"); + window->priv->generic_message_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR(window->priv->statusbar), + "generic_message"); + window->priv->tip_message_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR(window->priv->statusbar), + "tip_message"); - gtk_box_pack_end (GTK_BOX (main_box), window->priv->statusbar, FALSE, TRUE, 0); + gtk_box_pack_end (GTK_BOX(main_box), window->priv->statusbar, FALSE, TRUE, 0); window->priv->tab_width_combo = xed_status_combo_box_new (_("Tab Width")); gtk_widget_show (window->priv->tab_width_combo); - gtk_box_pack_end (GTK_BOX (window->priv->statusbar), window->priv->tab_width_combo, FALSE, TRUE, 0); + gtk_box_pack_end (GTK_BOX(window->priv->statusbar), window->priv->tab_width_combo, FALSE, TRUE, 0); fill_tab_width_combo (window); - g_signal_connect (G_OBJECT (window->priv->tab_width_combo), "changed", - G_CALLBACK (tab_width_combo_changed), window); + g_signal_connect(G_OBJECT (window->priv->tab_width_combo), "changed", + G_CALLBACK (tab_width_combo_changed), window); window->priv->language_combo = xed_status_combo_box_new (NULL); gtk_widget_show (window->priv->language_combo); - gtk_box_pack_end (GTK_BOX (window->priv->statusbar), window->priv->language_combo, FALSE, TRUE, 0); + gtk_box_pack_end (GTK_BOX(window->priv->statusbar), window->priv->language_combo, FALSE, TRUE, 0); fill_language_combo (window); - g_signal_connect (G_OBJECT (window->priv->language_combo), "changed", - G_CALLBACK (language_combo_changed), window); + g_signal_connect(G_OBJECT (window->priv->language_combo), "changed", + G_CALLBACK (language_combo_changed), window); - g_signal_connect_after (G_OBJECT (window->priv->statusbar), "show", - G_CALLBACK (statusbar_visibility_changed), window); + g_signal_connect_after(G_OBJECT (window->priv->statusbar), "show", + G_CALLBACK (statusbar_visibility_changed), window); - g_signal_connect_after (G_OBJECT (window->priv->statusbar), "hide", - G_CALLBACK (statusbar_visibility_changed), window); + g_signal_connect_after(G_OBJECT (window->priv->statusbar), "hide", + G_CALLBACK (statusbar_visibility_changed), window); set_statusbar_style (window, NULL); - gtk_box_pack_end (GTK_BOX (main_box), window->priv->searchbar, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX(main_box), window->priv->searchbar, FALSE, FALSE, 0); } @@ -1570,32 +1688,36 @@ clone_window (XedWindow *origin) { XedWindow *window; GdkScreen *screen; - XedApp *app; + XedApp *app; gint panel_page; xed_debug (DEBUG_WINDOW); app = xed_app_get_default (); - screen = gtk_window_get_screen (GTK_WINDOW (origin)); + screen = gtk_window_get_screen (GTK_WINDOW(origin)); window = xed_app_create_window (app, screen); - if ((origin->priv->window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0) { + if ((origin->priv->window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0) + { gint w, h; xed_prefs_manager_get_default_window_size (&w, &h); - gtk_window_set_default_size (GTK_WINDOW (window), w, h); - gtk_window_maximize (GTK_WINDOW (window)); + gtk_window_set_default_size (GTK_WINDOW(window), w, h); + gtk_window_maximize (GTK_WINDOW(window)); } - else { - gtk_window_set_default_size (GTK_WINDOW (window), origin->priv->width, origin->priv->height); - gtk_window_unmaximize (GTK_WINDOW (window)); + else + { + gtk_window_set_default_size (GTK_WINDOW(window), origin->priv->width, origin->priv->height); + gtk_window_unmaximize (GTK_WINDOW(window)); } - if ((origin->priv->window_state & GDK_WINDOW_STATE_STICKY ) != 0) { - gtk_window_stick (GTK_WINDOW (window)); + if ((origin->priv->window_state & GDK_WINDOW_STATE_STICKY) != 0) + { + gtk_window_stick (GTK_WINDOW(window)); } - else { - gtk_window_unstick (GTK_WINDOW (window)); + else + { + gtk_window_unstick (GTK_WINDOW(window)); } /* set the panes size, the paned position will be set when @@ -1603,23 +1725,27 @@ clone_window (XedWindow *origin) window->priv->side_panel_size = origin->priv->side_panel_size; window->priv->bottom_panel_size = origin->priv->bottom_panel_size; - panel_page = _xed_panel_get_active_item_id (XED_PANEL (origin->priv->side_panel)); - _xed_panel_set_active_item_by_id (XED_PANEL (window->priv->side_panel), panel_page); + panel_page = _xed_panel_get_active_item_id (XED_PANEL(origin->priv->side_panel)); + _xed_panel_set_active_item_by_id (XED_PANEL(window->priv->side_panel), panel_page); - panel_page = _xed_panel_get_active_item_id (XED_PANEL (origin->priv->bottom_panel)); - _xed_panel_set_active_item_by_id (XED_PANEL (window->priv->bottom_panel), panel_page); + panel_page = _xed_panel_get_active_item_id (XED_PANEL(origin->priv->bottom_panel)); + _xed_panel_set_active_item_by_id (XED_PANEL(window->priv->bottom_panel), panel_page); - if (gtk_widget_get_visible (origin->priv->side_panel)) { + if (gtk_widget_get_visible (origin->priv->side_panel)) + { gtk_widget_show (window->priv->side_panel); } - else { + else + { gtk_widget_hide (window->priv->side_panel); } - if (gtk_widget_get_visible (origin->priv->bottom_panel)) { + if (gtk_widget_get_visible (origin->priv->bottom_panel)) + { gtk_widget_show (window->priv->bottom_panel); } - else { + else + { gtk_widget_hide (window->priv->bottom_panel); } @@ -1630,7 +1756,8 @@ clone_window (XedWindow *origin) } static void -update_cursor_position_statusbar (GtkTextBuffer *buffer, XedWindow *window) +update_cursor_position_statusbar (GtkTextBuffer *buffer, + XedWindow *window) { gint row, col; GtkTextIter iter; @@ -1640,7 +1767,8 @@ update_cursor_position_statusbar (GtkTextBuffer *buffer, XedWindow *window) xed_debug (DEBUG_WINDOW); - if (buffer != GTK_TEXT_BUFFER (xed_window_get_active_document (window))) { + if (buffer != GTK_TEXT_BUFFER(xed_window_get_active_document (window))) + { return; } @@ -1654,34 +1782,39 @@ update_cursor_position_statusbar (GtkTextBuffer *buffer, XedWindow *window) gtk_text_iter_set_line_offset (&start, 0); col = 0; - tab_size = gtk_source_view_get_tab_width (GTK_SOURCE_VIEW (view)); + tab_size = gtk_source_view_get_tab_width (GTK_SOURCE_VIEW(view)); - while (!gtk_text_iter_equal (&start, &iter)) { + while (!gtk_text_iter_equal (&start, &iter)) + { /* FIXME: Are we Unicode compliant here? */ - if (gtk_text_iter_get_char (&start) == '\t') { - col += (tab_size - (col % tab_size)); + if (gtk_text_iter_get_char (&start) == '\t') + { + col += (tab_size - (col % tab_size)); } - else { + else + { ++col; } gtk_text_iter_forward_char (&start); } - xed_statusbar_set_cursor_position (XED_STATUSBAR (window->priv->statusbar), row + 1, col + 1); + xed_statusbar_set_cursor_position (XED_STATUSBAR(window->priv->statusbar), row + 1, col + 1); } static void -update_overwrite_mode_statusbar (GtkTextView *view, XedWindow *window) +update_overwrite_mode_statusbar (GtkTextView *view, + XedWindow *window) { - if (view != GTK_TEXT_VIEW (xed_window_get_active_view (window))) { + if (view != GTK_TEXT_VIEW(xed_window_get_active_view (window))) + { return; } /* Note that we have to use !gtk_text_view_get_overwrite since we - are in the in the signal handler of "toggle overwrite" that is - G_SIGNAL_RUN_LAST - */ - xed_statusbar_set_overwrite (XED_STATUSBAR (window->priv->statusbar), !gtk_text_view_get_overwrite (view)); + are in the in the signal handler of "toggle overwrite" that is + G_SIGNAL_RUN_LAST + */ + xed_statusbar_set_overwrite (XED_STATUSBAR(window->priv->statusbar), !gtk_text_view_get_overwrite (view)); } #define MAX_TITLE_LENGTH 100 @@ -1695,13 +1828,14 @@ set_title (XedWindow *window) gchar *title = NULL; gint len; - if (window->priv->active_tab == NULL) { - gtk_window_set_title (GTK_WINDOW (window), "Xed"); + if (window->priv->active_tab == NULL) + { + gtk_window_set_title (GTK_WINDOW(window), "Xed"); return; } doc = xed_tab_get_document (window->priv->active_tab); - g_return_if_fail (doc != NULL); + g_return_if_fail(doc != NULL); name = xed_document_get_short_name_for_display (doc); @@ -1710,16 +1844,19 @@ set_title (XedWindow *window) /* if the name is awfully long, truncate it and be done with it, * otherwise also show the directory (ellipsized if needed) */ - if (len > MAX_TITLE_LENGTH) { + if (len > MAX_TITLE_LENGTH) + { gchar *tmp; tmp = xed_utils_str_middle_truncate (name, MAX_TITLE_LENGTH); g_free (name); name = tmp; } - else { + else + { GFile *file; file = xed_document_get_location (doc); - if (file != NULL) { + if (file != NULL) + { gchar *str; str = xed_utils_location_get_dirname_for_display (file); g_object_unref (file); @@ -1730,36 +1867,43 @@ set_title (XedWindow *window) * we have a title long 99 + 20, but I think it's a rare enough * case to be acceptable. It's justa darn title afterall :) */ - dirname = xed_utils_str_middle_truncate (str, MAX (20, MAX_TITLE_LENGTH - len)); + dirname = xed_utils_str_middle_truncate (str, MAX(20, MAX_TITLE_LENGTH - len)); g_free (str); } } - if (gtk_text_buffer_get_modified (GTK_TEXT_BUFFER (doc))) { + if (gtk_text_buffer_get_modified (GTK_TEXT_BUFFER(doc))) + { gchar *tmp_name; tmp_name = g_strdup_printf ("*%s", name); g_free (name); name = tmp_name; } - if (xed_document_get_readonly (doc)) { - if (dirname != NULL) { + if (xed_document_get_readonly (doc)) + { + if (dirname != NULL) + { title = g_strdup_printf ("%s [%s] (%s)", name, _("Read-Only"), dirname); } - else { + else + { title = g_strdup_printf ("%s [%s]", name, _("Read-Only")); } } - else { - if (dirname != NULL) { + else + { + if (dirname != NULL) + { title = g_strdup_printf ("%s (%s)", name, dirname); } - else { + else + { title = g_strdup_printf ("%s", name); } } - gtk_window_set_title (GTK_WINDOW (window), title); + gtk_window_set_title (GTK_WINDOW(window), title); g_free (dirname); g_free (name); @@ -1769,60 +1913,70 @@ set_title (XedWindow *window) #undef MAX_TITLE_LENGTH static void -set_tab_width_item_blocked (XedWindow *window, GtkMenuItem *item) +set_tab_width_item_blocked (XedWindow *window, + GtkMenuItem *item) { - g_signal_handlers_block_by_func (window->priv->tab_width_combo, tab_width_combo_changed, window); - xed_status_combo_box_set_item (XED_STATUS_COMBO_BOX (window->priv->tab_width_combo), item); - g_signal_handlers_unblock_by_func (window->priv->tab_width_combo, tab_width_combo_changed, window); + g_signal_handlers_block_by_func(window->priv->tab_width_combo, tab_width_combo_changed, window); + xed_status_combo_box_set_item (XED_STATUS_COMBO_BOX(window->priv->tab_width_combo), item); + g_signal_handlers_unblock_by_func(window->priv->tab_width_combo, tab_width_combo_changed, window); } static void -spaces_instead_of_tabs_changed (GObject *object, GParamSpec *pspec, XedWindow *window) +spaces_instead_of_tabs_changed (GObject *object, + GParamSpec *pspec, + XedWindow *window) { - XedView *view = XED_VIEW (object); - gboolean active = gtk_source_view_get_insert_spaces_instead_of_tabs (GTK_SOURCE_VIEW (view)); - GList *children = xed_status_combo_box_get_items (XED_STATUS_COMBO_BOX (window->priv->tab_width_combo)); + XedView *view = XED_VIEW(object); + gboolean active = gtk_source_view_get_insert_spaces_instead_of_tabs (GTK_SOURCE_VIEW(view)); + GList *children = xed_status_combo_box_get_items (XED_STATUS_COMBO_BOX(window->priv->tab_width_combo)); GtkCheckMenuItem *item; - item = GTK_CHECK_MENU_ITEM (g_list_last (children)->data); + item = GTK_CHECK_MENU_ITEM(g_list_last (children)->data); gtk_check_menu_item_set_active (item, active); g_list_free (children); } static void -tab_width_changed (GObject *object, GParamSpec *pspec, XedWindow *window) +tab_width_changed (GObject *object, + GParamSpec *pspec, + XedWindow *window) { GList *items; GList *item; - XedStatusComboBox *combo = XED_STATUS_COMBO_BOX (window->priv->tab_width_combo); + XedStatusComboBox *combo = XED_STATUS_COMBO_BOX(window->priv->tab_width_combo); guint new_tab_width; gboolean found = FALSE; items = xed_status_combo_box_get_items (combo); - new_tab_width = gtk_source_view_get_tab_width (GTK_SOURCE_VIEW (object)); + new_tab_width = gtk_source_view_get_tab_width (GTK_SOURCE_VIEW(object)); - for (item = items; item; item = item->next) { - guint tab_width = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item->data), TAB_WIDTH_DATA)); + for (item = items; item; item = item->next) + { + guint tab_width = GPOINTER_TO_INT(g_object_get_data (G_OBJECT (item->data), TAB_WIDTH_DATA)); - if (tab_width == new_tab_width) { - set_tab_width_item_blocked (window, GTK_MENU_ITEM (item->data)); + if (tab_width == new_tab_width) + { + set_tab_width_item_blocked (window, GTK_MENU_ITEM(item->data)); found = TRUE; } - if (GTK_IS_SEPARATOR_MENU_ITEM (item->next->data)) { - if (!found) { + if (GTK_IS_SEPARATOR_MENU_ITEM(item->next->data)) + { + if (!found) + { /* Set for the last item the custom thing */ gchar *text; text = g_strdup_printf ("%u", new_tab_width); - xed_status_combo_box_set_item_text (combo, GTK_MENU_ITEM (item->data), text); - gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (item->data))), text); + xed_status_combo_box_set_item_text (combo, GTK_MENU_ITEM(item->data), text); + gtk_label_set_text (GTK_LABEL(gtk_bin_get_child (GTK_BIN (item->data))), text); - set_tab_width_item_blocked (window, GTK_MENU_ITEM (item->data)); - gtk_widget_show (GTK_WIDGET (item->data)); + set_tab_width_item_blocked (window, GTK_MENU_ITEM(item->data)); + gtk_widget_show (GTK_WIDGET(item->data)); } - else { - gtk_widget_hide (GTK_WIDGET (item->data)); + else + { + gtk_widget_hide (GTK_WIDGET(item->data)); } break; @@ -1833,33 +1987,40 @@ tab_width_changed (GObject *object, GParamSpec *pspec, XedWindow *window) } static void -language_changed (GObject *object, GParamSpec *pspec, XedWindow *window) +language_changed (GObject *object, + GParamSpec *pspec, + XedWindow *window) { GList *items; GList *item; - XedStatusComboBox *combo = XED_STATUS_COMBO_BOX (window->priv->language_combo); + XedStatusComboBox *combo = XED_STATUS_COMBO_BOX(window->priv->language_combo); GtkSourceLanguage *new_language; const gchar *new_id; items = xed_status_combo_box_get_items (combo); - new_language = gtk_source_buffer_get_language (GTK_SOURCE_BUFFER (object)); + new_language = gtk_source_buffer_get_language (GTK_SOURCE_BUFFER(object)); - if (new_language) { + if (new_language) + { new_id = gtk_source_language_get_id (new_language); } - else { + else + { new_id = NULL; } - for (item = items; item; item = item->next) { - GtkSourceLanguage *lang = g_object_get_data (G_OBJECT (item->data), LANGUAGE_DATA); - if ((new_id == NULL && lang == NULL) || - (new_id != NULL && lang != NULL && strcmp (gtk_source_language_get_id (lang), new_id) == 0)) { - g_signal_handlers_block_by_func (window->priv->language_combo, language_combo_changed, window); - xed_status_combo_box_set_item ( - XED_STATUS_COMBO_BOX (window->priv->language_combo), GTK_MENU_ITEM (item->data)); - g_signal_handlers_unblock_by_func (window->priv->language_combo, language_combo_changed, window); + for (item = items; item; item = item->next) + { + GtkSourceLanguage *lang = g_object_get_data (G_OBJECT(item->data), + LANGUAGE_DATA); + if ((new_id == NULL && lang == NULL) + || (new_id != NULL && lang != NULL && strcmp (gtk_source_language_get_id (lang), new_id) == 0)) + { + g_signal_handlers_block_by_func(window->priv->language_combo, language_combo_changed, window); + xed_status_combo_box_set_item (XED_STATUS_COMBO_BOX(window->priv->language_combo), + GTK_MENU_ITEM(item->data)); + g_signal_handlers_unblock_by_func(window->priv->language_combo, language_combo_changed, window); } } @@ -1867,7 +2028,10 @@ language_changed (GObject *object, GParamSpec *pspec, XedWindow *window) } static void -notebook_switch_page (GtkNotebook *book, GtkWidget *pg, gint page_num, XedWindow *window) +notebook_switch_page (GtkNotebook *book, + GtkWidget *pg, + gint page_num, + XedWindow *window) { XedView *view; XedTab *tab; @@ -1875,23 +2039,26 @@ notebook_switch_page (GtkNotebook *book, GtkWidget *pg, gint page_num, XedWindow gchar *action_name; /* CHECK: I don't know why but it seems notebook_switch_page is called - two times every time the user change the active tab */ + two times every time the user change the active tab */ - tab = XED_TAB (gtk_notebook_get_nth_page (book, page_num)); - if (tab == window->priv->active_tab) { + tab = XED_TAB(gtk_notebook_get_nth_page (book, page_num)); + if (tab == window->priv->active_tab) + { return; } - if (window->priv->active_tab) { - if (window->priv->tab_width_id) { - g_signal_handler_disconnect (xed_tab_get_view (window->priv->active_tab), - window->priv->tab_width_id); + if (window->priv->active_tab) + { + if (window->priv->tab_width_id) + { + g_signal_handler_disconnect (xed_tab_get_view (window->priv->active_tab), window->priv->tab_width_id); window->priv->tab_width_id = 0; } - if (window->priv->spaces_instead_of_tabs_id) { + if (window->priv->spaces_instead_of_tabs_id) + { g_signal_handler_disconnect (xed_tab_get_view (window->priv->active_tab), - window->priv->spaces_instead_of_tabs_id); + window->priv->spaces_instead_of_tabs_id); window->priv->spaces_instead_of_tabs_id = 0; } } @@ -1910,8 +2077,9 @@ notebook_switch_page (GtkNotebook *book, GtkWidget *pg, gint page_num, XedWindow * is set active during the documents list menu creation * CHECK: would it be nicer if active_tab was a property and we monitored the notify signal? */ - if (action != NULL) { - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); + if (action != NULL) + { + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), TRUE); } g_free (action_name); @@ -1922,28 +2090,27 @@ notebook_switch_page (GtkNotebook *book, GtkWidget *pg, gint page_num, XedWindow view = xed_tab_get_view (tab); /* sync the statusbar */ - update_cursor_position_statusbar (GTK_TEXT_BUFFER (xed_tab_get_document (tab)), window); - xed_statusbar_set_overwrite (XED_STATUSBAR (window->priv->statusbar), - gtk_text_view_get_overwrite (GTK_TEXT_VIEW (view))); + update_cursor_position_statusbar (GTK_TEXT_BUFFER(xed_tab_get_document (tab)), window); + xed_statusbar_set_overwrite (XED_STATUSBAR(window->priv->statusbar), + gtk_text_view_get_overwrite (GTK_TEXT_VIEW(view))); gtk_widget_show (window->priv->tab_width_combo); gtk_widget_show (window->priv->language_combo); - window->priv->tab_width_id = g_signal_connect (view, "notify::tab-width", - G_CALLBACK (tab_width_changed), window); + window->priv->tab_width_id = g_signal_connect(view, "notify::tab-width", G_CALLBACK (tab_width_changed), window); - window->priv->spaces_instead_of_tabs_id = g_signal_connect (view, "notify::insert-spaces-instead-of-tabs", - G_CALLBACK (spaces_instead_of_tabs_changed), window); + window->priv->spaces_instead_of_tabs_id = g_signal_connect(view, "notify::insert-spaces-instead-of-tabs", + G_CALLBACK (spaces_instead_of_tabs_changed), window); - window->priv->language_changed_id = g_signal_connect (xed_tab_get_document (tab), "notify::language", - G_CALLBACK (language_changed), window); + window->priv->language_changed_id = g_signal_connect(xed_tab_get_document (tab), "notify::language", + G_CALLBACK (language_changed), window); /* call it for the first time */ - tab_width_changed (G_OBJECT (view), NULL, window); - spaces_instead_of_tabs_changed (G_OBJECT (view), NULL, window); - language_changed (G_OBJECT (xed_tab_get_document (tab)), NULL, window); + tab_width_changed (G_OBJECT(view), NULL, window); + spaces_instead_of_tabs_changed (G_OBJECT(view), NULL, window); + language_changed (G_OBJECT(xed_tab_get_document (tab)), NULL, window); - g_signal_emit (G_OBJECT (window), signals[ACTIVE_TAB_CHANGED], 0, window->priv->active_tab); + g_signal_emit (G_OBJECT(window), signals[ACTIVE_TAB_CHANGED], 0, window->priv->active_tab); } static void @@ -1952,18 +2119,20 @@ set_sensitivity_according_to_window_state (XedWindow *window) GtkAction *action; /* We disable File->Quit/SaveAll/CloseAll while printing to avoid to have two - operations (save and print/print preview) that uses the message area at - the same time (may be we can remove this limitation in the future) */ + operations (save and print/print preview) that uses the message area at + the same time (may be we can remove this limitation in the future) */ /* We disable File->Quit/CloseAll if state is saving since saving cannot be - cancelled (may be we can remove this limitation in the future) */ - gtk_action_group_set_sensitive (window->priv->quit_action_group, - !(window->priv->state & XED_WINDOW_STATE_SAVING) && - !(window->priv->state & XED_WINDOW_STATE_PRINTING)); + cancelled (may be we can remove this limitation in the future) */ + gtk_action_group_set_sensitive ( + window->priv->quit_action_group, + !(window->priv->state & XED_WINDOW_STATE_SAVING) + && !(window->priv->state & XED_WINDOW_STATE_PRINTING)); action = gtk_action_group_get_action (window->priv->action_group, "FileCloseAll"); - gtk_action_set_sensitive (action, - !(window->priv->state & XED_WINDOW_STATE_SAVING) && - !(window->priv->state & XED_WINDOW_STATE_PRINTING)); + gtk_action_set_sensitive ( + action, + !(window->priv->state & XED_WINDOW_STATE_SAVING) + && !(window->priv->state & XED_WINDOW_STATE_PRINTING)); action = gtk_action_group_get_action (window->priv->action_group, "FileSaveAll"); gtk_action_set_sensitive (action, !(window->priv->state & XED_WINDOW_STATE_PRINTING)); @@ -1975,57 +2144,67 @@ set_sensitivity_according_to_window_state (XedWindow *window) gtk_action_set_sensitive (action, !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); gtk_action_group_set_sensitive (window->priv->recents_action_group, - !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); + !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); - xed_notebook_set_close_buttons_sensitive (XED_NOTEBOOK (window->priv->notebook), - !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); + xed_notebook_set_close_buttons_sensitive (XED_NOTEBOOK(window->priv->notebook), + !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); - xed_notebook_set_tab_drag_and_drop_enabled (XED_NOTEBOOK (window->priv->notebook), - !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); + xed_notebook_set_tab_drag_and_drop_enabled (XED_NOTEBOOK(window->priv->notebook), + !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); - if ((window->priv->state & XED_WINDOW_STATE_SAVING_SESSION) != 0) { + if ((window->priv->state & XED_WINDOW_STATE_SAVING_SESSION) != 0) + { /* TODO: If we really care, Find could be active * when in SAVING_SESSION state */ - if (gtk_action_group_get_sensitive (window->priv->action_group)) { + if (gtk_action_group_get_sensitive (window->priv->action_group)) + { gtk_action_group_set_sensitive (window->priv->action_group, FALSE); } - if (gtk_action_group_get_sensitive (window->priv->quit_action_group)) { + if (gtk_action_group_get_sensitive (window->priv->quit_action_group)) + { gtk_action_group_set_sensitive (window->priv->quit_action_group, FALSE); } - if (gtk_action_group_get_sensitive (window->priv->close_action_group)) { + if (gtk_action_group_get_sensitive (window->priv->close_action_group)) + { gtk_action_group_set_sensitive (window->priv->close_action_group, FALSE); } } else { - if (!gtk_action_group_get_sensitive (window->priv->action_group)) { + if (!gtk_action_group_get_sensitive (window->priv->action_group)) + { gtk_action_group_set_sensitive (window->priv->action_group, window->priv->num_tabs > 0); } - if (!gtk_action_group_get_sensitive (window->priv->quit_action_group)) { + if (!gtk_action_group_get_sensitive (window->priv->quit_action_group)) + { gtk_action_group_set_sensitive (window->priv->quit_action_group, window->priv->num_tabs > 0); } - if (!gtk_action_group_get_sensitive (window->priv->close_action_group)) {} { + if (!gtk_action_group_get_sensitive (window->priv->close_action_group)) + { gtk_action_group_set_sensitive (window->priv->close_action_group, window->priv->num_tabs > 0); } } } static void -update_tab_autosave (GtkWidget *widget, gpointer data) +update_tab_autosave (GtkWidget *widget, + gpointer data) { - XedTab *tab = XED_TAB (widget); + XedTab *tab = XED_TAB(widget); gboolean *enabled = (gboolean *) data; xed_tab_set_auto_save_enabled (tab, *enabled); } static void -analyze_tab_state (XedTab *tab, XedWindow *window) +analyze_tab_state (XedTab *tab, + XedWindow *window) { XedTabState ts; ts = xed_tab_get_state (tab); - switch (ts) { + switch (ts) + { case XED_TAB_STATE_LOADING: case XED_TAB_STATE_REVERTING: window->priv->state |= XED_WINDOW_STATE_LOADING; @@ -2065,36 +2244,43 @@ update_window_state (XedWindow *window) window->priv->num_tabs_with_error = 0; - gtk_container_foreach (GTK_CONTAINER (window->priv->notebook), (GtkCallback)analyze_tab_state, window); + gtk_container_foreach (GTK_CONTAINER(window->priv->notebook), (GtkCallback) analyze_tab_state, window); xed_debug_message (DEBUG_WINDOW, "New state: %x", window->priv->state); - if (old_ws != window->priv->state) { + if (old_ws != window->priv->state) + { set_sensitivity_according_to_window_state (window); - xed_statusbar_set_window_state (XED_STATUSBAR (window->priv->statusbar), - window->priv->state, window->priv->num_tabs_with_error); - g_object_notify (G_OBJECT (window), "state"); + xed_statusbar_set_window_state (XED_STATUSBAR(window->priv->statusbar), window->priv->state, + window->priv->num_tabs_with_error); + g_object_notify (G_OBJECT(window), "state"); } - else if (old_num_of_errors != window->priv->num_tabs_with_error) { - xed_statusbar_set_window_state (XED_STATUSBAR (window->priv->statusbar), - window->priv->state, window->priv->num_tabs_with_error); + else if (old_num_of_errors != window->priv->num_tabs_with_error) + { + xed_statusbar_set_window_state (XED_STATUSBAR(window->priv->statusbar), window->priv->state, + window->priv->num_tabs_with_error); } } static void -sync_state (XedTab *tab, GParamSpec *pspec, XedWindow *window) +sync_state (XedTab *tab, + GParamSpec *pspec, + XedWindow *window) { xed_debug (DEBUG_WINDOW); update_window_state (window); - if (tab != window->priv->active_tab) { + if (tab != window->priv->active_tab) + { return; } set_sensitivity_according_to_tab (window, tab); - g_signal_emit (G_OBJECT (window), signals[ACTIVE_TAB_STATE_CHANGED], 0); + g_signal_emit (G_OBJECT(window), signals[ACTIVE_TAB_STATE_CHANGED], 0); } static void -sync_name (XedTab *tab, GParamSpec *pspec, XedWindow *window) +sync_name (XedTab *tab, + GParamSpec *pspec, + XedWindow *window) { GtkAction *action; gchar *action_name; @@ -2104,7 +2290,8 @@ sync_name (XedTab *tab, GParamSpec *pspec, XedWindow *window) gint n; XedDocument *doc; - if (tab == window->priv->active_tab) { + if (tab == window->priv->active_tab) + { set_title (window); doc = xed_tab_get_document (tab); action = gtk_action_group_get_action (window->priv->action_group, "FileRevert"); @@ -2112,15 +2299,15 @@ sync_name (XedTab *tab, GParamSpec *pspec, XedWindow *window) } /* sync the item in the documents list menu */ - n = gtk_notebook_page_num (GTK_NOTEBOOK (window->priv->notebook), GTK_WIDGET (tab)); + n = gtk_notebook_page_num (GTK_NOTEBOOK(window->priv->notebook), GTK_WIDGET(tab)); action_name = g_strdup_printf ("Tab_%d", n); action = gtk_action_group_get_action (window->priv->documents_list_action_group, action_name); g_free (action_name); - g_return_if_fail (action != NULL); + g_return_if_fail(action != NULL); tab_name = _xed_tab_get_name (tab); escaped_name = xed_utils_escape_underscores (tab_name, -1); - tip = get_menu_tip_for_tab (tab); + tip = get_menu_tip_for_tab (tab); g_object_set (action, "label", escaped_name, NULL); g_object_set (action, "tooltip", tip, NULL); @@ -2137,26 +2324,30 @@ get_drop_window (GtkWidget *widget) { GtkWidget *target_window; target_window = gtk_widget_get_toplevel (widget); - g_return_val_if_fail (XED_IS_WINDOW (target_window), NULL); + g_return_val_if_fail(XED_IS_WINDOW (target_window), NULL); - if ((XED_WINDOW(target_window)->priv->state & XED_WINDOW_STATE_SAVING_SESSION) != 0) { + if ((XED_WINDOW(target_window)->priv->state & XED_WINDOW_STATE_SAVING_SESSION) != 0) + { return NULL; } - return XED_WINDOW (target_window); + return XED_WINDOW(target_window); } static void -load_uris_from_drop (XedWindow *window, gchar **uri_list) +load_uris_from_drop (XedWindow *window, + gchar **uri_list) { GSList *uris = NULL; gint i; - if (uri_list == NULL) { + if (uri_list == NULL) + { return; } - for (i = 0; uri_list[i] != NULL; ++i) { + for (i = 0; uri_list[i] != NULL; ++i) + { uris = g_slist_prepend (uris, uri_list[i]); } @@ -2168,19 +2359,27 @@ load_uris_from_drop (XedWindow *window, gchar **uri_list) /* Handle drops on the XedWindow */ static void -drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, gint x, gint y, GtkSelectionData *selection_data, - guint info, guint timestamp, gpointer data) +drag_data_received_cb (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint timestamp, + gpointer data) { XedWindow *window; gchar **uri_list; window = get_drop_window (widget); - if (window == NULL) { + if (window == NULL) + { return; } - if (info == TARGET_URI_LIST) { - uri_list = xed_utils_drop_get_uris(selection_data); + if (info == TARGET_URI_LIST) + { + uri_list = xed_utils_drop_get_uris (selection_data); load_uris_from_drop (window, uri_list); g_strfreev (uri_list); } @@ -2188,11 +2387,13 @@ drag_data_received_cb (GtkWidget *widget, GdkDragContext *context, gint x, gint /* Handle drops on the XedView */ static void -drop_uris_cb (GtkWidget *widget, gchar **uri_list) +drop_uris_cb (GtkWidget *widget, + gchar **uri_list) { XedWindow *window; window = get_drop_window (widget); - if (window == NULL) { + if (window == NULL) + { return; } load_uris_from_drop (window, uri_list); @@ -2205,13 +2406,14 @@ fullscreen_controls_show (XedWindow *window) GdkRectangle fs_rect; gint w, h; - screen = gtk_window_get_screen (GTK_WINDOW (window)); - gdk_screen_get_monitor_geometry (screen, - gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (GTK_WIDGET (window))), &fs_rect); + screen = gtk_window_get_screen (GTK_WINDOW(window)); + gdk_screen_get_monitor_geometry ( + screen, gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (GTK_WIDGET(window))), + &fs_rect); - gtk_window_get_size (GTK_WINDOW (window->priv->fullscreen_controls), &w, &h); - gtk_window_resize (GTK_WINDOW (window->priv->fullscreen_controls), fs_rect.width, h); - gtk_window_move (GTK_WINDOW (window->priv->fullscreen_controls), fs_rect.x, fs_rect.y - h + 1); + gtk_window_get_size (GTK_WINDOW(window->priv->fullscreen_controls), &w, &h); + gtk_window_resize (GTK_WINDOW(window->priv->fullscreen_controls), fs_rect.width, h); + gtk_window_move (GTK_WINDOW(window->priv->fullscreen_controls), fs_rect.x, fs_rect.y - h + 1); gtk_widget_show_all (window->priv->fullscreen_controls); } @@ -2219,83 +2421,102 @@ fullscreen_controls_show (XedWindow *window) static gboolean run_fullscreen_animation (gpointer data) { - XedWindow *window = XED_WINDOW (data); + XedWindow *window = XED_WINDOW(data); GdkScreen *screen; GdkRectangle fs_rect; gint x, y; - screen = gtk_window_get_screen (GTK_WINDOW (window)); + screen = gtk_window_get_screen (GTK_WINDOW(window)); gdk_screen_get_monitor_geometry (screen, - gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (GTK_WIDGET (window))), &fs_rect); + gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (GTK_WIDGET(window))), + &fs_rect); - gtk_window_get_position (GTK_WINDOW (window->priv->fullscreen_controls), &x, &y); + gtk_window_get_position (GTK_WINDOW(window->priv->fullscreen_controls), &x, &y); - if (window->priv->fullscreen_animation_enter) { - if (y == fs_rect.y) { + if (window->priv->fullscreen_animation_enter) + { + if (y == fs_rect.y) + { window->priv->fullscreen_animation_timeout_id = 0; return FALSE; } - else { - gtk_window_move (GTK_WINDOW (window->priv->fullscreen_controls), x, y + 1); + else + { + gtk_window_move (GTK_WINDOW(window->priv->fullscreen_controls), x, y + 1); return TRUE; } } - else { + else + { gint w, h; - gtk_window_get_size (GTK_WINDOW (window->priv->fullscreen_controls), &w, &h); - if (y == fs_rect.y - h + 1) { + gtk_window_get_size (GTK_WINDOW(window->priv->fullscreen_controls), &w, &h); + if (y == fs_rect.y - h + 1) + { window->priv->fullscreen_animation_timeout_id = 0; return FALSE; } - else { - gtk_window_move (GTK_WINDOW (window->priv->fullscreen_controls), x, y - 1); + else + { + gtk_window_move (GTK_WINDOW(window->priv->fullscreen_controls), x, y - 1); return TRUE; } } } static void -show_hide_fullscreen_toolbar (XedWindow *window, gboolean show, gint height) +show_hide_fullscreen_toolbar (XedWindow *window, + gboolean show, + gint height) { GtkSettings *settings; gboolean enable_animations; - settings = gtk_widget_get_settings (GTK_WIDGET (window)); - g_object_get (G_OBJECT (settings), "gtk-enable-animations", &enable_animations, NULL); + settings = gtk_widget_get_settings (GTK_WIDGET(window)); + g_object_get (G_OBJECT(settings), "gtk-enable-animations", &enable_animations, NULL); - if (enable_animations) { + if (enable_animations) + { window->priv->fullscreen_animation_enter = show; - if (window->priv->fullscreen_animation_timeout_id == 0) { - window->priv->fullscreen_animation_timeout_id = - g_timeout_add (FULLSCREEN_ANIMATION_SPEED, (GSourceFunc) run_fullscreen_animation, window); + if (window->priv->fullscreen_animation_timeout_id == 0) + { + window->priv->fullscreen_animation_timeout_id = g_timeout_add (FULLSCREEN_ANIMATION_SPEED, + (GSourceFunc) run_fullscreen_animation, window); } } - else { + else + { GdkRectangle fs_rect; GdkScreen *screen; - screen = gtk_window_get_screen (GTK_WINDOW (window)); + screen = gtk_window_get_screen (GTK_WINDOW(window)); gdk_screen_get_monitor_geometry (screen, - gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (GTK_WIDGET (window))), &fs_rect); + gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (GTK_WIDGET(window))), + &fs_rect); - if (show) { - gtk_window_move (GTK_WINDOW (window->priv->fullscreen_controls), fs_rect.x, fs_rect.y); + if (show) + { + gtk_window_move (GTK_WINDOW(window->priv->fullscreen_controls), fs_rect.x, fs_rect.y); } - else { - gtk_window_move (GTK_WINDOW (window->priv->fullscreen_controls), fs_rect.x, fs_rect.y - height + 1); + else + { + gtk_window_move (GTK_WINDOW(window->priv->fullscreen_controls), fs_rect.x, fs_rect.y - height + 1); } } } static gboolean -on_fullscreen_controls_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event, XedWindow *window) +on_fullscreen_controls_enter_notify_event (GtkWidget *widget, + GdkEventCrossing *event, + XedWindow *window) { show_hide_fullscreen_toolbar (window, TRUE, 0); return FALSE; } static gboolean -on_fullscreen_controls_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event, XedWindow *window) +on_fullscreen_controls_leave_notify_event (GtkWidget *widget, + GdkEventCrossing *event, + XedWindow *window) { GdkDisplay *display; GdkScreen *screen; @@ -2303,15 +2524,16 @@ on_fullscreen_controls_leave_notify_event (GtkWidget *widget, GdkEventCrossing * gint x, y; display = gdk_display_get_default (); - screen = gtk_window_get_screen (GTK_WINDOW (window)); + screen = gtk_window_get_screen (GTK_WINDOW(window)); - gtk_window_get_size (GTK_WINDOW (window->priv->fullscreen_controls), &w, &h); + gtk_window_get_size (GTK_WINDOW(window->priv->fullscreen_controls), &w, &h); gdk_display_get_pointer (display, &screen, &x, &y, NULL); /* gtk seems to emit leave notify when clicking on tool items, * work around it by checking the coordinates */ - if (y >= h) { + if (y >= h) + { show_hide_fullscreen_toolbar (window, FALSE, h); } @@ -2326,42 +2548,46 @@ fullscreen_controls_build (XedWindow *window) GtkWidget *toolbar_recent_menu; GtkAction *action; - if (priv->fullscreen_controls != NULL) { + if (priv->fullscreen_controls != NULL) + { return; } priv->fullscreen_controls = gtk_window_new (GTK_WINDOW_POPUP); - gtk_window_set_transient_for (GTK_WINDOW (priv->fullscreen_controls), &window->window); + gtk_window_set_transient_for (GTK_WINDOW(priv->fullscreen_controls), &window->window); /* popup toolbar */ toolbar = gtk_ui_manager_get_widget (priv->manager, "/FullscreenToolBar"); - gtk_container_add (GTK_CONTAINER (priv->fullscreen_controls), toolbar); + gtk_container_add (GTK_CONTAINER(priv->fullscreen_controls), toolbar); action = gtk_action_group_get_action (priv->always_sensitive_action_group, "LeaveFullscreen"); g_object_set (action, "is-important", TRUE, NULL); toolbar_recent_menu = setup_toolbar_open_button (window, toolbar); - gtk_container_foreach (GTK_CONTAINER (toolbar), (GtkCallback)set_non_homogeneus, NULL); + gtk_container_foreach (GTK_CONTAINER(toolbar), (GtkCallback) set_non_homogeneus, NULL); /* Set the toolbar style */ - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); + gtk_toolbar_set_style (GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ); - g_signal_connect (priv->fullscreen_controls, "enter-notify-event", - G_CALLBACK (on_fullscreen_controls_enter_notify_event), window); + g_signal_connect(priv->fullscreen_controls, "enter-notify-event", + G_CALLBACK (on_fullscreen_controls_enter_notify_event), window); - g_signal_connect (priv->fullscreen_controls, "leave-notify-event", - G_CALLBACK (on_fullscreen_controls_leave_notify_event), window); + g_signal_connect(priv->fullscreen_controls, "leave-notify-event", + G_CALLBACK (on_fullscreen_controls_leave_notify_event), window); } static void -can_search_again (XedDocument *doc, GParamSpec *pspec, XedWindow *window) +can_search_again (XedDocument *doc, + GParamSpec *pspec, + XedWindow *window) { gboolean sensitive; GtkAction *action; - if (doc != xed_window_get_active_document (window)) { + if (doc != xed_window_get_active_document (window)) + { return; } @@ -2376,15 +2602,16 @@ can_search_again (XedDocument *doc, GParamSpec *pspec, XedWindow *window) static void can_undo (XedDocument *doc, - GParamSpec *pspec, - XedWindow *window) + GParamSpec *pspec, + XedWindow *window) { GtkAction *action; gboolean sensitive; - sensitive = gtk_source_buffer_can_undo (GTK_SOURCE_BUFFER (doc)); + sensitive = gtk_source_buffer_can_undo (GTK_SOURCE_BUFFER(doc)); - if (doc != xed_window_get_active_document (window)) { + if (doc != xed_window_get_active_document (window)) + { return; } @@ -2394,15 +2621,16 @@ can_undo (XedDocument *doc, static void can_redo (XedDocument *doc, - GParamSpec *pspec, - XedWindow *window) + GParamSpec *pspec, + XedWindow *window) { GtkAction *action; gboolean sensitive; - sensitive = gtk_source_buffer_can_redo (GTK_SOURCE_BUFFER (doc)); + sensitive = gtk_source_buffer_can_redo (GTK_SOURCE_BUFFER(doc)); - if (doc != xed_window_get_active_document (window)) { + if (doc != xed_window_get_active_document (window)) + { return; } @@ -2412,8 +2640,8 @@ can_redo (XedDocument *doc, static void selection_changed (XedDocument *doc, - GParamSpec *pspec, - XedWindow *window) + GParamSpec *pspec, + XedWindow *window) { XedTab *tab; XedView *view; @@ -2424,7 +2652,8 @@ selection_changed (XedDocument *doc, xed_debug (DEBUG_WINDOW); - if (doc != xed_window_get_active_document (window)) { + if (doc != xed_window_get_active_document (window)) + { return; } @@ -2433,34 +2662,37 @@ selection_changed (XedDocument *doc, state_normal = (state == XED_TAB_STATE_NORMAL); view = xed_tab_get_view (tab); - editable = gtk_text_view_get_editable (GTK_TEXT_VIEW (view)); + editable = gtk_text_view_get_editable (GTK_TEXT_VIEW(view)); action = gtk_action_group_get_action (window->priv->action_group, "EditCut"); gtk_action_set_sensitive (action, - state_normal && editable && gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (doc))); + state_normal && editable && gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER(doc))); action = gtk_action_group_get_action (window->priv->action_group, "EditCopy"); gtk_action_set_sensitive (action, - (state_normal || - state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) && - gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (doc))); + (state_normal || state == XED_TAB_STATE_EXTERNALLY_MODIFIED_NOTIFICATION) + && gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER(doc))); action = gtk_action_group_get_action (window->priv->action_group, "EditDelete"); gtk_action_set_sensitive (action, - state_normal && editable && gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (doc))); + state_normal && editable && gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER(doc))); xed_plugins_engine_update_plugins_ui (xed_plugins_engine_get_default (), window); } static void -sync_languages_menu (XedDocument *doc, GParamSpec *pspec, XedWindow *window) +sync_languages_menu (XedDocument *doc, + GParamSpec *pspec, + XedWindow *window) { update_languages_menu (window); xed_plugins_engine_update_plugins_ui (xed_plugins_engine_get_default (), window); } static void -readonly_changed (XedDocument *doc, GParamSpec *pspec, XedWindow *window) +readonly_changed (XedDocument *doc, + GParamSpec *pspec, + XedWindow *window) { set_sensitivity_according_to_tab (window, window->priv->active_tab); sync_name (window->priv->active_tab, NULL, window); @@ -2468,7 +2700,9 @@ readonly_changed (XedDocument *doc, GParamSpec *pspec, XedWindow *window) } static void -editable_changed (XedView *view, GParamSpec *arg1, XedWindow *window) +editable_changed (XedView *view, + GParamSpec *arg1, + XedWindow *window) { xed_plugins_engine_update_plugins_ui (xed_plugins_engine_get_default (), window); } @@ -2487,14 +2721,16 @@ update_sensitivity_according_to_open_tabs (XedWindow *window) } static void -notebook_tab_added (XedNotebook *notebook, XedTab *tab, XedWindow *window) +notebook_tab_added (XedNotebook *notebook, + XedTab *tab, + XedWindow *window) { XedView *view; XedDocument *doc; xed_debug (DEBUG_WINDOW); - g_return_if_fail ((window->priv->state & XED_WINDOW_STATE_SAVING_SESSION) == 0); + g_return_if_fail((window->priv->state & XED_WINDOW_STATE_SAVING_SESSION) == 0); ++window->priv->num_tabs; @@ -2506,92 +2742,101 @@ notebook_tab_added (XedNotebook *notebook, XedTab *tab, XedWindow *window) /* IMPORTANT: remember to disconnect the signal in notebook_tab_removed * if a new signal is connected here */ - g_signal_connect (tab, "notify::name", G_CALLBACK (sync_name), window); - g_signal_connect (tab, "notify::state", G_CALLBACK (sync_state), window); + g_signal_connect(tab, "notify::name", G_CALLBACK (sync_name), window); + g_signal_connect(tab, "notify::state", G_CALLBACK (sync_state), window); - g_signal_connect (doc, "cursor-moved", G_CALLBACK (update_cursor_position_statusbar), window); - g_signal_connect (doc, "notify::can-search-again", G_CALLBACK (can_search_again), window); - g_signal_connect (doc, "notify::can-undo", G_CALLBACK (can_undo), window); - g_signal_connect (doc, "notify::can-redo", G_CALLBACK (can_redo), window); - g_signal_connect (doc, "notify::has-selection", G_CALLBACK (selection_changed), window); - g_signal_connect (doc, "notify::language", G_CALLBACK (sync_languages_menu), window); - g_signal_connect (doc, "notify::read-only", G_CALLBACK (readonly_changed), window); - g_signal_connect (view, "toggle_overwrite", G_CALLBACK (update_overwrite_mode_statusbar), window); - g_signal_connect (view, "notify::editable", G_CALLBACK (editable_changed), window); + g_signal_connect(doc, "cursor-moved", G_CALLBACK (update_cursor_position_statusbar), window); + g_signal_connect(doc, "notify::can-search-again", G_CALLBACK (can_search_again), window); + g_signal_connect(doc, "notify::can-undo", G_CALLBACK (can_undo), window); + g_signal_connect(doc, "notify::can-redo", G_CALLBACK (can_redo), window); + g_signal_connect(doc, "notify::has-selection", G_CALLBACK (selection_changed), window); + g_signal_connect(doc, "notify::language", G_CALLBACK (sync_languages_menu), window); + g_signal_connect(doc, "notify::read-only", G_CALLBACK (readonly_changed), window); + g_signal_connect(view, "toggle_overwrite", G_CALLBACK (update_overwrite_mode_statusbar), window); + g_signal_connect(view, "notify::editable", G_CALLBACK (editable_changed), window); update_documents_list_menu (window); - g_signal_connect (view, "drop_uris", G_CALLBACK (drop_uris_cb), NULL); + g_signal_connect(view, "drop_uris", G_CALLBACK (drop_uris_cb), NULL); update_window_state (window); - g_signal_emit (G_OBJECT (window), signals[TAB_ADDED], 0, tab); + g_signal_emit (G_OBJECT(window), signals[TAB_ADDED], 0, tab); } static void -notebook_tab_removed (XedNotebook *notebook, XedTab *tab, XedWindow *window) +notebook_tab_removed (XedNotebook *notebook, + XedTab *tab, + XedWindow *window) { - XedView *view; + XedView *view; XedDocument *doc; xed_debug (DEBUG_WINDOW); - g_return_if_fail ((window->priv->state & XED_WINDOW_STATE_SAVING_SESSION) == 0); + g_return_if_fail((window->priv->state & XED_WINDOW_STATE_SAVING_SESSION) == 0); --window->priv->num_tabs; view = xed_tab_get_view (tab); doc = xed_tab_get_document (tab); - g_signal_handlers_disconnect_by_func (tab, G_CALLBACK (sync_name), window); - g_signal_handlers_disconnect_by_func (tab, G_CALLBACK (sync_state), window); - g_signal_handlers_disconnect_by_func (doc, G_CALLBACK (update_cursor_position_statusbar), window); - g_signal_handlers_disconnect_by_func (doc, G_CALLBACK (can_search_again), window); - g_signal_handlers_disconnect_by_func (doc, G_CALLBACK (can_undo), window); - g_signal_handlers_disconnect_by_func (doc, G_CALLBACK (can_redo), window); - g_signal_handlers_disconnect_by_func (doc, G_CALLBACK (selection_changed), window); - g_signal_handlers_disconnect_by_func (doc, G_CALLBACK (sync_languages_menu), window); - g_signal_handlers_disconnect_by_func (doc, G_CALLBACK (readonly_changed), window); - g_signal_handlers_disconnect_by_func (view, G_CALLBACK (update_overwrite_mode_statusbar), window); - g_signal_handlers_disconnect_by_func (view, G_CALLBACK (editable_changed), window); - g_signal_handlers_disconnect_by_func (view, G_CALLBACK (drop_uris_cb), NULL); + g_signal_handlers_disconnect_by_func(tab, G_CALLBACK (sync_name), window); + g_signal_handlers_disconnect_by_func(tab, G_CALLBACK (sync_state), window); + g_signal_handlers_disconnect_by_func(doc, G_CALLBACK (update_cursor_position_statusbar), window); + g_signal_handlers_disconnect_by_func(doc, G_CALLBACK (can_search_again), window); + g_signal_handlers_disconnect_by_func(doc, G_CALLBACK (can_undo), window); + g_signal_handlers_disconnect_by_func(doc, G_CALLBACK (can_redo), window); + g_signal_handlers_disconnect_by_func(doc, G_CALLBACK (selection_changed), window); + g_signal_handlers_disconnect_by_func(doc, G_CALLBACK (sync_languages_menu), window); + g_signal_handlers_disconnect_by_func(doc, G_CALLBACK (readonly_changed), window); + g_signal_handlers_disconnect_by_func(view, G_CALLBACK (update_overwrite_mode_statusbar), window); + g_signal_handlers_disconnect_by_func(view, G_CALLBACK (editable_changed), window); + g_signal_handlers_disconnect_by_func(view, G_CALLBACK (drop_uris_cb), NULL); - if (window->priv->tab_width_id && tab == xed_window_get_active_tab (window)) { + if (window->priv->tab_width_id && tab == xed_window_get_active_tab (window)) + { g_signal_handler_disconnect (view, window->priv->tab_width_id); window->priv->tab_width_id = 0; } - if (window->priv->spaces_instead_of_tabs_id && tab == xed_window_get_active_tab (window)) { + if (window->priv->spaces_instead_of_tabs_id && tab == xed_window_get_active_tab (window)) + { g_signal_handler_disconnect (view, window->priv->spaces_instead_of_tabs_id); window->priv->spaces_instead_of_tabs_id = 0; } - if (window->priv->language_changed_id && tab == xed_window_get_active_tab (window)) { + if (window->priv->language_changed_id && tab == xed_window_get_active_tab (window)) + { g_signal_handler_disconnect (doc, window->priv->language_changed_id); window->priv->language_changed_id = 0; } - g_return_if_fail (window->priv->num_tabs >= 0); - if (window->priv->num_tabs == 0) { + g_return_if_fail(window->priv->num_tabs >= 0); + if (window->priv->num_tabs == 0) + { window->priv->active_tab = NULL; set_title (window); /* Remove line and col info */ - xed_statusbar_set_cursor_position (XED_STATUSBAR (window->priv->statusbar), -1, -1); + xed_statusbar_set_cursor_position (XED_STATUSBAR(window->priv->statusbar), -1, -1); - xed_statusbar_clear_overwrite (XED_STATUSBAR (window->priv->statusbar)); + xed_statusbar_clear_overwrite (XED_STATUSBAR(window->priv->statusbar)); /* hide the combos */ gtk_widget_hide (window->priv->tab_width_combo); gtk_widget_hide (window->priv->language_combo); } - if (!window->priv->removing_tabs) { + if (!window->priv->removing_tabs) + { update_documents_list_menu (window); update_next_prev_doc_sensitivity_per_window (window); } - else { - if (window->priv->num_tabs == 0) { + else + { + if (window->priv->num_tabs == 0) + { update_documents_list_menu (window); update_next_prev_doc_sensitivity_per_window (window); } @@ -2599,178 +2844,204 @@ notebook_tab_removed (XedNotebook *notebook, XedTab *tab, XedWindow *window) update_sensitivity_according_to_open_tabs (window); - if (window->priv->num_tabs == 0) { + if (window->priv->num_tabs == 0) + { xed_plugins_engine_update_plugins_ui (xed_plugins_engine_get_default (), window); } update_window_state (window); - g_signal_emit (G_OBJECT (window), signals[TAB_REMOVED], 0, tab); + g_signal_emit (G_OBJECT(window), signals[TAB_REMOVED], 0, tab); } static void -notebook_tabs_reordered (XedNotebook *notebook, XedWindow *window) +notebook_tabs_reordered (XedNotebook *notebook, + XedWindow *window) { update_documents_list_menu (window); update_next_prev_doc_sensitivity_per_window (window); - g_signal_emit (G_OBJECT (window), signals[TABS_REORDERED], 0); + g_signal_emit (G_OBJECT(window), signals[TABS_REORDERED], 0); } static void -notebook_tab_detached (XedNotebook *notebook, XedTab *tab, XedWindow *window) +notebook_tab_detached (XedNotebook *notebook, + XedTab *tab, + XedWindow *window) { XedWindow *new_window; new_window = clone_window (window); - xed_notebook_move_tab (notebook, XED_NOTEBOOK (_xed_window_get_notebook (new_window)), tab, 0); + xed_notebook_move_tab (notebook, XED_NOTEBOOK(_xed_window_get_notebook (new_window)), tab, 0); - gtk_window_set_position (GTK_WINDOW (new_window), GTK_WIN_POS_MOUSE); + gtk_window_set_position (GTK_WINDOW(new_window), GTK_WIN_POS_MOUSE); - gtk_widget_show (GTK_WIDGET (new_window)); + gtk_widget_show (GTK_WIDGET(new_window)); } static void -notebook_tab_close_request (XedNotebook *notebook, XedTab *tab, GtkWindow *window) +notebook_tab_close_request (XedNotebook *notebook, + XedTab *tab, + GtkWindow *window) { /* Note: we are destroying the tab before the default handler * seems to be ok, but we need to keep an eye on this. */ - _xed_cmd_file_close_tab (tab, XED_WINDOW (window)); + _xed_cmd_file_close_tab (tab, XED_WINDOW(window)); } static gboolean -show_notebook_popup_menu (GtkNotebook *notebook, XedWindow *window, GdkEventButton *event) +show_notebook_popup_menu (GtkNotebook *notebook, + XedWindow *window, + GdkEventButton *event) { GtkWidget *menu; // GtkAction *action; menu = gtk_ui_manager_get_widget (window->priv->manager, "/NotebookPopup"); - g_return_val_if_fail (menu != NULL, FALSE); + g_return_val_if_fail(menu != NULL, FALSE); // CHECK do we need this? #if 0 /* allow extensions to sync when showing the popup */ action = gtk_action_group_get_action (window->priv->action_group, - "NotebookPopupAction"); + "NotebookPopupAction"); g_return_val_if_fail (action != NULL, FALSE); gtk_action_activate (action); #endif - if (event != NULL) { - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time); + if (event != NULL) + { + gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time); } - else { + else + { GtkWidget *tab; GtkWidget *tab_label; - tab = GTK_WIDGET (xed_window_get_active_tab (window)); - g_return_val_if_fail (tab != NULL, FALSE); + tab = GTK_WIDGET(xed_window_get_active_tab (window)); + g_return_val_if_fail(tab != NULL, FALSE); tab_label = gtk_notebook_get_tab_label (notebook, tab); - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, - xed_utils_menu_position_under_widget, tab_label, 0, gtk_get_current_event_time ()); + gtk_menu_popup (GTK_MENU(menu), NULL, NULL, xed_utils_menu_position_under_widget, tab_label, 0, + gtk_get_current_event_time ()); - gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE); + gtk_menu_shell_select_first (GTK_MENU_SHELL(menu), FALSE); } return TRUE; } static gboolean -notebook_button_press_event (GtkNotebook *notebook, GdkEventButton *event, XedWindow *window) +notebook_button_press_event (GtkNotebook *notebook, + GdkEventButton *event, + XedWindow *window) { - if (GDK_BUTTON_PRESS == event->type && 3 == event->button) { + if (GDK_BUTTON_PRESS == event->type && 3 == event->button) + { return show_notebook_popup_menu (notebook, window, event); } - else if (GDK_BUTTON_PRESS == event->type && 2 == event->button) { + else if (GDK_BUTTON_PRESS == event->type && 2 == event->button) + { XedTab *tab; tab = xed_window_get_active_tab (window); - notebook_tab_close_request (XED_NOTEBOOK (notebook), tab, GTK_WINDOW (window)); + notebook_tab_close_request (XED_NOTEBOOK(notebook), tab, GTK_WINDOW(window)); return FALSE; } return FALSE; } static gboolean -notebook_popup_menu (GtkNotebook *notebook, XedWindow *window) +notebook_popup_menu (GtkNotebook *notebook, + XedWindow *window) { /* Only respond if the notebook is the actual focus */ - if (XED_IS_NOTEBOOK (gtk_window_get_focus (GTK_WINDOW (window)))) { + if (XED_IS_NOTEBOOK(gtk_window_get_focus (GTK_WINDOW (window)))) + { return show_notebook_popup_menu (notebook, window, NULL); } return FALSE; } static void -side_panel_size_allocate (GtkWidget *widget, GtkAllocation *allocation, XedWindow *window) +side_panel_size_allocate (GtkWidget *widget, + GtkAllocation *allocation, + XedWindow *window) { window->priv->side_panel_size = allocation->width; } static void -bottom_panel_size_allocate (GtkWidget *widget, GtkAllocation *allocation, XedWindow *window) +bottom_panel_size_allocate (GtkWidget *widget, + GtkAllocation *allocation, + XedWindow *window) { window->priv->bottom_panel_size = allocation->height; } static void -hpaned_restore_position (GtkWidget *widget, XedWindow *window) +hpaned_restore_position (GtkWidget *widget, + XedWindow *window) { gint pos; xed_debug_message (DEBUG_WINDOW, "Restoring hpaned position: side panel size %d", window->priv->side_panel_size); - pos = MAX (100, window->priv->side_panel_size); - gtk_paned_set_position (GTK_PANED (window->priv->hpaned), pos); + pos = MAX(100, window->priv->side_panel_size); + gtk_paned_set_position (GTK_PANED(window->priv->hpaned), pos); /* start monitoring the size */ - g_signal_connect (window->priv->side_panel, "size-allocate", G_CALLBACK (side_panel_size_allocate), window); + g_signal_connect(window->priv->side_panel, "size-allocate", G_CALLBACK (side_panel_size_allocate), window); /* run this only once */ - g_signal_handlers_disconnect_by_func (widget, hpaned_restore_position, window); + g_signal_handlers_disconnect_by_func(widget, hpaned_restore_position, window); } static void -vpaned_restore_position (GtkWidget *widget, XedWindow *window) +vpaned_restore_position (GtkWidget *widget, + XedWindow *window) { GtkAllocation allocation; gint pos; gtk_widget_get_allocation (widget, &allocation); - xed_debug_message (DEBUG_WINDOW, - "Restoring vpaned position: bottom panel size %d", window->priv->bottom_panel_size); + xed_debug_message (DEBUG_WINDOW, "Restoring vpaned position: bottom panel size %d", + window->priv->bottom_panel_size); - pos = allocation.height - MAX (50, window->priv->bottom_panel_size); - gtk_paned_set_position (GTK_PANED (window->priv->vpaned), pos); + pos = allocation.height - MAX(50, window->priv->bottom_panel_size); + gtk_paned_set_position (GTK_PANED(window->priv->vpaned), pos); /* start monitoring the size */ - g_signal_connect (window->priv->bottom_panel, "size-allocate", G_CALLBACK (bottom_panel_size_allocate), window); + g_signal_connect(window->priv->bottom_panel, "size-allocate", G_CALLBACK (bottom_panel_size_allocate), window); /* run this only once */ - g_signal_handlers_disconnect_by_func (widget, vpaned_restore_position, window); + g_signal_handlers_disconnect_by_func(widget, vpaned_restore_position, window); } static void -side_panel_visibility_changed (GtkWidget *side_panel, XedWindow *window) +side_panel_visibility_changed (GtkWidget *side_panel, + XedWindow *window) { gboolean visible; GtkAction *action; visible = gtk_widget_get_visible (side_panel); - if (xed_prefs_manager_side_pane_visible_can_set ()) { + if (xed_prefs_manager_side_pane_visible_can_set ()) + { xed_prefs_manager_set_side_pane_visible (visible); } action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewSidePane"); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) { - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action)) != visible) + { + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), visible); } /* focus the document */ - if (!visible && window->priv->active_tab != NULL) { - gtk_widget_grab_focus (GTK_WIDGET (xed_tab_get_view (XED_TAB (window->priv->active_tab)))); + if (!visible && window->priv->active_tab != NULL) + { + gtk_widget_grab_focus (GTK_WIDGET(xed_tab_get_view (XED_TAB (window->priv->active_tab)))); } } @@ -2782,64 +3053,77 @@ create_side_panel (XedWindow *window) window->priv->side_panel = xed_panel_new (GTK_ORIENTATION_VERTICAL); - gtk_paned_pack1 (GTK_PANED (window->priv->hpaned), window->priv->side_panel, FALSE, FALSE); + gtk_paned_pack1 (GTK_PANED(window->priv->hpaned), window->priv->side_panel, + FALSE, + FALSE); - g_signal_connect_after (window->priv->side_panel, "show", G_CALLBACK (side_panel_visibility_changed), window); - g_signal_connect_after (window->priv->side_panel, "hide", G_CALLBACK (side_panel_visibility_changed), window); + g_signal_connect_after(window->priv->side_panel, "show", G_CALLBACK (side_panel_visibility_changed), window); + g_signal_connect_after(window->priv->side_panel, "hide", G_CALLBACK (side_panel_visibility_changed), window); documents_panel = xed_documents_panel_new (window); - xed_panel_add_item_with_stock_icon (XED_PANEL (window->priv->side_panel), - documents_panel, _("Documents"), GTK_STOCK_FILE); + xed_panel_add_item_with_stock_icon (XED_PANEL(window->priv->side_panel), documents_panel, _("Documents"), + GTK_STOCK_FILE); } static void -bottom_panel_visibility_changed (XedPanel *bottom_panel, XedWindow *window) +bottom_panel_visibility_changed (XedPanel *bottom_panel, + XedWindow *window) { gboolean visible; GtkAction *action; - visible = gtk_widget_get_visible (GTK_WIDGET (bottom_panel)); + visible = gtk_widget_get_visible (GTK_WIDGET(bottom_panel)); - if (xed_prefs_manager_bottom_panel_visible_can_set ()) { + if (xed_prefs_manager_bottom_panel_visible_can_set ()) + { xed_prefs_manager_set_bottom_panel_visible (visible); } action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane"); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) { - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action)) != visible) + { + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), visible); } /* focus the document */ - if (!visible && window->priv->active_tab != NULL) { - gtk_widget_grab_focus (GTK_WIDGET (xed_tab_get_view (XED_TAB (window->priv->active_tab)))); + if (!visible && window->priv->active_tab != NULL) + { + gtk_widget_grab_focus (GTK_WIDGET(xed_tab_get_view (XED_TAB (window->priv->active_tab)))); } } static void -bottom_panel_item_removed (XedPanel *panel, GtkWidget *item, XedWindow *window) +bottom_panel_item_removed (XedPanel *panel, + GtkWidget *item, + XedWindow *window) { - if (xed_panel_get_n_items (panel) == 0) { + if (xed_panel_get_n_items (panel) == 0) + { GtkAction *action; - gtk_widget_hide (GTK_WIDGET (panel)); + gtk_widget_hide (GTK_WIDGET(panel)); action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane"); gtk_action_set_sensitive (action, FALSE); } } static void -bottom_panel_item_added (XedPanel *panel, GtkWidget *item, XedWindow *window) +bottom_panel_item_added (XedPanel *panel, + GtkWidget *item, + XedWindow *window) { /* if it's the first item added, set the menu item * sensitive and if needed show the panel */ - if (xed_panel_get_n_items (panel) == 1) { + if (xed_panel_get_n_items (panel) == 1) + { GtkAction *action; gboolean show; action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane"); gtk_action_set_sensitive (action, TRUE); - show = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); - if (show) { - gtk_widget_show (GTK_WIDGET (panel)); + show = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action)); + if (show) + { + gtk_widget_show (GTK_WIDGET(panel)); } } } @@ -2849,9 +3133,11 @@ create_bottom_panel (XedWindow *window) { xed_debug (DEBUG_WINDOW); window->priv->bottom_panel = xed_panel_new (GTK_ORIENTATION_HORIZONTAL); - gtk_paned_pack2 (GTK_PANED (window->priv->vpaned), window->priv->bottom_panel, FALSE, FALSE); - g_signal_connect_after (window->priv->bottom_panel, "show", G_CALLBACK (bottom_panel_visibility_changed), window); - g_signal_connect_after (window->priv->bottom_panel, "hide", G_CALLBACK (bottom_panel_visibility_changed), window); + gtk_paned_pack2 (GTK_PANED(window->priv->vpaned), window->priv->bottom_panel, + FALSE, + FALSE); + g_signal_connect_after(window->priv->bottom_panel, "show", G_CALLBACK (bottom_panel_visibility_changed), window); + g_signal_connect_after(window->priv->bottom_panel, "hide", G_CALLBACK (bottom_panel_visibility_changed), window); } static void @@ -2862,88 +3148,101 @@ init_panels_visibility (XedWindow *window) /* side pane */ active_page = xed_prefs_manager_get_side_panel_active_page (); - _xed_panel_set_active_item_by_id (XED_PANEL (window->priv->side_panel), active_page); + _xed_panel_set_active_item_by_id (XED_PANEL(window->priv->side_panel), active_page); - if (xed_prefs_manager_get_side_pane_visible ()) { + if (xed_prefs_manager_get_side_pane_visible ()) + { gtk_widget_show (window->priv->side_panel); } /* bottom pane, it can be empty */ - if (xed_panel_get_n_items (XED_PANEL (window->priv->bottom_panel)) > 0) { + if (xed_panel_get_n_items (XED_PANEL(window->priv->bottom_panel)) > 0) + { active_page = xed_prefs_manager_get_bottom_panel_active_page (); - _xed_panel_set_active_item_by_id (XED_PANEL (window->priv->bottom_panel), active_page); + _xed_panel_set_active_item_by_id (XED_PANEL(window->priv->bottom_panel), active_page); - if (xed_prefs_manager_get_bottom_panel_visible ()) { + if (xed_prefs_manager_get_bottom_panel_visible ()) + { gtk_widget_show (window->priv->bottom_panel); } } - else { + else + { GtkAction *action; action = gtk_action_group_get_action (window->priv->panes_action_group, "ViewBottomPane"); gtk_action_set_sensitive (action, FALSE); } /* start track sensitivity after the initial state is set */ - window->priv->bottom_panel_item_removed_handler_id = - g_signal_connect (window->priv->bottom_panel, "item_removed", - G_CALLBACK (bottom_panel_item_removed), window); + window->priv->bottom_panel_item_removed_handler_id = g_signal_connect(window->priv->bottom_panel, "item_removed", + G_CALLBACK (bottom_panel_item_removed), window); - g_signal_connect (window->priv->bottom_panel, "item_added", - G_CALLBACK (bottom_panel_item_added), window); + g_signal_connect(window->priv->bottom_panel, "item_added", G_CALLBACK (bottom_panel_item_added), window); } static void -clipboard_owner_change (GtkClipboard *clipboard, GdkEventOwnerChange *event, XedWindow *window) +clipboard_owner_change (GtkClipboard *clipboard, + GdkEventOwnerChange *event, + XedWindow *window) { set_paste_sensitivity_according_to_clipboard (window, clipboard); } static void -window_realized (GtkWidget *window, gpointer *data) +window_realized (GtkWidget *window, + gpointer *data) { GtkClipboard *clipboard; clipboard = gtk_widget_get_clipboard (window, GDK_SELECTION_CLIPBOARD); - g_signal_connect (clipboard, "owner_change", G_CALLBACK (clipboard_owner_change), window); + g_signal_connect(clipboard, "owner_change", G_CALLBACK (clipboard_owner_change), window); } static void -window_unrealized (GtkWidget *window, gpointer *data) +window_unrealized (GtkWidget *window, + gpointer *data) { GtkClipboard *clipboard; clipboard = gtk_widget_get_clipboard (window, GDK_SELECTION_CLIPBOARD); - g_signal_handlers_disconnect_by_func (clipboard, G_CALLBACK (clipboard_owner_change), window); + g_signal_handlers_disconnect_by_func(clipboard, G_CALLBACK (clipboard_owner_change), window); } static void -check_window_is_active (XedWindow *window, GParamSpec *property, gpointer useless) +check_window_is_active (XedWindow *window, + GParamSpec *property, + gpointer useless) { - if (window->priv->window_state & GDK_WINDOW_STATE_FULLSCREEN) { - if (gtk_window_is_active (GTK_WINDOW (window))) { + if (window->priv->window_state & GDK_WINDOW_STATE_FULLSCREEN) + { + if (gtk_window_is_active (GTK_WINDOW(window))) + { gtk_widget_show (window->priv->fullscreen_controls); } - else { + else + { gtk_widget_hide (window->priv->fullscreen_controls); } } } static void -connect_notebook_signals (XedWindow *window, GtkWidget *notebook) +connect_notebook_signals (XedWindow *window, + GtkWidget *notebook) { - g_signal_connect (notebook, "switch-page", G_CALLBACK (notebook_switch_page), window); - g_signal_connect (notebook, "tab-added", G_CALLBACK (notebook_tab_added), window); - g_signal_connect (notebook, "tab-removed", G_CALLBACK (notebook_tab_removed), window); - g_signal_connect (notebook, "tabs-reordered", G_CALLBACK (notebook_tabs_reordered), window); - g_signal_connect (notebook, "tab-detached", G_CALLBACK (notebook_tab_detached), window); - g_signal_connect (notebook, "tab-close-request", G_CALLBACK (notebook_tab_close_request), window); - g_signal_connect (notebook, "button-press-event", G_CALLBACK (notebook_button_press_event), window); - g_signal_connect (notebook, "popup-menu", G_CALLBACK (notebook_popup_menu), window); + g_signal_connect(notebook, "switch-page", G_CALLBACK (notebook_switch_page), window); + g_signal_connect(notebook, "tab-added", G_CALLBACK (notebook_tab_added), window); + g_signal_connect(notebook, "tab-removed", G_CALLBACK (notebook_tab_removed), window); + g_signal_connect(notebook, "tabs-reordered", G_CALLBACK (notebook_tabs_reordered), window); + g_signal_connect(notebook, "tab-detached", G_CALLBACK (notebook_tab_detached), window); + g_signal_connect(notebook, "tab-close-request", G_CALLBACK (notebook_tab_close_request), window); + g_signal_connect(notebook, "button-press-event", G_CALLBACK (notebook_button_press_event), window); + g_signal_connect(notebook, "popup-menu", G_CALLBACK (notebook_popup_menu), window); } static void -add_notebook (XedWindow *window, GtkWidget *notebook) +add_notebook (XedWindow *window, + GtkWidget *notebook) { - gtk_paned_pack1 (GTK_PANED (window->priv->vpaned), notebook, TRUE, TRUE); + gtk_paned_pack1 (GTK_PANED(window->priv->vpaned), notebook, TRUE, TRUE); gtk_widget_show (notebook); connect_notebook_signals (window, notebook); } @@ -2956,7 +3255,7 @@ xed_window_init (XedWindow *window) xed_debug (DEBUG_WINDOW); - window->priv = XED_WINDOW_GET_PRIVATE (window); + window->priv = XED_WINDOW_GET_PRIVATE(window); window->priv->active_tab = NULL; window->priv->num_tabs = 0; window->priv->removing_tabs = FALSE; @@ -2968,24 +3267,25 @@ xed_window_init (XedWindow *window) window->priv->message_bus = xed_message_bus_new (); window->priv->window_group = gtk_window_group_new (); - gtk_window_group_add_window (window->priv->window_group, GTK_WINDOW (window)); + gtk_window_group_add_window (window->priv->window_group, GTK_WINDOW(window)); main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_container_add (GTK_CONTAINER (window), main_box); + gtk_container_add (GTK_CONTAINER(window), main_box); gtk_widget_show (main_box); /* Add menu bar and toolbar bar */ create_menu_bar_and_toolbar (window, main_box); /* If we're running as root, add and infobar to warn about elevated privileges */ - if (geteuid() == 0) { + if (geteuid () == 0) + { GtkWidget *root_bar = gtk_info_bar_new (); - gtk_info_bar_set_message_type (GTK_INFO_BAR (root_bar), GTK_MESSAGE_ERROR); - GtkWidget *content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (root_bar)); + gtk_info_bar_set_message_type (GTK_INFO_BAR(root_bar), GTK_MESSAGE_ERROR); + GtkWidget *content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR(root_bar)); GtkWidget *label = gtk_label_new (_("Elevated Privileges")); gtk_widget_show (label); - gtk_container_add (GTK_CONTAINER (content_area), label); - gtk_box_pack_start (GTK_BOX (main_box), root_bar, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER(content_area), label); + gtk_box_pack_start (GTK_BOX(main_box), root_bar, FALSE, FALSE, 0); gtk_widget_set_visible (root_bar, TRUE); } @@ -2995,10 +3295,11 @@ xed_window_init (XedWindow *window) /* Add the main area */ xed_debug_message (DEBUG_WINDOW, "Add main area"); window->priv->hpaned = gtk_hpaned_new (); - gtk_box_pack_start (GTK_BOX (main_box), window->priv->hpaned, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX(main_box), window->priv->hpaned, TRUE, TRUE, 0); window->priv->vpaned = gtk_vpaned_new (); - gtk_paned_pack2 (GTK_PANED (window->priv->hpaned), window->priv->vpaned, TRUE, FALSE); + gtk_paned_pack2 (GTK_PANED(window->priv->hpaned), window->priv->vpaned, TRUE, + FALSE); xed_debug_message (DEBUG_WINDOW, "Create xed notebook"); window->priv->notebook = xed_notebook_new (); @@ -3013,24 +3314,24 @@ xed_window_init (XedWindow *window) window->priv->side_panel_size = xed_prefs_manager_get_side_panel_size (); window->priv->bottom_panel_size = xed_prefs_manager_get_bottom_panel_size (); - g_signal_connect_after (window->priv->hpaned, "map", G_CALLBACK (hpaned_restore_position), window); - g_signal_connect_after (window->priv->vpaned, "map", G_CALLBACK (vpaned_restore_position), window); + g_signal_connect_after(window->priv->hpaned, "map", G_CALLBACK (hpaned_restore_position), window); + g_signal_connect_after(window->priv->vpaned, "map", G_CALLBACK (vpaned_restore_position), window); gtk_widget_show (window->priv->hpaned); gtk_widget_show (window->priv->vpaned); /* Drag and drop support, set targets to NULL because we add the - default uri_targets below */ - gtk_drag_dest_set (GTK_WIDGET (window), - GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, - NULL, 0, GDK_ACTION_COPY); + default uri_targets below */ + gtk_drag_dest_set (GTK_WIDGET(window), GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, + NULL, 0, GDK_ACTION_COPY); /* Add uri targets */ - tl = gtk_drag_dest_get_target_list (GTK_WIDGET (window)); + tl = gtk_drag_dest_get_target_list (GTK_WIDGET(window)); - if (tl == NULL) { + if (tl == NULL) + { tl = gtk_target_list_new (NULL, 0); - gtk_drag_dest_set_target_list (GTK_WIDGET (window), tl); + gtk_drag_dest_set_target_list (GTK_WIDGET(window), tl); gtk_target_list_unref (tl); } @@ -3038,17 +3339,17 @@ xed_window_init (XedWindow *window) /* connect instead of override, so that we can * share the cb code with the view */ - g_signal_connect (window, "drag_data_received", G_CALLBACK (drag_data_received_cb), NULL); + g_signal_connect(window, "drag_data_received", G_CALLBACK (drag_data_received_cb), NULL); /* we can get the clipboard only after the widget * is realized */ - g_signal_connect (window, "realize", G_CALLBACK (window_realized), NULL); - g_signal_connect (window, "unrealize", G_CALLBACK (window_unrealized), NULL); + g_signal_connect(window, "realize", G_CALLBACK (window_realized), NULL); + g_signal_connect(window, "unrealize", G_CALLBACK (window_unrealized), NULL); /* Check if the window is active for fullscreen */ - g_signal_connect (window, "notify::is-active", G_CALLBACK (check_window_is_active), NULL); + g_signal_connect(window, "notify::is-active", G_CALLBACK (check_window_is_active), NULL); - g_signal_connect (GTK_WIDGET (window), "key-press-event", G_CALLBACK (on_key_pressed), window); + g_signal_connect(GTK_WIDGET (window), "key-press-event", G_CALLBACK (on_key_pressed), window); xed_debug_message (DEBUG_WINDOW, "Update plugins ui"); @@ -3076,15 +3377,17 @@ xed_window_get_active_view (XedWindow *window) { XedView *view; - if (window == NULL) { + if (window == NULL) + { return NULL; } - if (window->priv->active_tab == NULL) { + if (window->priv->active_tab == NULL) + { return NULL; } - view = xed_tab_get_view (XED_TAB (window->priv->active_tab)); + view = xed_tab_get_view (XED_TAB(window->priv->active_tab)); return view; } @@ -3102,22 +3405,24 @@ xed_window_get_active_document (XedWindow *window) { XedView *view; - if (window == NULL) { + if (window == NULL) + { return NULL; } view = xed_window_get_active_view (window); - if (view == NULL) { + if (view == NULL) + { return NULL; } - return XED_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); + return XED_DOCUMENT(gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); } GtkWidget * _xed_window_get_notebook (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); return window->priv->notebook; } @@ -3133,19 +3438,21 @@ _xed_window_get_notebook (XedWindow *window) * Returns: a new #XedTab */ XedTab * -xed_window_create_tab (XedWindow *window, gboolean jump_to) +xed_window_create_tab (XedWindow *window, + gboolean jump_to) { XedTab *tab; - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); - tab = XED_TAB (_xed_tab_new ()); - gtk_widget_show (GTK_WIDGET (tab)); + tab = XED_TAB(_xed_tab_new ()); + gtk_widget_show (GTK_WIDGET(tab)); - xed_notebook_add_tab (XED_NOTEBOOK (window->priv->notebook), tab, -1, jump_to); + xed_notebook_add_tab (XED_NOTEBOOK(window->priv->notebook), tab, -1, jump_to); - if (!gtk_widget_get_visible (GTK_WIDGET (window))) { - gtk_window_present (GTK_WINDOW (window)); + if (!gtk_widget_get_visible (GTK_WIDGET(window))) + { + gtk_window_present (GTK_WINDOW(window)); } return tab; @@ -3168,28 +3475,34 @@ xed_window_create_tab (XedWindow *window, gboolean jump_to) * Returns: a new #XedTab */ XedTab * -xed_window_create_tab_from_uri (XedWindow *window, const gchar *uri, const XedEncoding *encoding, gint line_pos, - gboolean create, gboolean jump_to) +xed_window_create_tab_from_uri (XedWindow *window, + const gchar *uri, + const XedEncoding *encoding, + gint line_pos, + gboolean create, + gboolean jump_to) { GtkWidget *tab; - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); - g_return_val_if_fail (uri != NULL, NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(uri != NULL, NULL); tab = _xed_tab_new_from_uri (uri, encoding, line_pos, create); - if (tab == NULL) { + if (tab == NULL) + { return NULL; } gtk_widget_show (tab); - xed_notebook_add_tab (XED_NOTEBOOK (window->priv->notebook), XED_TAB (tab), -1, jump_to); + xed_notebook_add_tab (XED_NOTEBOOK(window->priv->notebook), XED_TAB(tab), -1, jump_to); - if (!gtk_widget_get_visible (GTK_WIDGET (window))) { - gtk_window_present (GTK_WINDOW (window)); + if (!gtk_widget_get_visible (GTK_WIDGET(window))) + { + gtk_window_present (GTK_WINDOW(window)); } - return XED_TAB (tab); + return XED_TAB(tab); } /** @@ -3203,18 +3516,21 @@ xed_window_create_tab_from_uri (XedWindow *window, const gchar *uri, const XedEn XedTab * xed_window_get_active_tab (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); - if (window->priv->active_tab == NULL) { + if (window->priv->active_tab == NULL) + { return NULL; } - else { - return XED_TAB (window->priv->active_tab); + else + { + return XED_TAB(window->priv->active_tab); } } static void -add_document (XedTab *tab, GList **res) +add_document (XedTab *tab, + GList **res) { XedDocument *doc; @@ -3237,14 +3553,15 @@ GList * xed_window_get_documents (XedWindow *window) { GList *res = NULL; - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); - gtk_container_foreach (GTK_CONTAINER (window->priv->notebook), (GtkCallback)add_document, &res); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); + gtk_container_foreach (GTK_CONTAINER(window->priv->notebook), (GtkCallback) add_document, &res); res = g_list_reverse (res); return res; } static void -add_view (XedTab *tab, GList **res) +add_view (XedTab *tab, + GList **res) { XedView *view; view = xed_tab_get_view (tab); @@ -3264,8 +3581,8 @@ GList * xed_window_get_views (XedWindow *window) { GList *res = NULL; - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); - gtk_container_foreach (GTK_CONTAINER (window->priv->notebook), (GtkCallback)add_view, &res); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); + gtk_container_foreach (GTK_CONTAINER(window->priv->notebook), (GtkCallback) add_view, &res); res = g_list_reverse (res); return res; } @@ -3278,14 +3595,15 @@ xed_window_get_views (XedWindow *window) * Closes the @tab. */ void -xed_window_close_tab (XedWindow *window, XedTab *tab) +xed_window_close_tab (XedWindow *window, + XedTab *tab) { - g_return_if_fail (XED_IS_WINDOW (window)); - g_return_if_fail (XED_IS_TAB (tab)); - g_return_if_fail ((xed_tab_get_state (tab) != XED_TAB_STATE_SAVING) && - (xed_tab_get_state (tab) != XED_TAB_STATE_SHOWING_PRINT_PREVIEW)); + g_return_if_fail(XED_IS_WINDOW (window)); + g_return_if_fail(XED_IS_TAB (tab)); + g_return_if_fail((xed_tab_get_state (tab) != XED_TAB_STATE_SAVING) + && (xed_tab_get_state (tab) != XED_TAB_STATE_SHOWING_PRINT_PREVIEW)); - xed_notebook_remove_tab (XED_NOTEBOOK (window->priv->notebook), tab); + xed_notebook_remove_tab (XED_NOTEBOOK(window->priv->notebook), tab); } /** @@ -3297,12 +3615,12 @@ xed_window_close_tab (XedWindow *window, XedTab *tab) void xed_window_close_all_tabs (XedWindow *window) { - g_return_if_fail (XED_IS_WINDOW (window)); - g_return_if_fail (!(window->priv->state & XED_WINDOW_STATE_SAVING) && - !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); + g_return_if_fail(XED_IS_WINDOW (window)); + g_return_if_fail(!(window->priv->state & XED_WINDOW_STATE_SAVING) + && !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); window->priv->removing_tabs = TRUE; - xed_notebook_remove_all_tabs (XED_NOTEBOOK (window->priv->notebook)); + xed_notebook_remove_all_tabs (XED_NOTEBOOK(window->priv->notebook)); window->priv->removing_tabs = FALSE; } @@ -3314,42 +3632,47 @@ xed_window_close_all_tabs (XedWindow *window) * Closes all tabs specified by @tabs. */ void -xed_window_close_tabs (XedWindow *window, const GList *tabs) +xed_window_close_tabs (XedWindow *window, + const GList *tabs) { - g_return_if_fail (XED_IS_WINDOW (window)); - g_return_if_fail (!(window->priv->state & XED_WINDOW_STATE_SAVING) && - !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); + g_return_if_fail(XED_IS_WINDOW (window)); + g_return_if_fail(!(window->priv->state & XED_WINDOW_STATE_SAVING) + && !(window->priv->state & XED_WINDOW_STATE_SAVING_SESSION)); - if (tabs == NULL) { + if (tabs == NULL) + { return; } window->priv->removing_tabs = TRUE; - while (tabs != NULL) { - if (tabs->next == NULL) { + while (tabs != NULL) + { + if (tabs->next == NULL) + { window->priv->removing_tabs = FALSE; } - xed_notebook_remove_tab (XED_NOTEBOOK (window->priv->notebook), XED_TAB (tabs->data)); - tabs = g_list_next (tabs); + xed_notebook_remove_tab (XED_NOTEBOOK(window->priv->notebook), XED_TAB(tabs->data)); + tabs = g_list_next(tabs); } - g_return_if_fail (window->priv->removing_tabs == FALSE); + g_return_if_fail(window->priv->removing_tabs == FALSE); } XedWindow * -_xed_window_move_tab_to_new_window (XedWindow *window, XedTab *tab) +_xed_window_move_tab_to_new_window (XedWindow *window, + XedTab *tab) { XedWindow *new_window; - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); - g_return_val_if_fail (XED_IS_TAB (tab), NULL); - g_return_val_if_fail (gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->priv->notebook)) > 1, NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(XED_IS_TAB (tab), NULL); + g_return_val_if_fail(gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->priv->notebook)) > 1, NULL); new_window = clone_window (window); - xed_notebook_move_tab (XED_NOTEBOOK (window->priv->notebook), XED_NOTEBOOK (new_window->priv->notebook), tab, -1); - gtk_widget_show (GTK_WIDGET (new_window)); + xed_notebook_move_tab (XED_NOTEBOOK(window->priv->notebook), XED_NOTEBOOK(new_window->priv->notebook), tab, -1); + gtk_widget_show (GTK_WIDGET(new_window)); return new_window; } @@ -3362,16 +3685,17 @@ _xed_window_move_tab_to_new_window (XedWindow *window, XedTab *tab) * Switches to the tab that matches with @tab. */ void -xed_window_set_active_tab (XedWindow *window, XedTab *tab) +xed_window_set_active_tab (XedWindow *window, + XedTab *tab) { gint page_num; - g_return_if_fail (XED_IS_WINDOW (window)); - g_return_if_fail (XED_IS_TAB (tab)); + g_return_if_fail(XED_IS_WINDOW (window)); + g_return_if_fail(XED_IS_TAB (tab)); - page_num = gtk_notebook_page_num (GTK_NOTEBOOK (window->priv->notebook), GTK_WIDGET (tab)); - g_return_if_fail (page_num != -1); - gtk_notebook_set_current_page (GTK_NOTEBOOK (window->priv->notebook), page_num); + page_num = gtk_notebook_page_num (GTK_NOTEBOOK(window->priv->notebook), GTK_WIDGET(tab)); + g_return_if_fail(page_num != -1); + gtk_notebook_set_current_page (GTK_NOTEBOOK(window->priv->notebook), page_num); } /** @@ -3385,14 +3709,14 @@ xed_window_set_active_tab (XedWindow *window, XedTab *tab) GtkWindowGroup * xed_window_get_group (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); return window->priv->window_group; } gboolean _xed_window_is_removing_tabs (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), FALSE); + g_return_val_if_fail(XED_IS_WINDOW (window), FALSE); return window->priv->removing_tabs; } @@ -3407,7 +3731,7 @@ _xed_window_is_removing_tabs (XedWindow *window) GtkUIManager * xed_window_get_ui_manager (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); return window->priv->manager; } @@ -3422,8 +3746,8 @@ xed_window_get_ui_manager (XedWindow *window) XedPanel * xed_window_get_side_panel (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); - return XED_PANEL (window->priv->side_panel); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); + return XED_PANEL(window->priv->side_panel); } /** @@ -3437,8 +3761,8 @@ xed_window_get_side_panel (XedWindow *window) XedPanel * xed_window_get_bottom_panel (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); - return XED_PANEL (window->priv->bottom_panel); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); + return XED_PANEL(window->priv->bottom_panel); } /** @@ -3452,7 +3776,7 @@ xed_window_get_bottom_panel (XedWindow *window) GtkWidget * xed_window_get_statusbar (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), 0); + g_return_val_if_fail(XED_IS_WINDOW (window), 0); return window->priv->statusbar; } @@ -3467,7 +3791,7 @@ xed_window_get_statusbar (XedWindow *window) GtkWidget * xed_window_get_searchbar (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), 0); + g_return_val_if_fail(XED_IS_WINDOW (window), 0); return window->priv->searchbar; } @@ -3482,34 +3806,38 @@ xed_window_get_searchbar (XedWindow *window) XedWindowState xed_window_get_state (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), XED_WINDOW_STATE_NORMAL); + g_return_val_if_fail(XED_IS_WINDOW (window), XED_WINDOW_STATE_NORMAL); return window->priv->state; } GFile * _xed_window_get_default_location (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); - if (window->priv->default_location != NULL) { + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); + if (window->priv->default_location != NULL) + { return g_object_ref (window->priv->default_location); } - else { + else + { return NULL; } } void -_xed_window_set_default_location (XedWindow *window, GFile *location) +_xed_window_set_default_location (XedWindow *window, + GFile *location) { GFile *dir; - g_return_if_fail (XED_IS_WINDOW (window)); - g_return_if_fail (G_IS_FILE (location)); + g_return_if_fail(XED_IS_WINDOW (window)); + g_return_if_fail(G_IS_FILE (location)); dir = g_file_get_parent (location); - g_return_if_fail (dir != NULL); + g_return_if_fail(dir != NULL); - if (window->priv->default_location != NULL) { + if (window->priv->default_location != NULL) + { g_object_unref (window->priv->default_location); } @@ -3532,20 +3860,22 @@ xed_window_get_unsaved_documents (XedWindow *window) GList *tabs; GList *l; - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); - tabs = gtk_container_get_children (GTK_CONTAINER (window->priv->notebook)); + tabs = gtk_container_get_children (GTK_CONTAINER(window->priv->notebook)); l = tabs; - while (l != NULL) { + while (l != NULL) + { XedTab *tab; - tab = XED_TAB (l->data); - if (!_xed_tab_can_close (tab)) { + tab = XED_TAB(l->data); + if (!_xed_tab_can_close (tab)) + { XedDocument *doc; doc = xed_tab_get_document (tab); unsaved_docs = g_list_prepend (unsaved_docs, doc); } - l = g_list_next (l); + l = g_list_next(l); } g_list_free (tabs); @@ -3554,29 +3884,35 @@ xed_window_get_unsaved_documents (XedWindow *window) } void -_xed_window_set_saving_session_state (XedWindow *window, gboolean saving_session) +_xed_window_set_saving_session_state (XedWindow *window, + gboolean saving_session) { XedWindowState old_state; - g_return_if_fail (XED_IS_WINDOW (window)); + g_return_if_fail(XED_IS_WINDOW (window)); old_state = window->priv->state; - if (saving_session) { + if (saving_session) + { window->priv->state |= XED_WINDOW_STATE_SAVING_SESSION; } - else { + else + { window->priv->state &= ~XED_WINDOW_STATE_SAVING_SESSION; } - if (old_state != window->priv->state) { + if (old_state != window->priv->state) + { set_sensitivity_according_to_window_state (window); - g_object_notify (G_OBJECT (window), "state"); + g_object_notify (G_OBJECT(window), "state"); } } static void -hide_notebook_tabs_on_fullscreen (GtkNotebook *notebook, GParamSpec *pspec, XedWindow *window) +hide_notebook_tabs_on_fullscreen (GtkNotebook *notebook, + GParamSpec *pspec, + XedWindow *window) { gtk_notebook_set_show_tabs (notebook, FALSE); } @@ -3584,24 +3920,25 @@ hide_notebook_tabs_on_fullscreen (GtkNotebook *notebook, GParamSpec *pspec, XedW void _xed_window_fullscreen (XedWindow *window) { - g_return_if_fail (XED_IS_WINDOW (window)); + g_return_if_fail(XED_IS_WINDOW (window)); - if (_xed_window_is_fullscreen (window)) { + if (_xed_window_is_fullscreen (window)) + { return; } /* Go to fullscreen mode and hide bars */ gtk_window_fullscreen (&window->window); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->priv->notebook), FALSE); - g_signal_connect (window->priv->notebook, "notify::show-tabs", - G_CALLBACK (hide_notebook_tabs_on_fullscreen), window); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK(window->priv->notebook), FALSE); + g_signal_connect(window->priv->notebook, "notify::show-tabs", + G_CALLBACK (hide_notebook_tabs_on_fullscreen), window); gtk_widget_hide (window->priv->menubar); - g_signal_handlers_block_by_func (window->priv->toolbar, toolbar_visibility_changed, window); + g_signal_handlers_block_by_func(window->priv->toolbar, toolbar_visibility_changed, window); gtk_widget_hide (window->priv->toolbar); - g_signal_handlers_block_by_func (window->priv->statusbar, statusbar_visibility_changed, window); + g_signal_handlers_block_by_func(window->priv->statusbar, statusbar_visibility_changed, window); gtk_widget_hide (window->priv->statusbar); fullscreen_controls_build (window); @@ -3614,31 +3951,34 @@ _xed_window_unfullscreen (XedWindow *window) gboolean visible; GtkAction *action; - g_return_if_fail (XED_IS_WINDOW (window)); + g_return_if_fail(XED_IS_WINDOW (window)); - if (!_xed_window_is_fullscreen (window)) { + if (!_xed_window_is_fullscreen (window)) + { return; } /* Unfullscreen and show bars */ gtk_window_unfullscreen (&window->window); - g_signal_handlers_disconnect_by_func (window->priv->notebook, hide_notebook_tabs_on_fullscreen, window); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->priv->notebook), TRUE); + g_signal_handlers_disconnect_by_func(window->priv->notebook, hide_notebook_tabs_on_fullscreen, window); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK(window->priv->notebook), TRUE); gtk_widget_show (window->priv->menubar); action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, "ViewToolbar"); - visible = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); - if (visible) { + visible = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action)); + if (visible) + { gtk_widget_show (window->priv->toolbar); } - g_signal_handlers_unblock_by_func (window->priv->toolbar, toolbar_visibility_changed, window); + g_signal_handlers_unblock_by_func(window->priv->toolbar, toolbar_visibility_changed, window); action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, "ViewStatusbar"); - visible = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); - if (visible) { + visible = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION(action)); + if (visible) + { gtk_widget_show (window->priv->statusbar); } - g_signal_handlers_unblock_by_func (window->priv->statusbar, statusbar_visibility_changed, window); + g_signal_handlers_unblock_by_func(window->priv->statusbar, statusbar_visibility_changed, window); gtk_widget_hide (window->priv->fullscreen_controls); } @@ -3646,7 +3986,7 @@ _xed_window_unfullscreen (XedWindow *window) gboolean _xed_window_is_fullscreen (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), FALSE); + g_return_val_if_fail(XED_IS_WINDOW (window), FALSE); return window->priv->window_state & GDK_WINDOW_STATE_FULLSCREEN; } @@ -3660,31 +4000,35 @@ _xed_window_is_fullscreen (XedWindow *window) * Returns: the #XedTab that matches with the given @location. */ XedTab * -xed_window_get_tab_from_location (XedWindow *window, GFile *location) +xed_window_get_tab_from_location (XedWindow *window, + GFile *location) { GList *tabs; GList *l; XedTab *ret = NULL; - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); - g_return_val_if_fail (G_IS_FILE (location), NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(G_IS_FILE (location), NULL); - tabs = gtk_container_get_children (GTK_CONTAINER (window->priv->notebook)); + tabs = gtk_container_get_children (GTK_CONTAINER(window->priv->notebook)); - for (l = tabs; l != NULL; l = g_list_next (l)) { + for (l = tabs; l != NULL; l = g_list_next(l)) + { XedDocument *d; XedTab *t; GFile *f; - t = XED_TAB (l->data); + t = XED_TAB(l->data); d = xed_tab_get_document (t); f = xed_document_get_location (d); - if ((f != NULL)) { + if ((f != NULL)) + { gboolean found = g_file_equal (location, f); g_object_unref (f); - if (found) { + if (found) + { ret = t; break; } @@ -3705,10 +4049,10 @@ xed_window_get_tab_from_location (XedWindow *window, GFile *location) * * Return value: (transfer none): the #XedMessageBus associated with @window */ -XedMessageBus * +XedMessageBus * xed_window_get_message_bus (XedWindow *window) { - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); return window->priv->message_bus; } @@ -3724,13 +4068,14 @@ xed_window_get_message_bus (XedWindow *window) * Deprecated: 2.24: Use xed_window_get_tab_from_location() instead. */ XedTab * -xed_window_get_tab_from_uri (XedWindow *window, const gchar *uri) +xed_window_get_tab_from_uri (XedWindow *window, + const gchar *uri) { GFile *f; XedTab *tab; - g_return_val_if_fail (XED_IS_WINDOW (window), NULL); - g_return_val_if_fail (uri != NULL, NULL); + g_return_val_if_fail(XED_IS_WINDOW (window), NULL); + g_return_val_if_fail(uri != NULL, NULL); f = g_file_new_for_uri (uri); tab = xed_window_get_tab_from_location (window, f);