spicec: Remove spice-client watermark (rhbz#662450)

This patch stops us from drawing the spice client watermark at the top of
the virtual machine view. We have had requests through several channels to
remove this as it has little added value, and is seen as annoying by some.
Given that we now also have a bugzilla for this I think it is time we really
remove it.

1 files changed, 2 insertions, 19 deletions

diff --git a/client/application.cpp b/client/application.cpp
index 1bd3ff4f..d865e849 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -207,9 +207,7 @@ private:
     void update_sticky_rect();
 
 private:
-    AlphaImageFromRes _info_pixmap;
     AlphaImageFromRes _sticky_pixmap;
-    SpicePoint _info_pos;
     SpicePoint _sticky_pos;
     SpiceRect _sticky_rect;
     bool _sticky_on;
@@ -218,7 +216,6 @@ private:
 
 InfoLayer::InfoLayer()
     : ScreenLayer(SCREEN_LAYER_INFO, false)
-    , _info_pixmap (INFO_IMAGE_RES_ID)
     , _sticky_pixmap (STICKY_KEY_PIXMAP)
     , _sticky_on (false)
 {
@@ -238,11 +235,9 @@ void InfoLayer::draw_info(const QRegion& dest_region, RedDrawable& dest)
         r.right = rects[i].x2;
         r.bottom = rects[i].y2;
 
-        /* is rect inside sticky region or info region? */
+        /* is rect inside sticky region ? */
         if (_sticky_on && rect_intersects(r, _sticky_rect)) {
             dest.blend_pixels(_sticky_pixmap, r.left - _sticky_pos.x, r.top - _sticky_pos.y, r);
-        } else {
-            dest.blend_pixels(_info_pixmap, r.left - _info_pos.x, r.top - _info_pos.y, r);
         }
     }
 }
@@ -255,21 +250,9 @@ void InfoLayer::copy_pixels(const QRegion& dest_region, RedDrawable& dest_dc)
 
 void InfoLayer::set_info_mode()
 {
-    RecurciveLock lock(_update_lock);
-
     ASSERT(screen());
 
-    SpicePoint size = _info_pixmap.get_size();
-    SpicePoint screen_size = screen()->get_size();
-    SpiceRect r;
-
-    r.left = (screen_size.x - size.x) / 2;
-    r.right = r.left + size.x;
-    _info_pos.x = r.right - size.x;
-    _info_pos.y = r.top = 0;
-    r.bottom = r.top + size.y;
-    lock.unlock();
-    set_rect_area(r);
+    clear_area();
     update_sticky_rect();
     set_sticky(_sticky_on);
 }