Index: src/group/group.h
===================================================================
--- src/group/group.h	(Revision 4348)
+++ src/group/group.h	(Arbeitskopie)
@@ -36,6 +36,7 @@
 #include <beryl_ipcs.h>
 #include <beryl-text.h>
 #include <X11/Xatom.h>
+#include <X11/extensions/shape.h>
 
 #include <math.h>
 #include <limits.h>
@@ -515,6 +516,12 @@
 
 	GroupWindowState windowState;
 
+	Window frameWindow;
+	unsigned int skipState;
+	XRectangle *inputRects;
+	int nInputRects;
+	int inputRectOrdering;
+
 	// for tab animation
 	Bool ungroup;
 	int animateState;
@@ -575,6 +582,7 @@
 /*
  * tab.c
  */
+void groupSetWindowVisibility(CompWindow *w, Bool visible);
 void groupHandleChanges(CompScreen* s);
 void groupHandleScreenActions(CompScreen *s);
 void groupHandleHoverDetection(GroupSelection *group);
Index: src/group/init.c
===================================================================
--- src/group/init.c	(Revision 4348)
+++ src/group/init.c	(Arbeitskopie)
@@ -272,6 +272,12 @@
 	gw->destination.x = 0;
 	gw->destination.y = 0;
 
+	gw->inputRects = NULL;
+	gw->nInputRects = 0;
+	gw->inputRectOrdering = 0;
+	gw->skipState = 0;
+	gw->frameWindow = None;
+
 	if (w->minimized)
 		gw->windowState = WindowMinimized;
 	else if (w->shaded)
@@ -301,8 +307,8 @@
 	/* TODO: this needs more work; positioning is not correct
 		 at the moment - but it's way better than leaving the 
 		 window offscreen */
-	if (gw->group && gw->group->tabBar && !IS_TOP_TAB(w, gw->group))
-		moveWindowOnscreen(w);
+	if (gw->inputRects)
+		groupSetWindowVisibility(w, TRUE);
 
 	if (gw->glowQuads)
 		free (gw->glowQuads);
Index: src/group/tab.c
===================================================================
--- src/group/tab.c	(Revision 4348)
+++ src/group/tab.c	(Arbeitskopie)
@@ -113,6 +113,54 @@
 }
 
 /*
+ * groupSetWindowVisibility
+ *
+ */
+void
+groupSetWindowVisibility(CompWindow *w, Bool visible)
+{
+	GROUP_WINDOW(w);
+
+	if (!visible) {
+		if (!gw->inputRects) {
+	        gw->inputRects = XShapeGetRectangles(w->screen->display->display,
+					w->id, ShapeInput, &gw->nInputRects,
+					&gw->inputRectOrdering);
+			
+			XShapeCombineRectangles(w->screen->display->display, w->id,
+					ShapeInput, 0, 0, NULL, 0, ShapeSet, 0);
+		}
+		if (!gw->frameWindow && w->frame) {
+			gw->frameWindow = w->frame;
+			XUnmapWindow(w->screen->display->display, w->frame);
+		}
+
+		gw->skipState = w->state & (CompWindowStateSkipPagerMask | CompWindowStateSkipTaskbarMask);
+		w->state |= (CompWindowStateSkipPagerMask | CompWindowStateSkipTaskbarMask);
+		setWindowState(w->screen->display, w->state, w->id);
+	} else {
+        if (gw->inputRects) {
+			XShapeCombineRectangles(w->screen->display->display, w->id,
+					ShapeInput, 0, 0, gw->inputRects, gw->nInputRects,
+					ShapeSet, gw->inputRectOrdering);
+
+		    gw->inputRects = NULL;
+			gw->nInputRects = 0;
+			gw->inputRectOrdering = 0;
+		}
+		if (gw->frameWindow) {
+			XMapWindow(w->screen->display->display, gw->frameWindow);
+			gw->frameWindow = None;
+		}
+
+		w->state &= ~(CompWindowStateSkipPagerMask | CompWindowStateSkipTaskbarMask);
+		w->state |= gw->skipState;
+		setWindowState(w->screen->display, w->state, w->id);
+		gw->skipState = 0;
+	}
+}
+
+/*
  * groupShowDelayTimeout
  *
  */
@@ -552,7 +600,7 @@
 		if(group->ungroupState == UngroupSingle && group->prevTopTab == NULL)
 		{
 			gs->queued = TRUE;
-			moveWindowOnscreen(topTab);
+			groupSetWindowVisibility(topTab, TRUE);
 			moveWindow(topTab, group->oldTopTabCenterX - WIN_X(topTab) - WIN_WIDTH(topTab) / 2, 
 				group->oldTopTabCenterY - WIN_Y(topTab) - WIN_HEIGHT(topTab) / 2, 
 				TRUE, TRUE); 
@@ -571,7 +619,7 @@
 	}
 
 	gs->queued = TRUE;
-	moveWindowOnscreen(topTab);
+	groupSetWindowVisibility(topTab, TRUE);
 	moveWindow(topTab, group->oldTopTabCenterX - WIN_X(topTab) - WIN_WIDTH(topTab) / 2, 
 		group->oldTopTabCenterY - WIN_Y(topTab) - WIN_HEIGHT(topTab) / 2, 
 		TRUE, TRUE); 
@@ -642,7 +690,7 @@
 		int oldChangeAnimationTime = group->changeAnimationTime;
 		
 		if (group->prevTopTab)
-			moveWindowOffscreen(PREV_TOP_TAB(group));
+			groupSetWindowVisibility(PREV_TOP_TAB(group), FALSE);
 			
 		group->prevTopTab = group->topTab;
 		group->changeState = PaintOff;
@@ -701,7 +749,7 @@
 		if (slot == group->topTab || !(gw->animateState & FINISHED_ANIMATION) || gw->ungroup)
 			continue;
 
-		moveWindowOffscreen(w);
+		groupSetWindowVisibility(w, FALSE);
 	}
 
 	group->changeTab = FALSE;
@@ -800,7 +848,7 @@
 			if (gw->ungroup)
 			{
 				gs->queued = TRUE;
-				moveWindowOnscreen(w);
+				groupSetWindowVisibility(w, TRUE);
 				moveWindow(w, group->oldTopTabCenterX - WIN_X(w) - WIN_WIDTH(w) / 2, 
 					group->oldTopTabCenterY - WIN_Y(w) - WIN_HEIGHT(w) / 2, 
 					TRUE, TRUE);
@@ -1490,7 +1538,7 @@
 		GROUP_WINDOW(cw);
 
 		gs->queued = TRUE;
-		moveWindowOnscreen(cw);
+		groupSetWindowVisibility(cw, TRUE);
 		moveWindow(cw, group->oldTopTabCenterX - WIN_X(cw) - WIN_WIDTH(cw) / 2, 
 			group->oldTopTabCenterY - WIN_Y(cw) - WIN_HEIGHT(cw) / 2, 
 			TRUE, TRUE);
Index: src/group/paint.c
===================================================================
--- src/group/paint.c	(Revision 4348)
+++ src/group/paint.c	(Arbeitskopie)
@@ -1236,7 +1236,6 @@
 		const CompTransform *transform,
 		Region region, unsigned int mask)
 {
-	FragmentAttrib fragment;
 	Bool status;
 	Bool doRotate;
 	GROUP_SCREEN(w->screen);
@@ -1288,8 +1287,6 @@
 		gAttrib.opacity = gAttrib.opacity * opacity / 100; 
 	}            
 	
-	initFragmentAttrib(&fragment, &gAttrib);
-
 	doRotate = gw->group && (gw->group->changeState != PaintOff) &&
 		(IS_TOP_TAB(w, gw->group) || IS_PREV_TOP_TAB(w, gw->group));
 
@@ -1319,6 +1316,9 @@
 		mask |= PAINT_WINDOW_TRANSFORMED_MASK;
 	}
 
+	if (gw->inputRects)
+		mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
+
 	UNWRAP(gs, w->screen, paintWindow);
 	
 	status = (*w->screen->paintWindow) (w, &gAttrib, &wTransform, region, mask);
Index: src/group/group.c
===================================================================
--- src/group/group.c	(Revision 4348)
+++ src/group/group.c	(Arbeitskopie)
@@ -322,7 +322,7 @@
 				CompWindow *lw = group->windows[0];
 
 				gs->queued = TRUE;
-				moveWindowOnscreen(lw);
+				groupSetWindowVisibility(lw, TRUE);
 				moveWindow(lw, group->oldTopTabCenterX - WIN_X(lw) - WIN_WIDTH(lw) / 2, 
 					group->oldTopTabCenterY - WIN_Y(lw) - WIN_HEIGHT(lw) / 2, TRUE, TRUE);
 				syncWindowPosition(lw);
@@ -926,7 +926,7 @@
 					tmpGroup->oldTopTabCenterY = WIN_Y(tw) + WIN_HEIGHT(tw) / 2;
 
 					gs->queued = TRUE;
-					moveWindowOnscreen(gs->draggedSlot->window);
+					groupSetWindowVisibility(gs->draggedSlot->window, TRUE);
 					moveWindow(gs->draggedSlot->window, 
 							gw->group->oldTopTabCenterX - WIN_X(gs->draggedSlot->window) - WIN_WIDTH(gs->draggedSlot->window) / 2, 
 							gw->group->oldTopTabCenterY - WIN_Y(gs->draggedSlot->window) - WIN_HEIGHT(gs->draggedSlot->window) / 2,