aboutsummaryrefslogtreecommitdiffstats
path: root/tests/perf
diff options
context:
space:
mode:
Diffstat (limited to 'tests/perf')
-rw-r--r--tests/perf/CMakeLists.txt4
-rw-r--r--tests/perf/decperf.cxx10
-rw-r--r--tests/perf/encperf.cxx24
3 files changed, 15 insertions, 23 deletions
diff --git a/tests/perf/CMakeLists.txt b/tests/perf/CMakeLists.txt
index 38f874d4..54a1ad89 100644
--- a/tests/perf/CMakeLists.txt
+++ b/tests/perf/CMakeLists.txt
@@ -27,8 +27,8 @@ if (BUILD_VIEWER)
target_sources(fbperf PRIVATE ${CMAKE_SOURCE_DIR}/vncviewer/Surface_X11.cxx)
endif()
target_include_directories(fbperf SYSTEM PUBLIC ${FLTK_INCLUDE_DIR})
- target_include_directories(fbperf SYSTEM PUBLIC ${GETTEXT_INCLUDE_DIR})
- target_link_libraries(fbperf test_util core rfb ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
+ target_include_directories(fbperf SYSTEM PUBLIC ${Intl_INCLUDE_DIR})
+ target_link_libraries(fbperf test_util core rfb ${FLTK_LIBRARIES} ${Intl_LIBRARIES})
if(WIN32)
target_link_libraries(fbperf msimg32)
endif()
diff --git a/tests/perf/decperf.cxx b/tests/perf/decperf.cxx
index 4d2f151a..2c7efa3b 100644
--- a/tests/perf/decperf.cxx
+++ b/tests/perf/decperf.cxx
@@ -67,8 +67,6 @@ public:
~CConn();
void initDone() override;
- void setCursor(int, int, const core::Point&, const uint8_t*) override;
- void setCursorPos(const core::Point&) override;
void framebufferUpdateStart() override;
void framebufferUpdateEnd() override;
void setColourMapEntries(int, int, uint16_t*) override;
@@ -140,14 +138,6 @@ void CConn::initDone()
server.height()));
}
-void CConn::setCursor(int, int, const core::Point&, const uint8_t*)
-{
-}
-
-void CConn::setCursorPos(const core::Point&)
-{
-}
-
void CConn::framebufferUpdateStart()
{
CConnection::framebufferUpdateStart();
diff --git a/tests/perf/encperf.cxx b/tests/perf/encperf.cxx
index 302e7eed..0da54603 100644
--- a/tests/perf/encperf.cxx
+++ b/tests/perf/encperf.cxx
@@ -98,8 +98,6 @@ public:
void initDone() override {};
void resizeFramebuffer() override;
- void setCursor(int, int, const core::Point&, const uint8_t*) override;
- void setCursorPos(const core::Point&) override;
void framebufferUpdateStart() override;
void framebufferUpdateEnd() override;
bool dataRect(const core::Rect&, int) override;
@@ -141,6 +139,10 @@ public:
void setDesktopSize(int fb_width, int fb_height,
const rfb::ScreenSet& layout) override;
+ void keyEvent(uint32_t keysym, uint32_t keycode, bool down) override;
+ void pointerEvent(const core::Point& pos,
+ uint16_t buttonMask) override;
+
protected:
DummyOutStream *out;
Manager *manager;
@@ -194,7 +196,7 @@ CConn::CConn(const char *filename)
sc = new SConn();
sc->client.setPF((bool)translate ? fbPF : pf);
- sc->setEncodings(sizeof(encodings) / sizeof(*encodings), encodings);
+ ((rfb::SMsgHandler*)sc)->setEncodings(sizeof(encodings) / sizeof(*encodings), encodings);
}
CConn::~CConn()
@@ -219,14 +221,6 @@ void CConn::resizeFramebuffer()
setFramebuffer(pb);
}
-void CConn::setCursor(int, int, const core::Point&, const uint8_t*)
-{
-}
-
-void CConn::setCursorPos(const core::Point&)
-{
-}
-
void CConn::framebufferUpdateStart()
{
CConnection::framebufferUpdateStart();
@@ -349,6 +343,14 @@ void SConn::setDesktopSize(int, int, const rfb::ScreenSet&)
{
}
+void SConn::keyEvent(uint32_t, uint32_t, bool)
+{
+}
+
+void SConn::pointerEvent(const core::Point&, uint16_t)
+{
+}
+
struct stats
{
double decodeTime;