Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix regression in wxGetKeyState() on GTK3 w/ X11

Browse Source 
wxGetKeyStateGTK() is intended to be used only with non-X11 GTK backends.
wxGetKeyStateX11() should still be used on GTK3 w/ X11 as the GTK
variant does not provide all key states.
This commit is contained in:
Scott Talbert
2021-02-27 11:48:49 -05:00
committed by paulcor
parent 04ea7b552a
commit f6a53b59b2
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/unix/utilsx11.cpp
View File

@@ -2550,7 +2550,6 @@ int wxUnicodeCharXToWX(WXKeySym keySym)
// check current state of a key // check current state of a key
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifndef wxHAS_GETKEYSTATE_GTK
static bool wxGetKeyStateX11(wxKeyCode key) static bool wxGetKeyStateX11(wxKeyCode key)
{ {
wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key != wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
@@ -2595,7 +2594,6 @@ static bool wxGetKeyStateX11(wxKeyCode key)
XQueryKeymap(pDisplay, key_vector); XQueryKeymap(pDisplay, key_vector);
return (key_vector[keyCode >> 3] & (1 << (keyCode & 7))) != 0; return (key_vector[keyCode >> 3] & (1 << (keyCode & 7))) != 0;
} }
#endif
#endif // !defined(__WXGTK__) || defined(GDK_WINDOWING_X11) #endif // !defined(__WXGTK__) || defined(GDK_WINDOWING_X11)
@@ -2643,17 +2641,20 @@ static bool wxGetKeyStateGTK(wxKeyCode key)
bool wxGetKeyState(wxKeyCode key) bool wxGetKeyState(wxKeyCode key)
{ {
#ifdef wxHAS_GETKEYSTATE_GTK #ifdef wxHAS_GETKEYSTATE_GTK
bool ret = false;
GdkDisplay* display = gdk_window_get_display(wxGetTopLevelGDK()); GdkDisplay* display = gdk_window_get_display(wxGetTopLevelGDK());
const char* name = g_type_name(G_TYPE_FROM_INSTANCE(display)); const char* name = g_type_name(G_TYPE_FROM_INSTANCE(display));
if (strcmp(name, "GdkX11Display") != 0) if (strcmp(name, "GdkX11Display") != 0)
{ {
ret = wxGetKeyStateGTK(key); return wxGetKeyStateGTK(key);
} }
return ret;
#else
return wxGetKeyStateX11(key);
#endif // GTK+ 3.4+ #endif // GTK+ 3.4+
#if !defined(__WXGTK__) || \
(!defined(__WXGTK20__) || defined(GDK_WINDOWING_X11))
return wxGetKeyStateX11(key);
#endif
return false;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------