Page MenuHome
Differential D1570 Diff 8908 intern/ghost/intern/GHOST_WindowX11.cpp

Changeset View

Standalone View

View Options

intern/ghost/intern/GHOST_WindowX11.cpp

Show First 20 Lines • Show All 336 Lines • ▼ Show 20 Lines : GHOST_Window(width, height, state, stereoVisual, exclusive, numOfAASamples),
m_invalid_window(false), m_invalid_window(false),
m_empty_cursor(None), m_empty_cursor(None),
m_custom_cursor(None), m_custom_cursor(None),
m_visible_cursor(None), m_visible_cursor(None),
#ifdef WITH_XDND #ifdef WITH_XDND
m_dropTarget(NULL), m_dropTarget(NULL),
#endif #endif
#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING) #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
m_xim_style(XIMPreeditNothing | XIMStatusNothing), /* root window style */
m_xic(NULL), m_xic(NULL),
m_focused(false),
m_xim_needed(false),
m_xim_spot_x(-1),
m_xim_spot_y(-1),
#endif #endif
m_valid_setup(false), m_valid_setup(false),
m_is_debug_context(is_debug) m_is_debug_context(is_debug)
{ {
if (type == GHOST_kDrawingContextTypeOpenGL) { if (type == GHOST_kDrawingContextTypeOpenGL) {
m_visualInfo = x11_visualinfo_from_glx(m_display, stereoVisual, &m_wantNumOfAASamples, alphaBackground, (GLXFBConfig*)&m_fbconfig); m_visualInfo = x11_visualinfo_from_glx(m_display, stereoVisual, &m_wantNumOfAASamples, alphaBackground, (GLXFBConfig*)&m_fbconfig);
} }
else { else {
▲ Show 20 Lines • Show All 257 Lines • ▼ Show 20 Lines
} }
bool GHOST_WindowX11::createX11_XIC() bool GHOST_WindowX11::createX11_XIC()
{ {
XIM xim = m_system->getX11_XIM(); XIM xim = m_system->getX11_XIM();
if (!xim) if (!xim)
return false; return false;
XIMStyles *supported_styles;
XIMStyle style;
unsigned short i;
/* use over-the-spot style if available */
XGetIMValues(xim, XNQueryInputStyle, &supported_styles, NULL);
for (i = 0; i < supported_styles->count_styles; i++) {
style = supported_styles->supported_styles[i];
if ((style & XIMPreeditPosition) && (style & XIMStatusNothing)) {
m_xim_style = style;
GHOST_PRINT("XIM: over-the-spot style chosen\n");
break;
}
}
XFree(supported_styles);
XRectangle area = {0, 0, 0, 0};
XPoint spot = {0, 0};
int missing_count;
char **missing_list, *def_string;
XFontSet fs = NULL;
XVaNestedList attr = NULL;
XICCallback destroy; XICCallback destroy;
if (m_xim_style & XIMPreeditPosition) {
fs = XCreateFontSet(m_display, "-*-*-*-*-*-*-*-*-*-*-*-*-*-*",
&missing_list, &missing_count, &def_string);
if (missing_list)
XFreeStringList(missing_list);
attr = XVaCreateNestedList(
0,
XNArea, &area,
XNSpotLocation, &spot,
XNFontSet, fs,
NULL);
}
destroy.callback = (XICProc)destroyICCallback; destroy.callback = (XICProc)destroyICCallback;
destroy.client_data = (XPointer)&m_xic; destroy.client_data = (XPointer)&m_xic;
m_xic = XCreateIC(xim, XNClientWindow, m_window, XNFocusWindow, m_window, m_xic = XCreateIC(xim, XNClientWindow, m_window, XNFocusWindow, m_window,
XNInputStyle, XIMPreeditNothing | XIMStatusNothing, XNInputStyle, m_xim_style,
XNResourceName, GHOST_X11_RES_NAME, XNResourceName, GHOST_X11_RES_NAME,
XNResourceClass, GHOST_X11_RES_CLASS, XNResourceClass, GHOST_X11_RES_CLASS,
XNDestroyCallback, &destroy, XNDestroyCallback, &destroy,
/* keep last */
attr ? XNPreeditAttributes : NULL, attr,
NULL); NULL);
if (attr)
XFree(attr);
if (fs)
XFreeFontSet(m_display, fs);
campbellbartonUnsubmitted
Not Done
Inline Actions

This is crashing for me (I expect because I dont have any styles available)

To resolve the crash I changed the last 3 lines:

m_xic = XCreateIC(xim, XNClientWindow, m_window, XNFocusWindow, m_window,
              XNInputStyle, m_xim_style,
              XNResourceName, GHOST_X11_RES_NAME,
              XNResourceClass, GHOST_X11_RES_CLASS,
              XNPreeditAttributes, attr,
              XNDestroyCallback, &destroy,
              NULL);

into...

        m_xic = XCreateIC(xim, XNClientWindow, m_window, XNFocusWindow, m_window,
	                  XNInputStyle, m_xim_style,
	                  XNResourceName, GHOST_X11_RES_NAME,
	                  XNResourceClass, GHOST_X11_RES_CLASS,
	                  XNDestroyCallback, &destroy,
	                  /* keep last */
	                  attr ? XNPreeditAttributes : NULL, attr,
	                  NULL);

... so that the NULL will be seen as the last arg.

campbellbarton: This is crashing for me (I expect because I dont have any styles available) To resolve the…
irieAuthorUnsubmitted
Not Done
Inline Actions

I was not aware of the attributes NULL case...
Confirmed your solution works for me.

irie: I was not aware of the attributes NULL case... Confirmed your solution works for me.
if (!m_xic) if (!m_xic)
return false; return false;
unsigned long fevent; unsigned long fevent;
XGetICValues(m_xic, XNFilterEvents, &fevent, NULL); XGetICValues(m_xic, XNFilterEvents, &fevent, NULL);
XSelectInput(m_display, m_window, XSelectInput(m_display, m_window,
ExposureMask | StructureNotifyMask | ExposureMask | StructureNotifyMask |
KeyPressMask | KeyReleaseMask | KeyPressMask | KeyReleaseMask |
EnterWindowMask | LeaveWindowMask | EnterWindowMask | LeaveWindowMask |
ButtonPressMask | ButtonReleaseMask | ButtonPressMask | ButtonReleaseMask |
PointerMotionMask | FocusChangeMask | PointerMotionMask | FocusChangeMask |
PropertyChangeMask | KeymapStateMask | fevent); PropertyChangeMask | KeymapStateMask | fevent);
return true; return true;
} }
#endif
static void unsetICFocus(XIC xic)
{
if (!xic)
return;
/* Input context must be reset when input focus is unset, otherwise
* the language bar doesn't disappear when input focus is unset.
*/
char *str = XmbResetIC(xic);
if (str)
XFree(str);
XUnsetICFocus(xic);
}
void GHOST_WindowX11::setX11_ICFocus(bool focused)
{
if (m_xic) {
if (focused && m_xim_needed) {
XSetICFocus(m_xic);
m_xim_spot_x = m_xim_spot_y = -1;
} else {
unsetICFocus(m_xic);
}
}
m_focused = focused;
}
bool GHOST_WindowX11::isIMSpotNeeded()
{
return (m_xim_spot_x == -1);
}
void GHOST_WindowX11::setIMSpot(GHOST_TInt32 x, GHOST_TInt32 y, GHOST_TInt32 /* h */)
{
if (m_im_modal)
return;
if (!m_xic || (m_xim_style & XIMPreeditNothing))
return;
if (!(m_focused && m_xim_needed))
return;
if ((m_xim_spot_x != -1) &&
(x == m_xim_spot_x) && (y == m_xim_spot_y))
return;
/* Note: This code takes effect only for over-the-spot style.
* If using on-the-spot style, XIM server will ignore the request.
*/
XPoint spot = {(short)x, (short)y};
XVaNestedList attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
XSetICValues(m_xic, XNPreeditAttributes, attr, NULL);
XFree(attr);
m_xim_spot_x = x;
m_xim_spot_y = y;
}
void GHOST_WindowX11::beginIM()
{
if (m_im_modal)
return;
if (m_xic && m_focused && !m_xim_needed) {
XSetICFocus(m_xic);
m_xim_spot_x = m_xim_spot_y = -1;
}
m_xim_needed = true;
}
void GHOST_WindowX11::endIM()
{
if (m_im_modal)
return;
if (m_xic && m_focused && m_xim_needed) {
unsetICFocus(m_xic);
}
m_xim_needed = false;
}
#endif /* defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING) */
#ifdef WITH_X11_XINPUT #ifdef WITH_X11_XINPUT
void GHOST_WindowX11::refreshXInputDevices() void GHOST_WindowX11::refreshXInputDevices()
{ {
if (m_system->m_xinput_version.present) { if (m_system->m_xinput_version.present) {
GHOST_SystemX11::GHOST_TabletX11 &xtablet = m_system->GetXTablet(); GHOST_SystemX11::GHOST_TabletX11 &xtablet = m_system->GetXTablet();
XEventClass xevents[8], ev; XEventClass xevents[8], ev;
int dcount = 0; int dcount = 0;
▲ Show 20 Lines • Show All 1,069 Lines • Show Last 20 Lines