Hacky keyboard modifiers and text for key events

Requires the hacky addition to the window system as well, but note
that since the protocol is unchanged, you can still run any combination
of new/old server/client without anything blowing up. You just won't
get key events that work.

1 files changed, 7 insertions, 2 deletions

diff --git a/qgraphicssystem_dd.cpp b/qgraphicssystem_dd.cpp
index 56fbe22..7f680c3 100644
--- a/qgraphicssystem_dd.cpp
+++ b/qgraphicssystem_dd.cpp
@@ -284,10 +284,15 @@ void QDevDaysGraphicsSystem::eventDispatcher()
                 QWindowSystemInterface::handleMouseEvent(window, pos, pos + window->pos(), b);
                 break; }
             case Event::KeyPressEvent: {
-                QWindowSystemInterface::handleKeyEvent(window, QEvent::KeyPress, m_message.value, Qt::NoModifier);
+                QString s;
+                if ( m_message.rect.x())
+                    s = QChar(int(m_message.rect.x()));
+                Qt::KeyboardModifiers mods = static_cast<Qt::KeyboardModifiers>(m_message.rect.y());
+                QWindowSystemInterface::handleKeyEvent(window, QEvent::KeyPress, m_message.value, mods, s);
                 break; }
             case Event::KeyReleaseEvent: {
-                QWindowSystemInterface::handleKeyEvent(window, QEvent::KeyRelease, m_message.value, Qt::NoModifier);
+                Qt::KeyboardModifiers mods = static_cast<Qt::KeyboardModifiers>(m_message.rect.y());
+                QWindowSystemInterface::handleKeyEvent(window, QEvent::KeyRelease, m_message.value, mods);
                 break; }
             }
             break; }