Apply core changes.

6 files changed, 0 insertions, 36 deletions

diff --git a/flyingwindows.cpp b/flyingwindows.cpp
index 42c53b8..bc18b3a 100644
--- a/flyingwindows.cpp
+++ b/flyingwindows.cpp
@@ -253,22 +253,6 @@ void ScreenFlyingWindows::paintTransformedOutput(	const ScreenPaintAttrib* sAttr
 		glEnable (GL_CULL_FACE);
 }
 
-void ScreenFlyingWindows::paintBackground( Region region, unsigned int mask )
-{
-	glColor4us (0xffff, 0xffff, 0xffff, ss->desktopOpacity);
-	glEnable (GL_BLEND);
-	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-	
-	mask |= PAINT_BACKGROUND_ON_TRANSFORMED_SCREEN_MASK;
-	ScreenEffect::paintBackground( region, mask );
-	
-	glColor3usv (defaultColor);
-	glDisable (GL_BLEND);
-	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	screenTexEnvMode(s, GL_REPLACE);
-}
-
 WindowFlyingWindows::WindowFlyingWindows( CompWindow* w ) :
 	WindowEffect(w),
 	active( FALSE ),
diff --git a/flyingwindows.h b/flyingwindows.h
index c2c8dd4..de6ac0c 100644
--- a/flyingwindows.h
+++ b/flyingwindows.h
@@ -31,7 +31,6 @@ public:
 	virtual void paintTransformedOutput(	const ScreenPaintAttrib* sAttrib, \
 											const CompTransform* transform, Region region, \
 											CompOutput *output, unsigned int mask);
-	virtual void paintBackground( Region region, unsigned int mask );
 private:
 	void initWindow( CompWindow* _w );
 	void recalcVertices( CompWindow* _w );
diff --git a/screensaver.cpp b/screensaver.cpp
index 5f5739f..45c4219 100644
--- a/screensaver.cpp
+++ b/screensaver.cpp
@@ -209,14 +209,6 @@ void screenSaverPaintScreen (CompScreen   *s,
     ss->effect->paintScreen (outputs, numOutputs, mask);
 }
 
-void screenSaverPaintBackground (CompScreen *s,
-				     Region	  region,
-				     unsigned int mask)
-{
-	SCREENSAVER_SCREEN(s);
-	ss->effect->paintBackground( region, mask );
-}
-
 static void screenSaverSetXScreenSaver( CompDisplay *d, Bool enable )
 {
 	SCREENSAVER_DISPLAY(d);
@@ -321,7 +313,6 @@ screenSaverInitScreen (CompPlugin *p,
 	WRAP (ss, s, paintOutput, screenSaverPaintOutput);
 	WRAP (ss, s, paintWindow, screenSaverPaintWindow);
 	WRAP (ss, s, paintTransformedOutput, screenSaverPaintTransformedOutput);
-	WRAP (ss, s, paintBackground, screenSaverPaintBackground);
 	WRAP (ss, s, paintScreen, screenSaverPaintScreen);
 
 	return TRUE;
@@ -338,7 +329,6 @@ screenSaverFiniScreen (CompPlugin *p,
 	UNWRAP (ss, s, paintOutput);
 	UNWRAP (ss, s, paintWindow);
 	UNWRAP (ss, s, paintTransformedOutput);
-	UNWRAP (ss, s, paintBackground);
 	UNWRAP (ss, s, paintScreen);
 	
 	delete ss->effect;
diff --git a/screensaver_internal.h b/screensaver_internal.h
index 8c430b7..a4cd427 100644
--- a/screensaver_internal.h
+++ b/screensaver_internal.h
@@ -75,7 +75,6 @@ typedef struct _ScreenSaverScreen {
 	PaintOutputProc				paintOutput;
 	PaintWindowProc				paintWindow;
 	PaintTransformedOutputProc	paintTransformedOutput;
-	PaintBackgroundProc			paintBackground;
 	PaintScreenProc                 paintScreen;
 	
 	// time is stored to calculate progress when fadingIn or fadingOut
diff --git a/wrapper.cpp b/wrapper.cpp
index a4dc44f..66c4ce9 100644
--- a/wrapper.cpp
+++ b/wrapper.cpp
@@ -69,13 +69,6 @@ void ScreenWrapper::paintScreen (CompOutput *outputs, int numOutputs, unsigned i
     WRAP (ss, s, paintScreen, screenSaverPaintScreen);
 }
 
-void ScreenWrapper::paintBackground( Region region, unsigned int mask )
-{
-	UNWRAP( ss, s, paintBackground );
-	s->paintBackground( s, region, mask );
-	WRAP( ss, s, paintBackground, screenSaverPaintBackground );
-}
-
 WindowWrapper::WindowWrapper( CompWindow* w )
 {
 	SCREENSAVER_WINDOW(w);
diff --git a/wrapper.h b/wrapper.h
index 9bc22b3..fadf4bf 100644
--- a/wrapper.h
+++ b/wrapper.h
@@ -31,7 +31,6 @@ public:
 	virtual Bool paintOutput(	const ScreenPaintAttrib *sAttrib, \
 								const CompTransform* transform, Region region, \
 								CompOutput* output, unsigned int mask);
-	virtual void paintBackground( Region region, unsigned int mask );
 	virtual void paintScreen (CompOutput   *outputs,
 				  int          numOutputs,
 				  unsigned int mask);