Merge lp:~brandontschaefer/nux/xic-sync-xevent-window into lp:nux

[Brandon Schaefer]

We need to check if the XIC client is synced up with the xevents coming in. If someone changes the focus window and our XIC hasn't been updated, we need to make sure we stay synced. Otherwise XIM fails to work.

We need to check if the XIC client is synced up with the xevents coming in. If someone changes the focus window and our XIC hasn't been updated, we need to make sure we stay synced. Otherwise XIM fails to work.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:821
http://jenkins.qa.ubuntu.com/job/nux-ci/78/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/30

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/nux-ci/78/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

LGTM

review: Approve

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2013-10-07 12:10:41 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2013-10-10 23:52:43 +0000
@@ -1359,6 +1359,12 @@
       bool bProcessEvent = true;
       XNextEvent(m_X11Display, &xevent);
 
+      if ((xevent.type == KeyPress || xevent.type == KeyRelease) &&
+          m_xim_controller->GetCurrentWindow() != xevent.xkey.window)
+      {
+        m_xim_controller->SetFocusedWindow(xevent.xkey.window);
+      }
+
       if (XFilterEvent(&xevent, None) == True)
         return true;
 
 
=== modified file 'NuxGraphics/XIMController.cpp'
--- NuxGraphics/XIMController.cpp	2013-09-05 22:24:24 +0000
+++ NuxGraphics/XIMController.cpp	2013-10-10 23:52:43 +0000
@@ -81,6 +81,11 @@
   xic_client_.DestroyXIC();
 }
 
+Window XIMController::GetCurrentWindow() const
+{
+  return window_;
+}
+
 void XIMController::InitXIMCallback()
 {
   char* const xmodifier = getenv("XMODIFIERS");
 
=== modified file 'NuxGraphics/XIMController.h'
--- NuxGraphics/XIMController.h	2012-12-17 19:04:50 +0000
+++ NuxGraphics/XIMController.h	2013-10-10 23:52:43 +0000
@@ -44,6 +44,9 @@
 
   void FocusInXIC();
   void FocusOutXIC();
+
+  Window GetCurrentWindow() const;
+
 private:
   void InitXIMCallback();
   static void SetupXIMClientCallback(Display* dpy, XPointer client_data, XPointer call_data);