Stop abusing InputHandler class for write class
The handler is for incoming data and we should not be abusing that
class for the writer class. Do proper write prototypes for the
relevant functions.
diff --git a/common/rfb/CMsgWriter.h b/common/rfb/CMsgWriter.h
index eb9b112..1322186 100644
--- a/common/rfb/CMsgWriter.h
+++ b/common/rfb/CMsgWriter.h
@@ -25,8 +25,6 @@
#include <rdr/types.h>
-#include <rfb/InputHandler.h>
-
namespace rdr { class OutStream; }
namespace rfb {
@@ -34,9 +32,10 @@
class PixelFormat;
class ConnParams;
struct ScreenSet;
+ struct Point;
struct Rect;
- class CMsgWriter : public InputHandler {
+ class CMsgWriter {
public:
CMsgWriter(ConnParams* cp, rdr::OutStream* os);
virtual ~CMsgWriter();
@@ -53,11 +52,9 @@
void writeFence(rdr::U32 flags, unsigned len, const char data[]);
- // InputHandler implementation
-
- virtual void keyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down);
- virtual void pointerEvent(const Point& pos, int buttonMask);
- virtual void clientCutText(const char* str, int len);
+ void writeKeyEvent(rdr::U32 keysym, rdr::U32 keycode, bool down);
+ void writePointerEvent(const Point& pos, int buttonMask);
+ void writeClientCutText(const char* str, rdr::U32 len);
protected:
void startMsg(int type);