AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made IM context optional functionality

This commit is contained in:
Jack Andersen 2016-01-06 11:02:23 -10:00
parent 939c0250be
commit c96f961c4d
2 changed files with 75 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/x11/ApplicationXlib.hpp
View File

@ -163,7 +163,7 @@ class ApplicationXlib final : public IApplication
std::unordered_map<Window, IWindow*> m_windows;
Display* m_xDisp = nullptr;
XIM m_xIM;
XIM m_xIM = nullptr;
XFontSet m_fontset;
XIMStyle m_bestStyle = 0;
int m_xDefaultScreen = 0;
@ -260,12 +260,8 @@ public:
if (XSetLocaleModifiers("") == nullptr)
Log.report(LogVisor::Warning, "Cannot set locale modifiers.");
if ((m_xIM = XOpenIM(m_xDisp, nullptr, nullptr, nullptr)) == nullptr)
if ((m_xIM = XOpenIM(m_xDisp, nullptr, nullptr, nullptr)))
{
Log.report(LogVisor::FatalError, "Couldn't open input method.");
return;
}
char** missing_charsets;
int num_missing_charsets = 0;
char* default_string;
@ -299,6 +295,7 @@ public:
return;
}
XFree(im_supported_styles);
}
m_xDefaultScreen = DefaultScreen(m_xDisp);
X_CURSORS.m_pointer = XCreateFontCursor(m_xDisp, XC_left_ptr);

20
lib/x11/WindowXlib.cpp
View File

@ -510,7 +510,7 @@ class WindowXlib : public IWindow
Colormap m_colormapId;
Window m_windowId;
XIMStyle m_bestStyle;
XIC m_xIC;
XIC m_xIC = nullptr;
GraphicsContextGLX m_gfxCtx;
uint32_t m_visualId;
@ -603,6 +603,8 @@ public:
* Now go create an IC using the style we chose.
* Also set the window and fontset attributes now.
*/
if (xIM)
{
XPoint pt = {0,0};
XVaNestedList nlist;
m_xIC = XCreateIC(xIM, XNInputStyle, bestInputStyle,
@ -614,15 +616,11 @@ public:
nullptr),
nullptr);
XFree(nlist);
if (m_xIC == nullptr)
{
Log.report(LogVisor::FatalError, "Couldn't create input context.");
return;
}
long im_event_mask;
XGetICValues(m_xIC, XNFilterEvents, &im_event_mask, nullptr);
XSelectInput(display, m_windowId, swa.event_mask | im_event_mask);
XSetICFocus(m_xIC);
}
/* The XInput 2.1 extension enables per-pixel smooth scrolling trackpads */
XIEventMask mask = {XIAllMasterDevices, XIMaskLen(XI_LASTEVENT)};
@ -904,6 +902,8 @@ public:
} m_clipData;
void claimKeyboardFocus(const int coord[2])
{
if (m_xIC)
{
XLockDisplay(m_xDisp);
if (!coord)
@ -920,6 +920,7 @@ public:
XSetICFocus(m_xIC);
XUnlockDisplay(m_xDisp);
}
}
bool clipboardCopy(EClipboardType type, const uint8_t* data, size_t sz)
{
@ -1141,6 +1142,7 @@ public:
};
}
#if 0
/* This procedure sets the application's size constraints and returns
* the IM's preferred size for either the Preedit or Status areas,
* depending on the value of the name argument. The area argument is
@ -1167,6 +1169,7 @@ public:
XSetICValues(m_xIC, name, list, nullptr);
XFree(list);
}
#endif
void _incomingEvent(void* e)
{
@ -1230,14 +1233,17 @@ public:
EModifierKey modifierKey;
unsigned int state = event->xkey.state;
event->xkey.state &= ~ControlMask;
std::string utf8Frag = translateUTF8(&event->xkey, m_xIC);
ITextInputCallback* inputCb = m_callback->getTextInputCallback();
if (m_xIC)
{
std::string utf8Frag = translateUTF8(&event->xkey, m_xIC);
if (utf8Frag.size())
{
if (inputCb)
inputCb->insertText(utf8Frag);
return;
}
}
char charCode = translateKeysym(&event->xkey, specialKey, modifierKey);
EModifierKey modifierMask = translateModifiers(state);
if (charCode)