From: Pierre Ossman <ossman@cendio.se>
Date: Mon, 1 Jul 2019 09:37:50 +0000 (+0200)
Subject: Merge branch 'exclipboard' of https://github.com/CendioOssman/tigervnc
X-Git-Tag: v1.9.90~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5b8a629661c25f7c11c4b37825b0c80c633c2bf6;p=tigervnc.git

Merge branch 'exclipboard' of https://github.com/CendioOssman/tigervnc
---

5b8a629661c25f7c11c4b37825b0c80c633c2bf6
diff --cc vncviewer/DesktopWindow.h
index 97a8178d,6b03325c..ef3dbb08
--- a/vncviewer/DesktopWindow.h
+++ b/vncviewer/DesktopWindow.h
@@@ -72,12 -69,16 +69,17 @@@ public
    // Change client LED state
    void setLEDState(unsigned int state);
  
+   // Clipboard events
+   void handleClipboardRequest();
+   void handleClipboardAnnounce(bool available);
+   void handleClipboardData(const char* data);
+ 
    // Fl_Window callback methods
 -  void draw();
 -  void resize(int x, int y, int w, int h);
 +  virtual void show();
 +  virtual void draw();
 +  virtual void resize(int x, int y, int w, int h);
  
 -  int handle(int event);
 +  virtual int handle(int event);
  
    void fullscreen_on();