Merge lp:~smspillaz/compiz-core/compiz-core.dropuseless-switches into lp:compiz-core/0.9.5

[Sam Spilsbury]

Drop useless command line switches

    Drop some unused globals and command line switchers, notable changes

    --indirect-rendering : There isn't a sane usecase for this anymore
    apart from remote compositing. Enable it automatically if needed, otherwise
    force direct rendering

    --use-root-window : Composite Overlay Window support was added to the server
    six years ago. We can drop this

    --background-image : Use the wallpaper plugin

    --no-detection : Use ccsm

[Thomas Voß (thomas-voss)]

Cannot compile the branch due to:

[ 0%] Built target decoration
[ 0%] Built target compiz.desktop
[ 1%] Generating /tmp/compiz-core.dropuseless-switches/po/compiz.pot
can't open ./../plugins/ini/ini.xml.in: No such file or directory at /usr/bin/intltool-extract line 212.
xgettext: error while opening "../plugins/ini/ini.xml.in.h" for reading: No such file or directory
ERROR: xgettext failed to generate PO template file. Please consult
       error message above if there is any.
make[2]: *** [/tmp/compiz-core.dropuseless-switches/po/compiz.pot] Error 1
make[1]: *** [po/CMakeFiles/nls.dir/all] Error 2
make: *** [all] Error 2

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

Deleting dead code - cool

review: Approve

[Alan Griffiths (alan-griffiths)]

Confirm the build error

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

This builds, merges and runs cleanly, the build error was due to the fact that it was based on a trunk that wasn't building.

Changing back to approved given that it was already previously approved.

review: Approve

=== modified file 'plugins/composite/src/privates.h'
--- plugins/composite/src/privates.h	2011-12-19 12:52:16 +0000
+++ plugins/composite/src/privates.h	2012-01-23 18:50:37 +0000
@@ -35,11 +35,6 @@
 
 #include "composite_options.h"
 
-#if COMPOSITE_MAJOR > 0 || COMPOSITE_MINOR > 2
-#define USE_COW
-extern bool       useCow;
-#endif
-
 extern CompPlugin::VTable *compositeVTable;
 
 extern CompWindow *lastDamagedWindow;

=== modified file 'plugins/composite/src/screen.cpp'
--- plugins/composite/src/screen.cpp	2012-01-20 09:05:56 +0000
+++ plugins/composite/src/screen.cpp	2012-01-23 18:50:37 +0000
@@ -249,12 +249,8 @@
 
 CompositeScreen::~CompositeScreen ()
 {
-#ifdef USE_COW
-    if (useCow)
-	XCompositeReleaseOverlayWindow (screen->dpy (),
-					screen->root ());
-#endif
-
+    XCompositeReleaseOverlayWindow (screen->dpy (),
+				    screen->root ());
     delete priv;
 }
 
@@ -485,8 +481,7 @@
 void
 CompositeScreen::showOutputWindow ()
 {
-#ifdef USE_COW
-    if (useCow && priv->pHnd)
+    if (priv->pHnd)
     {
 	Display       *dpy = screen->dpy ();
 	XserverRegion region;
@@ -506,37 +501,28 @@
 
 	damageScreen ();
     }
-#endif
-
 }
 
 void
 CompositeScreen::hideOutputWindow ()
 {
-#ifdef USE_COW
-    if (useCow)
-    {
-	Display       *dpy = screen->dpy ();
-	XserverRegion region;
-
-	region = XFixesCreateRegion (dpy, NULL, 0);
-
-	XFixesSetWindowShapeRegion (dpy,
-				    priv->output,
-				    ShapeBounding,
-				    0, 0, region);
-
-	XFixesDestroyRegion (dpy, region);
-    }
-#endif
-
+    Display       *dpy = screen->dpy ();
+    XserverRegion region;
+
+    region = XFixesCreateRegion (dpy, NULL, 0);
+
+    XFixesSetWindowShapeRegion (dpy,
+				priv->output,
+				ShapeBounding,
+				0, 0, region);
+
+    XFixesDestroyRegion (dpy, region);
 }
 
 void
 CompositeScreen::updateOutputWindow ()
 {
-#ifdef USE_COW
-    if (useCow && priv->pHnd)
+    if (priv->pHnd)
     {
 	Display       *dpy = screen->dpy ();
 	XserverRegion region;
@@ -563,24 +549,16 @@
 
 	XFixesDestroyRegion (dpy, region);
     }
-#endif
 
 }
 
 void
 PrivateCompositeScreen::makeOutputWindow ()
 {
-#ifdef USE_COW
-    if (useCow)
-    {
-	overlay = XCompositeGetOverlayWindow (screen->dpy (), screen->root ());
-	output  = overlay;
+    overlay = XCompositeGetOverlayWindow (screen->dpy (), screen->root ());
+    output  = overlay;
 
-	XSelectInput (screen->dpy (), output, ExposureMask);
-    }
-    else
-#endif
-	output = overlay = screen->root ();
+    XSelectInput (screen->dpy (), output, ExposureMask);
 
     cScreen->hideOutputWindow ();
 }
@@ -843,11 +821,8 @@
 PrivateCompositeScreen::outputChangeNotify ()
 {
     screen->outputChangeNotify ();
-#ifdef USE_COW
-    if (useCow)
-	XMoveResizeWindow (screen->dpy (), overlay, 0, 0,
-			   screen->width (), screen->height ());
-#endif
+    XMoveResizeWindow (screen->dpy (), overlay, 0, 0,
+		       screen->width (), screen->height ());
     cScreen->damageScreen ();
 }
 

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2012-01-20 09:05:56 +0000
+++ plugins/opengl/src/screen.cpp	2012-01-23 18:50:37 +0000
@@ -95,15 +95,27 @@
     const char           *glRenderer;
     CompOption::Vector o (0);
 
-    priv->ctx = glXCreateContext (dpy, visinfo, NULL, !indirectRendering);
+    priv->ctx = glXCreateContext (dpy, visinfo, NULL, false);
     if (!priv->ctx)
     {
-	compLogMessage ("opengl", CompLogLevelFatal,
-			"glXCreateContext failed");
-	XFree (visinfo);
-
-	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	return false;
+	compLogMessage ("opengl", CompLogLevelWarn,
+			"glXCreateContext with direct rendering failed - trying indirect");
+
+	/* force Mesa libGL into indirect rendering mode, because
+	   glXQueryExtensionsString is context-independant */
+	setenv ("LIBGL_ALWAYS_INDIRECT", "1", True);
+	priv->ctx = glXCreateContext(dpy, visinfo, NULL, true);
+
+	if (!priv->ctx)
+	{
+	    compLogMessage ("opengl", CompLogLevelWarn,
+			    "glXCreateContext failed");
+
+	    XFree (visinfo);
+
+	    screen->handleCompizEvent ("opengl", "fatal_fallback", o);
+	    return false;
+	}
     }
 
     XFree (visinfo);
@@ -299,13 +311,6 @@
     XWindowAttributes    attr;
     CompOption::Vector o (0);
 
-    if (indirectRendering)
-    {
-	/* force Mesa libGL into indirect rendering mode, because
-	   glXQueryExtensionsString is context-independant */
-	setenv ("LIBGL_ALWAYS_INDIRECT", "1", True);
-    }
-
     if (!XGetWindowAttributes (dpy, s->root (), &attr))
     {
 	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
@@ -850,61 +855,51 @@
     if (backgroundTextures.empty ())
     {
 	CompSize   size;
-	if (backgroundImage)
-	{
-	    CompString fileName (backgroundImage);
-	    CompString pname ("");
-
-	    backgroundTextures = GLTexture::readImageToTexture (fileName, pname, size);
-	}
-	else
-	{
-	    /* Try to get the root window background */
-	    XGCValues gcv;
-	    GC        gc;
-
-	    gcv.graphics_exposures = false;
-	    gcv.subwindow_mode = IncludeInferiors;
-	    gc = XCreateGC (screen->dpy (), screen->root (),
-			    GCGraphicsExposures | GCSubwindowMode, &gcv);
-
-	    if (rootPixmapSize.width () != screen->width () ||
-		rootPixmapSize.height () != screen->height ())
-	    {
-		if (rootPixmapCopy)
-		    XFreePixmap (screen->dpy (), rootPixmapCopy);
-
-		rootPixmapSize = CompSize (screen->width (), screen->height ());
-
-		rootPixmapCopy = XCreatePixmap (screen->dpy (), screen->root (),
-						rootPixmapSize.width (), rootPixmapSize.height (),
-						DefaultDepth (screen->dpy (), DefaultScreen (screen->dpy ())));
-
-		backgroundTextures =
-		GLTexture::bindPixmapToTexture (rootPixmapCopy, rootPixmapSize.width (), rootPixmapSize.height (),
-						DefaultDepth (screen->dpy (), DefaultScreen (screen->dpy ())));
-
-		if (backgroundTextures.empty ())
-		{
-		    compLogMessage ("core", CompLogLevelWarn,
-				    "Couldn't bind background pixmap 0x%x to "
-				    "texture", (int) screen->width ());
-		}
-	    }
-
+	/* Try to get the root window background */
+	XGCValues gcv;
+	GC        gc;
+
+	gcv.graphics_exposures = false;
+	gcv.subwindow_mode = IncludeInferiors;
+	gc = XCreateGC (screen->dpy (), screen->root (),
+			GCGraphicsExposures | GCSubwindowMode, &gcv);
+
+	if (rootPixmapSize.width () != screen->width () ||
+	    rootPixmapSize.height () != screen->height ())
+	{
 	    if (rootPixmapCopy)
-	    {
-		XCopyArea (screen->dpy (), screen->root (), rootPixmapCopy, gc,
-			   0, 0, screen->width (), screen->height (), 0, 0);
-		XSync (screen->dpy (), false);
-	    }
-	    else
-	    {
-		backgroundTextures.clear ();
-	    }
-
-	    XFreeGC(dpy, gc);  
-	}
+		XFreePixmap (screen->dpy (), rootPixmapCopy);
+
+	    rootPixmapSize = CompSize (screen->width (), screen->height ());
+
+	    rootPixmapCopy = XCreatePixmap (screen->dpy (), screen->root (),
+					    rootPixmapSize.width (), rootPixmapSize.height (),
+					    DefaultDepth (screen->dpy (), DefaultScreen (screen->dpy ())));
+
+	    backgroundTextures =
+	    GLTexture::bindPixmapToTexture (rootPixmapCopy, rootPixmapSize.width (), rootPixmapSize.height (),
+					    DefaultDepth (screen->dpy (), DefaultScreen (screen->dpy ())));
+
+	    if (backgroundTextures.empty ())
+	    {
+		compLogMessage ("core", CompLogLevelWarn,
+				"Couldn't bind background pixmap 0x%x to "
+				"texture", (int) screen->width ());
+	    }
+	}
+
+	if (rootPixmapCopy)
+	{
+	    XCopyArea (screen->dpy (), screen->root (), rootPixmapCopy, gc,
+		       0, 0, screen->width (), screen->height (), 0, 0);
+	    XSync (screen->dpy (), false);
+	}
+	else
+	{
+	    backgroundTextures.clear ();
+	}
+
+	XFreeGC(dpy, gc);
     }
 
     if (!backgroundTextures.empty ())

=== modified file 'src/global.cpp'
--- src/global.cpp	2012-01-19 11:25:58 +0000
+++ src/global.cpp	2012-01-23 18:50:37 +0000
@@ -33,16 +33,11 @@
 char **programArgv;
 int  programArgc;
 
-char *backgroundImage = NULL;
-
-bool shutDown = false;
 bool restartSignal = false;
 
 CompWindow *lastFoundWindow = 0;
 
 bool replaceCurrentWm = false;
-bool indirectRendering = false;
-bool noDetection = false;
 bool useDesktopHints = false;
 bool debugOutput = false;
 

=== modified file 'src/main.cpp'
--- src/main.cpp	2012-01-23 17:45:39 +0000
+++ src/main.cpp	2012-01-23 18:50:37 +0000
@@ -51,13 +51,9 @@
     printf ("Usage: %s "
 	    "[--replace] "
 	    "[--display DISPLAY]\n       "
-	    "[--indirect-rendering] "
 	    "[--sm-disable] "
 	    "[--sm-client-id ID]\n       "
-	    "[--bg-image PNG] "
-	    "[--no-detection] "
 	    "[--keep-desktop-hints]\n       "
-	    "[--use-root-window] "
 	    "[--debug] "
 	    "[--version] "
 	    "[--help] "
@@ -101,18 +97,10 @@
 	    if (i + 1 < argc)
 		displayName = argv[++i];
 	}
-	else if (!strcmp (argv[i], "--indirect-rendering"))
-	{
-	    indirectRendering = true;
-	}
 	else if (!strcmp (argv[i], "--keep-desktop-hints"))
 	{
 	    useDesktopHints = true;
 	}
-	else if (!strcmp (argv[i], "--use-root-window"))
-	{
-	    useCow = false;
-	}
 	else if (!strcmp (argv[i], "--replace"))
 	{
 	    replaceCurrentWm = true;
@@ -126,15 +114,6 @@
 	    if (i + 1 < argc)
 		clientId = argv[++i];
 	}
-	else if (!strcmp (argv[i], "--no-detection"))
-	{
-	    noDetection = true;
-	}
-	else if (!strcmp (argv[i], "--bg-image"))
-	{
-	    if (i + 1 < argc)
-		backgroundImage = argv[++i];
-	}
 	else if (*argv[i] == '-')
 	{
 	    compLogMessage ("core", CompLogLevelWarn,

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2012-01-21 13:34:31 +0000
+++ src/privatescreen.h	2012-01-23 18:50:37 +0000
@@ -55,11 +55,6 @@
 extern CompWindow *lastFoundWindow;
 extern bool	  useDesktopHints;
 
-extern bool inHandleEvent;
-
-extern CompScreen *targetScreen;
-extern CompOutput *targetOutput;
-
 extern std::list <CompString> initialPlugins;
 
 

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-01-23 17:40:11 +0000
+++ src/screen.cpp	2012-01-23 18:50:37 +0000
@@ -60,11 +60,6 @@
 #include "privateaction.h"
 #include "privatestackdebugger.h"
 
-bool inHandleEvent = false;
-
-bool screenInitalized = false;
-
-CompScreen *targetScreen = NULL;
 CompOutput *targetOutput;
 
 int lastPointerX = 0;
@@ -74,6 +69,13 @@
 int pointerY     = 0;
 unsigned int pointerMods = 0;
 
+namespace
+{
+bool inHandleEvent = false;
+
+bool screenInitalized = false;
+}
+
 #define MwmHintsFunctions   (1L << 0)
 #define MwmHintsDecorations (1L << 1)
 #define PropMotifWmHintElements 3
@@ -118,17 +120,17 @@
     {
 	case SIGINT:
 	case SIGTERM:
-	    shutDown = true;
+	    mainloop->quit ();
 	    break;
 	case SIGHUP:
 	    restartSignal = true;
+	    mainloop->quit ();
 	    break;
 	default:
 	    break;
     }
 
-    if (shutDown || restartSignal)
-	mainloop->quit ();
+    mainloop->quit ();
 }
 
 void
@@ -629,7 +631,7 @@
 	    return screen->updateDefaultIcon ();
 	    break;
 	case CoreOptions::Outputs:
-	    if (!noDetection && optionGetDetectOutputs ())
+	    if (optionGetDetectOutputs ())
 		return false;
 	    updateOutputDevices ();
 	    break;
@@ -1110,7 +1112,7 @@
 	wmSnAtom != event->xselectionclear.selection)
 	return;
 
-    shutDown = true;
+    mainloop->quit ();
 }
 
 #define IMAGEDIR "images"
@@ -1926,7 +1928,7 @@
 void
 PrivateScreen::detectOutputDevices ()
 {
-    if (!noDetection && optionGetDetectOutputs ())
+    if (optionGetDetectOutputs ())
     {
 	CompString	  name;
 	CompOption::Value value;