Changed: Minor changes

--HG--
branch : develop
This commit is contained in:
kervala 2016-01-02 11:34:17 +01:00
parent 71f7cb28dc
commit 6e36d06f76

View file

@ -37,11 +37,9 @@ static Atom XA_WM_DELETE_WINDOW = 0;
namespace NLMISC { namespace NLMISC {
CUnixEventEmitter::CUnixEventEmitter ():_dpy(NULL), _win(0), _driver(NULL) CUnixEventEmitter::CUnixEventEmitter ():_dpy(NULL), _win(0), _im(NULL), _ic(NULL), _driver(NULL)
{ {
_im = 0; _SelectionOwned = false;
_ic = 0;
_SelectionOwned=false;
} }
CUnixEventEmitter::~CUnixEventEmitter() CUnixEventEmitter::~CUnixEventEmitter()
@ -513,7 +511,7 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
if (keyCode) if (keyCode)
{ {
TKey key = getKeyFromKeySym(k); TKey key = getKeyFromKeySym(k);
if(key == KeyNOKEY) if (key == KeyNOKEY)
key = getKeyFromKeycode(keyCode); key = getKeyFromKeycode(keyCode);
// search for key in map // search for key in map
@ -526,12 +524,12 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
_PressedKeys[key] = true; _PressedKeys[key] = true;
// don't send a control character when deleting // don't send a control character when deleting
if (key == KeyDELETE) if (key == KeyDELETE) c = 0;
c = 0;
} }
Text[c] = '\0'; Text[c] = '\0';
if(c>0)
if (c > 0)
{ {
#ifdef X_HAVE_UTF8_STRING #ifdef X_HAVE_UTF8_STRING
ucstring ucstr; ucstring ucstr;