From b000ff13275cd9df34494553ba49746a85e63072 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 22 Sep 2017 16:43:50 +0200 Subject: [PATCH] Get rid of getFbSize()/getDesktopSize() in common It was only used by WinVNC, so push it there instead. --- common/rfb/SDesktop.h | 5 ----- common/rfb/VNCServerST.h | 4 ---- unix/x0vncserver/x0vncserver.cxx | 4 ---- unix/xserver/hw/vnc/XserverDesktop.h | 1 - win/rfb_win32/SDisplay.h | 5 ++++- win/winvnc/JavaViewer.cxx | 3 ++- win/winvnc/JavaViewer.h | 7 ++++--- win/winvnc/VNCServerWin32.cxx | 2 +- win/winvnc/VNCServerWin32.h | 4 ++++ 9 files changed, 15 insertions(+), 20 deletions(-) diff --git a/common/rfb/SDesktop.h b/common/rfb/SDesktop.h index 322fe320..717ddbc9 100644 --- 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 2dfdbbdb..3a563703 100644 --- 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 b9d717f0..6fd6bc3b 100644 --- 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 7f7823a7..9e7dfd1e 100644 --- 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 9892ed99..f36b2b73 100644 --- 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 c9631229..e2e307e8 100644 --- a/win/winvnc/JavaViewer.cxx +++ b/win/winvnc/JavaViewer.cxx @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -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 ecda4d3e..79a39696 100644 --- a/win/winvnc/JavaViewer.h +++ b/win/winvnc/JavaViewer.h @@ -25,14 +25,15 @@ #define WINVNC_JAVA_VIEWER #include -#include #include 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 d86384da..b164c65f 100644 --- 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 f384bbeb..ed051dcf 100644 --- 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. -- 2.39.5