Merge lp:~brandontschaefer/nux/lp.1219432-fix into lp:nux

[Brandon Schaefer]

Greek does not play nice with XmbLookupString and gives us a size 0 for the event string size. So if we run into the status XLookupKeySym, look it up using XLookupString. This way pinyin will still work as it did before the greek fix went in last week.

Greek does not play nice with XmbLookupString and gives us a size 0 for the event string size. So if we run into the status XLookupKeySym, look it up using XLookupString. This way pinyin will still work as it did before the greek fix went in last week.

[lp:~brandontschaefer/nux/lp.1219432-fix]

816. By Brandon Schaefer on 2013-09-05

* Destory the XIC when we focus out, otherwise we seem to be getting stuck if
  we leave fcitx enabled...need to check 12.04 to see if this is the case as well.
  Could be a bug in fcitx...as we have focused out, and it doesn't leave enabled mode.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:816
http://jenkins.qa.ubuntu.com/job/nux-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/21/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/69/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Works for me now. I'm approving but bregma is also looking it over, so let's wait on his feedback before globally approving.

review: Approve

[Christopher Townsend (townsend)]

Ok, let's globally approve this.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2013-09-05 19:27:56 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2013-09-05 22:25:40 +0000
@@ -1603,6 +1603,15 @@
     }
   }
 
+  void GetDefaultSizeLookupString(XEvent event, Event* nux_event)
+  {
+    nux_event->dtext = new char[NUX_EVENT_TEXT_BUFFER_SIZE];
+    int num_char_stored = XLookupString(&event.xkey, nux_event->dtext, NUX_EVENT_TEXT_BUFFER_SIZE,
+                                       (KeySym*)&nux_event->x11_keysym, nullptr);
+
+    nux_event->dtext[num_char_stored] = 0;
+  }
+
   void GraphicsDisplay::ProcessXEvent(XEvent xevent, bool foreign)
   {
     int x_recalc = 0;
@@ -1708,8 +1717,6 @@
         m_pEvent->x11_timestamp = xevent.xkey.time;
         m_pEvent->x11_key_state = xevent.xkey.state;
 
-        char buffer[NUX_EVENT_TEXT_BUFFER_SIZE];
-
         Memset(m_pEvent->text, 0, NUX_EVENT_TEXT_BUFFER_SIZE);
 
         bool skip = false;
@@ -1729,11 +1736,16 @@
           {
             delete[] m_pEvent->dtext;
             m_pEvent->dtext = nullptr;
-
-            num_char_stored = XmbLookupString(m_xim_controller->GetXIC(), &xevent.xkey, buffer,
-                                              NUX_EVENT_TEXT_BUFFER_SIZE, (KeySym*) &m_pEvent->x11_keysym, nullptr);
-
-            if (num_char_stored > 0)
+            Status status;
+
+            num_char_stored = XmbLookupString(m_xim_controller->GetXIC(), &xevent.xkey, nullptr,
+                                              0, (KeySym*) &m_pEvent->x11_keysym, &status);
+
+            if (status == XLookupKeySym)
+            {
+              GetDefaultSizeLookupString(xevent, m_pEvent);
+            }
+            else if (num_char_stored > 0)
             {
               int buf_len = num_char_stored + 1;
               m_pEvent->dtext = new char[buf_len];
@@ -1745,11 +1757,7 @@
           }
           else
           {
-            m_pEvent->dtext = new char[NUX_EVENT_TEXT_BUFFER_SIZE];
-            num_char_stored = XLookupString(&xevent.xkey, m_pEvent->dtext, NUX_EVENT_TEXT_BUFFER_SIZE,
-                                            (KeySym*) &m_pEvent->x11_keysym, nullptr);
-
-            m_pEvent->dtext[num_char_stored] = 0;
+            GetDefaultSizeLookupString(xevent, m_pEvent);
           }
         }
 

=== modified file 'NuxGraphics/XIMController.cpp'
--- NuxGraphics/XIMController.cpp	2012-12-17 19:04:50 +0000
+++ NuxGraphics/XIMController.cpp	2013-09-05 22:25:40 +0000
@@ -78,6 +78,7 @@
 void XIMController::FocusOutXIC()
 {
   xic_client_.FocusOutXIC();
+  xic_client_.DestroyXIC();
 }
 
 void XIMController::InitXIMCallback()