Merge lp:~njpatel/unity/ibus-support into lp:unity

[Neil J. Patel]

- Adds support for IBus (either directly or through XIM), plus other, non-async, input methods (working on getting async ones working)
- Adds support for copy-and-paste in the entry

[Neil J. Patel (njpatel)]

- Fixes allocation of dash
- Makes the standalone dash be the size of a 1024x600 screen (minus the launcher + panel), which eases testing.

[Jason Smith (jassmith)]

+1 looks good, works right

review: Approve

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2011-08-26 14:07:47 +0000
+++ plugins/unityshell/src/DashView.cpp	2011-08-31 20:22:26 +0000
@@ -114,8 +114,13 @@
   lens_bar_ = new LensBar();
   lens_bar_->lens_activated.connect(sigc::mem_fun(this, &DashView::OnLensBarActivated));
   content_layout_->AddView(lens_bar_, 0, nux::MINOR_POSITION_CENTER);
+
+  search_bar_->OnGeometryChanged.connect([&] (nux::Area*, nux::Geometry& geo) { Relayout(); });
+  lens_bar_->OnGeometryChanged.connect([&] (nux::Area*, nux::Geometry& geo) { Relayout(); });
 }
 
+
+
 void DashView::SetupUBusConnections()
 {
   ubus_manager_.RegisterInterest(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
@@ -140,6 +145,7 @@
   // the bottom of the dash off the screen
   // not hugely happy with this, so FIXME
   lenses_layout_->SetMaximumHeight (content_geo_.height - search_bar_->GetGeometry().height - lens_bar_->GetGeometry().height);
+  lenses_layout_->SetMinimumHeight (content_geo_.height - search_bar_->GetGeometry().height - lens_bar_->GetGeometry().height);
 
   content_layout_->SetMinMaxSize(content_geo_.width, content_geo_.height);
 

=== modified file 'plugins/unityshell/src/IMTextEntry.cpp'
--- plugins/unityshell/src/IMTextEntry.cpp	2011-08-24 18:46:52 +0000
+++ plugins/unityshell/src/IMTextEntry.cpp	2011-08-31 20:22:26 +0000
@@ -44,14 +44,13 @@
   , client_window_(0)
   , im_enabled_(false)
   , im_active_(false)
+  , focused_(false)
 {
+  g_setenv("IBUS_ENABLE_SYNC_MODE", "1", TRUE);
   CheckIMEnabled();
-  //FIXME: Make event forwarding work before enabling
-  // im_enabled_ ? SetupMultiIM() : SetupSimpleIM();
-  SetupSimpleIM();
+  im_enabled_ ? SetupMultiIM() : SetupSimpleIM();
 
-  FocusChanged.connect(sigc::mem_fun(this, &IMTextEntry::OnFocusChanged));
-  OnKeyNavFocusChange.connect(sigc::mem_fun(this, &IMTextEntry::OnFocusChanged));
+  FocusChanged.connect([&] (nux::Area*) { GetFocused() ? OnFocusIn() : OnFocusOut(); });
   mouse_up.connect(sigc::mem_fun(this, &IMTextEntry::OnMouseButtonUp));
 }
 
@@ -101,19 +100,24 @@
 {
   bool propagate_event = !(TryHandleEvent(event_type, keysym, character));
 
-  LOG_DEBUG(logger) << "Input method ("
+  LOG_DEBUG(logger) << "Input method "
                     << (im_enabled_ ? gtk_im_multicontext_get_context_id(GTK_IM_MULTICONTEXT(im_context_)) : "simple")
-                    << ") "
+                    << " "
                     << (propagate_event ? "did not handle " : "handled ") 
                     << "event ("
                     << (event_type == NUX_KEYDOWN ? "press" : "release")
                     << ") ";
 
   if (propagate_event)
+    propagate_event = !TryHandleSpecial(event_type, keysym, character);
+
+  if (propagate_event)
   {
     text_input_mode_ = event_type == NUX_KEYDOWN;
     propagate_event = TextEntry::InspectKeyEvent(event_type, keysym, character);
     text_input_mode_ = false;
+
+    UpdateCursorLocation();
   }
   return propagate_event;
 }
@@ -139,7 +143,7 @@
     client_window_ = gdk_x11_window_foreign_new_for_display(gdk_display_get_default(), window);
     gtk_im_context_set_client_window(im_context_, client_window_);
 
-    if (GetFocused())
+    if (focused_)
     {
       gtk_im_context_focus_in(im_context_);
     }
@@ -149,7 +153,6 @@
 void IMTextEntry::KeyEventToGdkEventKey(Event& event, GdkEventKey& gdk_event)
 {
   gdk_event.type = event.e_event == nux::NUX_KEYDOWN ? GDK_KEY_PRESS : GDK_KEY_RELEASE;
-
   gdk_event.window = client_window_;
   gdk_event.send_event = FALSE;
   gdk_event.time = event.e_x11_timestamp;
@@ -165,20 +168,66 @@
   gdk_event.is_modifier = 0;
 }
 
-void IMTextEntry::OnFocusChanged(nux::Area* area)
+bool IMTextEntry::TryHandleSpecial(unsigned int eventType, unsigned int keysym, const char* character)
 {
-
-  LOG_DEBUG(logger) << "Focus changed " << boost::lexical_cast<bool>(GetFocused());
-
-  if (GetFocused())
-  {
-    gtk_im_context_focus_in(im_context_);
+  nux::Event event = nux::GetGraphicsThread()->GetWindow().GetCurrentEvent();
+  unsigned int keyval = keysym;
+  bool shift = (event.GetKeyState() & NUX_STATE_SHIFT);
+  bool ctrl = (event.GetKeyState() & NUX_STATE_CTRL);
+
+  if (eventType != NUX_KEYDOWN)
+    return false;
+
+  if (((keyval == NUX_VK_x) && ctrl && !shift) ||
+      ((keyval == NUX_VK_DELETE) && shift && !ctrl))
+  {
+    Cut();
+  }
+  else if (((keyval == NUX_VK_c) && ctrl && (!shift)) ||
+           ((keyval == NUX_VK_INSERT) && ctrl && (!shift)))
+  {
+    Copy();
+  }
+  else if (((keyval == NUX_VK_v) && ctrl && (!shift)) ||
+      ((keyval == NUX_VK_INSERT) && shift && (!ctrl)))
+  {
+    Paste();
   }
   else
   {
-    gtk_im_context_focus_out(im_context_);
-    gtk_im_context_reset(im_context_);
-  }
+    return false;
+  }
+  return true;
+}
+
+void IMTextEntry::Cut()
+{
+  Copy();
+  DeleteSelection();
+}
+
+void IMTextEntry::Copy()
+{
+  int start=0, end=0;
+  if (GetSelectionBounds(&start, &end))
+  {
+    GtkClipboard* clip = gtk_clipboard_get_for_display(gdk_display_get_default(),
+                                                       GDK_SELECTION_CLIPBOARD);
+    gtk_clipboard_set_text(clip, _text.c_str() + start, end - start);
+  }
+}
+
+void IMTextEntry::Paste()
+{
+  GtkClipboard* clip = gtk_clipboard_get_for_display(gdk_display_get_default(),
+                                                     GDK_SELECTION_CLIPBOARD);
+  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));
+   };
+
+  gtk_clipboard_request_text(clip, callback, this);
 }
 
 void IMTextEntry::OnCommit(GtkIMContext* context, char* str)
@@ -191,6 +240,7 @@
     int cursor = cursor_;
     SetText(new_text.c_str());
     SetCursor(cursor + strlen(str));
+    UpdateCursorLocation();
   }
 }
 
@@ -223,6 +273,30 @@
   LOG_DEBUG(logger) << "Preedit ended";
 }
 
+void IMTextEntry::OnFocusIn()
+{
+  focused_ = true;
+  gtk_im_context_focus_in(im_context_);
+  gtk_im_context_reset(im_context_);
+  UpdateCursorLocation();
+}
+
+void IMTextEntry::OnFocusOut()
+{
+  focused_ = false;
+  gtk_im_context_focus_out(im_context_);
+}
+
+void IMTextEntry::UpdateCursorLocation()
+{
+  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_)

=== modified file 'plugins/unityshell/src/IMTextEntry.h'
--- plugins/unityshell/src/IMTextEntry.h	2011-08-18 15:10:37 +0000
+++ plugins/unityshell/src/IMTextEntry.h	2011-08-31 20:22:26 +0000
@@ -53,13 +53,20 @@
   bool TryHandleEvent(unsigned int eventType, unsigned int keysym, const char* character);
   void KeyEventToGdkEventKey(Event& event, GdkEventKey& gdk_event);
   inline void CheckValidClientWindow(Window window);
+  bool TryHandleSpecial(unsigned int eventType, unsigned int keysym, const char* character);
+  void Cut();
+  void Copy();
+  void Paste();
 
-  void OnFocusChanged(nux::Area* area);
   void OnCommit(GtkIMContext* context, char* str);
   void OnPreeditChanged(GtkIMContext* context);
   void OnPreeditStart(GtkIMContext* context);
   void OnPreeditEnd(GtkIMContext* context);
 
+  void OnFocusIn();
+  void OnFocusOut();
+  void UpdateCursorLocation();
+
   void OnMouseButtonUp(int x, int y, unsigned long bflags, unsigned long kflags);
 
  private:
@@ -68,6 +75,7 @@
   GdkWindow* client_window_;
   bool im_enabled_;
   bool im_active_;
+  bool focused_;
 };
 
 }

=== modified file 'plugins/unityshell/src/PlacesHomeView.cpp'
--- plugins/unityshell/src/PlacesHomeView.cpp	2011-08-24 21:47:34 +0000
+++ plugins/unityshell/src/PlacesHomeView.cpp	2011-08-31 20:22:26 +0000
@@ -101,12 +101,12 @@
   _layout->SetChildrenSize(style->GetHomeTileWidth(), style->GetHomeTileHeight());
   _layout->EnablePartialVisibility(false);
   _layout->SetHeightMatchContent(true);
-  _layout->SetVerticalExternalMargin(32);
+  //_layout->SetVerticalExternalMargin(24);
   _layout->SetHorizontalExternalMargin(32);
   _layout->SetVerticalInternalMargin(32);
   _layout->SetHorizontalInternalMargin(32);
   _layout->SetMinMaxSize((style->GetHomeTileWidth() * 4) + (32 * 5),
-                         (style->GetHomeTileHeight() * 2) + (32 * 3));
+                         (style->GetHomeTileHeight() * 2) + 32);
 
   _client = gconf_client_get_default();
   gconf_client_add_dir(_client,

=== modified file 'tests/standalone_dash.cpp'
--- tests/standalone_dash.cpp	2011-08-26 14:07:47 +0000
+++ tests/standalone_dash.cpp	2011-08-31 20:22:26 +0000
@@ -30,8 +30,8 @@
 #include "FontSettings.h"
 #include "DashView.h"
 
-#define WIDTH 1054
-#define HEIGHT 640
+#define WIDTH 958
+#define HEIGHT 574
 
 using namespace unity::dash;
 
@@ -103,7 +103,7 @@
 
   TestRunner *test_runner = new TestRunner ();
   wt = nux::CreateGUIThread(TEXT("Unity Dash"),
-                            WIDTH+12, HEIGHT+12,
+                            WIDTH, HEIGHT,
                             0,
                             &TestRunner::InitWindowThread,
                             test_runner);