diff options
author | Laurent Napias <[email protected]> | 2019-06-29 10:29:13 +0200 |
---|---|---|
committer | ZenWalker <[email protected]> | 2019-07-06 21:46:58 +0200 |
commit | db655f3fb2f67b695d36369e584fcb598e0e1bea (patch) | |
tree | ff7a4404cb6f0d1d8ca3a08ee50c60641641f1b4 /pluma/pluma-view.c | |
parent | 5153fb08a2e26015d07e7b3805de15d38bd05a9d (diff) | |
download | pluma-db655f3fb2f67b695d36369e584fcb598e0e1bea.tar.bz2 pluma-db655f3fb2f67b695d36369e584fcb598e0e1bea.tar.xz |
Remove trailing whitespaces
Diffstat (limited to 'pluma/pluma-view.c')
-rw-r--r-- | pluma/pluma-view.c | 474 |
1 files changed, 237 insertions, 237 deletions
diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c index 835c0764..cb115574 100644 --- a/pluma/pluma-view.c +++ b/pluma/pluma-view.c @@ -3,8 +3,8 @@ * This file is part of pluma * * Copyright (C) 1998, 1999 Alex Roberts, Evan Lawrence - * Copyright (C) 2000, 2002 Chema Celorio, Paolo Maggi - * Copyright (C) 2003-2005 Paolo Maggi + * Copyright (C) 2000, 2002 Chema Celorio, Paolo Maggi + * Copyright (C) 2003-2005 Paolo Maggi * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,16 +18,16 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. */ - + /* - * Modified by the pluma Team, 1998-2005. See the AUTHORS file for a - * list of people on the pluma Team. + * Modified by the pluma Team, 1998-2005. See the AUTHORS file for a + * list of people on the pluma Team. * See the ChangeLog files for a list of changes. * - * $Id$ + * $Id$ */ #ifdef HAVE_CONFIG_H @@ -73,7 +73,7 @@ enum struct _PlumaViewPrivate { SearchMode search_mode; - + GtkTextIter start_search_iter; /* used to restore the search state if an @@ -94,9 +94,9 @@ struct _PlumaViewPrivate guint typeselect_flush_timeout; guint search_entry_changed_id; - + gboolean disable_popdown; - + GtkTextBuffer *current_buffer; }; @@ -173,13 +173,13 @@ typedef enum } PlumaSearchEntryState; static void -document_read_only_notify_handler (PlumaDocument *document, +document_read_only_notify_handler (PlumaDocument *document, GParamSpec *pspec, PlumaView *view) { pluma_debug (DEBUG_VIEW); - gtk_text_view_set_editable (GTK_TEXT_VIEW (view), + gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !pluma_document_get_readonly (document)); } @@ -219,7 +219,7 @@ pluma_view_class_init (PlumaViewClass *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; object_class->dispose = pluma_view_dispose; @@ -228,7 +228,7 @@ pluma_view_class_init (PlumaViewClass *klass) widget_class->focus_out_event = pluma_view_focus_out; widget_class->draw = pluma_view_draw; widget_class->scroll_event = pluma_view_scroll_event; - + /* * Override the gtk_text_view_drag_motion and drag_drop * functions to get URIs @@ -251,10 +251,10 @@ pluma_view_class_init (PlumaViewClass *klass) text_view_class->populate_popup = pluma_view_populate_popup; klass->start_interactive_search = start_interactive_search; klass->start_interactive_goto_line = start_interactive_goto_line; - klass->reset_searched_text = reset_searched_text; + klass->reset_searched_text = reset_searched_text; text_view_class->delete_from_cursor = pluma_view_delete_from_cursor; - + view_signals[START_INTERACTIVE_SEARCH] = g_signal_new ("start_interactive_search", G_TYPE_FROM_CLASS (object_class), @@ -262,7 +262,7 @@ pluma_view_class_init (PlumaViewClass *klass) G_STRUCT_OFFSET (PlumaViewClass, start_interactive_search), NULL, NULL, pluma_marshal_BOOLEAN__VOID, - G_TYPE_BOOLEAN, 0); + G_TYPE_BOOLEAN, 0); view_signals[START_INTERACTIVE_GOTO_LINE] = g_signal_new ("start_interactive_goto_line", @@ -280,14 +280,14 @@ pluma_view_class_init (PlumaViewClass *klass) G_STRUCT_OFFSET (PlumaViewClass, reset_searched_text), NULL, NULL, pluma_marshal_BOOLEAN__VOID, - G_TYPE_BOOLEAN, 0); + 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'. PlumaView now handles - * dnd in the default handlers of drag_drop, drag_motion and + * dnd in the default handlers of drag_drop, drag_motion and * drag_data_received. The view emits drop_uris from drag_data_received - * if valid uris have been dropped. Plugins should connect to - * drag_motion, drag_drop and drag_data_received to change this + * if valid uris have been dropped. Plugins should connect to + * drag_motion, drag_drop and drag_data_received to change this * default behaviour. They should _NOT_ use this signal because this * will not prevent pluma from loading the uri */ @@ -299,27 +299,27 @@ pluma_view_class_init (PlumaViewClass *klass) NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, G_TYPE_STRV); - + g_type_class_add_private (klass, sizeof (PlumaViewPrivate)); - + binding_set = gtk_binding_set_by_class (klass); - + gtk_binding_entry_add_signal (binding_set, GDK_KEY_k, GDK_CONTROL_MASK, "start_interactive_search", 0); - + 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_k, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "reset_searched_text", 0); - gtk_binding_entry_add_signal (binding_set, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_d, GDK_CONTROL_MASK, "delete_from_cursor", 2, @@ -338,7 +338,7 @@ current_buffer_removed (PlumaView *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; } @@ -350,10 +350,10 @@ on_notify_buffer_cb (PlumaView *view, gpointer userdata) { GtkTextBuffer *buffer; - + current_buffer_removed (view); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - + if (buffer == NULL || !PLUMA_IS_DOCUMENT (buffer)) return; @@ -363,7 +363,7 @@ on_notify_buffer_cb (PlumaView *view, G_CALLBACK (document_read_only_notify_handler), view); - gtk_text_view_set_editable (GTK_TEXT_VIEW (view), + gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !pluma_document_get_readonly (PLUMA_DOCUMENT (buffer))); g_signal_connect (buffer, @@ -453,18 +453,18 @@ pluma_set_source_space_drawer (GtkSourceView *view) } #endif -static void +static void pluma_view_init (PlumaView *view) { GtkTargetList *tl; - + pluma_debug (DEBUG_VIEW); - + view->priv = PLUMA_VIEW_GET_PRIVATE (view); /* * Set tab, fonts, wrap mode, colors, etc. according - * to preferences + * to preferences */ if (!pluma_prefs_manager_get_use_default_font ()) { @@ -481,13 +481,13 @@ pluma_view_init (PlumaView *view) pluma_view_set_font (view, TRUE, NULL); } - g_object_set (G_OBJECT (view), + g_object_set (G_OBJECT (view), "wrap_mode", pluma_prefs_manager_get_wrap_mode (), "show_line_numbers", pluma_prefs_manager_get_display_line_numbers (), "auto_indent", pluma_prefs_manager_get_auto_indent (), "tab_width", pluma_prefs_manager_get_tabs_size (), "insert_spaces_instead_of_tabs", pluma_prefs_manager_get_insert_spaces (), - "show_right_margin", pluma_prefs_manager_get_display_right_margin (), + "show_right_margin", pluma_prefs_manager_get_display_right_margin (), "right_margin_position", pluma_prefs_manager_get_right_margin_position (), "highlight_current_line", pluma_prefs_manager_get_highlight_current_line (), "smart_home_end", pluma_prefs_manager_get_smart_home_end (), @@ -499,15 +499,15 @@ pluma_view_init (PlumaView *view) view->priv->typeselect_flush_timeout = 0; view->priv->wrap_around = TRUE; - /* Drag and drop support */ + /* Drag and drop support */ tl = gtk_drag_dest_get_target_list (GTK_WIDGET (view)); if (tl != NULL) gtk_target_list_add_uri_targets (tl, TARGET_URI_LIST); - + /* Act on buffer change */ - g_signal_connect (view, - "notify::buffer", + g_signal_connect (view, + "notify::buffer", G_CALLBACK (on_notify_buffer_cb), NULL); } @@ -524,20 +524,20 @@ pluma_view_dispose (GObject *object) gtk_widget_destroy (view->priv->search_window); view->priv->search_window = NULL; view->priv->search_entry = NULL; - + 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 */ current_buffer_removed (view); g_signal_handlers_disconnect_by_func (view, on_notify_buffer_cb, NULL); - + (* G_OBJECT_CLASS (pluma_view_parent_class)->dispose) (object); } @@ -559,23 +559,23 @@ static gint pluma_view_focus_out (GtkWidget *widget, GdkEventFocus *event) { PlumaView *view = PLUMA_VIEW (widget); - + gtk_widget_queue_draw (widget); - + /* hide interactive search dialog */ if (view->priv->search_window != NULL) hide_search_window (view, FALSE); - + (* GTK_WIDGET_CLASS (pluma_view_parent_class)->focus_out_event) (widget, event); - + return FALSE; } /** * pluma_view_new: * @doc: a #PlumaDocument - * - * Creates a new #PlumaView object displaying the @doc document. + * + * Creates a new #PlumaView object displaying the @doc document. * @doc cannot be %NULL. * * Return value: a new #PlumaView @@ -619,7 +619,7 @@ pluma_view_cut_clipboard (PlumaView *view) clipboard, !pluma_document_get_readonly ( PLUMA_DOCUMENT (buffer))); - + gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (view), gtk_text_buffer_get_insert (buffer), PLUMA_VIEW_SCROLL_MARGIN, @@ -683,7 +683,7 @@ pluma_view_paste_clipboard (PlumaView *view) /** * pluma_view_delete_selection: * @view: a #PlumaView - * + * * Deletes the text currently selected in the #GtkTextBuffer associated * to the view and scroll to the cursor position. **/ @@ -704,7 +704,7 @@ pluma_view_delete_selection (PlumaView *view) TRUE, !pluma_document_get_readonly ( PLUMA_DOCUMENT (buffer))); - + gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (view), gtk_text_buffer_get_insert (buffer), PLUMA_VIEW_SCROLL_MARGIN, @@ -716,7 +716,7 @@ pluma_view_delete_selection (PlumaView *view) /** * pluma_view_select_all: * @view: a #PlumaView - * + * * Selects all the text displayed in the @view. **/ void @@ -739,7 +739,7 @@ pluma_view_select_all (PlumaView *view) /** * pluma_view_scroll_to_cursor: * @view: a #PlumaView - * + * * Scrolls the @view to the cursor position. **/ void @@ -750,7 +750,7 @@ pluma_view_scroll_to_cursor (PlumaView *view) pluma_debug (DEBUG_VIEW); g_return_if_fail (PLUMA_IS_VIEW (view)); - + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); g_return_if_fail (buffer != NULL); @@ -874,13 +874,13 @@ pluma_override_font (const gchar *item, * @view: a #PlumaView * @def: whether to reset the default font * @font_name: the name of the font to use - * + * * If @def is #TRUE, resets the font of the @view to the default font * otherwise sets it to @font_name. **/ void -pluma_view_set_font (PlumaView *view, - gboolean def, +pluma_view_set_font (PlumaView *view, + gboolean def, const gchar *font_name) { PangoFontDescription *font_desc = NULL; @@ -915,7 +915,7 @@ pluma_view_set_font (PlumaView *view, pango_font_description_free (sys_font_desc); } - pango_font_description_free (font_desc); + pango_font_description_free (font_desc); } static void @@ -939,7 +939,7 @@ add_search_completion_entry (const gchar *str) g_return_if_fail (GTK_IS_TREE_MODEL (search_completion_model)); - model = GTK_TREE_MODEL (search_completion_model); + model = GTK_TREE_MODEL (search_completion_model); /* Get the first iter in the list */ valid = gtk_tree_model_get_iter_first (model, &iter); @@ -949,9 +949,9 @@ add_search_completion_entry (const gchar *str) /* Walk through the list, reading each row */ gchar *str_data; - gtk_tree_model_get (model, - &iter, - 0, + gtk_tree_model_get (model, + &iter, + 0, &str_data, -1); @@ -1006,18 +1006,18 @@ run_search (PlumaView *view, { GtkTextIter start_iter; GtkTextIter match_start; - GtkTextIter match_end; + GtkTextIter match_end; gboolean found = FALSE; PlumaDocument *doc; g_return_val_if_fail (view->priv->search_mode == SEARCH, FALSE); doc = PLUMA_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); - + start_iter = view->priv->start_search_iter; - + if (*entry_text != '\0') - { + { if (!search_backward) { if (!typing) @@ -1026,38 +1026,38 @@ run_search (PlumaView *view, gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc), &start_iter, &match_end); - + gtk_text_iter_order (&match_end, &start_iter); } - + /* run search */ found = pluma_document_search_forward (doc, &start_iter, NULL, &match_start, &match_end); - } + } else if (!typing) { /* backward and not typing */ gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc), &start_iter, &match_end); - + /* run search */ found = pluma_document_search_backward (doc, NULL, &start_iter, &match_start, &match_end); - } + } else { /* backward (while typing) */ g_return_val_if_reached (FALSE); } - + if (!found && wrap_around) { if (!search_backward) @@ -1069,7 +1069,7 @@ run_search (PlumaView *view, else found = pluma_document_search_backward (doc, NULL, /* FIXME: set the start_inter */ - NULL, + NULL, &match_start, &match_end); } @@ -1077,10 +1077,10 @@ run_search (PlumaView *view, else { gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (doc), - &start_iter, - NULL); - } - + &start_iter, + NULL); + } + if (found) { gtk_text_buffer_place_cursor (GTK_TEXT_BUFFER (doc), @@ -1097,9 +1097,9 @@ run_search (PlumaView *view, &view->priv->start_search_iter); } } - + if (found || (*entry_text == '\0')) - { + { pluma_view_scroll_to_cursor (view); set_entry_state (view->priv->search_entry, @@ -1126,9 +1126,9 @@ send_focus_change (GtkWidget *widget, fevent->focus_change.type = GDK_FOCUS_CHANGE; fevent->focus_change.window = g_object_ref (gtk_widget_get_window (widget)); fevent->focus_change.in = in; - + gtk_widget_event (widget, fevent); - + g_object_notify (G_OBJECT (widget), "has-focus"); g_object_unref (widget); @@ -1158,14 +1158,14 @@ hide_search_window (PlumaView *view, gboolean cancel) 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) { GtkTextBuffer *buffer; - + buffer = GTK_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); gtk_text_buffer_place_cursor (buffer, &view->priv->start_search_iter); - + pluma_view_scroll_to_cursor (view); } @@ -1192,10 +1192,10 @@ update_search_window_position (PlumaView *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); - + gtk_window_move (GTK_WINDOW (view->priv->search_window), x, y); } @@ -1215,7 +1215,7 @@ search_window_button_press_event (GtkWidget *widget, PlumaView *view) { hide_search_window (view, FALSE); - + gtk_propagate_event (GTK_WIDGET (view), (GdkEvent *)event); return FALSE; @@ -1228,8 +1228,8 @@ search_again (PlumaView *view, const gchar *entry_text; g_return_if_fail (view->priv->search_mode == SEARCH); - - /* SEARCH mode */ + + /* SEARCH mode */ /* renew the flush timeout */ if (view->priv->typeselect_flush_timeout != 0) { @@ -1239,11 +1239,11 @@ search_again (PlumaView *view, (GSourceFunc)search_entry_flush_timeout, view); } - + entry_text = gtk_entry_get_text (GTK_ENTRY (view->priv->search_entry)); - + add_search_completion_entry (entry_text); - + run_search (view, entry_text, search_backward, @@ -1260,8 +1260,8 @@ search_window_scroll_event (GtkWidget *widget, if (view->priv->search_mode == GOTO_LINE) return retval; - - /* SEARCH mode */ + + /* SEARCH mode */ if (event->direction == GDK_SCROLL_UP) { search_again (view, TRUE); @@ -1302,19 +1302,19 @@ search_window_key_press_event (GtkWidget *widget, /* restore document search so that Find Next does the right thing */ doc = PLUMA_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); - pluma_document_set_search_text (doc, + pluma_document_set_search_text (doc, view->priv->old_search_text, view->priv->old_search_flags); - + } - + hide_search_window (view, TRUE); retval = TRUE; } - + if (view->priv->search_mode == GOTO_LINE) return retval; - + /* SEARCH mode */ /* select previous matching iter */ @@ -1324,7 +1324,7 @@ search_window_key_press_event (GtkWidget *widget, retval = TRUE; } - if (((event->state & modifiers) == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) && + if (((event->state & modifiers) == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) && (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G)) { search_again (view, TRUE); @@ -1338,7 +1338,7 @@ search_window_key_press_event (GtkWidget *widget, retval = TRUE; } - if (((event->state & modifiers) == GDK_CONTROL_MASK) && + if (((event->state & modifiers) == GDK_CONTROL_MASK) && (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G)) { search_again (view, FALSE); @@ -1358,7 +1358,7 @@ search_entry_activate (GtkEntry *entry, static void wrap_around_menu_item_toggled (GtkCheckMenuItem *checkmenuitem, PlumaView *view) -{ +{ view->priv->wrap_around = gtk_check_menu_item_get_active (checkmenuitem); } @@ -1401,7 +1401,7 @@ search_enable_popdown (GtkWidget *widget, PlumaView *view) { g_timeout_add (200, real_search_enable_popdown, view); - + /* renew the flush timeout */ if (view->priv->typeselect_flush_timeout != 0) g_source_remove (view->priv->typeselect_flush_timeout); @@ -1434,7 +1434,7 @@ search_entry_populate_popup (GtkEntry *entry, /* create "Wrap Around" menu item. */ menu_item = gtk_check_menu_item_new_with_mnemonic (_("_Wrap Around")); g_signal_connect (G_OBJECT (menu_item), "toggled", - G_CALLBACK (wrap_around_menu_item_toggled), + G_CALLBACK (wrap_around_menu_item_toggled), view); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), @@ -1444,7 +1444,7 @@ search_entry_populate_popup (GtkEntry *entry, /* create "Match Entire Word Only" menu item. */ menu_item = gtk_check_menu_item_new_with_mnemonic (_("Match _Entire Word Only")); g_signal_connect (G_OBJECT (menu_item), "toggled", - G_CALLBACK (match_entire_word_menu_item_toggled), + G_CALLBACK (match_entire_word_menu_item_toggled), view); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), @@ -1454,7 +1454,7 @@ search_entry_populate_popup (GtkEntry *entry, /* create "Match Case" menu item. */ menu_item = gtk_check_menu_item_new_with_mnemonic (_("_Match Case")); g_signal_connect (G_OBJECT (menu_item), "toggled", - G_CALLBACK (match_case_menu_item_toggled), + G_CALLBACK (match_case_menu_item_toggled), view); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), @@ -1464,7 +1464,7 @@ search_entry_populate_popup (GtkEntry *entry, /* create "Parse escapes" menu item. */ menu_item = gtk_check_menu_item_new_with_mnemonic (_("_Parse escape sequences (e.g. \n)")); g_signal_connect (G_OBJECT (menu_item), "toggled", - G_CALLBACK (parse_escapes_menu_item_toggled), + G_CALLBACK (parse_escapes_menu_item_toggled), view); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menu_item); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), @@ -1473,9 +1473,9 @@ search_entry_populate_popup (GtkEntry *entry, } static void -search_entry_insert_text (GtkEditable *editable, - const gchar *text, - gint length, +search_entry_insert_text (GtkEditable *editable, + const gchar *text, + gint length, gint *position, PlumaView *view) { @@ -1493,24 +1493,24 @@ search_entry_insert_text (GtkEditable *editable, return; c = g_utf8_get_char (p); - + if (((c == '-' || c == '+') && *position == 0) || (c == ':' && *position != 0)) { gchar *s = NULL; - + 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); p = next; } - + g_free (s); } @@ -1557,7 +1557,7 @@ search_entry_insert_text (GtkEditable *editable, insert_text = TRUE; g_signal_stop_emission_by_name (editable, "insert_text"); - + gtk_editable_insert_text (editable, escaped_text, new_len, position); insert_text = FALSE; @@ -1574,7 +1574,7 @@ customize_for_search_mode (PlumaView *view) gtk_entry_set_icon_from_icon_name (GTK_ENTRY (view->priv->search_entry), GTK_ENTRY_ICON_PRIMARY, "edit-find"); - + gtk_widget_set_tooltip_text (view->priv->search_entry, _("String you want to search for")); } @@ -1583,7 +1583,7 @@ customize_for_search_mode (PlumaView *view) gtk_entry_set_icon_from_icon_name (GTK_ENTRY (view->priv->search_entry), GTK_ENTRY_ICON_PRIMARY, "go-jump"); - + gtk_widget_set_tooltip_text (view->priv->search_entry, _("Line you want to move the cursor to")); } @@ -1600,30 +1600,30 @@ completion_func (GtkEntryCompletion *completion, GtkTreeModel *model; PlumaViewPrivate *priv = (PlumaViewPrivate *)data; const gchar *real_key; - + if (priv->search_mode == GOTO_LINE) return FALSE; - + real_key = gtk_entry_get_text (GTK_ENTRY (gtk_entry_completion_get_entry (completion))); - + if (g_utf8_strlen (real_key, -1) <= MIN_SEARCH_COMPLETION_KEY_LEN) return FALSE; - + model = gtk_entry_completion_get_model (completion); - g_return_val_if_fail (gtk_tree_model_get_column_type (model, 0) == G_TYPE_STRING, + g_return_val_if_fail (gtk_tree_model_get_column_type (model, 0) == G_TYPE_STRING, FALSE); - - gtk_tree_model_get (model, + + gtk_tree_model_get (model, iter, - 0, + 0, &item, -1); - + if (item == NULL) return FALSE; - + if (PLUMA_SEARCH_IS_CASE_SENSITIVE (priv->search_flags)) - { + { if (!strncmp (real_key, item, strlen (real_key))) ret = TRUE; } @@ -1631,33 +1631,33 @@ completion_func (GtkEntryCompletion *completion, { gchar *normalized_string; gchar *case_normalized_string; - + normalized_string = g_utf8_normalize (item, -1, G_NORMALIZE_ALL); case_normalized_string = g_utf8_casefold (normalized_string, -1); - + if (!strncmp (key, case_normalized_string, strlen (key))) ret = TRUE; - + g_free (normalized_string); g_free (case_normalized_string); - + } - + g_free (item); - - return ret; + + return ret; } static void ensure_search_window (PlumaView *view) -{ +{ GtkWidget *frame; GtkWidget *vbox; GtkWidget *toplevel; GtkEntryCompletion *completion; 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) @@ -1671,20 +1671,20 @@ ensure_search_window (PlumaView *view) else if (search_group) gtk_window_group_remove_window (search_group, GTK_WINDOW (view->priv->search_window)); - + customize_for_search_mode (view); - + return; } - + view->priv->search_window = gtk_window_new (GTK_WINDOW_POPUP); 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); - + g_signal_connect (view->priv->search_window, "delete_event", G_CALLBACK (search_window_delete_event), view); @@ -1711,18 +1711,18 @@ ensure_search_window (PlumaView *view) /* 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_signal_connect (view->priv->search_entry, "activate", G_CALLBACK (search_entry_activate), view); - g_signal_connect (view->priv->search_entry, + g_signal_connect (view->priv->search_entry, "insert_text", - G_CALLBACK (search_entry_insert_text), - view); - + G_CALLBACK (search_entry_insert_text), + view); + gtk_container_add (GTK_CONTAINER (vbox), view->priv->search_entry); @@ -1731,12 +1731,12 @@ ensure_search_window (PlumaView *view) /* Create a tree model and use it as the completion model */ search_completion_model = gtk_list_store_new (1, G_TYPE_STRING); } - + /* Create the completion object for the search entry */ completion = gtk_entry_completion_new (); - gtk_entry_completion_set_model (completion, + gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (search_completion_model)); - + /* Use model column 0 as the text column */ gtk_entry_completion_set_text_column (completion, 0); @@ -1745,20 +1745,20 @@ ensure_search_window (PlumaView *view) gtk_entry_completion_set_popup_completion (completion, FALSE); gtk_entry_completion_set_inline_completion (completion, TRUE); - - gtk_entry_completion_set_match_func (completion, + + gtk_entry_completion_set_match_func (completion, completion_func, view->priv, NULL); /* Assign the completion to the entry */ - gtk_entry_set_completion (GTK_ENTRY (view->priv->search_entry), + gtk_entry_set_completion (GTK_ENTRY (view->priv->search_entry), completion); g_object_unref (completion); gtk_widget_realize (view->priv->search_entry); - customize_for_search_mode (view); + customize_for_search_mode (view); } static gboolean @@ -1789,23 +1789,23 @@ static void init_search_entry (PlumaView *view) { GtkTextBuffer *buffer; - + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - + if (view->priv->search_mode == GOTO_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), + + gtk_entry_set_text (GTK_ENTRY (view->priv->search_entry), line_str); - + g_free (line_str); - + return; } else @@ -1817,7 +1817,7 @@ init_search_entry (PlumaView *view) guint old_find_flags = 0; gint sel_len = 0; - old_find_text = pluma_document_get_search_text (PLUMA_DOCUMENT (buffer), + old_find_text = pluma_document_get_search_text (PLUMA_DOCUMENT (buffer), &old_find_flags); if (old_find_text != NULL) { @@ -1831,21 +1831,21 @@ init_search_entry (PlumaView *view) view->priv->old_search_flags = old_find_flags; } - selection_exists = get_selected_text (buffer, - &find_text, + selection_exists = get_selected_text (buffer, + &find_text, &sel_len); - + if (selection_exists && (find_text != NULL) && (sel_len <= 160)) { - gtk_entry_set_text (GTK_ENTRY (view->priv->search_entry), - find_text); + gtk_entry_set_text (GTK_ENTRY (view->priv->search_entry), + find_text); } else { - gtk_entry_set_text (GTK_ENTRY (view->priv->search_entry), + gtk_entry_set_text (GTK_ENTRY (view->priv->search_entry), ""); } - + g_free (find_text); } } @@ -1866,11 +1866,11 @@ search_init (GtkWidget *entry, (GSourceFunc)search_entry_flush_timeout, view); } - + doc = PLUMA_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); - + entry_text = gtk_entry_get_text (GTK_ENTRY (entry)); - + if (view->priv->search_mode == SEARCH) { gchar *search_text; @@ -1882,7 +1882,7 @@ search_init (GtkWidget *entry, (strcmp (search_text, entry_text) != 0) || search_flags != view->priv->search_flags) { - pluma_document_set_search_text (doc, + pluma_document_set_search_text (doc, entry_text, view->priv->search_flags); } @@ -1905,9 +1905,9 @@ search_init (GtkWidget *entry, gint line_offset = 0; gchar **split_text = NULL; const gchar *text; - + split_text = g_strsplit (entry_text, ":", -1); - + if (g_strv_length (split_text) > 1) { text = split_text[0]; @@ -1916,41 +1916,41 @@ search_init (GtkWidget *entry, { text = entry_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); - + line = MAX (cur_line - offset_line, 0); } 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); - + line = cur_line + offset_line; } else { line = MAX (atoi (text) - 1, 0); } - + if (split_text[1] != NULL) { line_offset = atoi (split_text[1]); } - + g_strfreev (split_text); - + moved = pluma_document_goto_line (doc, line); moved_offset = pluma_document_goto_line_offset (doc, line, line_offset); - + pluma_view_scroll_to_cursor (view); if (!moved || !moved_offset) @@ -1965,9 +1965,9 @@ search_init (GtkWidget *entry, static gboolean start_interactive_search_real (PlumaView *view) -{ +{ GtkTextBuffer *buffer; - + if ((view->priv->search_window != NULL) && gtk_widget_get_visible (view->priv->search_window)) return TRUE; @@ -2001,44 +2001,44 @@ start_interactive_search_real (PlumaView *view) init_search_entry (view); - view->priv->typeselect_flush_timeout = + view->priv->typeselect_flush_timeout = g_timeout_add (PLUMA_VIEW_SEARCH_DIALOG_TIMEOUT, (GSourceFunc) search_entry_flush_timeout, view); 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); - + return TRUE; } static gboolean reset_searched_text (PlumaView *view) -{ +{ PlumaDocument *doc; doc = PLUMA_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))); - + pluma_document_set_search_text (doc, "", PLUMA_SEARCH_DONT_SET_FLAGS); - + return TRUE; } static gboolean start_interactive_search (PlumaView *view) -{ +{ view->priv->search_mode = SEARCH; - + return start_interactive_search_real (view); } -static gboolean +static gboolean start_interactive_goto_line (PlumaView *view) { view->priv->search_mode = GOTO_LINE; - + return start_interactive_search_real (view); } @@ -2049,9 +2049,9 @@ pluma_view_draw (GtkWidget *widget, GtkTextView *text_view; PlumaDocument *doc; GdkWindow *window; - + text_view = GTK_TEXT_VIEW (widget); - + doc = PLUMA_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) && @@ -2059,7 +2059,7 @@ pluma_view_draw (GtkWidget *widget, { GdkRectangle visible_rect; GtkTextIter iter1, iter2; - + gtk_text_view_get_visible_rect (text_view, &visible_rect); gtk_text_view_get_line_at_y (text_view, &iter1, visible_rect.y, NULL); @@ -2067,7 +2067,7 @@ pluma_view_draw (GtkWidget *widget, visible_rect.y + visible_rect.height, NULL); gtk_text_iter_forward_line (&iter2); - + _pluma_document_search_region (doc, &iter1, &iter2); @@ -2082,14 +2082,14 @@ drag_get_uri_target (GtkWidget *widget, { GdkAtom target; GtkTargetList *tl; - + tl = gtk_target_list_new (NULL, 0); gtk_target_list_add_uri_targets (tl, 0); - + target = gtk_drag_dest_find_target (widget, context, tl); gtk_target_list_unref (tl); - - return target; + + return target; } static gboolean @@ -2101,13 +2101,13 @@ pluma_view_drag_motion (GtkWidget *widget, { gboolean result; - /* Chain up to allow textview to scroll and position dnd mark, note + /* Chain up to allow textview to scroll and position dnd mark, note * that this needs to be checked if gtksourceview or gtktextview * changes drag_motion behaviour */ result = GTK_WIDGET_CLASS (pluma_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), @@ -2128,17 +2128,17 @@ pluma_view_drag_data_received (GtkWidget *widget, guint timestamp) { gchar **uri_list; - + /* If this is an URL emit DROP_URIS, otherwise chain up the signal */ if (info == TARGET_URI_LIST) { uri_list = pluma_utils_drop_get_uris (selection_data); - + 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); } } @@ -2200,9 +2200,9 @@ create_line_numbers_menu (GtkWidget *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); - + return menu; } @@ -2232,7 +2232,7 @@ pluma_view_button_press_event (GtkWidget *widget, GdkEventButton *event) else gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_PRIMARY), primtxt, strlen (primtxt)); - if ((event->type == GDK_BUTTON_PRESS) && + if ((event->type == GDK_BUTTON_PRESS) && (event->window == gtk_text_view_get_window (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_LEFT))) { @@ -2275,27 +2275,27 @@ pluma_view_populate_popup (GtkTextView *text_view, GtkWidget *widget) middle_or_right_down = FALSE; } -static void +static void search_highlight_updated_cb (PlumaDocument *doc, GtkTextIter *start, GtkTextIter *end, PlumaView *view) { GdkRectangle visible_rect; - GdkRectangle updated_rect; + GdkRectangle updated_rect; GdkRectangle redraw_rect; gint y; gint height; GtkTextView *text_view; - + text_view = GTK_TEXT_VIEW (view); g_return_if_fail (pluma_document_get_enable_search_highlighting ( PLUMA_DOCUMENT (gtk_text_view_get_buffer (text_view)))); - + /* get visible area */ gtk_text_view_get_visible_rect (text_view, &visible_rect); - + /* get updated rectangle */ gtk_text_view_get_line_yrange (text_view, start, &y, &height); updated_rect.y = y; @@ -2305,20 +2305,20 @@ search_highlight_updated_cb (PlumaDocument *doc, 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.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, @@ -2344,39 +2344,39 @@ delete_line (GtkTextView *text_view, if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end)) { gtk_text_iter_order (&start, &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) - { + { 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)) gtk_text_iter_forward_to_line_end (&start); } } - else if (count < 0) + else if (count < 0) { if (!gtk_text_iter_ends_line (&end)) gtk_text_iter_forward_to_line_end (&end); - while (count < 0) + while (count < 0) { if (!gtk_text_iter_backward_line (&start)) break; - + ++count; } @@ -2393,12 +2393,12 @@ delete_line (GtkTextView *text_view, { GtkTextIter cur = start; gtk_text_iter_set_line_offset (&cur, 0); - + gtk_text_buffer_begin_user_action (buffer); gtk_text_buffer_place_cursor (buffer, &cur); - gtk_text_buffer_delete_interactive (buffer, + gtk_text_buffer_delete_interactive (buffer, &start, &end, gtk_text_view_get_editable (text_view)); |