diff options
| author | Yonit Halperin <yhalperi@redhat.com> | 2011-09-18 21:50:06 +0300 |
|---|---|---|
| committer | Yonit Halperin <yhalperi@redhat.com> | 2011-11-02 11:30:29 +0200 |
| commit | 00ff038cc90ef49f350a2fc033115d10b72995a7 (patch) | |
| tree | af8d4fca74bdb525fb330d3477f105be7a622ce4 /client/display_channel.h | |
| parent | 87664af999a534090c37ffb53aec2a6cd970cdcc (diff) | |
| download | spice-00ff038cc90ef49f350a2fc033115d10b72995a7.tar.gz spice-00ff038cc90ef49f350a2fc033115d10b72995a7.tar.xz spice-00ff038cc90ef49f350a2fc033115d10b72995a7.zip | |
client: display channel migration
(cherry picked from commit cad3c585444f940f60c12789f4174f2d32bec70f branch 0.8)
Conflicts:
client/display_channel.cpp
Diffstat (limited to 'client/display_channel.h')
| -rw-r--r-- | client/display_channel.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/client/display_channel.h b/client/display_channel.h index f30311db..30a76e27 100644 --- a/client/display_channel.h +++ b/client/display_channel.h @@ -114,6 +114,7 @@ public: protected: virtual void on_connect(); virtual void on_disconnect(); + virtual void on_disconnect_mig_src(); private: void set_draw_handlers(); @@ -129,13 +130,17 @@ private: void destroy_canvas(int surface_id); void create_canvas(int surface_id, const std::vector<int>& canvas_type, int width, int height, uint32_t format); - void destroy_strams(); + void destroy_streams(); void update_cursor(); void create_primary_surface(int width, int height, uint32_t format); void create_surface(int surface_id, int width, int height, uint32_t format); void destroy_primary_surface(); void destroy_surface(int surface_id); + void destroy_all_surfaces(); + void do_destroy_all_surfaces(); + void destroy_off_screen_surfaces(); + void do_destroy_off_screen_surfaces(); void handle_mode(RedPeer::InMessage* message); void handle_mark(RedPeer::InMessage* message); @@ -217,11 +222,13 @@ private: #endif InterruptUpdate _interrupt_update; + bool _mig_wait_primary; friend class SetModeEvent; friend class CreatePrimarySurfaceEvent; friend class DestroyPrimarySurfaceEvent; friend class CreateSurfaceEvent; friend class DestroySurfaceEvent; + friend class DestroyAllSurfacesEvent; friend class ActivateTimerEvent; friend class VideoStream; friend class StreamsTrigger; @@ -229,6 +236,7 @@ private: friend class StreamsTimer; friend class AttachChannelsEvent; friend class DetachChannelsEvent; + friend class MigPrimarySurfaceTimer; }; #endif |