Changeset 78921 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 3, 2019 8:36:10 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131041

Message:

FE/Qt: bugref:6143. Some more refactoring

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/softkeyboard/UISoftKeyboard.cpp (modified) (23 diffs)
• src/softkeyboard/UISoftKeyboard.h (modified) (3 diffs)
• xml/102_iso.xml (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -36 +36 @@
 #include "CEventSource.h"
 
-
+/* Forward declarations: */
+class UISoftKeyboardWidget;
 
 enum UIKeyState
@@ -48 +49 @@
 enum UIKeyType
 {
+    /** Can be in UIKeyState_NotPressed and UIKeyState_Pressed states. */
     UIKeyType_Ordinary,
-    /** e.g. CapsLock. Can be only in UIKeyState_NotPressed, UIKeyState_Locked, */
+    /** e.g. CapsLock. Can be only in UIKeyState_NotPressed, UIKeyState_Locked */
     UIKeyType_Toggleable,
     /** e.g. Shift Can be in all 3 states*/
@@ -126 +128 @@
     void setCutout(int iCorner, int iWidth, int iHeight);
 
+    void setParentWidget(UISoftKeyboardWidget* pParent);
     UIKeyState state() const;
     QVector<LONG> scanCodeWithPrefix() const;
 
     void release();
+    void press();
 
     void setPolygon(const QPolygon &polygon);
@@ -163 +167 @@
     /** Key's position in the layout. */
     int        m_iPosition;
+    UISoftKeyboardWidget  *m_pParentWidget;
 };
 
@@ -172 +177 @@
     Q_OBJECT;
 
+signals:
+
+    void sigPutKeyboardSequence(QVector<LONG> sequence);
+
 public:
 
     UISoftKeyboardWidget(QWidget *pParent = 0);
+
     virtual QSize minimumSizeHint() const;
     virtual QSize sizeHint() const;
     void setNewMinimumSize(const QSize &size);
-    QVector<UISoftKeyboardRow> m_rows;
+
+    QVector<UISoftKeyboardRow> &rows();
+    const QVector<UISoftKeyboardRow> &rows() const;
+
     void setInitialSize(int iWidth, int iHeight);
+    void keyStateChange(UISoftKeyboardKey* pKey);
 
 protected:
 
     void paintEvent(QPaintEvent *pEvent) /* override */;
-    void mousePressEvent(QMouseEvent *pEvent);
+    void mousePressEvent(QMouseEvent *pEvent) /* override */;
+    void mouseReleaseEvent(QMouseEvent *pEvent) /* override */;
     void mouseMoveEvent(QMouseEvent *pEvent);
 
@@ -190 +205 @@
 
     UISoftKeyboardKey *keyUnderMouse(QMouseEvent *pEvent);
-
+    void               handleKeyPress(UISoftKeyboardKey *pKey);
+    void               handleKeyRelease(UISoftKeyboardKey *pKey);
     QSize m_minimumSize;
     int m_iInitialHeight;
@@ -197 +213 @@
     float m_fMultiplierY;
     UISoftKeyboardKey *m_pKeyUnderMouse;
+    UISoftKeyboardKey *m_pKeyPressed;
     QColor m_keyDefaultColor;
     QColor m_keyHoverColor;
-    QColor m_keyPressColor;
     QColor m_textDefaultColor;
+    QColor m_textPressedColor;
+    QVector<UISoftKeyboardKey*> m_pressedModifiers;
+    QVector<UISoftKeyboardRow> m_rows;
 };
 
@@ -294 +313 @@
     , m_iCutoutCorner(-1)
     , m_iPosition(0)
+    , m_pParentWidget(0)
 {
 }
@@ -402 +422 @@
 }
 
+void UISoftKeyboardKey::setParentWidget(UISoftKeyboardWidget* pParent)
+{
+    m_pParentWidget = pParent;
+}
+
 void UISoftKeyboardKey::release()
 {
     updateState(false);
+}
+
+void UISoftKeyboardKey::press()
+{
+    updateState(true);
 }
 
@@ -441 +471 @@
 void UISoftKeyboardKey::updateState(bool fPressed)
 {
-    if (m_enmType == UIKeyType_Ordinary)
-        return;
+    UIKeyState enmPreviousState = state();
     if (m_enmType == UIKeyType_Modifier)
     {
@@ -470 +499 @@
         }
     }
+    else if (m_enmType == UIKeyType_Ordinary)
+    {
+        if (m_enmState == UIKeyState_NotPressed)
+            m_enmState = UIKeyState_Pressed;
+        else
+            m_enmState = UIKeyState_NotPressed;
+    }
+    if (enmPreviousState != state() && m_pParentWidget)
+        m_pParentWidget->keyStateChange(this);
 }
 
@@ -479 +517 @@
     :QWidget(pParent)
     , m_pKeyUnderMouse(0)
-    , m_keyDefaultColor(QColor(255, 228, 192))
-    , m_keyHoverColor(QColor(238, 208, 169))
-    , m_keyPressColor(QColor(248, 218, 179))
-    , m_textDefaultColor(QColor(0, 0, 0))
+    , m_pKeyPressed(0)
+    , m_keyDefaultColor(QColor(103, 128, 159))
+    , m_keyHoverColor(QColor(108, 122, 137))
+    , m_textDefaultColor(QColor(46, 49, 49))
+    , m_textPressedColor(QColor(149, 165, 166))
 {
     setMouseTracking(true);
@@ -507 +546 @@
     m_iInitialWidth = iWidth;
     m_iInitialHeight = iHeight;
+}
+
+QVector<UISoftKeyboardRow> &UISoftKeyboardWidget::rows()
+{
+    return m_rows;
+}
+
+const QVector<UISoftKeyboardRow> &UISoftKeyboardWidget::rows() const
+{
+    return m_rows;
 }
 
@@ -524 +573 @@
     painter.setFont(painterFont);
     painter.setRenderHint(QPainter::Antialiasing);
-    painter.setPen(QPen(QColor(m_textDefaultColor), 2));
-    painter.setBrush(QBrush(m_keyDefaultColor));
     painter.scale(m_fMultiplierX, m_fMultiplierY);
+    int unitSize = qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
+    float fLedRadius =  1.5 * unitSize;
+    float fLedMargin =  unitSize;
+
     for (int i = 0; i < m_rows.size(); ++i)
     {
@@ -534 +585 @@
             UISoftKeyboardKey &key = keys[j];
             painter.translate(key.keyGeometry().x(), key.keyGeometry().y());
+            if (&key  == m_pKeyUnderMouse)
+                painter.setBrush(QBrush(m_keyHoverColor));
+            else
+                painter.setBrush(QBrush(m_keyDefaultColor));
+
+            if (&key  == m_pKeyPressed)
+                painter.setPen(QPen(QColor(m_textPressedColor), 2));
+            else
+                painter.setPen(QPen(QColor(m_textDefaultColor), 2));
+
             painter.drawPolygon(key.polygon());
-            QRect textRect(5, 5, key.keyGeometry().width(), key.keyGeometry().height());
+
+            QRect textRect(0.8 * unitSize, 2 * unitSize
+                           , key.keyGeometry().width(), key.keyGeometry().height());
             painter.drawText(textRect, Qt::TextWordWrap, key.keyCap());
+
+            if (key.type() != UIKeyType_Ordinary)
+            {
+                QColor ledColor;
+                if (key.state() == UIKeyState_NotPressed)
+                    ledColor = m_textDefaultColor;
+                else if (key.state() == UIKeyState_Pressed)
+                    ledColor = QColor(0, 255, 0);
+                else
+                    ledColor = QColor(255, 0, 0);
+                painter.setBrush(ledColor);
+                painter.setPen(ledColor);
+                QRectF rectangle(key.keyGeometry().width() - 2 * fLedMargin, fLedMargin, fLedRadius, fLedRadius);
+                painter.drawEllipse(rectangle);
+            }
             painter.translate(-key.keyGeometry().x(), -key.keyGeometry().y());
+
         }
     }
-
-    if (m_pKeyUnderMouse)
-    {
-        painter.setBrush(QBrush(m_keyHoverColor));
-        painter.translate(m_pKeyUnderMouse->keyGeometry().x(), m_pKeyUnderMouse->keyGeometry().y());
-        painter.drawPolygon(m_pKeyUnderMouse->polygon());
-        QRect textRect(5, 5, m_pKeyUnderMouse->keyGeometry().width(), m_pKeyUnderMouse->keyGeometry().height());
-        painter.drawText(textRect, Qt::TextWordWrap, m_pKeyUnderMouse->keyCap());
-        painter.translate(-m_pKeyUnderMouse->keyGeometry().x(), -m_pKeyUnderMouse->keyGeometry().y());
-    }
 }
 
 void UISoftKeyboardWidget::mousePressEvent(QMouseEvent *pEvent)
 {
-    keyUnderMouse(pEvent);
+    m_pKeyPressed = keyUnderMouse(pEvent);
+    handleKeyPress(m_pKeyPressed);
+    update();
+}
+
+void UISoftKeyboardWidget::mouseReleaseEvent(QMouseEvent *)
+{
+    if (!m_pKeyPressed)
+        return;
+    handleKeyRelease(m_pKeyPressed);
+    m_pKeyPressed = 0;
+    update();
 }
 
@@ -585 +665 @@
     }
     return 0;
+}
+
+void UISoftKeyboardWidget::handleKeyPress(UISoftKeyboardKey *pKey)
+{
+    if (!pKey)
+        return;
+    pKey->press();
+
+    if (pKey->type() == UIKeyType_Modifier)
+        return;
+
+    QVector<LONG> sequence;
+
+     /* Add the pressed modifiers first: */
+    for (int i = 0; i < m_pressedModifiers.size(); ++i)
+    {
+        UISoftKeyboardKey *pModifier = m_pressedModifiers[i];
+        if (pModifier->scanCodePrefix() != 0)
+            sequence << pModifier->scanCodePrefix();
+        sequence << pModifier->scanCode();
+    }
+
+    if (pKey->scanCodePrefix() != 0)
+        sequence << pKey->scanCodePrefix();
+    sequence << pKey->scanCode();
+    emit sigPutKeyboardSequence(sequence);
+}
+
+void UISoftKeyboardWidget::keyStateChange(UISoftKeyboardKey* pKey)
+{
+    if (!pKey)
+        return;
+    if (pKey->type() == UIKeyType_Modifier)
+    {
+        if (pKey->state() == UIKeyState_NotPressed)
+            m_pressedModifiers.removeOne(pKey);
+        else
+            if (!m_pressedModifiers.contains(pKey))
+                m_pressedModifiers.append(pKey);
+    }
+}
+
+void UISoftKeyboardWidget::handleKeyRelease(UISoftKeyboardKey *pKey)
+{
+    if (!pKey)
+        return;
+    if (pKey->type() == UIKeyType_Ordinary)
+        pKey->release();
+    /* We only send the scan codes of Ordinary keys: */
+    if (pKey->type() == UIKeyType_Modifier)
+        return;
+
+    QVector<LONG> sequence;
+    if (pKey->scanCodePrefix() != 0)
+        sequence <<  pKey->scanCodePrefix();
+    sequence << (pKey->scanCode() | 0x80);
+
+    /* Add the pressed modifiers in the reverse order: */
+    for (int i = m_pressedModifiers.size() - 1; i >= 0; --i)
+    {
+        UISoftKeyboardKey *pModifier = m_pressedModifiers[i];
+        if (pModifier->scanCodePrefix() != 0)
+            sequence << pModifier->scanCodePrefix();
+        sequence << (pModifier->scanCode() | 0x80);
+        /* Release the pressed modifiers (if there are not locked): */
+        pModifier->release();
+    }
+    emit sigPutKeyboardSequence(sequence);
 }
 
@@ -693 +841 @@
        else if (m_xmlReader.name() == "position")
             key.setPosition(m_xmlReader.readElementText().toInt());
-        // else if (m_xmlReader.name() == "type")
-        // {
-        //     QString strType = m_xmlReader.readElementText();
-        //     if (strType == "modifier")
-        //         pKey->setType(UIKeyType_Modifier);
-        //     else if (strType == "toggleable")
-        //         pKey->setType(UIKeyType_Toggleable);
-        // }
+        else if (m_xmlReader.name() == "type")
+        {
+            QString strType = m_xmlReader.readElementText();
+            if (strType == "modifier")
+                key.setType(UIKeyType_Modifier);
+            else if (strType == "toggleable")
+                key.setType(UIKeyType_Toggleable);
+        }
         else
             m_xmlReader.skipCurrentElement();
@@ -812 +960 @@
     , m_pContainerWidget(0)
     , m_strMachineName(strMachineName)
-
-    , m_fKeepAspectRatio(false)
     , m_iXSpacing(5)
     , m_iYSpacing(5)
@@ -823 +969 @@
     setAttribute(Qt::WA_DeleteOnClose);
     prepareObjects();
-    parseLayout();
+    createKeyboard();
     prepareConnections();
     prepareToolBar();
@@ -839 +985 @@
 }
 
-void UISoftKeyboard::sltHandleKeyPress()
-{
-//     UISoftKeyboardKey *pKey = qobject_cast<UISoftKeyboardKey*>(sender());
-//     if (!pKey)
-//         return;
-//     if (pKey->type() == UIKeyType_Modifier)
-//         return;
-
-//     QVector<LONG> sequence;
-
-//     /* Add the pressed modifiers first: */
-//     for (int i = 0; i < m_pressedModifiers.size(); ++i)
-//     {
-//         UISoftKeyboardKey *pModifier = m_pressedModifiers[i];
-//         if (pModifier->scanCodePrefix() != 0)
-//             sequence << pModifier->scanCodePrefix();
-//         sequence << pModifier->scanCode();
-//     }
-
-//     if (pKey->scanCodePrefix() != 0)
-//         sequence << pKey->scanCodePrefix();
-//     sequence << pKey->scanCode();
-//     keyboard().PutScancodes(sequence);
-}
-
-void UISoftKeyboard::sltHandleKeyRelease()
-{
-    //UISoftKeyboardKey *pKey = qobject_cast<UISoftKeyboardKey*>(sender());
-//     if (!pKey)
-//         return;
-//     /* We only send the scan codes of Ordinary keys: */
-//     if (pKey->type() == UIKeyType_Modifier)
-//         return;
-
-//     QVector<LONG> sequence;
-//     if (pKey->scanCodePrefix() != 0)
-//         sequence <<  pKey->scanCodePrefix();
-//     sequence << (pKey->scanCode() | 0x80);
-
-//     /* Add the pressed modifiers in the reverse order: */
-//     for (int i = m_pressedModifiers.size() - 1; i >= 0; --i)
-//     {
-//         UISoftKeyboardKey *pModifier = m_pressedModifiers[i];
-//         if (pModifier->scanCodePrefix() != 0)
-//             sequence << pModifier->scanCodePrefix();
-//         sequence << (pModifier->scanCode() | 0x80);
-//         /* Release the pressed modifiers (if there are not locked): */
-//         pModifier->release();
-//     }
-//     keyboard().PutScancodes(sequence);
-}
-
-void UISoftKeyboard::sltHandleModifierStateChange()
-{
-    // UISoftKeyboardKey *pKey = qobject_cast<UISoftKeyboardKey*>(sender());
-    // if (!pKey)
-    //     return;
-    // if (pKey->type() != UIKeyType_Modifier)
-    //     return;
-    // if (pKey->state() == UIKeyState_NotPressed)
-    // {
-    //     m_pressedModifiers.removeOne(pKey);
-    // }
-    // else
-    // {
-    //     if (!m_pressedModifiers.contains(pKey))
-    //         m_pressedModifiers.append(pKey);
-    // }
-}
-
 void UISoftKeyboard::sltHandleKeyboardLedsChange()
 {
     // bool fNumLockLed = m_pSession->isNumLock();
     // bool fCapsLockLed = m_pSession->isCapsLock();
-    // bool fScrollLock = m_pSession->isScrollLock();
+    // bool fScrollLockLed = m_pSession->isScrollLock();
+}
+
+void UISoftKeyboard::sltHandlePutKeyboardSequence(QVector<LONG> sequence)
+{
+    keyboard().PutScancodes(sequence);
 }
 
@@ -929 +1010 @@
 {
     connect(m_pSession, &UISession::sigKeyboardLedsChange, this, &UISoftKeyboard::sltHandleKeyboardLedsChange);
+    connect(m_pContainerWidget, &UISoftKeyboardWidget::sigPutKeyboardSequence, this, &UISoftKeyboard::sltHandlePutKeyboardSequence);
 }
 
@@ -943 +1025 @@
 }
 
-void UISoftKeyboard::parseLayout()
+void UISoftKeyboard::createKeyboard()
 {
     if (!m_pContainerWidget)
         return;
     UIKeyboardLayoutReader reader;
-    QVector<UISoftKeyboardRow> &rows = m_pContainerWidget->m_rows;
+    QVector<UISoftKeyboardRow> &rows = m_pContainerWidget->rows();
     if (!reader.parseXMLFile(":/102_iso.xml", rows))
         return;
     int iY = m_iTopMargin;
     int iMaxWidth = 0;
+
     for (int i = 0; i < rows.size(); ++i)
     {
@@ -963 +1046 @@
             key.setKeyGeometry(QRect(iX, iY, key.width(), key.height()));
             key.setPolygon(QPolygon(UIKeyboardLayoutReader::computeKeyVertices(key)));
+            key.setParentWidget(m_pContainerWidget);
             iX += key.width();
             if (j < row.keys().size() - 1)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h

@@ -59 +59 @@
 private slots:
 
-    void sltHandleKeyPress();
-    void sltHandleKeyRelease();
-    void sltHandleModifierStateChange();
     void sltHandleKeyboardLedsChange();
+    void sltHandlePutKeyboardSequence(QVector<LONG> sequence);
 
 private:
@@ -71 +69 @@
     void saveSettings();
     void loadSettings();
-    void parseLayout();
+    void createKeyboard();
     CKeyboard& keyboard() const;
 
@@ -78 +76 @@
     UISoftKeyboardWidget       *m_pContainerWidget;
     QString       m_strMachineName;
-    QVector<UISoftKeyboardKey*> m_pressedModifiers;
-    bool          m_fKeepAspectRatio;
 
     int m_iXSpacing;

trunk/src/VBox/Frontends/VirtualBox/xml/102_iso.xml

@@ -81 +81 @@
         </space>
         <key>
-            <keycap>PrtScn</keycap>
+            <keycap>Prt</keycap>
+            <keycap>Scn</keycap>
             <position>124</position>
             <scancodeprefix>0xe0</scancodeprefix>
@@ -294 +295 @@
         </space>
         <key>
-            <keycap>Delete</keycap>
+            <keycap>Del</keycap>
             <position>76</position>
             <scancode>0x53</scancode>