Allow screen switching on local XInput

Allows to switch from client to server and vice versa if
local input is detected, e.g. a touchscreen input or a
mouse click if clients also have input devices

Author: florianhofhammer

src/lib/barrier/protocol_types.cpp

@@ -29,6 +29,7 @@ const char*                kMsgCScreenSaver     = "CSEC%1i";
 const char*                kMsgCResetOptions    = "CROP";
 const char*                kMsgCInfoAck        = "CIAK";
 const char*                kMsgCKeepAlive        = "CALV";
+const char*                kMsgCLocalInput      = "CLIN%2i%2i";
 const char*                kMsgDKeyDown        = "DKDN%2i%2i%2i";
 const char*                kMsgDKeyDown1_0        = "DKDN%2i%2i";
 const char*                kMsgDKeyRepeat        = "DKRP%2i%2i%2i%2i";

src/lib/barrier/protocol_types.h

@@ -29,9 +29,10 @@
 // 1.4:  adds crypto support
 // 1.5:  adds file transfer and removes home brew crypto
 // 1.6:  adds clipboard streaming
+// 1.7:  adds focus/screen switch on local input
 // NOTE: with new version, barrier minor version should increment
 static const SInt16        kProtocolMajorVersion = 1;
-static const SInt16        kProtocolMinorVersion = 6;
+static const SInt16        kProtocolMinorVersion = 7;
 
 // default contact port number
 static const UInt16        kDefaultPort = 24800;
@@ -172,6 +173,10 @@ extern const char*        kMsgCInfoAck;
 // defined by an option.
 extern const char*        kMsgCKeepAlive;
 
+// Local input:  secondary -> primary
+// Inform primary about local input to request focus
+extern const char*        kMsgCLocalInput;
+
 //
 // data codes
 //

src/lib/base/EventTypes.cpp

@@ -177,6 +177,7 @@ REGISTER_EVENT(IPrimaryScreen, fakeInputEnd)
 
 REGISTER_EVENT(IScreen, error)
 REGISTER_EVENT(IScreen, shapeChanged)
+REGISTER_EVENT(IScreen, localInput)
 REGISTER_EVENT(IScreen, suspend)
 REGISTER_EVENT(IScreen, resume)
 

src/lib/base/EventTypes.h

@@ -651,6 +651,7 @@ class IScreenEvents : public EventTypes {
     IScreenEvents() :
         m_error(Event::kUnknown),
         m_shapeChanged(Event::kUnknown),
+        m_localInput(Event::kUnknown),
         m_suspend(Event::kUnknown),
         m_resume(Event::kUnknown) { }
 
@@ -671,6 +672,14 @@ class IScreenEvents : public EventTypes {
     */
     Event::Type        shapeChanged();
 
+    //! Get local input event type
+    /*!
+    Returns the local input event type. This is sent when the cursor
+    is not on the current screen but a local input is detected (e.g.
+    via touchscreen inputs or mouse movements).
+    */
+    Event::Type        localInput();
+
     //! Get suspend event type
     /*!
     Returns the suspend event type. This is sent whenever the system goes
@@ -690,6 +699,7 @@ class IScreenEvents : public EventTypes {
 private:
     Event::Type        m_error;
     Event::Type        m_shapeChanged;
+    Event::Type        m_localInput;
     Event::Type        m_suspend;
     Event::Type        m_resume;
 };

src/lib/client/Client.cpp

@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -134,11 +134,11 @@ Client::connect()
         // being shuttled between various networks).  patch by Brent
         // Priddy.
         m_serverAddress.resolve();
-        
+
         // m_serverAddress will be null if the hostname address is not reolved
         if (m_serverAddress.getAddress() != NULL) {
           // to help users troubleshoot, show server host name (issue: 60)
-          LOG((CLOG_NOTE "connecting to '%s': %s:%i", 
+          LOG((CLOG_NOTE "connecting to '%s': %s:%i",
           m_serverAddress.getHostname().c_str(),
           ARCH->addrToString(m_serverAddress.getAddress()).c_str(),
           m_serverAddress.getPort()));
@@ -255,7 +255,7 @@ Client::leave()
     m_active = false;
 
     m_screen->leave();
-    
+
     if (m_enableClipboard) {
         // send clipboards that we own and that have changed
         for (ClipboardID id = 0; id < kClipboardEnd; ++id) {
@@ -271,7 +271,7 @@ Client::leave()
 void
 Client::setClipboard(ClipboardID id, const IClipboard* clipboard)
 {
-     m_screen->setClipboard(id, clipboard);
+    m_screen->setClipboard(id, clipboard);
     m_ownClipboard[id]  = false;
     m_sentClipboard[id] = false;
 }
@@ -508,6 +508,10 @@ Client::setupScreen()
                             getEventTarget(),
                             new TMethodEventJob<Client>(this,
                                 &Client::handleClipboardGrabbed));
+    m_events->adoptHandler(m_events->forIScreen().localInput(),
+							getEventTarget(),
+							new TMethodEventJob<Client>(this,
+								&Client::handleLocalInputEvent));
 }
 
 void
@@ -564,6 +568,8 @@ Client::cleanupScreen()
                             getEventTarget());
         m_events->removeHandler(m_events->forClipboard().clipboardGrabbed(),
                             getEventTarget());
+        m_events->removeHandler(m_events->forIScreen().localInput(),
+                            getEventTarget());
         delete m_server;
         m_server = NULL;
     }
@@ -767,6 +773,14 @@ Client::handleStopRetry(const Event&, void*)
     m_args.m_restartable = false;
 }
 
+void
+Client::handleLocalInputEvent(const Event& event, void*)
+{
+    IPlatformScreen::MotionInfo* info = static_cast<IPlatformScreen::MotionInfo*>(event.getData());
+    LOG((CLOG_DEBUG "Trigger screen switching caused by local input, screen coordinates (%d, %d)", info->m_x, info->m_y));
+    m_server->onLocalInput(info->m_x, info->m_y);
+}
+
 void
 Client::writeToDropDirThread(void*)
 {
@@ -775,7 +789,7 @@ Client::writeToDropDirThread(void*)
     while (m_screen->isFakeDraggingStarted()) {
         ARCH->sleep(.1f);
     }
-    
+
     DropHelper::writeToDir(m_screen->getDropTarget(), m_dragFileList,
                     m_receivedFileData);
 }
@@ -790,7 +804,7 @@ Client::dragInfoReceived(UInt32 fileNum, std::string data)
     }
 
     DragInformation::parseDragInfo(m_dragFileList, fileNum, data);
-    
+
     m_screen->startDraggingFiles(m_dragFileList);
 }
 
@@ -806,7 +820,7 @@ Client::sendFileToServer(const char* filename)
     if (m_sendFileThread != NULL) {
         StreamChunker::interruptFile();
     }
-    
+
     m_sendFileThread = new Thread(
         new TMethodJob<Client>(
             this, &Client::sendFileThread,

src/lib/client/Client.h

@@ -191,6 +191,7 @@ class Client : public IClient, public INode {
     void                handleFileChunkSending(const Event&, void*);
     void                handleFileRecieveCompleted(const Event&, void*);
     void                handleStopRetry(const Event&, void*);
+    void                handleLocalInputEvent(const Event&, void*);
     void                onFileRecieveCompleted();
     void                sendClipboardThread(void*);
 

src/lib/client/ServerProxy.cpp

@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -367,6 +367,14 @@ ServerProxy::onClipboardChanged(ClipboardID id, const IClipboard* clipboard)
     StreamChunker::sendClipboard(data, data.size(), id, m_seqNum, m_events, this);
 }
 
+void
+ServerProxy::onLocalInput(SInt32 x, SInt32 y)
+{
+    // Coordinates as signed 32 bit integers don't make a lot of sense
+    // but are used for compatibility with e.g. IPlatformScreen::MotionInfo
+    ProtocolUtil::writef(m_stream, kMsgCLocalInput, x, y);
+}
+
 void
 ServerProxy::flushCompressedMouse()
 {
@@ -553,7 +561,7 @@ ServerProxy::setClipboard()
     static std::string dataCached;
     ClipboardID id;
     UInt32 seq;
-    
+
     int r = ClipboardChunk::assemble(m_stream, dataCached, id, seq);
 
     if (r == kStart) {
@@ -562,7 +570,7 @@ ServerProxy::setClipboard()
     }
     else if (r == kFinish) {
         LOG((CLOG_DEBUG "received clipboard %d size=%d", id, dataCached.size()));
-        
+
         // forward
         Clipboard clipboard;
         clipboard.unmarshall(dataCached, 0);

src/lib/client/ServerProxy.h

@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -50,6 +50,7 @@ class ServerProxy {
     void                onInfoChanged();
     bool                onGrabClipboard(ClipboardID);
     void                onClipboardChanged(ClipboardID, const IClipboard*);
+    void                onLocalInput(SInt32 x, SInt32 y);
 
     //@}
 
@@ -58,7 +59,7 @@ class ServerProxy {
 
     // sending dragging information to server
     void                sendDragInfo(UInt32 fileCount, const char* info, size_t size);
-    
+
 #ifdef TEST_ENV
     void                handleDataForTest() { handleData(Event(), NULL); }
 #endif