Merge lp:~3v1n0/unity/simpler-request-frame-extents into lp:unity

[Marco Trevisan (Treviño)]

DecoratedWindow: Just send estimated extents on _NET_REQUEST_FRAME_EXTENTS

As per EWMH protocol when _NET_REQUEST_FRAME_EXTENTS we just have to send the
client the estimation of the border. We don't have to set it on window yet.
Let's just implement this by avoiding setting the compiz borders, as this will prevent the window
to be moved to be fully visible once mapped.

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2016-03-08 00:09:32 +0000
+++ decorations/DecoratedWindow.cpp	2016-04-01 00:53:26 +0000
@@ -17,6 +17,9 @@
  * Authored by: Marco Trevisan <[e-mail]>
  */
 
+#include <core/atoms.h>
+#include <X11/Xatom.h>
+
 #include "DecorationsPriv.h"
 #include "DecorationsForceQuitDialog.h"
 #include "DecorationsEdgeBorders.h"
@@ -155,13 +158,8 @@
     win_->setWindowFrameExtents(&empty, &empty);
 }
 
-void Window::Impl::SetupExtents()
+void Window::Impl::ComputeBorderExtent(CompWindowExtents& border)
 {
-  if (win_->hasUnmapReference())
-    return;
-
-  CompWindowExtents border;
-
   if (deco_elements_ & cu::DecorationElement::BORDER)
   {
     auto const& sb = Style::Get()->Border();
@@ -170,6 +168,15 @@
     border.top = cv_->CP(sb.top);
     border.bottom = cv_->CP(sb.bottom);
   }
+}
+
+void Window::Impl::SetupExtents()
+{
+  if (win_->hasUnmapReference())
+    return;
+
+  CompWindowExtents border;
+  ComputeBorderExtent(border);
 
   CompWindowExtents input(border);
 
@@ -189,8 +196,19 @@
 void Window::Impl::SendFrameExtents()
 {
   UpdateElements(cu::WindowFilter::UNMAPPED);
-  SetupExtents();
-  win_->setWindowFrameExtents(&win_->border(), &win_->input());
+
+  CompWindowExtents border;
+  ComputeBorderExtent(border);
+
+  std::vector<unsigned long> extents(4);
+  extents.push_back(border.left);
+  extents.push_back(border.right);
+  extents.push_back(border.top);
+  extents.push_back(border.bottom);
+
+  XChangeProperty(screen->dpy(), win_->id(), Atoms::frameExtents, XA_CARDINAL, 32,
+                  PropModeReplace, reinterpret_cast<unsigned char *>(extents.data()),
+                  extents.size());
 }
 
 void Window::Impl::UnsetFrame()

=== modified file 'decorations/DecorationsPriv.h'
--- decorations/DecorationsPriv.h	2016-03-09 17:28:36 +0000
+++ decorations/DecorationsPriv.h	2016-04-01 00:53:26 +0000
@@ -98,6 +98,7 @@
 private:
   void UnsetExtents();
   void SetupExtents();
+  void ComputeBorderExtent(CompWindowExtents &border);
   void UpdateElements(cu::WindowFilter wf = cu::WindowFilter::NONE);
   void UpdateClientDecorationsState();
   void UpdateMonitor();