Revert last three commits

"Display: Add frameGtkExtentsAtom", "Window: Add clientFrame(), to get the eventually set CSD extents", "Restore ABI compatibility broken by the previous commit".
compiz-reloaded · Mar 24, 2016 · 03873f3 · 03873f3
1 parent 8f8e6ec
commit 03873f3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 53 deletions.
diff --git a/include/compiz-core.h b/include/compiz-core.h
@@ -979,7 +979,6 @@ struct _CompDisplay {
     Atom clientListStackingAtom;
 
     Atom frameExtentsAtom;
-    Atom frameGtkExtentsAtom;
     Atom frameWindowAtom;
 
     Atom wmStateAtom;
@@ -2639,8 +2638,6 @@ struct _CompWindow {
 
     CompWindowExtents input;
     CompWindowExtents output;
-    /* was placed below for ABI compat reasons */
-    /* CompWindowExtents clientFrame; */
 
     CompStruts *struts;
 
@@ -2689,9 +2686,6 @@ struct _CompWindow {
     /* must be set by addWindowGeometry */
     DrawWindowGeometryProc drawWindowGeometry;
 
-    /* was placed here and not above for ABI compat reasons */
-    CompWindowExtents clientFrame;
-
     void *reserved;
 };
 
@@ -2820,9 +2814,6 @@ updateTransientHint (CompWindow *w);
 void
 updateIconGeometry (CompWindow *w);
 
-void
-updateClientFrame (CompWindow *w);
-
 Window
 getClientLeader (CompWindow *w);
 

diff --git a/src/display.c b/src/display.c
@@ -2114,9 +2114,8 @@ addDisplay (const char *name)
     d->clientListStackingAtom =
 	XInternAtom (dpy, "_NET_CLIENT_LIST_STACKING", 0);
 
-    d->frameExtentsAtom    = XInternAtom (dpy, "_NET_FRAME_EXTENTS", 0);
-    d->frameGtkExtentsAtom = XInternAtom (dpy, "_GTK_FRAME_EXTENTS", 0);
-    d->frameWindowAtom     = XInternAtom (dpy, "_NET_FRAME_WINDOW", 0);
+    d->frameExtentsAtom = XInternAtom (dpy, "_NET_FRAME_EXTENTS", 0);
+    d->frameWindowAtom  = XInternAtom (dpy, "_NET_FRAME_WINDOW", 0);
 
     d->wmStateAtom	  = XInternAtom (dpy, "WM_STATE", 0);
     d->wmChangeStateAtom  = XInternAtom (dpy, "WM_CHANGE_STATE", 0);

diff --git a/src/event.c b/src/event.c
@@ -1544,12 +1544,6 @@ handleEvent (CompDisplay *d,
 	    if (w)
 		updateIconGeometry (w);
 	}
-	else if (event->xproperty.atom == d->frameGtkExtentsAtom)
-	{
-	    w = findWindowAtDisplay (d, event->xproperty.window);
-	    if (w)
-		updateClientFrame (w);
-	}
 	else if (event->xproperty.atom == d->winOpacityAtom)
 	{
 	    w = findWindowAtDisplay (d, event->xproperty.window);

diff --git a/src/window.c b/src/window.c
@@ -452,40 +452,6 @@ updateIconGeometry (CompWindow *w)
     }
 }
 
-void
-updateClientFrame (CompWindow *w)
-{
-    Atom	  actual;
-    int		  result, format;
-    unsigned long n, left;
-    unsigned char *data;
-
-    w->clientFrame.left   = 0;
-    w->clientFrame.right  = 0;
-    w->clientFrame.top    = 0;
-    w->clientFrame.bottom = 0;
-
-    result = XGetWindowProperty (w->screen->display->display, w->id,
-				 w->screen->display->frameGtkExtentsAtom,
-				 0L, 65536L, False, XA_CARDINAL,
-				 &actual, &format, &n, &left, &data);
-
-    if (result == Success && data)
-    {
-	if (n == 4 && actual == XA_CARDINAL)
-	{
-	    unsigned long *extents = *(unsigned long **) &data;
-
-	    w->clientFrame.left   = extents[0];
-	    w->clientFrame.right  = extents[1];
-	    w->clientFrame.top    = extents[2];
-	    w->clientFrame.bottom = extents[3];
-	}
-
-	XFree (data);
-    }
-}
-
 static Window
 getClientLeaderOfAncestor (CompWindow *w)
 {
@@ -2381,7 +2347,6 @@ addWindow (CompScreen *screen,
 
     recalcWindowActions (w);
     updateIconGeometry (w);
-    updateClientFrame (w);
 
     if (w->shaded)
 	resizeWindow (w,