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

diff --cc vncviewer/DesktopWindow.cxx
Simple merge

diff --cc vncviewer/DesktopWindow.h
index 97a8178db2b6e5c079e7d1ed13df80f5149cbb91,6b03325cb8f6066c08e486b34c41f62c38ecee5c..ef3dbb08ec82b3565a5bf11293de532c971b420d
--- 1/vncviewer/DesktopWindow.h
--- 2/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();