Merge lp:~3v1n0/compiz/client-frame-api into lp:compiz/0.9.12

[Marco Trevisan (Treviño)]

Window: add clientFrame(), to get the client-side decoration extents

This only supports GTK at the moment, but it might be adapted to other toolkits.

[Christopher Townsend (townsend)]

Ok, looks good and build fine.

review: Approve

[Alberts Muktupāvels (muktupavels)]

_GTK_FRAME_EXTENTS should be added to _NET_SUPPORTED. Needed by GTK+ 3.16.

src/screen.cpp:
atoms.push_back (Atoms::frameGtkExtents) in CompScreenImpl::_addSupportedAtoms ().

[Marco Trevisan (Treviño) (3v1n0)]

> _GTK_FRAME_EXTENTS should be added to _NET_SUPPORTED. Needed by GTK+ 3.16.
>
> src/screen.cpp:
> atoms.push_back (Atoms::frameGtkExtents) in CompScreenImpl::_addSupportedAtoms
> ().

Well, that's needed only by old versions of Gtk (newer one don't really care about that), and yes, will add it but not yet since we still don't handle this value

[Alberts Muktupāvels (muktupavels)]

> > _GTK_FRAME_EXTENTS should be added to _NET_SUPPORTED. Needed by GTK+ 3.16.
> >
> > src/screen.cpp:
> > atoms.push_back (Atoms::frameGtkExtents) in
> CompScreenImpl::_addSupportedAtoms
> > ().
>
> Well, that's needed only by old versions of Gtk (newer one don't really care
> about that), and yes, will add it but not yet since we still don't handle this
> value

I think you are wrong. It is needed by GTK+ 3.16. They reverted / added back check for _GTK_FRAME_EXTENTS:
https://git.gnome.org/browse/gtk+/commit/?id=5ced234144ce63decbf5afc8a3517290b9027018

I was testing compiz / gtk-window-decorator with GTK+ 3.16 and windows are not client-side-decorated - they look like compositing manager is not running.

[MC Return (mc-return)]

This part LGTM, but additional code will be needed also...
(please see my comments here: https://code.launchpad.net/~albertsmuktupavels/compiz/add-gtk-frame-extents-to-net-supported/+merge/257303 )

review: Approve

=== modified file 'include/core/abiversion.h'
--- include/core/abiversion.h	2014-01-23 16:44:12 +0000
+++ include/core/abiversion.h	2015-02-17 15:00:18 +0000
@@ -5,6 +5,6 @@
 #  error Conflicting definitions of CORE_ABIVERSION
 #endif
 
-#define CORE_ABIVERSION 20140123
+#define CORE_ABIVERSION 20150217
 
 #endif // COMPIZ_ABIVERSION_H

=== modified file 'include/core/atoms.h'
--- include/core/atoms.h	2012-01-19 17:44:32 +0000
+++ include/core/atoms.h	2015-02-17 15:00:18 +0000
@@ -110,6 +110,7 @@
     extern Atom clientListStacking;
 
     extern Atom frameExtents;
+    extern Atom frameGtkExtents;
     extern Atom frameWindow;
 
     extern Atom wmState;

=== modified file 'include/core/window.h'
--- include/core/window.h	2014-03-27 15:09:02 +0000
+++ include/core/window.h	2015-02-17 15:00:18 +0000
@@ -217,7 +217,8 @@
    CompWindowNotifyUnshade,
    CompWindowNotifyEnterShowDesktopMode,
    CompWindowNotifyLeaveShowDesktopMode,
-   CompWindowNotifyBeforeMap
+   CompWindowNotifyBeforeMap,
+   CompWindowNotifyActions,
 };
 
 /**
@@ -502,6 +503,7 @@
 	const CompWindowExtents & border () const;
 	const CompWindowExtents & input () const;
 	const CompWindowExtents & output () const;
+	const CompWindowExtents & clientFrame () const;
 
 	// FIXME: This should return a const reference but grid needs fixing...
 	XSizeHints & sizeHints () const;

=== modified file 'src/atoms.cpp'
--- src/atoms.cpp	2012-01-19 17:44:32 +0000
+++ src/atoms.cpp	2015-02-17 15:00:18 +0000
@@ -107,6 +107,7 @@
     Atom clientListStacking;
 
     Atom frameExtents;
+    Atom frameGtkExtents;
     Atom frameWindow;
 
     Atom wmState;
@@ -270,8 +271,9 @@
 	clientListStacking =
 	    XInternAtom (dpy, "_NET_CLIENT_LIST_STACKING", 0);
 
-	frameExtents = XInternAtom (dpy, "_NET_FRAME_EXTENTS", 0);
-	frameWindow  = XInternAtom (dpy, "_NET_FRAME_WINDOW", 0);
+	frameExtents    = XInternAtom (dpy, "_NET_FRAME_EXTENTS", 0);
+	frameGtkExtents = XInternAtom (dpy, "_GTK_FRAME_EXTENTS", 0);
+	frameWindow     = XInternAtom (dpy, "_NET_FRAME_WINDOW", 0);
 
 	wmState        = XInternAtom (dpy, "WM_STATE", 0);
 	wmChangeState  = XInternAtom (dpy, "WM_CHANGE_STATE", 0);

=== modified file 'src/event.cpp'
--- src/event.cpp	2014-06-06 09:42:16 +0000
+++ src/event.cpp	2015-02-17 15:00:18 +0000
@@ -1755,6 +1755,12 @@
 	    if (w)
 		w->priv->updateIconGeometry ();
 	}
+	else if (event->xproperty.atom == Atoms::frameGtkExtents)
+	{
+	    w = findWindow (event->xproperty.window);
+	    if (w)
+		w->priv->updateClientFrame ();
+	}
 	else if (event->xproperty.atom == Atoms::wmStrut ||
 		 event->xproperty.atom == Atoms::wmStrutPartial)
 	{

=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2014-03-27 15:09:02 +0000
+++ src/privatewindow.h	2015-02-17 15:00:18 +0000
@@ -276,6 +276,8 @@
 
 	void updateIconGeometry ();
 
+	void updateClientFrame ();
+
 	Window getClientLeader ();
 
 	char * getStartupId ();
@@ -429,6 +431,7 @@
 	CompWindowExtents lastServerInput;
 	CompWindowExtents border;
 	CompWindowExtents output;
+	CompWindowExtents clientFrame;
 
 	CompStruts *struts;
 

=== modified file 'src/window.cpp'
--- src/window.cpp	2014-09-16 19:37:23 +0000
+++ src/window.cpp	2015-02-17 15:00:18 +0000
@@ -373,6 +373,38 @@
     }
 }
 
+void
+PrivateWindow::updateClientFrame ()
+{
+    Atom          actual;
+    int           format;
+    unsigned long n, left;
+    unsigned char *data;
+
+    int result = XGetWindowProperty (screen->dpy (), priv->id,
+				     Atoms::frameGtkExtents,
+				     0L, 65536, False, XA_CARDINAL,
+				     &actual, &format, &n, &left, &data);
+
+    if (result == Success && actual == XA_CARDINAL && data)
+    {
+	if (n == 4)
+	{
+	    unsigned long *extents = reinterpret_cast<unsigned long *>(data);
+	    priv->clientFrame.left = extents[0];
+	    priv->clientFrame.right = extents[1];
+	    priv->clientFrame.top = extents[2];
+	    priv->clientFrame.bottom = extents[3];
+	}
+
+	XFree (data);
+    }
+    else
+    {
+	priv->clientFrame = CompWindowExtents ();
+    }
+}
+
 Window
 PrivateWindow::getClientLeaderOfAncestor ()
 {
@@ -708,6 +740,7 @@
     if (actions != priv->actions)
     {
 	priv->actions = actions;
+	windowNotify (CompWindowNotifyActions);
 	setWindowActions (screen, actions, priv->id);
     }
 }
@@ -5947,6 +5980,12 @@
     return priv->output;
 }
 
+const CompWindowExtents &
+CompWindow::clientFrame () const
+{
+    return priv->clientFrame;
+}
+
 XSizeHints &
 CompWindow::sizeHints () const
 {
@@ -6205,6 +6244,7 @@
 
     recalcActions ();
     priv->updateIconGeometry ();
+    priv->updateClientFrame ();
 
     if (priv->shaded)
 	priv->updateFrameWindow ();