Merge lp:~thomas-voss/compiz-core/fix-globals-simplified into lp:compiz-core/0.9.5

[Thomas Voß]

Move the globals definitions into a separate file

[Alan Griffiths (alan-griffiths)]

There seems to be a lot shown in the diff that isn't about moving global variables. (That bit seems fine.)

[Daniel van Vugt (vanvugt)]

Please remove all the changes unrelated to the globals clean-up in question.

It looks like lots of them crept in from:
https://code.launchpad.net/~thomas-voss/compiz-core/CompizOptionRework/+merge/87714

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

I'm not sure it's appropriate to be changing the compiz command line parameters in this proposal:

106 - "[--use-root-window] "

114 - else if (!strcmp (argv[i], "--use-root-window"))
115 - {
116 - useCow = false;
117 - }

If you want to remove "useCow" then it should be done in a separate proposal, and also plugins/composite/src/* would need to be updated to no longer reference useCow.

review: Needs Fixing

[lp:~thomas-voss/compiz-core/fix-globals-simplified]

2922. By Thomas Voß on 2012-01-19

Re-enabled command-line flag --use-root-window and defined the variable in main.cpp.

[Thomas Voß (thomas-voss)]

> I'm not sure it's appropriate to be changing the compiz command line
> parameters in this proposal:
>

Reverted that change and added a comment in the code.

> If you want to remove "useCow" then it should be done in a separate proposal,
> and also plugins/composite/src/* would need to be updated to no longer
> reference useCow.

Ack.

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

> 106 - "[--use-root-window] "

> 114 - else if (!strcmp (argv[i], "--use-root-window"))
> 115 - {
> 116 - useCow = false;
> 117 - }

> If you want to remove "useCow" then it should be done in a separate proposal, and also plugins/composite/src/* would need to be updated to no longer reference useCow.

Support for drawing directly to the root window should be removed. The composite overlay window is the correct way to do it. This was added in 2006 ! http://lists.x.org/archives/xorg-arch/2006-February/000437.html

[Daniel van Vugt (vanvugt)]

OK, moving the useCow / --use-root-window discussion to bug 919023.

[Daniel van Vugt (vanvugt)]

While the diff looks OK on the web page, I get a conflict and then build failures (after I fixed the conflict) when merged with lp:compiz-core.

Please fix the conflict and build failures by merging the latest lp:compiz-core into your branch. Test everything builds and that nothing unrelated to the globals cleanup has crept in.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

Seems OK now

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-19 11:30:31 +0000
+++ src/CMakeLists.txt	2012-01-19 11:30:31 +0000
@@ -60,6 +60,7 @@
 )
 
 add_library (compiz_core
+	${CMAKE_CURRENT_SOURCE_DIR}/global.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/region.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/atoms.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/actions.cpp

=== added file 'src/global.cpp'
--- src/global.cpp	1970-01-01 00:00:00 +0000
+++ src/global.cpp	2012-01-19 11:30:31 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Thomas Voss <[e-mail]>
+ */
+
+#include <list>
+
+#include "core/string.h"
+
+class CompWindow;
+
+char *programName;
+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;
+
+std::list <CompString> initialPlugins;
+
+unsigned int pluginClassHandlerIndex = 0;

=== modified file 'src/main.cpp'
--- src/main.cpp	2012-01-19 06:08:11 +0000
+++ src/main.cpp	2012-01-19 11:30:31 +0000
@@ -37,28 +37,14 @@
 #include "privatescreen.h"
 #include "privatestackdebugger.h"
 
-char *programName;
-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;
+/*
+ * The extern declaration of useCow
+ * is in plugins/composite/src/privates.h.
+ * It needs to be defined here to
+ * make it visible to the command line parser.
+ */
 bool useCow = true;
 
-std::list <CompString> initialPlugins;
-
-unsigned int pluginClassHandlerIndex = 0;
-
 void
 CompManager::usage ()
 {

=== removed file 'src/tests/globals.h'
--- src/tests/globals.h	2012-01-19 11:30:31 +0000
+++ src/tests/globals.h	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-#ifndef GLOBALS_H
-#define GLOBALS_H
-
-char *programName;
-char **programArgv;
-int  programArgc;
-
-bool shutDown = false;
-bool restartSignal = false;
-
-CompWindow *lastFoundWindow = 0;
-
-bool replaceCurrentWm = false;
-bool indirectRendering = false;
-bool noDetection = false;
-bool useDesktopHints = false;
-bool debugOutput = false;
-bool useCow = true;
-
-std::list <CompString> initialPlugins;
-
-unsigned int pluginClassHandlerIndex = 0;
-
-#endif // GLOBALS_H

=== modified file 'src/tests/option.cpp'
--- src/tests/option.cpp	2012-01-19 11:30:31 +0000
+++ src/tests/option.cpp	2012-01-19 11:30:31 +0000
@@ -5,8 +5,6 @@
 #include "core/match.h"
 #include "core/option.h"
 
-#include "globals.h"
-
 namespace {
     template<typename T>
     void