Anonymous

Index: src/group/init.c
===================================================================
--- src/group/init.c	(Revision 3167)
+++ src/group/init.c	(Arbeitskopie)
@@ -58,9 +58,9 @@
 
 	initCornerPoints(gd);
 
-	WRAP(gd, d, handleEvent, groupHandleEvent);
+//	WRAP(gd, d, handleEvent, groupHandleEvent);
 
-	gd->timeoutHandle = compAddTimeout (UPDATE_TAB_BAR_INTERVAL, groupUpdateTabBars, d);
+//	gd->timeoutHandle = compAddTimeout (UPDATE_TAB_BAR_INTERVAL, groupUpdateTabBars, d);
 
 	d->privates[displayPrivateIndex].ptr = gd;
 
@@ -89,9 +89,9 @@
 	}
 	freeScreenPrivateIndex(d, gd->screenPrivateIndex);
 
-	UNWRAP(gd, d, handleEvent);
+//	UNWRAP(gd, d, handleEvent);
 	
-	compRemoveTimeout(gd->timeoutHandle);
+//	compRemoveTimeout(gd->timeoutHandle);
 
 	free(gd);
 }
@@ -120,7 +120,7 @@
 	groupScreenInitOptions(gs);
 
 	gs->wMask=compWindowTypeMaskFromStringList(&gs->opt[GROUP_SCREEN_OPTION_TYPES].value);
-
+/*
 	addScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_SELECT].value.action);
 	addScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_SELECT_SINGLE].value.action);
 	addScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_GROUPING].value.action);
@@ -131,21 +131,21 @@
 	addScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_TABMODE].value.action);
 	addScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_CHANGE_TAB_LEFT].value.action);
 	addScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_CHANGE_TAB_RIGHT].value.action);
+*/
+//	WRAP(gs, s, windowMoveNotify, groupWindowMoveNotify);
+//	WRAP(gs, s, windowResizeNotify, groupWindowResizeNotify);
+//	WRAP(gs, s, getOutputExtentsForWindow, groupGetOutputExtentsForWindow);
+//	WRAP(gs, s, preparePaintScreen, groupPreparePaintScreen);
+//	WRAP(gs, s, paintScreen, groupPaintScreen);
+//	WRAP(gs, s, drawWindow, groupDrawWindow);
+//	WRAP(gs, s, paintWindow, groupPaintWindow);
+//	WRAP(gs, s, paintTransformedScreen, groupPaintTransformedScreen);
+//	WRAP(gs, s, donePaintScreen, groupDonePaintScreen);
+//	WRAP(gs, s, windowGrabNotify, groupWindowGrabNotify);
+//	WRAP(gs, s, windowUngrabNotify, groupWindowUngrabNotify);
+//	WRAP(gs, s, damageWindowRect, groupDamageWindowRect);
+//	WRAP(gs, s, windowStateChangeNotify, groupWindowStateChangeNotify);
 
-	WRAP(gs, s, windowMoveNotify, groupWindowMoveNotify);
-	WRAP(gs, s, windowResizeNotify, groupWindowResizeNotify);
-	WRAP(gs, s, getOutputExtentsForWindow, groupGetOutputExtentsForWindow);
-	WRAP(gs, s, preparePaintScreen, groupPreparePaintScreen);
-	WRAP(gs, s, paintScreen, groupPaintScreen);
-	WRAP(gs, s, drawWindow, groupDrawWindow);
-	WRAP(gs, s, paintWindow, groupPaintWindow);
-	WRAP(gs, s, paintTransformedScreen, groupPaintTransformedScreen);
-	WRAP(gs, s, donePaintScreen, groupDonePaintScreen);
-	WRAP(gs, s, windowGrabNotify, groupWindowGrabNotify);
-	WRAP(gs, s, windowUngrabNotify, groupWindowUngrabNotify);
-	WRAP(gs,s,damageWindowRect,groupDamageWindowRect);
-	WRAP(gs,s,windowStateChangeNotify,groupWindowStateChangeNotify);
-
 	s->privates[gd->screenPrivateIndex].ptr = gs;
 
 	gs->grabIndex = 0;
@@ -184,7 +184,7 @@
 	GROUP_SCREEN(s);
 	GROUP_DISPLAY(s->display);
 	freeWindowPrivateIndex(s, gs->windowPrivateIndex);
-
+/*
 	removeScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_SELECT].value.action);
 	removeScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_SELECT_SINGLE].value.action);
 	removeScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_GROUPING].value.action);
@@ -195,21 +195,21 @@
 	removeScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_TABMODE].value.action);
 	removeScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_CHANGE_TAB_LEFT].value.action);
 	removeScreenAction(s, &gd->opt[GROUP_DISPLAY_OPTION_CHANGE_TAB_RIGHT].value.action);
+*/
+//	UNWRAP(gs, s, windowMoveNotify);
+//	UNWRAP(gs, s, windowResizeNotify);
+//	UNWRAP(gs, s, getOutputExtentsForWindow);
+//	UNWRAP(gs, s, preparePaintScreen);
+//	UNWRAP(gs, s, paintScreen);
+//	UNWRAP(gs, s, drawWindow);
+//	UNWRAP(gs, s, paintWindow);
+//	UNWRAP(gs, s, paintTransformedScreen);
+//	UNWRAP(gs, s, donePaintScreen);
+//	UNWRAP(gs, s, windowGrabNotify);
+//	UNWRAP(gs, s, windowUngrabNotify);
+//	UNWRAP(gs, s, damageWindowRect);
+//	UNWRAP(gs, s, windowStateChangeNotify);
 
-	UNWRAP(gs, s, windowMoveNotify);
-	UNWRAP(gs, s, windowResizeNotify);
-	UNWRAP(gs, s, getOutputExtentsForWindow);
-	UNWRAP(gs, s, preparePaintScreen);
-	UNWRAP(gs, s, paintScreen);
-	UNWRAP(gs, s, drawWindow);
-	UNWRAP(gs, s, paintWindow);
-	UNWRAP(gs, s, paintTransformedScreen);
-	UNWRAP(gs, s, donePaintScreen);
-	UNWRAP(gs, s, windowGrabNotify);
-	UNWRAP(gs, s, windowUngrabNotify);
-	UNWRAP(gs,s,damageWindowRect);
-	UNWRAP(gs,s,windowStateChangeNotify);
-
 	finiTexture (s, &gs->glowTexture); 
 	free(gs);
 }
@@ -259,7 +259,7 @@
 	w->privates[gs->windowPrivateIndex].ptr = gw;
 
 	gw->glowQuads = NULL;
-	groupComputeGlowQuads (w, &gs->glowTexture.matrix);
+	//groupComputeGlowQuads (w, &gs->glowTexture.matrix);
 
 	return TRUE;
 }