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

Refactor to eliminate duplication in wxGTK key events generation code.

Browse Source 
This also fixes a small bug with wxKeyEvent::m_uniChar not being always set
correctly to the same value as m_keyCode for ASCII characters.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-12-08 15:55:37 +00:00
parent 20004800cf
commit 64c502e828
1 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/gtk/window.cpp
View File

@@ -338,18 +338,6 @@ parent_set(GtkWidget* widget, GtkWidget* old_parent, wxWindow* win)
// "key_press_event" from any window // "key_press_event" from any window
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// These are used when transforming Ctrl-alpha to ascii values 1-26
inline bool wxIsLowerChar(int code)
{
return (code >= 'a' && code <= 'z' );
}
inline bool wxIsUpperChar(int code)
{
return (code >= 'A' && code <= 'Z' );
}
// set WXTRACE to this to see the key event codes on the console // set WXTRACE to this to see the key event codes on the console
#define TRACE_KEYS wxT("keyevent") #define TRACE_KEYS wxT("keyevent")
@@ -849,6 +837,41 @@ bool SendCharHookEvent(const wxKeyEvent& event, wxWindow *win)
return false; return false;
} }
// Adjust wxEVT_CHAR event key code fields. This function takes care of two
// conventions:
// (a) Ctrl-letter key presses generate key codes in range 1..26
// (b) Unicode key codes are same as key codes for the codes in 1..255 range
void AdjustCharEventKeyCodes(wxKeyEvent& event)
{
const int code = event.m_keyCode;
// Check for (a) above.
if ( event.ControlDown() )
{
// We intentionally don't use isupper/lower() here, we really need
// ASCII letters only as it doesn't make sense to translate any other
// ones into this range which has only 26 slots.
if ( code >= 'a' && code <= 'z' )
event.m_keyCode = code - 'a' + 1;
else if ( code >= 'A' && code <= 'Z' )
event.m_keyCode = code - 'A' + 1;
#if wxUSE_UNICODE
// Adjust the Unicode equivalent in the same way too.
if ( event.m_keyCode != code )
event.m_uniChar = event.m_keyCode;
#endif // wxUSE_UNICODE
}
#if wxUSE_UNICODE
// Check for (b) from above.
//
// FIXME: Should we do it for key codes up to 255?
if ( !event.m_uniChar && code < WXK_DELETE )
event.m_uniChar = code;
#endif // wxUSE_UNICODE
}
} // anonymous namespace } // anonymous namespace
extern "C" { extern "C" {
@@ -964,19 +987,7 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
eventChar.m_keyCode = key_code; eventChar.m_keyCode = key_code;
// To conform to the docs we need to translate Ctrl-alpha AdjustCharEventKeyCodes(eventChar);
// characters to values in the range 1-26.
if ( eventChar.ControlDown() &&
( wxIsLowerChar(key_code) || wxIsUpperChar(key_code) ))
{
if ( wxIsLowerChar(key_code) )
eventChar.m_keyCode = key_code - 'a' + 1;
if ( wxIsUpperChar(key_code) )
eventChar.m_keyCode = key_code - 'A' + 1;
#if wxUSE_UNICODE
eventChar.m_uniChar = eventChar.m_keyCode;
#endif
}
ret = win->HandleWindowEvent(eventChar); ret = win->HandleWindowEvent(eventChar);
} }
@@ -1021,21 +1032,7 @@ gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context),
event.m_keyCode = (char)*pstr; event.m_keyCode = (char)*pstr;
#endif // wxUSE_UNICODE #endif // wxUSE_UNICODE
// To conform to the docs we need to translate Ctrl-alpha AdjustCharEventKeyCodes(event);
// characters to values in the range 1-26.
if ( event.ControlDown() &&
( wxIsLowerChar(*pstr) || wxIsUpperChar(*pstr) ))
{
if ( wxIsLowerChar(*pstr) )
event.m_keyCode = *pstr - 'a' + 1;
if ( wxIsUpperChar(*pstr) )
event.m_keyCode = *pstr - 'A' + 1;
event.m_keyCode = *pstr - 'a' + 1;
#if wxUSE_UNICODE
event.m_uniChar = event.m_keyCode;
#endif
}
window->HandleWindowEvent(event); window->HandleWindowEvent(event);
} }