Changeset 5782 in vbox

Timestamp:

Nov 16, 2007 8:34:18 PM (17 years ago)

Author:

vboxsync

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

26179

Message:

Implemented NumLock state synch over VRDP.

Location:

trunk

Files:

• include/VBox/vrdpapi.h (modified) (2 diffs)
• src/VBox/Main/ConsoleVRDPServer.cpp (modified) (5 diffs)
• src/VBox/Main/include/ConsoleVRDPServer.h (modified) (3 diffs)

trunk/include/VBox/vrdpapi.h

@@ -733 +733 @@
 #define VRDP_INPUT_CAD      2
 #define VRDP_INPUT_RESET    3
+#define VRDP_INPUT_SYNCH    4
 
 typedef struct _VRDPINPUTSCANCODE
@@ -751 +752 @@
     unsigned uButtons;
 } VRDPINPUTPOINT;
+
+#define VRDP_INPUT_SYNCH_SCROLL   0x01
+#define VRDP_INPUT_SYNCH_NUMLOCK  0x02
+#define VRDP_INPUT_SYNCH_CAPITAL  0x04
+
+typedef struct _VRDPINPUTSYNCH
+{
+    unsigned uLockStatus;
+} VRDPINPUTSYNCH;
 #pragma pack()
 

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -92 +92 @@
     STDMETHOD(OnKeyboardLedsChange)(BOOL fNumLock, BOOL fCapsLock, BOOL fScrollLock)
     {
+        if (m_server)
+        {
+            m_server->NotifyKeyboardLedsChange (fNumLock, fCapsLock, fScrollLock);
+        }
         return S_OK;
     }
@@ -863 +867 @@
 }
 
+static void fixKbdLockStatus (VRDPInputSynch *pInputSynch, IKeyboard *pKeyboard)
+{
+    if (   pInputSynch->cGuestNumLockAdaptions
+        && (pInputSynch->fGuestNumLock != pInputSynch->fClientNumLock))
+    {
+        pInputSynch->cGuestNumLockAdaptions--;
+        pKeyboard->PutScancode(0x45);
+        pKeyboard->PutScancode(0x45 | 0x80);
+    }
+    if (   pInputSynch->cGuestCapsLockAdaptions
+        && (pInputSynch->fGuestCapsLock != pInputSynch->fClientCapsLock))
+    {
+        pInputSynch->cGuestCapsLockAdaptions--;
+        pKeyboard->PutScancode(0x3a);
+        pKeyboard->PutScancode(0x3a | 0x80);
+    }
+}
+
 DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackInput (void *pvCallback, int type, const void *pvInput, unsigned cbInput)
 {
@@ -874 +896 @@
             if (cbInput == sizeof (VRDPINPUTSCANCODE))
             {
+                IKeyboard *pKeyboard = pConsole->getKeyboard ();
+
                 const VRDPINPUTSCANCODE *pInputScancode = (VRDPINPUTSCANCODE *)pvInput;
-                pConsole->getKeyboard ()->PutScancode((LONG)pInputScancode->uScancode);
+
+                /* Track lock keys. */
+                if (pInputScancode->uScancode == 0x45)
+                {
+                    server->m_InputSynch.fClientNumLock = !server->m_InputSynch.fClientNumLock;
+                }
+                else if (pInputScancode->uScancode == 0x3a)
+                {
+                    server->m_InputSynch.fClientCapsLock = !server->m_InputSynch.fClientCapsLock;
+                }
+                else if (pInputScancode->uScancode == 0x46)
+                {
+                    server->m_InputSynch.fClientScrollLock = !server->m_InputSynch.fClientScrollLock;
+                }
+                else if ((pInputScancode->uScancode & 0x80) == 0)
+                {
+                    /* Key pressed. */
+                    fixKbdLockStatus (&server->m_InputSynch, pKeyboard);
+                }
+
+                pKeyboard->PutScancode((LONG)pInputScancode->uScancode);
             }
         } break;
@@ -935 +979 @@
         } break;
 
+        case VRDP_INPUT_SYNCH:
+        {
+            if (cbInput == sizeof (VRDPINPUTSYNCH))
+            {
+                IKeyboard *pKeyboard = pConsole->getKeyboard ();
+
+                const VRDPINPUTSYNCH *pInputSynch = (VRDPINPUTSYNCH *)pvInput;
+
+                server->m_InputSynch.fClientNumLock    = (pInputSynch->uLockStatus & VRDP_INPUT_SYNCH_NUMLOCK) != 0;
+                server->m_InputSynch.fClientCapsLock   = (pInputSynch->uLockStatus & VRDP_INPUT_SYNCH_CAPITAL) != 0;
+                server->m_InputSynch.fClientScrollLock = (pInputSynch->uLockStatus & VRDP_INPUT_SYNCH_SCROLL) != 0;
+
+                /* The client initiated synchronization. Always make the guest to reflect the client state. 
+                 * Than means, when the guest changes the state itself, it is forced to return to the client
+                 * state.
+                 */
+                if (server->m_InputSynch.fClientNumLock != server->m_InputSynch.fGuestNumLock)
+                {
+                    server->m_InputSynch.cGuestNumLockAdaptions = 2;
+                }
+
+                if (server->m_InputSynch.fClientCapsLock != server->m_InputSynch.fGuestCapsLock)
+                {
+                    server->m_InputSynch.cGuestCapsLockAdaptions = 2;
+                }
+
+                fixKbdLockStatus (&server->m_InputSynch, pKeyboard);
+            }
+        } break;
+
         default:
             break;
@@ -975 +1049 @@
     m_mousey = 0;
 
+    m_InputSynch.cGuestNumLockAdaptions = 2;
+    m_InputSynch.cGuestCapsLockAdaptions = 2;
+
+    m_InputSynch.fGuestNumLock    = false;
+    m_InputSynch.fGuestCapsLock   = false;
+    m_InputSynch.fGuestScrollLock = false;
+    
+    m_InputSynch.fClientNumLock    = false;
+    m_InputSynch.fClientCapsLock   = false;
+    m_InputSynch.fClientScrollLock = false;
+    
     memset (maFramebuffers, 0, sizeof (maFramebuffers));
 

trunk/src/VBox/Main/include/ConsoleVRDPServer.h

@@ -33 +33 @@
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifdef VRDP_NO_COM
+typedef struct _VRDPInputSynch
+{
+    int cGuestNumLockAdaptions;
+    int cGuestCapsLockAdaptions;
+
+    bool fGuestNumLock;
+    bool fGuestCapsLock;
+    bool fGuestScrollLock;
+
+    bool fClientNumLock;
+    bool fClientCapsLock;
+    bool fClientScrollLock;
+} VRDPInputSynch;
+#endif /* VRDP_NO_COM */
+
 /* Member of Console. Helper class for VRDP server management. Not a COM class. */
 class ConsoleVRDPServer
@@ -46 +62 @@
         m_fGuestWantsAbsolute = fGuestWantsAbsolute;
     }
-    
+
+    void NotifyKeyboardLedsChange (BOOL fNumLock, BOOL fCapsLock, BOOL fScrollLock)
+    {
+        bool fGuestNumLock    = (fNumLock != FALSE);
+        bool fGuestCapsLock   = (fCapsLock != FALSE);
+        bool fGuestScrollLock = (fScrollLock != FALSE);
+
+        /* Might need to resynch in case the guest itself changed the LED status. */
+        if (m_InputSynch.fClientNumLock != fGuestNumLock)
+        {
+            m_InputSynch.cGuestNumLockAdaptions = 2;
+        }
+
+        if (m_InputSynch.fClientCapsLock != fGuestCapsLock)
+        {
+            m_InputSynch.cGuestCapsLockAdaptions = 2;
+        }
+
+        m_InputSynch.fGuestNumLock    = fGuestNumLock;
+        m_InputSynch.fGuestCapsLock   = fGuestCapsLock;
+        m_InputSynch.fGuestScrollLock = fGuestScrollLock;
+    }
+
     void EnableConnections (void);
     void MousePointerUpdate (const VRDPCOLORPOINTER *pPointer);
@@ -145 +183 @@
     
     IConsoleCallback *mConsoleCallback;
+
+    VRDPInputSynch m_InputSynch;
 #else
     // VRDP API function pointers