Merge lp:~smspillaz/compiz-core/compiz-core.use-extents-shift into lp:compiz-core/0.9.5

[Sam Spilsbury]

Use compiz::window::extents::shift

[Alan Griffiths (alan-griffiths)]

I'm still not happy with the with the overuse of namespaces.

One consequence of which is verbosity like "compiz::window::extents::shift" (although this could be reduced by a using declaration or namespace alias).

review: Approve

=== modified file 'cmake/CompizPlugin.cmake'
--- cmake/CompizPlugin.cmake	2012-01-12 06:48:58 +0000
+++ cmake/CompizPlugin.cmake	2012-01-21 19:09:24 +0000
@@ -404,6 +404,7 @@
 		      ${${_PLUGIN}_PKG_LIBRARIES}
 		      ${${_PLUGIN}_LIBRARIES}
 		      ${${_PLUGIN}_MOD_LIBRARIES}
+		      compiz_core
 	)
 
 	install (

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-01-19 18:12:31 +0000
+++ plugins/decor/src/decor.cpp	2012-01-21 19:09:24 +0000
@@ -1064,64 +1064,6 @@
 }
 
 /*
- * DecorWindow::shiftX
- *
- * Determines the amount that the window needs to
- * move based on the gravity hint once it is decorated,
- * at least in the X direction
- *
- * FIXME: This should be merged into a function
- * that returns CompPoint, there is no reason for
- * there to be two separate functions
- *
- */
-int
-DecorWindow::shiftX ()
-{
-    switch (window->sizeHints ().win_gravity) {
-	case WestGravity:
-	case NorthWestGravity:
-	case SouthWestGravity:
-	    return window->border ().left;
-	case EastGravity:
-	case NorthEastGravity:
-	case SouthEastGravity:
-	    return -window->border ().right;
-    }
-
-    return 0;
-}
-
-/*
- * DecorWindow::shiftY
- *
- * Determines the amount that the window needs to
- * move based on the gravity hint once it is decorated,
- * at least in the Y direction
- *
- * FIXME: This should be merged into a function
- * that returns CompPoint, there is no reason for
- * there to be two separate functions
- *
- */
-int
-DecorWindow::shiftY ()
-{
-    switch (window->sizeHints ().win_gravity) {
-	case NorthGravity:
-	case NorthWestGravity:
-	case NorthEastGravity:
-	    return window->border ().top;
-	case SouthGravity:
-	case SouthWestGravity:
-	case SouthEastGravity:
-	    return -window->border ().bottom;
-    }
-
-    return 0;
-}
-
-/*
  * decorOffsetMove
  *
  * Function called on a timer (to avoid calling configureXWindow from
@@ -1385,9 +1327,7 @@
     Decoration	     *old, *decoration = NULL;
     bool	     decorate = false;
     bool	     shadowOnly = true;
-    int		     moveDx, moveDy;
-    int		     oldShiftX = 0;
-    int		     oldShiftY  = 0;
+    CompPoint        oldShift, movement;
 
     old = (wd) ? wd->decor : NULL;
 
@@ -1506,8 +1446,7 @@
      * WindowDecoration */
     if (old)
     {
-	oldShiftX = shiftX ();
-	oldShiftY = shiftY ();
+	oldShift = compiz::window::extents::shift (window->border (), window->sizeHints ().win_gravity);
 
 	WindowDecoration::destroy (wd);
 
@@ -1536,8 +1475,8 @@
 	    window->setWindowFrameExtents (&wd->decor->border,
 					   &wd->decor->input);
 
-	moveDx = shiftX () - oldShiftX;
-	moveDy = shiftY () - oldShiftY;
+	movement = compiz::window::extents::shift (window->border (), window->sizeHints ().win_gravity);
+	movement -= oldShift;
 
 	/* Update the input and output frame */
 	if (decorate)
@@ -1562,13 +1501,12 @@
 
 	window->setWindowFrameExtents (&emptyExtents, &emptyExtents);
 
-	moveDx = -oldShiftX;
-	moveDy = -oldShiftY;
+	movement -= oldShift;
     }
 
     /* Need to actually move the window */
     if (window->placed () && !window->overrideRedirect () &&
-	(moveDx || moveDy))
+	(movement.x () || movement.y ()))
     {
 	XWindowChanges xwc;
 	unsigned int   mask = CWX | CWY;
@@ -1578,8 +1516,8 @@
 	/* Grab the geometry last sent to server at configureXWindow
 	 * time and not here since serverGeometry may be updated by
 	 * the time that we do call configureXWindow */
-	xwc.x = moveDx;
-	xwc.y = moveDy;
+	xwc.x = movement.x ();
+	xwc.y = movement.y ();
 
 	/* Except if it's fullscreen, maximized or such */
 	if (window->state () & CompWindowStateFullscreenMask)
@@ -1592,10 +1530,10 @@
 	    mask &= ~CWY;
 
 	if (window->saveMask () & CWX)
-	    window->saveWc ().x += moveDx;
+	    window->saveWc ().x += movement.x ();
 
 	if (window->saveMask () & CWY)
-	    window->saveWc ().y += moveDy;
+	    window->saveWc ().y += movement.y ();
 
 	if (mask)
 	{
@@ -2810,9 +2748,8 @@
 {
     if (wd && wd->decor)
     {
-	int oldShiftX = shiftX ();
-	int oldShiftY = shiftY ();
-	int moveDx, moveDy;
+	CompPoint oldShift = compiz::window::extents::shift (window->border (), window->sizeHints ().win_gravity);
+	
 
 	if ((window->state () & MAXIMIZE_STATE))
 	    window->setWindowFrameExtents (&wd->decor->maxBorder,
@@ -2826,14 +2763,13 @@
 	 * to prevent the window from shifting back too far once
 	 * unmaximized */
 
-	moveDx = shiftX () - oldShiftX;
-	moveDy = shiftY () - oldShiftY;
+	CompPoint movement = compiz::window::extents::shift (window->border (), window->sizeHints ().win_gravity) - oldShift;
 
 	if (window->saveMask () & CWX)
-	    window->saveWc ().x += moveDx;
+	    window->saveWc ().x += movement.x ();
 
 	if (window->saveMask () & CWY)
-	    window->saveWc ().y += moveDy;
+	    window->saveWc ().y += movement.y ();
 
 	updateFrame ();
     }

=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2012-01-19 18:12:31 +0000
+++ plugins/decor/src/decor.h	2012-01-21 19:09:24 +0000
@@ -30,6 +30,7 @@
 #include <composite/composite.h>
 #include <opengl/opengl.h>
 #include <core/atoms.h>
+#include <core/windowextents.h>
 
 #include "decor_options.h"
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-20 15:42:52 +0000
+++ src/CMakeLists.txt	2012-01-21 19:09:24 +0000
@@ -77,6 +77,7 @@
 link_directories (
     ${COMPIZ_LINK_DIRS}
     ${CORE_MOD_LIBRARY_DIRS}
+    ${libdir}
 )
 
 add_library (compiz_core SHARED
@@ -144,10 +145,14 @@
 
 install (
     TARGETS compiz_core
+  	LIBRARY DESTINATION ${COMPIZ_DESTDIR}${libdir}
+)
+
+install (
+    TARGETS compiz
     RUNTIME DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}
-  	LIBRARY DESTINATION ${COMPIZ_DESTDIR}${libdir}
-  	ARCHIVE DESTINATION ${COMPIZ_DESTDIR}${libdir}
 )
+
 add_subdirectory(tests)
 
 enable_coverage_report( TARGETS compiz )