Get rid of getFbSize()/getDesktopSize() in common

It was only used by WinVNC, so push it there instead.

diff --git a/common/rfb/SDesktop.h b/common/rfb/SDesktop.h
index 322fe3200e026a4815deb3ca4e1cda88c7fb76dc..717ddbc9d9a7a850f3f51bd6941a440b98a9f224 100644 (file)
--- a/common/rfb/SDesktop.h
+++ b/common/rfb/SDesktop.h
@@ -65,11 +65,6 @@ namespace rfb {
 
     virtual void stop() {}
 
-    // getFbSize() returns the current dimensions of the framebuffer.
-    // This can be called even while the SDesktop is not start()ed.
-
-    virtual Point getFbSize() = 0;
-
     // setScreenLayout() requests to reconfigure the framebuffer and/or
     // the layout of screens.
     virtual unsigned int setScreenLayout(int __unused_attr fb_width,

diff --git a/common/rfb/VNCServerST.h b/common/rfb/VNCServerST.h
index 2dfdbbdbcff984e5f79940289103a18c19de2736..3a5637031cee284843f80c4d28f0699461516e7c 100644 (file)
--- a/common/rfb/VNCServerST.h
+++ b/common/rfb/VNCServerST.h
@@ -120,10 +120,6 @@ namespace rfb {
 
     SConnection* getSConnection(network::Socket* sock);
 
-    // getDesktopSize() returns the size of the SDesktop exported by this
-    // server.
-    Point getDesktopSize() const {return desktop->getFbSize();}
-
     // getName() returns the name of this VNC Server.  NB: The value returned
     // is the server's internal buffer which may change after any other methods
     // are called - take a copy if necessary.

diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index b9d717f01dc0aa6298507cfc4559958da8166a3c..6fd6bc3b7e7b723c40a4bb8421e38d51c73c7391 100644 (file)
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -427,10 +427,6 @@ public:
   virtual void clientCutText(const char* str, int len) {
   }
 
-  virtual Point getFbSize() {
-    return Point(pb->width(), pb->height());
-  }
-
   // -=- TXGlobalEventHandler interface
 
   virtual bool handleGlobalEvent(XEvent* ev) {

diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
index 7f7823a766c1915a94f6731daaa178e225917bff..9e7dfd1ee4409920eee223f2a1eb7194c92ce880 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.h
+++ b/unix/xserver/hw/vnc/XserverDesktop.h
@@ -91,7 +91,6 @@ public:
   virtual void pointerEvent(const rfb::Point& pos, int buttonMask);
   virtual void keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down);
   virtual void clientCutText(const char* str, int len);
-  virtual rfb::Point getFbSize() { return rfb::Point(width(), height()); }
   virtual unsigned int setScreenLayout(int fb_width, int fb_height,
                                        const rfb::ScreenSet& layout);
 

diff --git a/win/rfb_win32/SDisplay.h b/win/rfb_win32/SDisplay.h
index 9892ed99ff044babea933a1bf18308f9a993383d..f36b2b73e95fc5ec459bf36633e91a3355e480df 100644 (file)
--- a/win/rfb_win32/SDisplay.h
+++ b/win/rfb_win32/SDisplay.h
@@ -68,7 +68,6 @@ namespace rfb {
       virtual void pointerEvent(const Point& pos, int buttonmask);
       virtual void keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down);
       virtual void clientCutText(const char* str, int len);
-      virtual Point getFbSize();
 
       // -=- Clipboard
       
@@ -87,6 +86,10 @@ namespace rfb {
 
       void setStatusLocation(bool* status) {statusLocation = status;}
 
+      // -=- Used (indirectly) by JavaViewer to get desktop size
+
+      Point getFbSize();
+
       friend class SDisplayCore;
 
       static IntParameter updateMethod;

diff --git a/win/winvnc/JavaViewer.cxx b/win/winvnc/JavaViewer.cxx
index c9631229a7b58f9046aada81ce51c46f30213bc2..e2e307e8d6a008b5b9548c829facecc033992ebb 100644 (file)
--- a/win/winvnc/JavaViewer.cxx
+++ b/win/winvnc/JavaViewer.cxx
@@ -17,6 +17,7 @@
  */
 
 #include <winvnc/JavaViewer.h>
+#include <winvnc/VNCServerWin32.h>
 #include <winvnc/resource.h>
 #include <rdr/MemInStream.h>
 #include <rfb/LogWriter.h>
@@ -31,7 +32,7 @@ using namespace rfb;
 
 static rfb::LogWriter vlog("JavaViewerServer");
 
-JavaViewerServer::JavaViewerServer(rfb::VNCServerST* svr) : server(svr) {
+JavaViewerServer::JavaViewerServer(VNCServerWin32* svr) : server(svr) {
 }
 
 JavaViewerServer::~JavaViewerServer() {

diff --git a/win/winvnc/JavaViewer.h b/win/winvnc/JavaViewer.h
index ecda4d3e8b1ecd862eff068a5f337afd77d035d9..79a39696dc831fc2f1bcda0beab93bc757d791e7 100644 (file)
--- a/win/winvnc/JavaViewer.h
+++ b/win/winvnc/JavaViewer.h
@@ -25,14 +25,15 @@
 #define WINVNC_JAVA_VIEWER
 
 #include <rfb/HTTPServer.h>
-#include <rfb/VNCServerST.h>
 #include <rdr/SubstitutingInStream.h>
 
 namespace winvnc {
 
+  class VNCServerWin32;
+
   class JavaViewerServer : public rfb::HTTPServer, public rdr::Substitutor {
   public:
-    JavaViewerServer(rfb::VNCServerST* desktop);
+    JavaViewerServer(VNCServerWin32* desktop);
     virtual ~JavaViewerServer();
 
     virtual rdr::InStream* getFile(const char* name, const char** contentType,
@@ -46,7 +47,7 @@ namespace winvnc {
     }
   protected:
     int rfbPort;
-    rfb::VNCServerST* server;
+    VNCServerWin32* server;
   };
 
 };

diff --git a/win/winvnc/VNCServerWin32.cxx b/win/winvnc/VNCServerWin32.cxx
index d86384da48dd4a8b8b4a994db6f724efb045207a..b164c65f3147aec7c18d5439f56b1b159fab55ae 100644 (file)
--- a/win/winvnc/VNCServerWin32.cxx
+++ b/win/winvnc/VNCServerWin32.cxx
@@ -63,7 +63,7 @@ VNCServerWin32::VNCServerWin32()
       CreateEvent(0, FALSE, FALSE, "Global\\SessionEventTigerVNC") : 0),
     vncServer(CStr(ComputerName().buf), &desktop),
     thread_id(-1), runServer(false), isDesktopStarted(false),
-    httpServer(&vncServer), config(&sockMgr),
+    httpServer(this), config(&sockMgr),
     rfbSock(&sockMgr), httpSock(&sockMgr), trayIcon(0),
     queryConnectDialog(0)
 {

diff --git a/win/winvnc/VNCServerWin32.h b/win/winvnc/VNCServerWin32.h
index f384bbeb5da1d6dfd8919a6f8d0b01e16afc96b8..ed051dcf96eebcee3eb7a20aae0d0b892f65d3d4 100644 (file)
--- a/win/winvnc/VNCServerWin32.h
+++ b/win/winvnc/VNCServerWin32.h
@@ -78,6 +78,10 @@ namespace winvnc {
 
     bool setClientsStatus(rfb::ListConnInfo* LCInfo);
 
+    // Used by JavaViewerServer
+    const char* getName() {return vncServer.getName();}
+    rfb::Point getDesktopSize() {return desktop.getFbSize();}
+
   protected:
     // VNCServerST::QueryConnectionHandler interface
     // Callback used to prompt user to accept or reject a connection.