diff options
| author | Pierre Ossman <ossman@cendio.se> | 2024-06-19 16:45:12 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2024-06-19 16:45:12 +0200 |
| commit | 858a859e59dcd794f0e6d50030e183be6ded0f7c (patch) | |
| tree | d5247bbb8f30932544f86ebbbab9b2161fe4c1b5 /unix/xserver/hw/vnc/XserverDesktop.h | |
| parent | 78510b981b211e29a06a30fa091b08070429b829 (diff) | |
| parent | 28c3f121613807df6d53dde9ac653916dcf8902d (diff) | |
| download | tigervnc-858a859e59dcd794f0e6d50030e183be6ded0f7c.tar.gz tigervnc-858a859e59dcd794f0e6d50030e183be6ded0f7c.zip | |
Merge branch 'present' of github.com:CendioOssman/tigervnc
Diffstat (limited to 'unix/xserver/hw/vnc/XserverDesktop.h')
| -rw-r--r-- | unix/xserver/hw/vnc/XserverDesktop.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h index 9cc5bf79..e604295b 100644 --- a/unix/xserver/hw/vnc/XserverDesktop.h +++ b/unix/xserver/hw/vnc/XserverDesktop.h @@ -1,5 +1,5 @@ /* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. - * Copyright 2009-2019 Pierre Ossman for Cendio AB + * Copyright 2009-2024 Pierre Ossman for Cendio AB * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -59,6 +59,9 @@ public: void unblockUpdates(); void setFramebuffer(int w, int h, void* fbptr, int stride); void refreshScreenLayout(); + uint64_t getMsc(); + void queueMsc(uint64_t id, uint64_t msc); + void abortMsc(uint64_t id); void requestClipboard(); void announceClipboard(bool available); void sendClipboardData(const char* data); @@ -88,8 +91,7 @@ public: const char* rejectMsg=0); // rfb::SDesktop callbacks - virtual void start(rfb::VNCServer* vs); - virtual void stop(); + virtual void init(rfb::VNCServer* vs); virtual void terminate(); virtual void queryConnection(network::Socket* sock, const char* userName); @@ -97,6 +99,7 @@ public: virtual void keyEvent(uint32_t keysym, uint32_t keycode, bool down); virtual unsigned int setScreenLayout(int fb_width, int fb_height, const rfb::ScreenSet& layout); + virtual void frameTick(uint64_t msc); virtual void handleClipboardRequest(); virtual void handleClipboardAnnounce(bool available); virtual void handleClipboardData(const char* data); @@ -112,7 +115,7 @@ protected: rfb::VNCServer* sockserv, bool read, bool write); - virtual bool handleTimeout(rfb::Timer* t); + virtual void handleTimeout(rfb::Timer* t); private: @@ -129,6 +132,8 @@ private: OutputIdMap outputIdMap; + std::map<uint64_t, uint64_t> pendingMsc; + rfb::Point oldCursorPos; }; #endif |