Merge lp:~brandontschaefer/nux/poke-lookupstring-SRU into lp:nux/2.0

[Brandon Schaefer]

Use a temp buf to poke for the size of string vs passing nullptr. For some reason this was working for most cases, but not greek. Using a temp buf allows us to poke the greeks chars and others that werent working.

Use a temp buf to poke for the size of string vs passing nullptr. For some reason this was working for most cases, but not greek. Using a temp buf allows us to poke the greeks chars and others that werent working.

[Christopher Townsend (townsend)]

LGTM +1

review: Approve

[Brandon Schaefer (brandontschaefer)]

This causes a regression!

review: Disapprove

Unmerged revisions

622. By Brandon Schaefer on 2013-08-28

* Use a temp buff to poke for the size of the char* from the event.

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2013-05-24 18:09:30 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2013-08-28 18:04:22 +0000
@@ -1636,8 +1636,8 @@
             delete[] m_pEvent->dtext;
             m_pEvent->dtext = nullptr;
 
-            num_char_stored = XmbLookupString(m_xim_controller->GetXIC(), &xevent.xkey, nullptr,
-                                              0, (KeySym*) &m_pEvent->x11_keysym, 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)
             {