Merge lp:~brandontschaefer/nux/lp.1219330 into lp:nux

[Brandon Schaefer]

Always use a dynamic char* when dealing with text events. We were using a static text, then allocating dtext causing ibus to get confused on what to use.

Always use a dynamic char* when dealing with text events. We were using a static text, then allocating dtext causing ibus to get confused on what to use.

[Christopher Townsend (townsend)]

LGTM and I'm sure this will make some people happy:)

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'NuxGraphics/Events.cpp'
--- NuxGraphics/Events.cpp	2013-05-13 19:53:15 +0000
+++ NuxGraphics/Events.cpp	2013-09-05 18:00:11 +0000
@@ -213,10 +213,7 @@
 
   const char* Event::GetText() const
   {
-    if (dtext)
-      return dtext;
-
-    return text;
+    return dtext;
   }
 
 

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2013-08-28 01:25:13 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2013-09-05 18:00:11 +0000
@@ -1745,13 +1745,11 @@
           }
           else
           {
-            num_char_stored = XLookupString(&xevent.xkey, buffer, NUX_EVENT_TEXT_BUFFER_SIZE,
-                                            (KeySym*) &m_pEvent->x11_keysym, NULL);
+            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);
 
-            if (num_char_stored > 0)
-            {
-              Memcpy(m_pEvent->text, buffer, num_char_stored);
-            }
+            m_pEvent->dtext[num_char_stored] = 0;
           }
         }