Merge lp:~gordallott/unity/hud-wait-100ms into lp:unity

[Gord Allott]

Reduce stress on hud service by waiting 100ms prior to sending request.

helps reduce the stress on the service, request from desrt, only sends a new hud dbus query after waiting 100ms from the last typed letter

helps fix lp:948820

no testing as this is a stop gap fix and not the "correct" behaviour, if i were to write a test it would be to make a failing test so remind everyone to correct this bug properly
but we aren't allowed failing tests so oh well ;)

[Didier Roche-Tolomelli (didrocks)]

gord, can you put a big insulting FIXME as a comment maybe? ;)

[Tim Penhey (thumper)]

+1 with the FIXME comment.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'plugins/unityshell/src/HudController.cpp'
--- plugins/unityshell/src/HudController.cpp	2012-03-21 15:30:49 +0000
+++ plugins/unityshell/src/HudController.cpp	2012-03-29 13:58:38 +0000
@@ -50,6 +50,7 @@
   , launcher_is_locked_out_(false)
   , view_(nullptr)
   , monitor_index_(0)
+  , type_wait_handle_(0)
 {
   LOG_DEBUG(logger) << "hud startup";
   SetupRelayoutCallbacks();
@@ -87,6 +88,7 @@
 
   g_source_remove(timeline_id_);
   g_source_remove(ensure_id_);
+  g_source_remove(type_wait_handle_);
 }
 
 void Controller::SetupWindow()
@@ -384,8 +386,22 @@
 
 void Controller::OnSearchChanged(std::string search_string)
 {
+  //FIXME!! - when the service is smart enough to not fall over if you send many requests, this should be removed
   LOG_DEBUG(logger) << "Search Changed";
-  hud_service_.RequestQuery(search_string);
+  auto on_search_changed_timeout_lambda = [] (gpointer data) -> gboolean {
+    Controller* self = static_cast<Controller*>(data);
+    self->hud_service_.RequestQuery(self->last_search_);
+    self->type_wait_handle_ = 0;
+    return FALSE;
+  };
+  
+  last_search_ = search_string;
+  
+  if (type_wait_handle_)
+  {
+    g_source_remove(type_wait_handle_);
+  }  
+  type_wait_handle_ = g_timeout_add(100, on_search_changed_timeout_lambda, this);
 }
 
 void Controller::OnSearchActivated(std::string search_string)

=== modified file 'plugins/unityshell/src/HudController.h'
--- plugins/unityshell/src/HudController.h	2012-03-21 15:30:49 +0000
+++ plugins/unityshell/src/HudController.h	2012-03-29 13:58:38 +0000
@@ -109,6 +109,8 @@
   std::string focused_app_icon_;
   nux::Layout* layout_;
   uint monitor_index_;
+  guint type_wait_handle_;
+  std::string last_search_;
 };