Remove old text clipboard

unix/xserver/hw/vnc/XserverDesktop.cc

@@ -176,15 +176,6 @@ XserverDesktop::queryConnection(network::Socket* sock,
   return rfb::VNCServerST::PENDING;
 }
 
-void XserverDesktop::requestClipboard()
-{
-  try {
-    server->requestClipboard();
-  } catch (rdr::Exception& e) {
-    vlog.error("XserverDesktop::requestClipboard: %s",e.str());
-  }
-}
-
 void XserverDesktop::announceClipboard(bool available)
 {
   try {
@@ -194,15 +185,6 @@ void XserverDesktop::announceClipboard(bool available)
   }
 }
 
-void XserverDesktop::sendClipboardData(const char* data)
-{
-  try {
-    server->sendClipboardData(data);
-  } catch (rdr::Exception& e) {
-    vlog.error("XserverDesktop::sendClipboardData: %s",e.str());
-  }
-}
-
 void XserverDesktop::clearBinaryClipboardData()
 {
   try {
@@ -500,11 +482,6 @@ unsigned int XserverDesktop::setScreenLayout(int fb_width, int fb_height,
   return ret;
 }
 
-void XserverDesktop::handleClipboardRequest()
-{
-  vncHandleClipboardRequest();
-}
-
 void XserverDesktop::handleClipboardAnnounce(bool available)
 {
   vncHandleClipboardAnnounce(available);
@@ -515,11 +492,6 @@ void XserverDesktop::handleClipboardAnnounceBinary(const unsigned num, const cha
   vncHandleClipboardAnnounceBinary(num, mimes);
 }
 
-void XserverDesktop::handleClipboardData(const char* data_, int len)
-{
-  vncHandleClipboardData(data_, len);
-}
-
 void XserverDesktop::grabRegion(const rfb::Region& region)
 {
   if (directFbptr)

unix/xserver/hw/vnc/XserverDesktop.h

@@ -62,7 +62,6 @@ public:
   void refreshScreenLayout();
   void requestClipboard();
   void announceClipboard(bool available);
-  void sendClipboardData(const char* data);
   void clearBinaryClipboardData();
   void sendBinaryClipboardData(const char* mime, const unsigned char *data,
                                const unsigned len);
@@ -99,10 +98,8 @@ public:
   virtual void keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down);
   virtual unsigned int setScreenLayout(int fb_width, int fb_height,
                                        const rfb::ScreenSet& layout);
-  virtual void handleClipboardRequest();
   virtual void handleClipboardAnnounce(bool available);
   virtual void handleClipboardAnnounceBinary(const unsigned num, const char mimes[][32]);
-  virtual void handleClipboardData(const char* data, int len);
 
   // rfb::PixelBuffer callbacks
   virtual void grabRegion(const rfb::Region& r);

unix/xserver/hw/vnc/vncExtInit.cc

@@ -352,24 +352,12 @@ void vncUpdateDesktopName(void)
     desktop[scr]->setDesktopName(desktopName);
 }
 
-void vncRequestClipboard(void)
-{
-  for (int scr = 0; scr < vncGetScreenCount(); scr++)
-    desktop[scr]->requestClipboard();
-}
-
 void vncAnnounceClipboard(int available)
 {
   for (int scr = 0; scr < vncGetScreenCount(); scr++)
     desktop[scr]->announceClipboard(available);
 }
 
-void vncSendClipboardData(const char* data)
-{
-  for (int scr = 0; scr < vncGetScreenCount(); scr++)
-    desktop[scr]->sendClipboardData(data);
-}
-
 void vncSendBinaryClipboardData(const char* mime, const unsigned char *data,
                                 const unsigned len)
 {

unix/xserver/hw/vnc/vncExtInit.h

@@ -67,9 +67,7 @@ int vncGetSendPrimary(void);
 
 void vncUpdateDesktopName(void);
 
-void vncRequestClipboard(void);
 void vncAnnounceClipboard(int available);
-void vncSendClipboardData(const char* data);
 void vncClearBinaryClipboardData();
 void vncSendBinaryClipboardData(const char* mime, const unsigned char *data,
                                 const unsigned len);

unix/xserver/hw/vnc/vncSelection.c

@@ -477,7 +477,7 @@ static int vncConvertSelection(ClientPtr client, Atom selection,
 
       LOG_DEBUG("Requesting clipboard data from client");
 
-      vncRequestClipboard();
+      //vncRequestClipboard();
 
       return Success;
     } else {
@@ -700,7 +700,7 @@ static void vncHandleSelection(Atom selection, Atom target,
     LOG_DEBUG("Sending clipboard to clients (%d bytes)",
               (int)strlen(utf8));
 
-    vncSendClipboardData(utf8);
+    //vncSendClipboardData(utf8);
 
     vncStrFree(utf8);
   } else if (target == xaUTF8_STRING) {
@@ -718,7 +718,7 @@ static void vncHandleSelection(Atom selection, Atom target,
     LOG_DEBUG("Sending clipboard to clients (%d bytes)",
               (int)strlen(filtered));
 
-    vncSendClipboardData(filtered);
+    //vncSendClipboardData(filtered);
 
     vncStrFree(filtered);
   } else {

unix/xserver/hw/vnc/vncSelection.h

@@ -24,10 +24,8 @@ extern "C" {
 
 void vncSelectionInit(void);
 
-void vncHandleClipboardRequest(void);
 void vncHandleClipboardAnnounce(int available);
 void vncHandleClipboardAnnounceBinary(const unsigned num, const char mimes[][32]);
-void vncHandleClipboardData(const char* data, int len);
 
 #ifdef __cplusplus
 }