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

[Sam Spilsbury]

Got rid of public externals and replaced them with a singleton.

[Alan Griffiths (alan-griffiths)]

Global variables are not good. But neither are singletons (for all the same reasons).

There seems to be no attempt to, for example, group related variables - so what problem does this solve?

AFAICS this increases coupling as anything that depended on the declaration of any one global variable now depends on the singleton.

The correct pattern to replace globals is "parameterise from above" not singleton.

(Also, this diff seems to have got mixed with the "variant" change.)

review: Disapprove

[Sam Spilsbury (smspillaz)]

58 + char * programName () const
59 + {
60 + return mProgramName;
61 + }
62 +
63 + void setProgramName (char * programName)
64 + {
65 + mProgramName = programName;
66 + }
67 +
68 + char** programArgv () const
69 + {
70 + return mProgramArgv;
71 + }
72 +
73 + void setProgramArgv (char ** argv)
74 + {
75 + mProgramArgv = argv;
76 + }

These are constant, so you only need getters for them and then they can be constructed in the constructor

88 + char * backgroundImage () const
89 + {
90 + return mBackgroundImage;
91 + }
92 +
93 + void setBackgroundImage (char * bgImage)
94 + {
95 + mBackgroundImage = bgImage;
96 + }

This command lind switch is redundant, so just remove it. I think the opengl plugin uses it but honestly who actually uses compiz and sets the background image manuallly. We already have the wallpaper plugin

48 + bool isDebugOutput () const
49 + {
50 + return mDebugOutput;
51 + }
52 +
53 + void setDebugOutput (bool isDebugOutput)
54 + {
55 + mDebugOutput = isDebugOutput;
56 + }

Something to consider later - we need to get a proper logging object in place, and then the level would be passed to the log object's constructor rather than conditionalizing on "debugOutput"

98 + bool replaceCurrentWm () const
99 + {
100 + return mReplaceCurrentWm;
101 + }
102 +
103 + void setReplaceCurrentWm (bool doReplace)
104 + {
105 + mReplaceCurrentWm = doReplace;
106 + }

I don't think there are any cases where the plugins need this tbh.

108 + bool indirectRendering () const
109 + {
110 + return mIndirectRendering;
111 + }
112 +
113 + void setIndirectRendering (bool isIndirectRendering)
114 + {
115 + mIndirectRendering = isIndirectRendering;
116 + }

Obsolete. Remove, also remove the related parts in the OpenGL plugin (but keep the fallback that detects for a direct context failing to be created)

148 + int lastPointerX () const
149 + {
150 + return mLastPointerX;
151 + }
152 +
153 + void setLastPointerX (int x)
154 + {
155 + mLastPointerX = x;
156 + }
157 +
158 + int lastPointerY () const
159 + {
160 + return mLastPointerY;
161 + }
162 +
163 + void setLastPointerY (int y)
164 + {
165 + mLastPointerY = y;
166 + }

168 + unsigned int lastPointerMods () const
169 + {
170 + return mLastPointerMods;
171 + }
172 +
173 + void setLastPointerMods (unsigned int mods)
174 + {
175 + mLastPointerMods = mods;
176 + }

In the future this needs to be a CompPoint, and ideally, removed alltogether

138 + ModifierHandler * modHandler () const
139 + {
140 + return mModHandler;
141 + }
142 +
143 + void setModHandler (ModifierHandler * handler)
144 + {
145 + mModHandler = handler;
146 + }

This is a singleton on its own, so feel free to make it one. There is only one plugin which depends on it

233 + CompWindow *lastFoundWindow () const
234 + {
235 + return mLastFoundWindow;
236 + }

This can be a local static variable in screen.cpp

208 + bool shutDown () const
209 + {
210 + return mShutDown;
211 + }
212 +
213 + void setShutDown (bool isShutDown)
214 + {
215 + mShutDown = isShutDown;
216 + }

I am 99% sure the only thing that uses this is the CompEventSource. It may not even be necessary now that we have a proper shutdown handler.

243 + void setInHandleEvent (bool i...

[Sam Spilsbury (smspillaz)]

Oh, and targetOutput is only used by the opengl plugin, so it can be moved there or removed alltogether.

[Alan Griffiths (alan-griffiths)]

Re Sam's comments: A good alternative to static members (which are visible to all translation units including the header) to is to put variable in an anonymous namespace in the .cpp file.

I still think a singleton makes things worse.

review: Abstain

Unmerged revisions

2921. By Thomas Voß on 2012-01-17

Removed all public externals and put them in a class CompGlobal.

2913. By Daniel van Vugt on 2012-01-16

Fixes focus being on the wrong window after viewport changes (LP: #896762)
Merged from lp:~smspillaz/compiz-core/fix_896762

2912. By Daniel van Vugt on 2012-01-16

Test harness for wrapsystem and some code initial cleanup.
Merged from lp:~alan-griffiths/compiz-core/wrapsystem

=== modified file 'include/core/global.h'
--- include/core/global.h	2011-12-19 07:06:22 +0000
+++ include/core/global.h	2012-01-18 06:49:24 +0000
@@ -25,13 +25,334 @@
 #ifndef _COMPIZ_GLOBAL_H
 #define _COMPIZ_GLOBAL_H
 
-/**
-* Flag indicating whether to produce debug output
-*/
-extern bool debugOutput;
-
-extern char       *programName;
-extern char       **programArgv;
-extern int        programArgc;
+#include <list>
+
+#include "core/string.h"
+
+class CompOutput;
+class CompScreen;
+class CompWindow;
+class ModifierHandler;
+
+class CompGlobal
+{
+public:
+
+    static CompGlobal & instance ()
+    {
+	static CompGlobal inst;
+	return inst;
+    }
+
+    bool isDebugOutput () const
+    {
+	return mDebugOutput;
+    }
+
+    void setDebugOutput (bool isDebugOutput)
+    {
+	mDebugOutput = isDebugOutput;
+    }
+
+    char * programName () const
+    {
+	return mProgramName;
+    }
+
+    void setProgramName (char * programName)
+    {
+	mProgramName = programName;
+    }
+
+    char** programArgv () const
+    {
+	return mProgramArgv;
+    }
+
+    void setProgramArgv (char ** argv)
+    {
+	mProgramArgv = argv;
+    }
+
+    int programArgc () const
+    {
+	return mProgramArgc;
+    }
+
+    void setProgramArgc (int argc)
+    {
+	mProgramArgc = argc;
+    }
+
+    char * backgroundImage () const
+    {
+	return mBackgroundImage;
+    }
+
+    void setBackgroundImage (char * bgImage)
+    {
+	mBackgroundImage = bgImage;
+    }
+
+    bool replaceCurrentWm () const
+    {
+	return mReplaceCurrentWm;
+    }
+
+    void setReplaceCurrentWm (bool doReplace)
+    {
+	mReplaceCurrentWm = doReplace;
+    }
+
+    bool indirectRendering () const
+    {
+	return mIndirectRendering;
+    }
+
+    void setIndirectRendering (bool isIndirectRendering)
+    {
+	mIndirectRendering = isIndirectRendering;
+    }
+
+    bool noDetection () const
+    {
+	return mNoDetection;
+    }
+
+    void setNoDetection (bool noDetection)
+    {
+	mNoDetection = noDetection;
+    }
+
+    CompScreen * screen () const
+    {
+	return mScreen;
+    }
+
+    void setScreen (CompScreen * screen)
+    {
+	mScreen = screen;
+    }
+
+    ModifierHandler * modHandler () const
+    {
+	return mModHandler;
+    }
+
+    void setModHandler (ModifierHandler * handler)
+    {
+	mModHandler = handler;
+    }
+
+    int lastPointerX () const
+    {
+	return mLastPointerX;
+    }
+
+    void setLastPointerX (int x)
+    {
+	mLastPointerX = x;
+    }
+
+    int lastPointerY () const
+    {
+	return mLastPointerY;
+    }
+
+    void setLastPointerY (int y)
+    {
+	mLastPointerY = y;
+    }
+
+    unsigned int lastPointerMods () const
+    {
+	return mLastPointerMods;
+    }
+
+    void setLastPointerMods (unsigned int mods)
+    {
+	mLastPointerMods = mods;
+    }
+
+    int pointerX () const
+    {
+	return mPointerX;
+    }
+
+    void setPointerX (int x)
+    {
+	mPointerX = x;
+    }
+
+    int pointerY () const
+    {
+	return mPointerY;
+    }
+
+    void setPointerY (int y)
+    {
+	mPointerY = y;
+    }
+
+    unsigned int pointerMods () const
+    {
+	return mPointerMods;
+    }
+
+    void setPointerMods (unsigned int mods)
+    {
+	mPointerMods = mods;
+    }
+
+    bool shutDown () const
+    {
+	return mShutDown;
+    }
+
+    void setShutDown (bool isShutDown)
+    {
+	mShutDown = isShutDown;
+    }
+
+    bool inHandleEvent () const
+    {
+	return mInHandleEvent;
+    }
+
+    std::list<CompString> & initialPlugins ()
+    {
+	return mInitialPlugins;
+    }
+
+    const std::list<CompString> & initialPlugins () const
+    {
+	return mInitialPlugins;
+    }
+
+    CompWindow *lastFoundWindow () const
+    {
+	return mLastFoundWindow;
+    }
+
+    bool restartSignal () const
+    {
+	return mRestartSignal;
+    }
+
+    void setInHandleEvent (bool inHandleEvent)
+    {
+	mInHandleEvent = inHandleEvent;
+    }
+
+    void setInitialPlugins (const std::list<CompString> & initialPlugins)
+    {
+	mInitialPlugins = initialPlugins;
+    }
+
+    void setLastFoundWindow (CompWindow *lastFoundWindow)
+    {
+	mLastFoundWindow = lastFoundWindow;
+    }
+
+    void setRestartSignal (bool restartSignal)
+    {
+	mRestartSignal = restartSignal;
+    }
+
+    void setTargetOutput (CompOutput *targetOutput)
+    {
+	mTargetOutput = targetOutput;
+    }
+
+    void setTargetScreen (CompScreen *targetScreen)
+    {
+	mTargetScreen = targetScreen;
+    }
+
+    void setUseDesktopHints (bool useDesktopHints)
+    {
+	mUseDesktopHints = useDesktopHints;
+    }
+
+    CompOutput *targetOutput () const
+    {
+	return mTargetOutput;
+    }
+
+    CompScreen *targetScreen () const
+    {
+	return mTargetScreen;
+    }
+
+    bool useDesktopHints () const
+    {
+	return mUseDesktopHints;
+    }
+private:
+    CompGlobal () :
+	    mDebugOutput(false),
+		    mProgramName(0),
+		    mProgramArgv(0),
+		    mProgramArgc(0),
+		    mBackgroundImage(0),
+		    mReplaceCurrentWm(false),
+		    mIndirectRendering(false),
+		    mNoDetection(false),
+		    mScreen(0),
+		    mModHandler(0),
+		    mLastPointerX(0),
+		    mLastPointerY(0),
+		    mLastPointerMods(0),
+		    mPointerX(0),
+		    mPointerY(0),
+		    mPointerMods(0),
+		    mShutDown(false),
+		    mRestartSignal(false),
+		    mLastFoundWindow(0),
+		    mUseDesktopHints(false),
+		    mInHandleEvent(false),
+		    mTargetScreen(0),
+		    mTargetOutput(0)
+    {
+    }
+
+    CompGlobal (const CompGlobal & rhs);
+    CompGlobal & operator= (const CompGlobal & rhs);
+    bool operator== (const CompGlobal & rhs) const;
+
+    bool mDebugOutput;
+
+    char *mProgramName;
+    char **mProgramArgv;
+    int mProgramArgc;
+
+    char * mBackgroundImage;
+    bool mReplaceCurrentWm;
+    bool mIndirectRendering;
+    bool mNoDetection;
+
+    CompScreen * mScreen;
+    ModifierHandler * mModHandler;
+
+    int mLastPointerX;
+    int mLastPointerY;
+    unsigned int mLastPointerMods;
+    int mPointerX;
+    int mPointerY;
+    unsigned int mPointerMods;
+
+    bool mShutDown;
+    bool mRestartSignal;
+
+    CompWindow *mLastFoundWindow;
+    bool mUseDesktopHints;
+
+    bool mInHandleEvent;
+
+    CompScreen * mTargetScreen;
+    CompOutput * mTargetOutput;
+
+    std::list<CompString> mInitialPlugins;
+};
 
 #endif // _COMPIZ_GLOBAL_H

=== modified file 'include/core/screen.h'
--- include/core/screen.h	2011-09-19 12:54:22 +0000
+++ include/core/screen.h	2012-01-18 06:49:24 +0000
@@ -45,6 +45,7 @@
 typedef std::list<CompWindow *> CompWindowList;
 typedef std::vector<CompWindow *> CompWindowVector;
 
+/*
 extern char       *backgroundImage;
 extern bool       replaceCurrentWm;
 extern bool       indirectRendering;
@@ -60,7 +61,7 @@
 extern int pointerX;
 extern int pointerY;
 extern unsigned int pointerMods;
-
+*/
 #define NOTIFY_CREATE_MASK (1 << 0)
 #define NOTIFY_DELETE_MASK (1 << 1)
 #define NOTIFY_MOVE_MASK   (1 << 2)

=== modified file 'plugins/annotate/src/annotate.cpp'
--- plugins/annotate/src/annotate.cpp	2010-07-02 03:00:14 +0000
+++ plugins/annotate/src/annotate.cpp	2012-01-18 06:49:24 +0000
@@ -468,8 +468,8 @@
     if (state & CompAction::StateInitKey)
         action->setState (action->state () | CompAction::StateTermKey);
 
-    annoLastPointerX = pointerX;
-    annoLastPointerY = pointerY;
+    annoLastPointerX = CompGlobal::instance ().pointerX ();
+    annoLastPointerY = CompGlobal::instance ().pointerY ();
 
     drawMode = EraseMode;
 
@@ -495,8 +495,8 @@
     if (state & CompAction::StateInitKey)
         action->setState (action->state () | CompAction::StateTermKey);
 
-    annoLastPointerX = pointerX;
-    annoLastPointerY = pointerY;
+    annoLastPointerX = CompGlobal::instance ().pointerX ();
+    annoLastPointerY = CompGlobal::instance ().pointerY ();
 
     drawMode = FreeDrawMode;
 
@@ -522,8 +522,8 @@
     if (state & CompAction::StateInitKey)
         action->setState (action->state () | CompAction::StateTermKey);
 
-    initialPointerX = pointerX;
-    initialPointerY = pointerY;
+    initialPointerX = CompGlobal::instance ().pointerX ();
+    initialPointerY = CompGlobal::instance ().pointerY ();
 
     drawMode = LineMode;
 
@@ -551,8 +551,8 @@
 
     drawMode = RectangleMode;
 
-    initialPointerX = pointerX;
-    initialPointerY = pointerY;
+    initialPointerX = CompGlobal::instance ().pointerX ();
+    initialPointerY = CompGlobal::instance ().pointerY ();
     rectangle.setGeometry (initialPointerX, initialPointerY, 0, 0);
     lastRect = rectangle;
 
@@ -580,8 +580,8 @@
 
     drawMode = EllipseMode;
 
-    initialPointerX = pointerX;
-    initialPointerY = pointerY;
+    initialPointerX = CompGlobal::instance ().pointerX ();
+    initialPointerY = CompGlobal::instance ().pointerY ();
     ellipse.radiusX = 0;
     ellipse.radiusY = 0;
     lastRect.setGeometry (initialPointerX, initialPointerY, 0, 0);
@@ -884,10 +884,10 @@
 {
     switch (event->type) {
     case MotionNotify:
-	handleMotionEvent (pointerX, pointerY);
+	handleMotionEvent (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
     case EnterNotify:
     case LeaveNotify:
-	handleMotionEvent (pointerX, pointerY);
+	handleMotionEvent (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
     default:
 	if (event->type == cScreen->damageEvent () + XDamageNotify)
 	{

=== modified file 'plugins/clone/src/clone.cpp'
--- plugins/clone/src/clone.cpp	2010-02-04 17:16:02 +0000
+++ plugins/clone/src/clone.cpp	2012-01-18 06:49:24 +0000
@@ -496,14 +496,14 @@
     {
 	case MotionNotify:
 	{
-	    CompPoint p (pointerX, pointerY);
+	    CompPoint p (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 	    handleMotionEvent (p);
 	}
 	break;
 	case EnterNotify:
 	case LeaveNotify:
 	{
-	    CompPoint p (pointerX, pointerY);
+	    CompPoint p (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 	    handleMotionEvent (p);
 	}
 	default:

=== modified file 'plugins/composite/src/screen.cpp'
--- plugins/composite/src/screen.cpp	2012-01-12 17:49:40 +0000
+++ plugins/composite/src/screen.cpp	2012-01-18 06:49:24 +0000
@@ -322,7 +322,7 @@
 
     if (currentCmSnOwner != None)
     {
-	if (!replaceCurrentWm)
+	if (!CompGlobal::instance ().replaceCurrentWm ())
 	{
 	    compLogMessage ("composite", CompLogLevelError,
 			    "Screen %d on display \"%s\" already "
@@ -648,7 +648,7 @@
 void
 PrivateCompositeScreen::detectRefreshRate ()
 {
-    if (!noDetection &&
+    if (!CompGlobal::instance ().noDetection () &&
 	optionGetDetectRefreshRate ())
     {
 	CompString        name;

=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2012-01-09 16:01:47 +0000
+++ plugins/move/src/move.cpp	2012-01-18 06:49:24 +0000
@@ -96,8 +96,8 @@
 	ms->x = 0;
 	ms->y = 0;
 
-	lastPointerX = x;
-	lastPointerY = y;
+	CompGlobal::instance ().setLastPointerX (x);
+	CompGlobal::instance ().setLastPointerY (y);
 
 	sourceExternalApp =
 	    CompOption::getBoolOptionNamed (options, "external", false);
@@ -141,7 +141,7 @@
 		xRoot = w->geometry ().x () + (w->size ().width () / 2);
 		yRoot = w->geometry ().y () + (w->size ().height () / 2);
 
-		s->warpPointer (xRoot - pointerX, yRoot - pointerY);
+		s->warpPointer (xRoot - CompGlobal::instance ().pointerX (), yRoot - CompGlobal::instance ().pointerY ());
 	    }
 
 	    if (ms->moveOpacity != OPAQUE)
@@ -321,8 +321,8 @@
 	wHeight = w->geometry ().height () +
 		  w->geometry ().border () * 2;
 
-	ms->x += xRoot - lastPointerX;
-	ms->y += yRoot - lastPointerY;
+	ms->x += xRoot - CompGlobal::instance ().lastPointerX ();
+	ms->y += yRoot - CompGlobal::instance ().lastPointerY ();
 
 	if (w->type () & CompWindowTypeFullscreenMask)
 	{
@@ -444,7 +444,7 @@
 			    wy  = workArea.y () + (w->border ().top >> 1);
 			    wy += w->sizeHints ().height_inc >> 1;
 
-			    s->warpPointer (0, wy - pointerY);
+			    s->warpPointer (0, wy - CompGlobal::instance ().pointerY ());
 
 			    return;
 			}
@@ -577,12 +577,12 @@
 	    break;
 	case MotionNotify:
 	    if (event->xmotion.root == screen->root ())
-		moveHandleMotionEvent (screen, pointerX, pointerY);
+		moveHandleMotionEvent (screen, CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 	    break;
 	case EnterNotify:
 	case LeaveNotify:
 	    if (event->xcrossing.root == screen->root ())
-		moveHandleMotionEvent (screen, pointerX, pointerY);
+		moveHandleMotionEvent (screen, CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 	    break;
 	case ClientMessage:
 	    if (event->xclient.message_type == Atoms::wmMoveResize)
@@ -616,10 +616,10 @@
 			{
 
 			    /* TODO: not only button 1 */
-			    if (pointerMods & Button1Mask)
+			    if (CompGlobal::instance ().pointerMods () & Button1Mask)
 			    {
 				o.push_back (CompOption ("modifiers", CompOption::TypeInt));
-				o[2].value ().set ((int) pointerMods);
+				o[2].value ().set ((int) CompGlobal::instance ().pointerMods ());
 
 				o.push_back (CompOption ("x", CompOption::TypeInt));
 				o[3].value ().set ((int) event->xclient.data.l[0]);
@@ -634,7 +634,7 @@
 				moveInitiate (&optionGetInitiateButton (),
 					      CompAction::StateInitButton, o);
 
-				moveHandleMotionEvent (screen, pointerX, pointerY);
+				moveHandleMotionEvent (screen, CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 			    }
 			}
 		    }

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2012-01-09 15:12:20 +0000
+++ plugins/opengl/src/screen.cpp	2012-01-18 06:49:24 +0000
@@ -94,7 +94,7 @@
     const char           *glRenderer;
     CompOption::Vector o (0);
 
-    priv->ctx = glXCreateContext (dpy, visinfo, NULL, !indirectRendering);
+    priv->ctx = glXCreateContext (dpy, visinfo, NULL, !CompGlobal::instance ().indirectRendering ());
     if (!priv->ctx)
     {
 	compLogMessage ("opengl", CompLogLevelFatal,
@@ -298,7 +298,7 @@
     XWindowAttributes    attr;
     CompOption::Vector o (0);
 
-    if (indirectRendering)
+    if (CompGlobal::instance ().indirectRendering ())
     {
 	/* force Mesa libGL into indirect rendering mode, because
 	   glXQueryExtensionsString is context-independant */
@@ -849,9 +849,9 @@
     if (backgroundTextures.empty ())
     {
 	CompSize   size;
-	if (backgroundImage)
+	if (CompGlobal::instance ().backgroundImage ())
 	{
-	    CompString fileName (backgroundImage);
+	    CompString fileName (CompGlobal::instance ().backgroundImage ());
 	    CompString pname ("");
 
 	    backgroundTextures = GLTexture::readImageToTexture (fileName, pname, size);

=== modified file 'plugins/resize/src/resize.cpp'
--- plugins/resize/src/resize.cpp	2011-08-19 14:25:11 +0000
+++ plugins/resize/src/resize.cpp	2012-01-18 06:49:24 +0000
@@ -321,8 +321,8 @@
 
 	CompWindow::Geometry server = w->serverGeometry ();
 
-	x = CompOption::getIntOptionNamed (options, "x", pointerX);
-	y = CompOption::getIntOptionNamed (options, "y", pointerY);
+	x = CompOption::getIntOptionNamed (options, "x", CompGlobal::instance ().pointerX ());
+	y = CompOption::getIntOptionNamed (options, "y", CompGlobal::instance ().pointerY ());
 
 	button = CompOption::getIntOptionNamed (options, "button", -1);
 
@@ -391,8 +391,8 @@
 
 	rs->geometry = rs->savedGeometry;
 
-	rs->pointerDx = x - pointerX;
-	rs->pointerDy = y - pointerY;
+	rs->pointerDx = x - CompGlobal::instance ().pointerX ();
+	rs->pointerDy = y - CompGlobal::instance ().pointerY ();
 
 	rs->centered |= rs->optionGetResizeFromCenterMatch ().evaluate (w);
 
@@ -469,7 +469,7 @@
 		xRoot = server.x () + (server.width () / 2);
 		yRoot = server.y () + (server.height () / 2);
 
-		screen->warpPointer (xRoot - pointerX, yRoot - pointerY);
+		screen->warpPointer (xRoot - CompGlobal::instance ().pointerX (), yRoot - CompGlobal::instance ().pointerY ());
 	    }
 
 	    rs->isConstrained = sourceExternalApp;
@@ -726,7 +726,7 @@
 		x = left + width  * (rKeys[i].dx + 1) / 2;
 		y = top  + height * (rKeys[i].dy + 1) / 2;
 
-		screen->warpPointer (x - pointerX, y - pointerY);
+		screen->warpPointer (x - CompGlobal::instance ().pointerX (), y - CompGlobal::instance ().pointerY ());
 
 		mask = rKeys[i].resizeMask;
 
@@ -830,13 +830,13 @@
 
 	    if (centered || optionGetResizeFromCenter ())
 	    {
-		pointerDx += (xRoot - lastPointerX) * 2;
-		pointerDy += (yRoot - lastPointerY) * 2;
+		pointerDx += (xRoot - CompGlobal::instance ().lastPointerX ()) * 2;
+		pointerDy += (yRoot - CompGlobal::instance ().lastPointerY ()) * 2;
 	    }
 	    else
 	    {
-		pointerDx += xRoot - lastPointerX;
-		pointerDy += yRoot - lastPointerY;
+		pointerDx += xRoot - CompGlobal::instance ().lastPointerX ();
+		pointerDy += yRoot - CompGlobal::instance ().lastPointerY ();
 	    }
 	    
 	    /* If we hit the edge of the screen while resizing
@@ -852,25 +852,25 @@
 		{
 		    if (xRoot == 0 &&
 			geometry.x - w->border ().left > grabWindowWorkArea->left ())
-			pointerDx += abs (yRoot - lastPointerY) * -1;
+			pointerDx += abs (yRoot - CompGlobal::instance ().lastPointerY ()) * -1;
 		}
 		else if (mask == ResizeRightMask)
 		{
 		    if (xRoot == screen->width () -1 &&
 			geometry.x + geometry.width + w->border ().right < grabWindowWorkArea->right ())
-			pointerDx += abs (yRoot - lastPointerY);
+			pointerDx += abs (yRoot - CompGlobal::instance ().lastPointerY ());
 		}
 		if (mask == ResizeUpMask)
 		{
 		    if (yRoot == 0 &&
 			geometry.y - w->border ().top > grabWindowWorkArea->top ())
-			pointerDy += abs (xRoot - lastPointerX) * -1;
+			pointerDy += abs (xRoot - CompGlobal::instance ().lastPointerX ()) * -1;
 		}
 		else if (mask == ResizeDownMask)
 		{
 		    if (yRoot == screen->height () -1 &&
 			geometry.y + geometry.height + w->border ().bottom < grabWindowWorkArea->bottom ())
-			pointerDx += abs (yRoot - lastPointerY);
+			pointerDx += abs (yRoot - CompGlobal::instance ().lastPointerY ());
 		}
 	    }
 	}
@@ -1268,12 +1268,12 @@
 	    break;
 	case MotionNotify:
 	    if (event->xmotion.root == screen->root ())
-		handleMotionEvent (pointerX, pointerY);
+		handleMotionEvent (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 	    break;
 	case EnterNotify:
 	case LeaveNotify:
 	    if (event->xcrossing.root == screen->root ())
-		handleMotionEvent (pointerX, pointerY);
+		handleMotionEvent (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 	    break;
 	case ClientMessage:
 	    if (event->xclient.message_type == Atoms::wmMoveResize)
@@ -1319,7 +1319,7 @@
 			    };
 
 			    /* TODO: not only button 1 */
-			    if (pointerMods & Button1Mask)
+			    if (CompGlobal::instance ().pointerMods () & Button1Mask)
 			    {
 				o.push_back (CompOption ("modifiers",
 					     CompOption::TypeInt));
@@ -1332,7 +1332,7 @@
 				o.push_back (CompOption ("button",
 					     CompOption::TypeInt));
 
-				o[2].value ().set ((int) pointerMods);
+				o[2].value ().set ((int) CompGlobal::instance ().pointerMods ());
 				o[3].value ().set
 				    ((int) event->xclient.data.l[0]);
 				o[4].value ().set
@@ -1348,7 +1348,7 @@
 				    CompAction::StateInitButton, o);
 
 				ResizeScreen::get (screen)->
-				    handleMotionEvent (pointerX, pointerY);
+				    handleMotionEvent (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 			    }
 			}
 		    }

=== modified file 'plugins/rotate/src/rotate.cpp'
--- plugins/rotate/src/rotate.cpp	2010-12-23 03:57:46 +0000
+++ plugins/rotate/src/rotate.cpp	2012-01-18 06:49:24 +0000
@@ -606,12 +606,12 @@
     if (screen->otherGrabExist ("rotate", "move", "group-drag", NULL))
 	return false;
 
-    warpX = pointerX - (screen->width () * direction);
+    warpX = CompGlobal::instance ().pointerX () - (screen->width () * direction);
     if (direction == -1)
 	screen->warpPointer (screen->width () - 10, 0);
     else
 	screen->warpPointer (10 - screen->width (), 0);
-    lastPointerX = warpX;
+    CompGlobal::instance ().setLastPointerX (warpX);
 
     o.push_back (CompOption ("root", CompOption::TypeInt));
     o.push_back (CompOption ("x", CompOption::TypeInt));
@@ -619,12 +619,12 @@
 
     o[0].value ().set ((int) screen->root ());
     o[1].value ().set (0);
-    o[2].value ().set (pointerY);
+    o[2].value ().set (CompGlobal::instance ().pointerY ());
 
     rotate (NULL, 0, o, direction);
 
     XWarpPointer (screen->dpy (), None, None, 0, 0, 0, 0, direction, 0);
-    mSavedPointer.setX (lastPointerX + (9 * direction));
+    mSavedPointer.setX (CompGlobal::instance ().lastPointerX () + (9 * direction));
 
     return false;
 }
@@ -690,28 +690,28 @@
 
     if (optionGetFlipTime () == 0 || (mMoving && !mSlow))
     {
-	int pointerDx = pointerX - lastPointerX;
+	int pointerDx = CompGlobal::instance ().pointerX () - CompGlobal::instance ().lastPointerX ();
 	int warpX;
 	
 	if (direction == -1)
 	{
-	    warpX = pointerX + screen->width ();
+	    warpX = CompGlobal::instance ().pointerX () + screen->width ();
 	    screen->warpPointer (screen->width () - 10, 0);
-	    lastPointerX = warpX - pointerDx;
+	    CompGlobal::instance ().setLastPointerX (warpX - pointerDx);
 	    rotate (NULL, 0, o, direction);
 
 	    XWarpPointer (screen->dpy (), None, None, 0, 0, 0, 0, -1, 0);
-	    mSavedPointer.setX (lastPointerX - 9);
+	    mSavedPointer.setX (CompGlobal::instance ().lastPointerX () - 9);
 	}
 	else
 	{
-	    warpX = pointerX - screen->width ();
+	    warpX = CompGlobal::instance ().pointerX () - screen->width ();
 	    screen->warpPointer (10 - screen->width (), 0);
-	    lastPointerX = warpX - pointerDx;
+	    CompGlobal::instance ().setLastPointerX (warpX - pointerDx);
 	    rotate (NULL, 0, o, direction);
 
 	    XWarpPointer (screen->dpy (), None, None, 0, 0, 0, 0, 1, 0);
-	    mSavedPointer.setX (lastPointerX + 9);
+	    mSavedPointer.setX (CompGlobal::instance ().lastPointerX () + 9);
 	}
 
     }
@@ -807,8 +807,8 @@
     o.push_back (CompOption ("y", CompOption::TypeInt));
 
     o[0].value ().set ((int) screen->root ());
-    o[1].value ().set (CompOption::getIntOptionNamed (options, "x", pointerX));
-    o[2].value ().set (CompOption::getIntOptionNamed (options, "y", pointerY));
+    o[1].value ().set (CompOption::getIntOptionNamed (options, "x", CompGlobal::instance ().pointerX ()));
+    o[2].value ().set (CompOption::getIntOptionNamed (options, "y", CompGlobal::instance ().pointerY ()));
 
     if (withWindow)
     {
@@ -835,16 +835,16 @@
 		    {
 			GLfloat pointerDx, pointerDy;
 
-			pointerDx = pointerX - lastPointerX;
-			pointerDy = pointerY - lastPointerY;
+			pointerDx = CompGlobal::instance ().pointerX () - CompGlobal::instance ().lastPointerX ();
+			pointerDy = CompGlobal::instance ().pointerY () - CompGlobal::instance ().lastPointerY ();
 
 			if (event->xmotion.x_root < 50	       ||
 			    event->xmotion.y_root < 50	       ||
 			    event->xmotion.x_root > screen->width () - 50 ||
 			    event->xmotion.y_root > screen->height () - 50)
 			{
-			    screen->warpPointer ((screen->width () / 2) - pointerX,
-						 (screen->height () / 2) - pointerY);
+			    screen->warpPointer ((screen->width () / 2) - CompGlobal::instance ().pointerX (),
+						 (screen->height () / 2) - CompGlobal::instance ().pointerY ());
 			}
 
 			if (optionGetInvertY ())
@@ -858,8 +858,8 @@
 		    }
 		    else
 		    {
-			mSavedPointer.setX (mSavedPointer.x () + pointerX - lastPointerX);
-			mSavedPointer.setY (mSavedPointer.y () + pointerY - lastPointerY);
+			mSavedPointer.setX (mSavedPointer.x () + CompGlobal::instance ().pointerX () - CompGlobal::instance ().lastPointerX ());
+			mSavedPointer.setY (mSavedPointer.y () + CompGlobal::instance ().pointerY () - CompGlobal::instance ().lastPointerY ());
 		    }
 		}
 	    }

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2012-01-12 17:49:40 +0000
+++ plugins/scale/src/scale.cpp	2012-01-18 06:49:24 +0000
@@ -1598,7 +1598,7 @@
 			state != ScaleScreen::In &&
 			w->id () == dndTarget)
 		    {
-			ScaleWindow *sw = checkForWindowAt (pointerX, pointerY);
+			ScaleWindow *sw = checkForWindowAt (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 			if (sw && sw->priv->isScaleWin ())
 			{
 			    int time;
@@ -1607,7 +1607,7 @@
 
 			    if (hover.active ())
 			    {
-				int lastMotion = sqrt (pow (pointerX - lastPointerX, 2) + pow (pointerY - lastPointerY, 2));
+				int lastMotion = sqrt (pow (CompGlobal::instance ().pointerX () - CompGlobal::instance ().lastPointerX (), 2) + pow (CompGlobal::instance ().pointerY () - CompGlobal::instance ().lastPointerY (), 2));
 				
 				if (sw->window->id () != selectedWindow || lastMotion > optionGetDndDistance ())
 				    hover.stop ();
@@ -1618,7 +1618,7 @@
 				hover.start (time, (float) time * 1.2);
 			    }
 
-			    selectWindowAt (pointerX, pointerY, focus);
+			    selectWindowAt (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY (), focus);
 			}
 			else
 			{

=== modified file 'plugins/screenshot/src/screenshot.cpp'
--- plugins/screenshot/src/screenshot.cpp	2010-12-07 03:14:59 +0000
+++ plugins/screenshot/src/screenshot.cpp	2012-01-18 06:49:24 +0000
@@ -53,8 +53,8 @@
 
     /* start selection screenshot rectangle */
 
-    mX1 = mX2 = pointerX;
-    mY1 = mY2 = pointerY;
+    mX1 = mX2 = CompGlobal::instance ().pointerX ();
+    mY1 = mY2 = CompGlobal::instance ().pointerY ();
 
     mGrab = true;
 
@@ -321,12 +321,12 @@
     switch (event->type) {
 	case MotionNotify:
 	    if (event->xmotion.root == screen->root ())
-		handleMotionEvent (pointerX, pointerY);
+		handleMotionEvent (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 	    break;
 	case EnterNotify:
 	case LeaveNotify:
 	    if (event->xcrossing.root == screen->root ())
-		handleMotionEvent (pointerX, pointerY);
+		handleMotionEvent (CompGlobal::instance ().pointerX (), CompGlobal::instance ().pointerY ());
 	default:
 	    break;
     }

=== modified file 'plugins/switcher/src/switcher.cpp'
--- plugins/switcher/src/switcher.cpp	2011-03-11 18:13:44 +0000
+++ plugins/switcher/src/switcher.cpp	2012-01-18 06:49:24 +0000
@@ -265,7 +265,8 @@
 			   CWBackPixel | CWBorderPixel | CWColormap | CWOverrideRedirect, &attr);
 
 	XSetWMProperties (dpy, popupWindow, NULL, NULL,
-			  programArgv, programArgc,
+			  CompGlobal::instance ().programArgv (),
+			  CompGlobal::instance ().programArgc (),
 			  &xsh, &xwmh, &xch);
 
 	state[nState++] = Atoms::winStateAbove;

=== modified file 'plugins/water/src/water.cpp'
--- plugins/water/src/water.cpp	2011-03-14 16:12:45 +0000
+++ plugins/water/src/water.cpp	2012-01-18 06:49:24 +0000
@@ -1019,8 +1019,8 @@
 	p[0].x = waterLastPointerX;
 	p[0].y = waterLastPointerY;
 
-	p[1].x = waterLastPointerX = pointerX;
-	p[1].y = waterLastPointerY = pointerY;
+	p[1].x = waterLastPointerX = CompGlobal::instance ().pointerX ();
+	p[1].y = waterLastPointerY = CompGlobal::instance ().pointerY ();
 
 	waterVertices (GL_LINES, p, 2, 0.2f);
 
@@ -1225,8 +1225,8 @@
 	    {
 		XPoint p;
 
-		p.x = pointerX;
-		p.y = pointerY;
+		p.x = CompGlobal::instance ().pointerX ();
+		p.y = CompGlobal::instance ().pointerY ();
 
 		waterVertices (GL_POINTS, &p, 1, 0.8f);
 		cScreen->damageScreen ();

=== modified file 'plugins/wobbly/src/wobbly.cpp'
--- plugins/wobbly/src/wobbly.cpp	2011-03-14 16:12:45 +0000
+++ plugins/wobbly/src/wobbly.cpp	2012-01-18 06:49:24 +0000
@@ -1860,12 +1860,12 @@
 		    int dx, dy;
 
 		    if (ww->state & CompWindowStateMaximizedHorzMask)
-			dx = pointerX - lastPointerX;
+			dx = CompGlobal::instance ().pointerX () - CompGlobal::instance ().lastPointerX ();
 		    else
 			dx = 0;
 
 		    if (ww->state & CompWindowStateMaximizedVertMask)
-			dy = pointerY - lastPointerY;
+			dy = CompGlobal::instance ().pointerY () - CompGlobal::instance ().lastPointerY ();
 		    else
 			dy = 0;
 
@@ -2070,8 +2070,8 @@
 	if (model->anchorObject)
 	    model->anchorObject->immobile = false;
 
-	model->anchorObject = model->findNearestObject (pointerX,
-							pointerY);
+	model->anchorObject = model->findNearestObject (CompGlobal::instance ().pointerX (),
+							CompGlobal::instance ().pointerY ());
 	model->anchorObject->immobile = true;
 
 	model->adjustObjectPosition (model->anchorObject,

=== modified file 'plugins/zoom/src/zoom.cpp'
--- plugins/zoom/src/zoom.cpp	2010-02-04 17:16:02 +0000
+++ plugins/zoom/src/zoom.cpp	2012-01-18 06:49:24 +0000
@@ -348,7 +348,7 @@
 
     ZOOM_SCREEN (screen);
 
-    output = screen->outputDeviceForPoint (pointerX, pointerY);
+    output = screen->outputDeviceForPoint (CompGlobal::instance ().pointerX(), CompGlobal::instance ().pointerY());
 
     if (!zs->grabIndex)
     {
@@ -371,9 +371,9 @@
     w = (box.x2 - box.x1) / zs->optionGetZoomFactor ();
     h = (box.y2 - box.y1) / zs->optionGetZoomFactor ();
 
-    x0 = (pointerX - screen->outputDevs ()[output].x1 ()) / (float)
+    x0 = (CompGlobal::instance ().pointerX() - screen->outputDevs ()[output].x1 ()) / (float)
 	screen->outputDevs ()[output].width ();
-    y0 = (pointerY - screen->outputDevs ()[output].y1 ()) / (float)
+    y0 = (CompGlobal::instance ().pointerY() - screen->outputDevs ()[output].y1 ()) / (float)
 	screen->outputDevs ()[output].height ();
 
     zs->x1 = box.x1 + (x0 * (box.x2 - box.x1) - x0 * w + 0.5f);
@@ -410,7 +410,7 @@
 
     /* start selection zoom rectangle */
 
-    output = screen->outputDeviceForPoint (pointerX, pointerY);
+    output = screen->outputDeviceForPoint (CompGlobal::instance ().pointerX(), CompGlobal::instance ().pointerY());
 
     if (zs->zoomed & (1 << output))
     {
@@ -433,10 +433,10 @@
     }
 
     zs->x1 = zs->x2 = x1 +
-	((pointerX - screen->outputDevs ()[output].x1 ()) /
+	((CompGlobal::instance ().pointerX() - screen->outputDevs ()[output].x1 ()) /
 	    scale + 0.5f);
     zs->y1 = zs->y2 = y1 +
-	((pointerY - screen->outputDevs ()[output].y1 ()) /
+	((CompGlobal::instance ().pointerY() - screen->outputDevs ()[output].y1 ()) /
 	    scale + 0.5f);
 
     zs->zoomOutput = output;
@@ -458,7 +458,7 @@
 
     ZOOM_SCREEN (screen);
 
-    output = screen->outputDeviceForPoint (pointerX, pointerY);
+    output = screen->outputDeviceForPoint (CompGlobal::instance ().pointerX(), CompGlobal::instance ().pointerY());
 
     zs->getCurrentZoom (output, &zs->last[output]);
 
@@ -526,7 +526,7 @@
 
     ZOOM_SCREEN (screen);
 
-    output = screen->outputDeviceForPoint (pointerX, pointerY);
+    output = screen->outputDeviceForPoint (CompGlobal::instance ().pointerX(), CompGlobal::instance ().pointerY());
 
     if (!(zs->zoomed & (1 << output)))
 	return false;
@@ -610,8 +610,8 @@
 	{
 	    float dx, dy;
 
-	    dx = (xRoot - lastPointerX) / scale;
-	    dy = (yRoot - lastPointerY) / scale;
+	    dx = (xRoot - CompGlobal::instance ().lastPointerX ()) / scale;
+	    dy = (yRoot - CompGlobal::instance ().lastPointerY ()) / scale;
 
 	    box.x1 -= dx;
 	    box.y1 -= dy;
@@ -677,12 +677,12 @@
     switch (event->type) {
 	case MotionNotify:
 	    if (event->xmotion.root == screen->root ())
-		handleMotionEvent (pointerX, pointerY);
+		handleMotionEvent (CompGlobal::instance ().pointerX(), CompGlobal::instance ().pointerY());
 	    break;
 	case EnterNotify:
 	case LeaveNotify:
 	    if (event->xcrossing.root == screen->root ())
-		handleMotionEvent (pointerX, pointerY);
+		handleMotionEvent (CompGlobal::instance ().pointerX(), CompGlobal::instance ().pointerY());
 	default:
 	    break;
     }

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-01-12 17:49:40 +0000
+++ src/event.cpp	2012-01-18 06:49:24 +0000
@@ -142,7 +142,7 @@
 {
     CompAction::State state = CompAction::StateInitButton;
     CompAction        *action;
-    unsigned int      ignored = modHandler->ignoredModMask ();
+    unsigned int      ignored = CompGlobal::instance ().modHandler ()->ignoredModMask ();
     unsigned int      modMask = REAL_MOD_MASK & ~ignored;
     unsigned int      bindMods;
     unsigned int      edge = 0;
@@ -178,7 +178,7 @@
 	{
 	    if (action->button ().button () == (int) event->button)
 	    {
-		bindMods = modHandler->virtualToRealModMask (
+		bindMods = CompGlobal::instance ().modHandler ()->virtualToRealModMask (
 		    action->button ().modifiers ());
 
 		if ((bindMods & modMask) == (event->state & modMask))
@@ -197,7 +197,7 @@
 		if ((action->button ().button () == (int) event->button) &&
 		    (action->edgeMask () & edge))
 		{
-		    bindMods = modHandler->virtualToRealModMask (
+		    bindMods = CompGlobal::instance ().modHandler ()->virtualToRealModMask (
 			action->button ().modifiers ());
 
 		    if ((bindMods & modMask) == (event->state & modMask))
@@ -245,7 +245,7 @@
 {
     CompAction::State state = 0;
     CompAction	      *action;
-    unsigned int      modMask = REAL_MOD_MASK & ~modHandler->ignoredModMask ();
+    unsigned int      modMask = REAL_MOD_MASK & ~CompGlobal::instance ().modHandler ()->ignoredModMask ();
     unsigned int      bindMods;
 
     if (event->keycode == escapeKeyCode)
@@ -275,7 +275,7 @@
 	if (isInitiateBinding (option, CompAction::BindingTypeKey,
 			       state, &action))
 	{
-	    bindMods = modHandler->virtualToRealModMask (
+	    bindMods = CompGlobal::instance ().modHandler ()->virtualToRealModMask (
 		action->key ().modifiers ());
 
 	    if (action->key ().keycode () == (int) event->keycode)
@@ -303,12 +303,12 @@
 {
     CompAction::State state = CompAction::StateTermKey;
     CompAction        *action;
-    unsigned int      ignored = modHandler->ignoredModMask ();
+    unsigned int      ignored = CompGlobal::instance ().modHandler ()->ignoredModMask ();
     unsigned int      modMask = REAL_MOD_MASK & ~ignored;
     unsigned int      bindMods;
     unsigned int      mods;
 
-    mods = modHandler->keycodeToModifiers (event->keycode);
+    mods = CompGlobal::instance ().modHandler ()->keycodeToModifiers (event->keycode);
     if (!xkbEvent && !mods)
 	return false;
 
@@ -317,7 +317,7 @@
 	if (isTerminateBinding (option, CompAction::BindingTypeKey,
 				state, &action))
 	{
-	    bindMods = modHandler->virtualToRealModMask (action->key ().modifiers ());
+	    bindMods = CompGlobal::instance ().modHandler ()->virtualToRealModMask (action->key ().modifiers ());
 
 	    if ((bindMods & modMask) == 0)
 	    {
@@ -346,7 +346,7 @@
 {
     CompAction::State state;
     CompAction        *action;
-    unsigned int      ignored = modHandler->ignoredModMask ();
+    unsigned int      ignored = CompGlobal::instance ().modHandler ()->ignoredModMask ();
     unsigned int      modMask = REAL_MOD_MASK & ~ignored;
     unsigned int      bindMods;
 
@@ -362,7 +362,7 @@
 		if (action->key ().keycode () == 0)
 		{
 		    bindMods =
-			modHandler->virtualToRealModMask (action->key ().modifiers ());
+			CompGlobal::instance ().modHandler ()->virtualToRealModMask (action->key ().modifiers ());
 
 		    if ((event->mods & modMask & bindMods) == bindMods)
 		    {
@@ -382,7 +382,7 @@
 	    if (isTerminateBinding (option, CompAction::BindingTypeKey,
 				    state, &action))
 	    {
-		bindMods = modHandler->virtualToRealModMask (action->key ().modifiers ());
+		bindMods = CompGlobal::instance ().modHandler ()->virtualToRealModMask (action->key ().modifiers ());
 
 		if ((event->mods & modMask & bindMods) != bindMods)
 		{
@@ -1710,7 +1710,7 @@
 	}
 	break;
     case MappingNotify:
-	modHandler->updateModifierMappings ();
+	CompGlobal::instance ().modHandler ()->updateModifierMappings ();
 	break;
     case MapRequest:
 	w = screen->findWindow (event->xmaprequest.window);

=== modified file 'src/eventsource.cpp'
--- src/eventsource.cpp	2011-08-19 14:25:11 +0000
+++ src/eventsource.cpp	2012-01-18 06:49:24 +0000
@@ -62,7 +62,7 @@
 bool
 CompEventSource::callback ()
 {
-    if (restartSignal || shutDown)
+    if (CompGlobal::instance ().restartSignal () || CompGlobal::instance ().shutDown ())
     {
 	screen->priv->mainloop->quit ();
 	return false;

=== modified file 'src/logmessage/src/logmessage.cpp'
--- src/logmessage/src/logmessage.cpp	2011-12-19 07:06:22 +0000
+++ src/logmessage/src/logmessage.cpp	2012-01-18 06:49:24 +0000
@@ -56,11 +56,11 @@
 	    CompLogLevel level,
 	    const char   *message)
 {
-    if (!debugOutput && level >= CompLogLevelDebug)
+    if (!CompGlobal::instance ().isDebugOutput () && level >= CompLogLevelDebug)
 	return;
 
     fprintf (stderr, "%s (%s) - %s: %s\n",
-	     programName, componentName,
+             CompGlobal::instance ().programName (), componentName,
 	     logLevelToString (level), message);
 }
 

=== modified file 'src/main.cpp'
--- src/main.cpp	2011-10-31 13:51:00 +0000
+++ src/main.cpp	2012-01-18 06:49:24 +0000
@@ -38,26 +38,7 @@
 #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;
-bool useCow = true;
-
-std::list <CompString> initialPlugins;
-
+bool useCow = false;
 unsigned int pluginClassHandlerIndex = 0;
 
 void
@@ -77,7 +58,7 @@
 	    "[--version] "
 	    "[--help] "
 	    "[PLUGIN]...\n",
-	    programName);
+	    CompGlobal::instance ().programName ());
 }
 
 static void
@@ -90,11 +71,11 @@
 	waitpid (-1, &status, WNOHANG | WUNTRACED);
 	break;
     case SIGHUP:
-	restartSignal = true;
+	CompGlobal::instance ().setRestartSignal (true);
 	break;
     case SIGINT:
     case SIGTERM:
-	shutDown = true;
+	CompGlobal::instance ().setShutDown (true);
     default:
 	break;
     }
@@ -117,7 +98,7 @@
 	}
 	else if (!strcmp (argv[i], "--debug"))
 	{
-	    debugOutput = true;
+	    CompGlobal::instance ().setDebugOutput (true);
 	}
 	else if (!strcmp (argv[i], "--display"))
 	{
@@ -126,11 +107,11 @@
 	}
 	else if (!strcmp (argv[i], "--indirect-rendering"))
 	{
-	    indirectRendering = true;
+	    CompGlobal::instance ().setIndirectRendering (true);
 	}
 	else if (!strcmp (argv[i], "--keep-desktop-hints"))
 	{
-	    useDesktopHints = true;
+	    CompGlobal::instance ().setUseDesktopHints(true);
 	}
 	else if (!strcmp (argv[i], "--use-root-window"))
 	{
@@ -138,7 +119,7 @@
 	}
 	else if (!strcmp (argv[i], "--replace"))
 	{
-	    replaceCurrentWm = true;
+	    CompGlobal::instance ().setReplaceCurrentWm (true);
 	}
 	else if (!strcmp (argv[i], "--sm-disable"))
 	{
@@ -151,12 +132,12 @@
 	}
 	else if (!strcmp (argv[i], "--no-detection"))
 	{
-	    noDetection = true;
+	    CompGlobal::instance ().setNoDetection (true);
 	}
 	else if (!strcmp (argv[i], "--bg-image"))
 	{
 	    if (i + 1 < argc)
-		backgroundImage = argv[++i];
+		CompGlobal::instance ().setBackgroundImage (argv[++i]);
 	}
 	else if (*argv[i] == '-')
 	{
@@ -169,7 +150,7 @@
 	}
     }
 
-    initialPlugins = plugins;
+    CompGlobal::instance ().setInitialPlugins (plugins);
 
     return true;
 }
@@ -195,9 +176,9 @@
 	return false;
     }
 
-    modHandler = new ModifierHandler ();
+    CompGlobal::instance ().setModHandler (new ModifierHandler ());
 
-    if (!modHandler)
+    if (!CompGlobal::instance ().modHandler ())
 	return false;
 
     if (!plugins.empty ())
@@ -224,7 +205,7 @@
     if (!screen->init (displayName))
 	return false;
 
-    if (debugOutput)
+    if (CompGlobal::instance ().isDebugOutput())
     {
 	StackDebugger::SetDefault (new StackDebugger (screen->dpy (),
 						      screen->root (),
@@ -262,7 +243,7 @@
     StackDebugger::SetDefault (NULL);
 
     delete screen;
-    delete modHandler;
+    delete CompGlobal::instance ().modHandler ();
 }
 
 
@@ -272,9 +253,9 @@
 {
     CompManager		    manager;
 
-    programName = argv[0];
-    programArgc = argc;
-    programArgv = argv;
+    CompGlobal::instance ().setProgramName (argv[0]);
+    CompGlobal::instance ().setProgramArgc(argc);
+    CompGlobal::instance ().setProgramArgv(argv);
 
     signal (SIGHUP, signalHandler);
     signal (SIGCHLD, signalHandler);
@@ -291,9 +272,9 @@
 
     manager.fini ();
 
-    if (restartSignal)
+    if (CompGlobal::instance ().restartSignal ())
     {
-	execvp (programName, programArgv);
+	execvp (CompGlobal::instance ().programName(), CompGlobal::instance ().programArgv ());
 	return 1;
     }
 

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2011-10-31 13:51:00 +0000
+++ src/privatescreen.h	2012-01-18 06:49:24 +0000
@@ -49,20 +49,6 @@
 
 class CoreWindow;
 
-extern bool shutDown;
-extern bool restartSignal;
-
-extern CompWindow *lastFoundWindow;
-extern bool	  useDesktopHints;
-
-extern bool inHandleEvent;
-
-extern CompScreen *targetScreen;
-extern CompOutput *targetOutput;
-
-extern std::list <CompString> initialPlugins;
-
-
 typedef struct _CompDelayedEdgeSettings
 {
     CompAction::CallBack initiate;

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-01-16 08:36:54 +0000
+++ src/screen.cpp	2012-01-18 06:49:24 +0000
@@ -610,7 +610,7 @@
 	    return screen->updateDefaultIcon ();
 	    break;
 	case CoreOptions::Outputs:
-	    if (!noDetection && optionGetDetectOutputs ())
+	    if (!CompGlobal::instance ().noDetection () && optionGetDetectOutputs ())
 		return false;
 	    updateOutputDevices ();
 	    break;
@@ -787,7 +787,7 @@
     /* Determine the number of plugins, which is core +
      * initial plugins + plugins in option list in addition
      * to initial plugins */
-    foreach (CompString &pn, initialPlugins)
+    foreach (CompString &pn, CompGlobal::instance ().initialPlugins ())
     {
 	if (pn != "core")
 	    pListCount++;
@@ -799,7 +799,7 @@
 	if (lp.s () == "core")
 	    continue;
 
-	foreach (CompString &p, initialPlugins)
+	foreach (CompString &p, CompGlobal::instance ().initialPlugins ())
 	{
 	    if (p == lp.s ())
 	    {
@@ -828,7 +828,7 @@
     j = 1;
 
     /* Add initial plugins */
-    foreach (CompString &p, initialPlugins)
+    foreach (CompString &p, CompGlobal::instance ().initialPlugins ())
     {
 	if (p == "core")
 	    continue;
@@ -839,12 +839,12 @@
     /* Add plugins not in the initial list */
     foreach (CompOption::Value &opt, list)
     {
-	std::list <CompString>::iterator it = initialPlugins.begin ();
+	std::list <CompString>::iterator it = CompGlobal::instance ().initialPlugins ().begin ();
 	bool				 skip = false;
 	if (opt.s () == "core")
 	    continue;
 
-	for (; it != initialPlugins.end (); it++)
+	for (; it != CompGlobal::instance ().initialPlugins ().end (); it++)
 	{
 	    if ((*it) == opt.s ())
 	    {
@@ -1054,7 +1054,7 @@
 	wmSnAtom != event->xselectionclear.selection)
 	return;
 
-    shutDown = true;
+    CompGlobal::instance ().setShutDown (true);
 }
 
 #define IMAGEDIR "images"
@@ -1868,7 +1868,7 @@
 void
 PrivateScreen::detectOutputDevices ()
 {
-    if (!noDetection && optionGetDetectOutputs ())
+    if (!CompGlobal::instance ().noDetection () && optionGetDetectOutputs ())
     {
 	CompString	  name;
 	CompOption::Value value;
@@ -2257,7 +2257,7 @@
     unsigned long n, left;
     unsigned char *propData;
 
-    if (useDesktopHints)
+    if (CompGlobal::instance ().useDesktopHints ())
     {
 	result = XGetWindowProperty (dpy, root,
 				     Atoms::numberOfDesktops,
@@ -2531,16 +2531,19 @@
 CompWindow *
 CompScreen::findWindow (Window id)
 {
-    if (lastFoundWindow && lastFoundWindow->id () == id)
+    if (CompGlobal::instance ().lastFoundWindow () && CompGlobal::instance ().lastFoundWindow ()->id () == id)
     {
-	return lastFoundWindow;
+	return CompGlobal::instance ().lastFoundWindow ();
     }
     else
     {
         CompWindow::Map::iterator it = priv->windowsMap.find (id);
 
         if (it != priv->windowsMap.end ())
-            return (lastFoundWindow = it->second);
+        {
+            CompGlobal::instance ().setLastFoundWindow (it->second);
+            return (CompGlobal::instance ().lastFoundWindow ());
+        }
     }
 
     return 0;
@@ -2729,8 +2732,8 @@
     w->next = NULL;
     w->prev = NULL;
 
-    if (w == lastFoundWindow)
-	lastFoundWindow = NULL;
+    if (w == CompGlobal::instance ().lastFoundWindow ())
+	CompGlobal::instance ().setLastFoundWindow (NULL);
 }
 
 void
@@ -4398,7 +4401,7 @@
 
     if (currentWmSnOwner != None)
     {
-	if (!replaceCurrentWm)
+	if (!CompGlobal::instance ().replaceCurrentWm ())
 	{
 	    compLogMessage ("core", CompLogLevelError,
 			    "Screen %d on display \"%s\" already "

=== modified file 'src/session.cpp'
--- src/session.cpp	2011-10-31 13:51:00 +0000
+++ src/session.cpp	2012-01-18 06:49:24 +0000
@@ -91,18 +91,18 @@
 
     /* at maximum, we pass our old arguments + our new client id
        to the SM, so allocate for that case */
-    args = (const char **) malloc ((programArgc + 2) * sizeof (char *));
+    args = (const char **) malloc ((CompGlobal::instance ().programArgc () + 2) * sizeof (char *));
     if (!args)
 	return;
 
-    for (i = 0; i < programArgc; i++)
+    for (i = 0; i < CompGlobal::instance ().programArgc(); i++)
     {
-	if (strcmp (programArgv[i], "--sm-client-id") == 0)
+	if (strcmp (CompGlobal::instance ().programArgv ()[i], "--sm-client-id") == 0)
 	    i++; /* skip old client id, we'll add the new one later */
-	else if (strcmp (programArgv[i], "--replace") == 0)
+	else if (strcmp (CompGlobal::instance ().programArgv ()[i], "--replace") == 0)
 	    continue; /* there's nothing to replace when starting session */
 	else
-	    args[count++] = programArgv[i];
+	    args[count++] = CompGlobal::instance ().programArgv ()[i];
     }
 
     setStringListProperty (connection, SmCloneCommand, args, count);

=== removed file 'src/tests/globals.h'
--- src/tests/globals.h	2012-01-18 06:49:24 +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-18 06:49:24 +0000
+++ src/tests/option.cpp	2012-01-18 06:49:24 +0000
@@ -5,8 +5,6 @@
 #include "core/match.h"
 #include "core/option.h"
 
-#include "globals.h"
-
 namespace {
     template<typename T>
     void

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-01-16 09:10:42 +0000
+++ src/window.cpp	2012-01-18 06:49:24 +0000
@@ -5984,15 +5984,15 @@
 	/* Grab only we have bindings on */
 	foreach (PrivateScreen::ButtonGrab &bind, screen->priv->buttonGrabs)
 	{
-	    unsigned int mods = modHandler->virtualToRealModMask (bind.modifiers);
+	    unsigned int mods = CompGlobal::instance ().modHandler ()->virtualToRealModMask (bind.modifiers);
 
 	    if (mods & CompNoMask)
 		continue;
 
 	    for (unsigned int ignore = 0;
-		     ignore <= modHandler->ignoredModMask (); ignore++)
+		     ignore <= CompGlobal::instance ().modHandler ()->ignoredModMask (); ignore++)
 	    {
-		if (ignore & ~modHandler->ignoredModMask ())
+		if (ignore & ~CompGlobal::instance ().modHandler ()->ignoredModMask ())
 		    continue;
 
 		XGrabButton (screen->priv->dpy,