[Linux] Improve preedit string and Instant suggestion support in omnibox.

chrome/browser/autocomplete/autocomplete_edit_view_gtk.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_GTK_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
@@ skipping 156 matching lines @@
                      GtkTextBuffer*);
   CHROMEG_CALLBACK_2(AutocompleteEditViewGtk, void, HandleMarkSet,
                      GtkTextBuffer*, GtkTextIter*, GtkTextMark*);
   // As above, but called after the default handler.
   CHROMEG_CALLBACK_2(AutocompleteEditViewGtk, void, HandleMarkSetAfter,
                      GtkTextBuffer*, GtkTextIter*, GtkTextMark*);
   CHROMEG_CALLBACK_3(AutocompleteEditViewGtk, void, HandleInsertText,
                      GtkTextBuffer*, GtkTextIter*, const gchar*, gint);
   CHROMEG_CALLBACK_0(AutocompleteEditViewGtk, void,
                      HandleKeymapDirectionChanged, GdkKeymap*);
+  CHROMEG_CALLBACK_2(AutocompleteEditViewGtk, void, HandleDeleteRange,
+                     GtkTextBuffer*, GtkTextIter*, GtkTextIter*);
+  // Unlike above HandleMarkSet and HandleMarkSetAfter, this handler will always
+  // be connected to the signal.
+  CHROMEG_CALLBACK_2(AutocompleteEditViewGtk, void, HandleMarkSetAlways,
+                     GtkTextBuffer*, GtkTextIter*, GtkTextMark*);
 
   CHROMEGTK_CALLBACK_1(AutocompleteEditViewGtk, gboolean, HandleKeyPress,
                        GdkEventKey*);
   CHROMEGTK_CALLBACK_1(AutocompleteEditViewGtk, gboolean, HandleKeyRelease,
                        GdkEventKey*);
   CHROMEGTK_CALLBACK_1(AutocompleteEditViewGtk, gboolean, HandleViewButtonPress,
                        GdkEventButton*);
   CHROMEGTK_CALLBACK_1(AutocompleteEditViewGtk, gboolean,
                        HandleViewButtonRelease, GdkEventButton*);
   CHROMEGTK_CALLBACK_1(AutocompleteEditViewGtk, gboolean, HandleViewFocusIn,
@@ skipping 20 matching lines @@
   CHROMEGTK_CALLBACK_1(AutocompleteEditViewGtk, gboolean, HandleExposeEvent,
                        GdkEventExpose*);
   CHROMEGTK_CALLBACK_1(AutocompleteEditViewGtk, void,
                        HandleWidgetDirectionChanged, GtkTextDirection);
   CHROMEGTK_CALLBACK_2(AutocompleteEditViewGtk, void,
                        HandleDeleteFromCursor, GtkDeleteType, gint);
   // We connect to this so we can determine our toplevel window, so we can
   // listen to focus change events on it.
   CHROMEGTK_CALLBACK_1(AutocompleteEditViewGtk, void, HandleHierarchyChanged,
                        GtkWidget*);
-  CHROMEGTK_CALLBACK_1(AutocompleteEditViewGtk, gboolean,
-                       HandleInstantViewButtonPress, GdkEventButton*);
-#if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2, 20, 0)
   CHROMEGTK_CALLBACK_1(AutocompleteEditViewGtk, void, HandlePreeditChanged,
                        const gchar*);
 #endif
+  // Undo/redo operations won't trigger "begin-user-action" and
+  // "end-user-action" signals, so we need to hook into "undo" and "redo"
+  // signals and call OnBeforePossibleChange()/OnAfterPossibleChange() by
+  // ourselves.
+  CHROMEGTK_CALLBACK_0(AutocompleteEditViewGtk, void, HandleUndoRedo);
+  CHROMEGTK_CALLBACK_0(AutocompleteEditViewGtk, void, HandleUndoRedoAfter);
 
   CHROMEG_CALLBACK_1(AutocompleteEditViewGtk, void, HandleWindowSetFocus,
                      GtkWindow*, GtkWidget*);
 
   // Callback for the PRIMARY selection clipboard.
   static void ClipboardGetSelectionThunk(GtkClipboard* clipboard,
                                          GtkSelectionData* selection_data,
                                          guint info,
                                          gpointer object);
   void ClipboardGetSelection(GtkClipboard* clipboard,
@@ skipping 29 matching lines @@
   // Get the character indices of the current selection.  This honors
   // direction, cp_max is the insertion point, and cp_min is the bound.
   CharRange GetSelection();
 
   // Translate from character positions to iterators for the current buffer.
   void ItersFromCharRange(const CharRange& range,
                           GtkTextIter* iter_min,
                           GtkTextIter* iter_max);
 
   // Return the number of characers in the current buffer.
-  int GetTextLength();
-
-  // Get the string contents for the given buffer.
-  std::wstring GetTextFromBuffer(GtkTextBuffer* buffer) const;
+  int GetTextLength() const;
 
   // Try to parse the current text as a URL and colorize the components.
   void EmphasizeURLComponents();
 
   // Internally invoked whenever the text changes in some way.
   void TextChanged();
 
   // Save |selected_text| as the PRIMARY X selection. Unlike
   // OwnPrimarySelection(), this won't set an owner or use callbacks.
   void SavePrimarySelection(const std::string& selected_text);
@@ skipping 13 matching lines @@
   // Get the text direction of |text_buffer_|'s content, by searching the first
   // character that has a strong direction.
   PangoDirection GetContentDirection();
 
   // Returns the selected text.
   std::string GetSelectedText() const;
 
   // If the selected text parses as a URL OwnPrimarySelection is invoked.
   void UpdatePrimarySelectionIfValidURL();
 
+  // Retrieves the first and last iterators in the |text_buffer_|, but excludes
+  // the anchor holding the |instant_view_| widget.
+  void GetTextBufferBounds(GtkTextIter* start, GtkTextIter* end) const;
+
+  // Validates an iterator in the |text_buffer_|, to make sure it doesn't go
+  // beyond the anchor for holding the |instant_view_| widget.
+  void ValidateTextBufferIter(GtkTextIter* iter) const;
+
+  // Adjusts vertical alignment of the |instant_view_| in the |text_view_|, to
+  // make sure they have the same baseline.
+  void AdjustVerticalAlignmentOfInstantView();
+
   // The widget we expose, used for vertically centering the real text edit,
   // since the height will change based on the font / font size, etc.
   OwnedWidgetGtk alignment_;
 
   // The actual text entry which will be owned by the alignment_.
   GtkWidget* text_view_;
 
   GtkTextTagTable* tag_table_;
   GtkTextBuffer* text_buffer_;
   GtkTextTag* faded_text_tag_;
   GtkTextTag* secure_scheme_tag_;
   GtkTextTag* security_error_scheme_tag_;
   GtkTextTag* normal_text_tag_;
 
   // Objects for the instant suggestion text view.
+  GtkTextTag* instant_anchor_tag_;
+
+  // A widget for displaying instant suggestion text. It'll be attached to a
+  // child anchor in the |text_buffer_| object.
   GtkWidget* instant_view_;
-  GtkTextBuffer* instant_buffer_;
-  GtkTextTag* instant_text_tag_;
+
+  // A mark to split the content and the instant anchor. Wherever the end
+  // iterator of the text buffer is required, the iterator to this mark should
+  // be used.
+  GtkTextMark* instant_mark_;
 
   scoped_ptr<AutocompleteEditModel> model_;
   scoped_ptr<AutocompletePopupView> popup_view_;
   AutocompleteEditController* controller_;
   ToolbarModel* toolbar_model_;
 
   // The object that handles additional command functionality exposed on the
   // edit, such as invoking the keyword editor.
   CommandUpdater* command_updater_;
 
@@ skipping 90 matching lines @@
 
   // Indicate if the tab to search should be enabled or not. It's true by
   // default and will only be set to false if the location bar view is not able
   // to show the tab to search hint.
   bool enable_tab_to_search_;
 
   // Indicates if the selected text is suggested text or not. If the selection
   // is not suggested text, that means the user manually made the selection.
   bool selection_suggested_;
 
-#if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2, 20, 0)
   // Stores the text being composed by the input method.
   std::wstring preedit_;
 #endif
 
   // The view that is going to be focused next. Only valid while handling
   // "focus-out" events.
   GtkWidget* going_to_focus_;
 
   GtkSignalRegistrar signals_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewGtk);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_GTK_H_