Merge lp:~3v1n0/unity/middle-click-paste-in-dash into lp:unity

[Marco Trevisan (Treviño)]

Add support to middle-click pasting on the dash search bar.

When the XA_PRIMARY clipboard has some content, that is pasted by middle click over the dash search bar.
This is for consistency with the rest of the system.

I've also added the proper glib::Object support to the class.

[Mirco Müller (macslow)]

Middle-click pasting doesn't work. Only Ctrl-V allows me to paste into the dash's search-bar.

review: Needs Fixing

[Andrea Azzarone (azzar1)]

150 + if (!im_enabled)
151 + return;

This if is no longer needed.

review: Needs Fixing

[Andrea Azzarone (azzar1)]

Just to be clear you should do either:

if (button == 3 and im_enabled)
{
}
else if (button == 2)
or

if (!im_enabled and button != 2)
  return;

if (button == 3)
{
}
else if (button == 2)
{
}

...

I'd prefer the former.

[Andrea Azzarone (azzar1)]

review: Approve

[Andrea Azzarone (azzar1)]

+1

[Mirco Müller (macslow)]

Finally works now for me too.

review: Approve

=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2011-12-18 19:38:55 +0000
+++ manual-tests/Dash.txt	2012-01-05 15:07:25 +0000
@@ -36,3 +36,18 @@
   The dropped icon should not have the keyboard focus and should not remain
   enlightened.
 
+Dash SearchBar middle-click
+---------------------------
+This test shows how the middle click over the dash search bar should work
+(see lp:842462)
+
+#. Open a text editor, and write some dummy text
+#. Select some text part of the written dummy text with mouse
+#. Press Super or Alt+F2 to open the Dash
+#. Move the mouse over the dash search bar
+#. Press middle click to paste the content of your primary clipboard
+
+Outcome
+  The text previously selected is pasted on the search bar at mouse pointer
+  position, if the operation is repeated the text is inserted where
+  the mouse pointer is.

=== modified file 'plugins/unityshell/src/IMTextEntry.cpp'
--- plugins/unityshell/src/IMTextEntry.cpp	2011-12-10 06:41:53 +0000
+++ plugins/unityshell/src/IMTextEntry.cpp	2012-01-05 15:07:25 +0000
@@ -42,8 +42,6 @@
   , preedit_string("")
   , im_enabled(false)
   , im_active(false)
-  , im_context_(0)
-  , client_window_(0)
   , focused_(false)
 {
   g_setenv("IBUS_ENABLE_SYNC_MODE", "1", TRUE);
@@ -53,14 +51,6 @@
   mouse_up.connect(sigc::mem_fun(this, &IMTextEntry::OnMouseButtonUp));
 }
 
-IMTextEntry::~IMTextEntry()
-{
-  if (im_context_)
-    g_object_unref(im_context_);
-  if (client_window_)
-    g_object_unref(client_window_);
-}
-
 void IMTextEntry::CheckIMEnabled()
 {
   const char* module = g_getenv("GTK_IM_MODULE");
@@ -76,7 +66,7 @@
 void IMTextEntry::SetupSimpleIM()
 {
   im_context_ = gtk_im_context_simple_new();
-  
+
   sig_manager_.Add(new Signal<void, GtkIMContext*, char*>(im_context_, "commit", sigc::mem_fun(this, &IMTextEntry::OnCommit)));
   sig_manager_.Add(new Signal<void, GtkIMContext*>(im_context_, "preedit-changed", sigc::mem_fun(this, &IMTextEntry::OnPreeditChanged)));
   sig_manager_.Add(new Signal<void, GtkIMContext*>(im_context_, "preedit-start", sigc::mem_fun(this, &IMTextEntry::OnPreeditStart)));
@@ -86,7 +76,7 @@
 void IMTextEntry::SetupMultiIM()
 {
   im_context_ = gtk_im_multicontext_new();
-  
+
   sig_manager_.Add(new Signal<void, GtkIMContext*, char*>(im_context_, "commit", sigc::mem_fun(this, &IMTextEntry::OnCommit)));
   sig_manager_.Add(new Signal<void, GtkIMContext*>(im_context_, "preedit-changed", sigc::mem_fun(this, &IMTextEntry::OnPreeditChanged)));
   sig_manager_.Add(new Signal<void, GtkIMContext*>(im_context_, "preedit-start", sigc::mem_fun(this, &IMTextEntry::OnPreeditStart)));
@@ -100,7 +90,7 @@
   bool propagate_event = !(TryHandleEvent(event_type, keysym, character));
 
   LOG_DEBUG(logger) << "Input method "
-                    << (im_enabled ? gtk_im_multicontext_get_context_id(GTK_IM_MULTICONTEXT(im_context_)) : "simple")
+                    << (im_enabled ? gtk_im_multicontext_get_context_id(glib::object_cast<GtkIMMulticontext>(im_context_)) : "simple")
                     << " "
                     << (propagate_event ? "did not handle " : "handled ") 
                     << "event ("
@@ -224,19 +214,37 @@
   }
 }
 
-void IMTextEntry::Paste()
+void IMTextEntry::Paste(bool primary)
 {
-  GtkClipboard* clip = gtk_clipboard_get_for_display(gdk_display_get_default(),
-                                                     GDK_SELECTION_CLIPBOARD);
+  GdkAtom origin = primary ? GDK_SELECTION_PRIMARY : GDK_SELECTION_CLIPBOARD;
+  glib::Object<GtkClipboard> clip(gtk_clipboard_get_for_display(gdk_display_get_default(),
+                                                                origin));
   auto callback = [](GtkClipboard* clip, const char* text, gpointer user_data)
    {
      IMTextEntry* self = static_cast<IMTextEntry*>(user_data);
-     self->OnCommit (self->im_context_, const_cast<char*>(text));
+     if (text)
+      self->InsertTextAt(self->cursor_, std::string(text));
    };
 
   gtk_clipboard_request_text(clip, callback, this);
 }
 
+void IMTextEntry::InsertTextAt(unsigned int position, std::string const& text)
+{
+  DeleteSelection();
+
+  if (!text.empty())
+  {
+    std::string new_text(GetText());
+    new_text.insert(position, text);
+
+    int cursor = position;
+    SetText(new_text.c_str());
+    SetCursor(cursor + text.length());
+    UpdateCursorLocation();
+  }
+}
+
 void IMTextEntry::OnCommit(GtkIMContext* context, char* str)
 {
   LOG_DEBUG(logger) << "Commit: " << str;
@@ -244,13 +252,7 @@
 
   if (str)
   {
-    std::string new_text = GetText();
-    new_text.insert(cursor_, str);
-		
-    int cursor = cursor_;
-    SetText(new_text.c_str());
-    SetCursor(cursor + strlen(str));
-    UpdateCursorLocation();
+    InsertTextAt(cursor_, std::string(str));
   }
 }
 
@@ -265,7 +267,7 @@
 
   preedit_ = preedit.Str();
 
-  if (strlen(preedit.Str().c_str())) {
+  if (!preedit.Str().empty()) {
     preedit_cursor_ = preedit.Str().length();
     QueueRefresh(true, true);
     sigTextChanged.emit(this);
@@ -311,20 +313,28 @@
   nux::Rect strong, weak;
   GetCursorRects(&strong, &weak);
   nux::Geometry geo = GetGeometry();
-  
+
   GdkRectangle area = { strong.x + geo.x, strong.y + geo.y, strong.width, strong.height };
   gtk_im_context_set_cursor_location(im_context_, &area);
 }
 
 void IMTextEntry::OnMouseButtonUp(int x, int y, unsigned long bflags, unsigned long kflags)
 {
-  if (nux::GetEventButton(bflags) == 3 && im_enabled)
+  int button = nux::GetEventButton(bflags);
+
+  if (im_enabled && button == 3)
   {
     GtkWidget* menu = gtk_menu_new();
-    gtk_im_multicontext_append_menuitems(GTK_IM_MULTICONTEXT(im_context_),
-                                          GTK_MENU_SHELL(menu));
+    gtk_im_multicontext_append_menuitems(glib::object_cast<GtkIMMulticontext>(im_context_),
+                                         GTK_MENU_SHELL(menu));
     gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, GDK_CURRENT_TIME);
   }
+  else if (button == 2)
+  {
+    SetCursor(XYToTextIndex(x, y));
+    UpdateCursorLocation();
+    Paste(true);
+  }
 }
 
 }

=== modified file 'plugins/unityshell/src/IMTextEntry.h'
--- plugins/unityshell/src/IMTextEntry.h	2011-09-29 08:16:37 +0000
+++ plugins/unityshell/src/IMTextEntry.h	2012-01-05 15:07:25 +0000
@@ -26,6 +26,7 @@
 #include <Nux/Nux.h>
 #include <Nux/TextEntry.h>
 #include <UnityCore/GLibSignal.h>
+#include <UnityCore/GLibWrapper.h>
 
 namespace unity
 {
@@ -40,7 +41,6 @@
   NUX_DECLARE_OBJECT_TYPE(IMTextEntry, nux::TextEntry);
 public:
   IMTextEntry();
-  ~IMTextEntry();
 
   nux::Property<std::string> preedit_string;
   nux::Property<bool> im_enabled;
@@ -56,9 +56,10 @@
   void KeyEventToGdkEventKey(Event& event, GdkEventKey& gdk_event);
   inline void CheckValidClientWindow(Window window);
   bool TryHandleSpecial(unsigned int eventType, unsigned int keysym, const char* character);
+  void InsertTextAt(unsigned int position, std::string const& text);
   void Cut();
   void Copy();
-  void Paste();
+  void Paste(bool primary = false);
 
   void OnCommit(GtkIMContext* context, char* str);
   void OnPreeditChanged(GtkIMContext* context);
@@ -73,8 +74,8 @@
 
  private:
   glib::SignalManager sig_manager_;
-  GtkIMContext* im_context_;
-  GdkWindow* client_window_;
+  glib::Object<GtkIMContext> im_context_;
+  glib::Object<GdkWindow> client_window_;
   bool focused_;
 };