Merge lp:~mc-return/compiz/compiz.merge-src-header-files-cleanup into lp:compiz/0.9.10

[MC Return]

src/*.h files cleanup:

Used prefix instead of postfix increment.
Fixed indentation.

WIP

[lp:~mc-return/compiz/compiz.merge-src-header-files-cleanup]

3726. By MC Return on 2013-06-20

More cleanup

3727. By MC Return on 2013-06-20

Merged latest lp:compiz and fixed conflicts

3728. By MC Return on 2013-06-20

More cleanup

Unmerged revisions

3728. By MC Return on 2013-06-20

More cleanup

3727. By MC Return on 2013-06-20

Merged latest lp:compiz and fixed conflicts

3726. By MC Return on 2013-06-20

More cleanup

3725. By MC Return on 2013-05-26

src/*.h files cleanup (please see main commit message for details)

=== modified file 'src/asyncserverwindow.h'
--- src/asyncserverwindow.h	2012-12-13 11:12:32 +0000
+++ src/asyncserverwindow.h	2013-06-20 07:03:30 +0000
@@ -39,11 +39,15 @@
 
 	virtual int requestConfigureOnClient (const XWindowChanges &xwc,
 					      unsigned int         valueMask) = 0;
+
 	virtual int requestConfigureOnWrapper (const XWindowChanges &xwc,
 					       unsigned int         valueMask) = 0;
+
 	virtual int requestConfigureOnFrame  (const XWindowChanges &xwc,
 					      unsigned int         valueMask) = 0;
+
 	virtual void sendSyntheticConfigureNotify () = 0;
+
 	virtual bool hasCustomShape () const = 0;
 };
 }

=== modified file 'src/configurerequestbuffer-impl.h'
--- src/configurerequestbuffer-impl.h	2012-12-13 11:12:32 +0000
+++ src/configurerequestbuffer-impl.h	2013-06-20 07:03:30 +0000
@@ -59,6 +59,7 @@
     public Releasable
 {
     public:
+
 	typedef boost::shared_ptr <BufferLock> Ptr;
 
 	virtual ~BufferLock () {}
@@ -89,9 +90,12 @@
 
 	void untrackLock (compiz::window::configure_buffers::BufferLock *lock);
 
-	void pushClientRequest (const XWindowChanges &xwc, unsigned int mask);
-	void pushWrapperRequest (const XWindowChanges &xwc, unsigned int mask);
-	void pushFrameRequest (const XWindowChanges &xwc, unsigned int mask);
+	void pushClientRequest (const XWindowChanges &xwc,
+				unsigned int         mask);
+	void pushWrapperRequest (const XWindowChanges &xwc,
+				 unsigned int         mask);
+	void pushFrameRequest (const XWindowChanges &xwc,
+			       unsigned int         mask);
 	void pushSyntheticConfigureNotify ();
 	compiz::window::configure_buffers::Releasable::Ptr obtainLock ();
 

=== modified file 'src/eventmanagement.h'
--- src/eventmanagement.h	2012-10-11 10:06:30 +0000
+++ src/eventmanagement.h	2013-06-20 07:03:30 +0000
@@ -75,6 +75,4 @@
 }
 }
 
-	
-
 #endif

=== modified file 'src/privateaction.h'
--- src/privateaction.h	2012-10-02 10:28:01 +0000
+++ src/privateaction.h	2013-06-20 07:03:30 +0000
@@ -41,8 +41,8 @@
 	virtual void setActive (bool) = 0;
 };
 
-void setActionActiveState (const CompAction  &action,
-			   bool              active);
+void setActionActiveState (const CompAction &action,
+			   bool             active);
 }
 }
 
@@ -50,15 +50,16 @@
     public compiz::actions::BoundAction
 {
     public:
+
 	PrivateAction ();
-	PrivateAction (const PrivateAction&);
+	PrivateAction (const PrivateAction &);
 
 	void setActive (bool);
 
-	CompAction::CallBack initiate;
-	CompAction::CallBack terminate;
+	CompAction::CallBack      initiate;
+	CompAction::CallBack      terminate;
 
-	CompAction::State state;
+	CompAction::State         state;
 
 	CompAction::BindingType   type;
 

=== modified file 'src/privateeventsource.h'
--- src/privateeventsource.h	2012-12-02 12:06:02 +0000
+++ src/privateeventsource.h	2013-06-20 07:03:30 +0000
@@ -54,9 +54,9 @@
 
     private:
 
-	Display	      *mDpy;
-	Glib::PollFD  mPollFD;
-	int	      mConnectionFD;
+	Display      *mDpy;
+	Glib::PollFD mPollFD;
+	int          mConnectionFD;
 };
 
 #endif

=== modified file 'src/privateiosource.h'
--- src/privateiosource.h	2012-12-02 12:06:02 +0000
+++ src/privateiosource.h	2013-06-20 07:03:30 +0000
@@ -47,22 +47,25 @@
 	virtual ~CompWatchFd ();
 
 	static
-	CompWatchFd * create (int,
-			      Glib::IOCondition,
-			      FdWatchCallBack);
+	CompWatchFd * create (int                ,
+			      Glib::IOCondition  ,
+			      FdWatchCallBack     );
 
     protected:
 
-	explicit CompWatchFd (int, Glib::IOCondition, FdWatchCallBack);
-	bool		 internalCallback (Glib::IOCondition);
+	explicit
+	CompWatchFd (int                ,
+		     Glib::IOCondition  ,
+		     FdWatchCallBack     );
+	bool              internalCallback (Glib::IOCondition);
 
     private:
 
-	int		  mFd;
+	int               mFd;
 	FdWatchCallBack   mCallBack;
 	CompWatchFdHandle mHandle;
-	bool		  mForceFail;
-	bool		  mExecuting;
+	bool              mForceFail;
+	bool              mExecuting;
 
     friend class ::compiz::private_screen::EventManager;
 };

=== modified file 'src/privatematch.h'
--- src/privatematch.h	2009-03-16 09:18:16 +0000
+++ src/privatematch.h	2013-06-20 07:03:30 +0000
@@ -34,9 +34,12 @@
 #define MATCH_OP_AND_MASK (1 << 0)
 #define MATCH_OP_NOT_MASK (1 << 1)
 
-class MatchOp {
+class MatchOp
+{
     public:
-	typedef enum {
+
+	typedef enum
+	{
 	    TypeNone,
 	    TypeGroup,
 	    TypeExp
@@ -52,22 +55,27 @@
 	unsigned int flags;
 };
 
-class MatchExpOp : public MatchOp {
+class MatchExpOp : public MatchOp
+{
     public:
+
 	MatchExpOp ();
 	MatchExpOp (const MatchExpOp &);
 
 	MatchOp::Type type () { return MatchOp::TypeExp; };
 
-	CompString	      value;
+	CompString                               value;
 
 	boost::shared_ptr<CompMatch::Expression> e;
 };
 
-class MatchGroupOp : public MatchOp {
+class MatchGroupOp : public MatchOp
+{
     public:
+
 	MatchGroupOp ();
 	~MatchGroupOp ();
+
 	MatchGroupOp (const MatchGroupOp &);
 
 	MatchGroupOp & operator= (const MatchGroupOp &);
@@ -77,11 +85,14 @@
 	MatchOp::List op;
 };
 
-class PrivateMatch {
+class PrivateMatch
+{
     public:
+
 	PrivateMatch ();
 
     public:
+
 	MatchGroupOp op;
 };
 

=== modified file 'src/privateoption.h'
--- src/privateoption.h	2012-01-24 08:24:18 +0000
+++ src/privateoption.h	2013-06-20 07:03:30 +0000
@@ -34,23 +34,27 @@
 #include <core/match.h>
 #include <core/screen.h>
 
-typedef struct _CompOptionIntRestriction {
+typedef struct _CompOptionIntRestriction
+{
     int min;
     int max;
 } IntRestriction;
 
-typedef struct _CompOptionFloatRestriction {
+typedef struct _CompOptionFloatRestriction
+{
     float min;
     float max;
     float precision;
 } FloatRestriction;
 
-typedef union {
-    IntRestriction    i;
-    FloatRestriction  f;
+typedef union
+{
+    IntRestriction   i;
+    FloatRestriction f;
 } RestrictionUnion;
 
-class PrivateRestriction {
+class PrivateRestriction
+{
     public:
 	CompOption::Type type;
 	RestrictionUnion rest;

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2013-05-12 08:20:10 +0000
+++ src/privatescreen.h	2013-06-20 07:03:30 +0000
@@ -53,10 +53,10 @@
 
 class CoreWindow;
 
-extern bool shutDown;
-extern bool restartSignal;
+extern bool                   shutDown;
+extern bool                   restartSignal;
 
-extern bool	  useDesktopHints;
+extern bool                   useDesktopHints;
 
 extern std::list <CompString> initialPlugins;
 
@@ -66,27 +66,30 @@
     CompAction::CallBack initiate;
     CompAction::CallBack terminate;
 
-    unsigned int edge;
-    unsigned int state;
+    unsigned int         edge;
+    unsigned int         state;
 
-    CompOption::Vector options;
+    CompOption::Vector   options;
 } CompDelayedEdgeSettings;
 
 
-struct CompScreenEdge {
-    Window	 id;
+struct CompScreenEdge
+{
+    Window       id;
     unsigned int count;
 };
 
-struct CompGroup {
-    unsigned int      refCnt;
-    Window	      id;
+struct CompGroup
+{
+    unsigned int refCnt;
+    Window       id;
 };
 
-struct CompStartupSequence {
-    SnStartupSequence		*sequence;
-    unsigned int		viewportX;
-    unsigned int		viewportY;
+struct CompStartupSequence
+{
+    SnStartupSequence *sequence;
+    unsigned int      viewportX;
+    unsigned int      viewportY;
 };
 
 namespace compiz
@@ -118,7 +121,7 @@
 
 	typedef CompWindow::ForEach Functor;
 
-	WindowManager();
+	WindowManager ();
 
 	CompGroup * addGroup (Window id);
 	void removeGroup (CompGroup *group);
@@ -127,90 +130,102 @@
 	void eraseWindowFromMap (Window id);
 	void removeDestroyed ();
 
-	void updateClientList (PrivateScreen& ps);
+	void updateClientList (PrivateScreen &ps);
 
-	void addToDestroyedWindows(CompWindow * cw)
+	void addToDestroyedWindows (CompWindow *cw)
 	    { destroyedWindows.push_back (cw); }
 
-	void incrementPendingDestroys() { pendingDestroys++; }
-	const CompWindowVector& getClientList () const
-	    { return clientList; }
-	const CompWindowVector& getClientListStacking () const
-	    { return clientListStacking; }
+	void incrementPendingDestroys ()
+	{
+	    ++pendingDestroys;
+	}
+
+	const CompWindowVector &getClientList () const
+	{
+	    return clientList;
+	}
+
+	const CompWindowVector &getClientListStacking () const
+	{
+	    return clientListStacking;
+	}
 
 	CompWindow * findWindow (Window id) const;
-	CompWindow * getTopWindow() const;
-	CompWindow * getTopServerWindow() const;
-
-
-	void removeFromFindWindowCache(CompWindow* w)
+	CompWindow * getTopWindow () const;
+	CompWindow * getTopServerWindow () const;
+
+
+	void removeFromFindWindowCache (CompWindow *w)
 	{
 	    if (w == lastFoundWindow)
 		lastFoundWindow = 0;
 	}
 
-	void addWindowToMap(CompWindow* w)
+	void addWindowToMap(CompWindow *w)
 	{
 	    if (w->id () != 1)
 		windowsMap[w->id ()] = w;
 	}
 
-	void validateServerWindows();
-
-	void invalidateServerWindows();
-
-	void insertWindow (CompWindow* w, Window aboveId);
+	void validateServerWindows ();
+
+	void invalidateServerWindows ();
+
+	void insertWindow (CompWindow *w,
+			   Window     aboveId);
 	void unhookWindow (CompWindow *w);
-	CompWindowList& getWindows()	{ return windows; }
-
-	CompWindowList& getDestroyedWindows()	{ return destroyedWindows; }
-
-	void insertServerWindow(CompWindow* w, Window aboveId);
-	void unhookServerWindow(CompWindow *w);
-	CompWindowList& getServerWindows()	{ return serverWindows; }
+	CompWindowList &getWindows ()	{ return windows; }
+
+	CompWindowList &getDestroyedWindows ()	{ return destroyedWindows; }
+
+	void insertServerWindow (CompWindow *w,
+				 Window     aboveId);
+	void unhookServerWindow (CompWindow *w);
+	CompWindowList &getServerWindows ()	{ return serverWindows; }
 
 	typedef CompWindowList::const_iterator iterator;
 	typedef CompWindowList::const_reverse_iterator reverse_iterator;
 
-	iterator begin() const { return windows.begin(); }
-	iterator end() const { return windows.end(); }
-	reverse_iterator rbegin() const { return windows.rbegin(); }
-	reverse_iterator rend() const { return windows.rend(); }
-
-	iterator serverBegin() const { return serverWindows.begin(); }
-	iterator serverEnd() const { return serverWindows.end(); }
-	reverse_iterator rserverBegin() const { return serverWindows.rbegin(); }
-	reverse_iterator rserverEnd() const { return serverWindows.rend(); }
-
-	void clearFullscreenHints() const;
-	void showOrHideForDesktop(unsigned int desktop) const;
-	void setWindowActiveness(::compiz::private_screen::History& history) const;
+	iterator begin () const { return windows.begin (); }
+	iterator end () const { return windows.end (); }
+	reverse_iterator rbegin () const { return windows.rbegin (); }
+	reverse_iterator rend () const { return windows.rend (); }
+
+	iterator serverBegin () const { return serverWindows.begin (); }
+	iterator serverEnd () const { return serverWindows.end (); }
+	reverse_iterator rserverBegin () const { return serverWindows.rbegin (); }
+	reverse_iterator rserverEnd () const { return serverWindows.rend (); }
+
+	void clearFullscreenHints () const;
+	void showOrHideForDesktop (unsigned int desktop) const;
+	void setWindowActiveness (::compiz::private_screen::History& history) const;
 	void setNumberOfDesktops (unsigned int nDesktop) const;
-	void updateWindowSizes() const;
+	void updateWindowSizes () const;
 
-	void forEachWindow(Functor const& f) const
+	void forEachWindow (Functor const& f) const
 	{
-	    std::for_each(windows.begin(), windows.end(), f);
+	    std::for_each (windows.begin (), windows.end (), f);
 	}
 
     private:
-	CompWindowList windows;
-	CompWindowList serverWindows;
-	CompWindowList destroyedWindows;
-	bool           stackIsFresh;
-
-	CompWindow::Map windowsMap;
+
+	CompWindowList         windows;
+	CompWindowList         serverWindows;
+	CompWindowList         destroyedWindows;
+	bool                   stackIsFresh;
+
+	CompWindow::Map        windowsMap;
 	std::list<CompGroup *> groups;
 
-	CompWindowVector clientList;            /* clients in mapping order */
-	CompWindowVector clientListStacking;    /* clients in stacking order */
-
-	std::vector<Window> clientIdList;        /* client ids in mapping order */
-	std::vector<Window> clientIdListStacking;/* client ids in stacking order */
-
-	unsigned int pendingDestroys;
-
-	mutable CompWindow* lastFoundWindow;
+	CompWindowVector       clientList;          /* clients in mapping order */
+	CompWindowVector       clientListStacking;  /* clients in stacking order */
+
+	std::vector<Window>    clientIdList;        /* client ids in mapping order */
+	std::vector<Window>    clientIdListStacking;/* client ids in stacking order */
+
+	unsigned int           pendingDestroys;
+
+	mutable CompWindow     *lastFoundWindow;
 };
 
 unsigned int windowStateFromString (const char *str);
@@ -218,11 +233,13 @@
 class PluginManager
 {
     public:
+
 	PluginManager();
 
-	void updatePlugins (CompScreen* screen, CompOption::Value::Vector const& extraPluginsRequested);
+	void updatePlugins (CompScreen                      *screen,
+			    CompOption::Value::Vector const &extraPluginsRequested);
 
-	void setPlugins(CompOption::Value::Vector const& vList)
+	void setPlugins(CompOption::Value::Vector const &vList)
 	{
 	    plugin.set (CompOption::TypeString, vList);
 	}
@@ -230,9 +247,10 @@
 	bool isDirtyPluginList () const { return dirtyPluginList; }
 	void setDirtyPluginList () { dirtyPluginList = true; }
 
-	CompOption::Value::Vector mergedPluginList(CompOption::Value::Vector const& extraPluginsRequested) const;
+	CompOption::Value::Vector mergedPluginList(CompOption::Value::Vector const &extraPluginsRequested) const;
 
     private:
+
 	CompOption::Value plugin;
 	bool	          dirtyPluginList;
 	typedef std::set<CompString> CompStringSet;
@@ -265,6 +283,7 @@
     public GrabList
 {
     public:
+
 	EventManager ();
 	~EventManager ();
 
@@ -278,24 +297,22 @@
 	                     CompAction::State   state,
 	                     CompOption::Vector &arguments);
 
-	void startEventLoop(Display* dpy);
-	void quit() { mainloop->quit(); }
+	void startEventLoop (Display *dpy);
+	void quit () { mainloop->quit(); }
 
-	CompWatchFdHandle addWatchFd (
-	    int             fd,
-	    short int       events,
-	    FdWatchCallBack callBack);
+	CompWatchFdHandle addWatchFd (int             fd,
+				      short int       events,
+				      FdWatchCallBack callBack);
 
 	void removeWatchFd (CompWatchFdHandle handle);
 
-	CompFileWatch* addFileWatch (
-	    const char        *path,
-	    int               mask,
-	    FileWatchCallBack callBack);
+	CompFileWatch* addFileWatch (const char        *path,
+				     int               mask,
+				     FileWatchCallBack callBack);
 
 	CompFileWatch* removeFileWatch (CompFileWatchHandle handle);
 
-	const CompFileWatchList& getFileWatches () const;
+	const CompFileWatchList &getFileWatches () const;
 
 	void grabNotified() { grabbed = true; }
 	void ungrabNotified() { grabbed = false; }
@@ -310,7 +327,8 @@
 	void resetPossibleTap() { possibleTap = 0; }
 
     private:
-        void *possibleTap;
+
+	void *possibleTap;
 
 	Glib::RefPtr <Glib::MainLoop>  mainloop;
 
@@ -338,22 +356,27 @@
 	Window  grabWindow;
 };
 
-class KeyGrab {
+class KeyGrab
+{
     public:
+
 	int          keycode;
 	unsigned int modifiers;
 	int          count;
 };
 
-class ButtonGrab {
+class ButtonGrab
+{
     public:
+
 	int          button;
 	unsigned int modifiers;
 	int          count;
 };
 
-struct Grab {
-	Grab(Cursor cursor, const char *name) : cursor(cursor), name(name) {}
+struct Grab
+{
+	Grab (Cursor cursor, const char *name) : cursor (cursor), name (name) {}
 	Cursor     cursor;
 	const char *name;
 };
@@ -371,40 +394,44 @@
 
 class GrabManager : boost::noncopyable
 {
-public:
-    GrabManager(CompScreen *screen);
-
-    bool addPassiveKeyGrab (CompAction::KeyBinding &key);
-    void removePassiveKeyGrab (CompAction::KeyBinding &key);
-    bool addPassiveButtonGrab (CompAction::ButtonBinding &button);
-    void removePassiveButtonGrab (CompAction::ButtonBinding &button);
-
-    void grabUngrabOneKey (unsigned int modifiers,
-			   int          keycode,
-			   bool         grab);
-    bool grabUngrabKeys (unsigned int modifiers,
-			 int          keycode,
-			 bool         grab);
-    void updatePassiveKeyGrabs ();
-    void updatePassiveButtonGrabs(Window serverFrame);
-
-    void setCurrentState(CompAction::State state);
-
-private:
-    CompScreen  * const screen;
-    CompAction::State currentState;
-
-    std::list<ButtonGrab> buttonGrabs;
-    std::list<KeyGrab>    keyGrabs;
+    public:
+
+	GrabManager(CompScreen *screen);
+
+	bool addPassiveKeyGrab (CompAction::KeyBinding &key);
+	void removePassiveKeyGrab (CompAction::KeyBinding &key);
+	bool addPassiveButtonGrab (CompAction::ButtonBinding &button);
+	void removePassiveButtonGrab (CompAction::ButtonBinding &button);
+
+	void grabUngrabOneKey (unsigned int modifiers,
+			       int          keycode,
+			       bool         grab);
+	bool grabUngrabKeys (unsigned int modifiers,
+			     int          keycode,
+			     bool         grab);
+	void updatePassiveKeyGrabs ();
+	void updatePassiveButtonGrabs(Window serverFrame);
+
+	void setCurrentState(CompAction::State state);
+
+    private:
+
+	CompScreen *const     screen;
+	CompAction::State     currentState;
+
+	std::list<ButtonGrab> buttonGrabs;
+	std::list<KeyGrab>    keyGrabs;
 };
 
 class History : public virtual ::compiz::History,
     boost::noncopyable
 {
     public:
+
 	History();
 
-	void setCurrentActiveWindowHistory (int x, int y);
+	void setCurrentActiveWindowHistory (int x,
+					    int y);
 
 	void addToCurrentActiveWindowHistory (Window id);
 
@@ -414,9 +441,10 @@
 	unsigned int activeNum () const;
 
     private:
+
 	CompActiveWindowHistory history[ACTIVE_WINDOW_HISTORY_NUM];
 	int                     currentHistory_;
-	unsigned int activeNum_;
+	unsigned int            activeNum_;
 };
 
 class ViewportRetrievalInterface
@@ -449,14 +477,15 @@
 namespace viewports
 {
     void viewportForGeometry (const CompWindow::Geometry &gm,
-			      CompPoint                   &viewport,
+			      CompPoint                  &viewport,
 			      ViewportRetrievalInterface *viewports,
-			      const CompSize &screenSize);
+			      const CompSize             &screenSize);
 }
 
 class StartupSequence : boost::noncopyable
 {
     public:
+
 	StartupSequence();
 	void addSequence (SnStartupSequence *sequence, CompPoint const& vp);
 	void removeSequence (SnStartupSequence *sequence);
@@ -466,6 +495,7 @@
 	virtual void updateStartupFeedback () = 0;
 	bool emptySequence() const { return startupSequences.empty(); }
     private:
+
 	std::list<CompStartupSequence *> startupSequences;
 	CompTimer                        startupSequenceTimer;
 };
@@ -474,44 +504,49 @@
 class StartupSequenceImpl : public StartupSequence
 {
     public:
-	StartupSequenceImpl(PrivateScreen* priv) : priv(priv) {}
+
+	StartupSequenceImpl(PrivateScreen *priv) : priv (priv) {}
 
 	virtual void updateStartupFeedback ();
     private:
-	PrivateScreen* const priv;
+
+	PrivateScreen *const priv;
 };
 
 class Extension
 {
-public:
-    Extension() : is_enabled(), extension() {}
-
-    template<Bool ExtensionQuery (Display*, int*, int*)>
-    bool init(Display * dpy)
-    {
-	int error;
-	is_enabled = ExtensionQuery(dpy, &extension, &error);
-	return is_enabled;
-    }
-
-    template<Bool ExtensionQuery(Display*, int*, int*, int*, int*, int*)>
-    bool init(Display * dpy)
-    {
-	int opcode;
-	int error;
-	is_enabled = ExtensionQuery(dpy, &opcode, &extension, &error, NULL, NULL);
-
-	if (!is_enabled) extension = -1;
-
-	return is_enabled;
-    }
-
-    int isEnabled () const { return is_enabled; }
-    int get () const { return extension; }
-
-private:
-    bool is_enabled;
-    int extension;
+    public:
+
+	Extension() : is_enabled(), extension() {}
+
+	template<Bool ExtensionQuery (Display*, int*, int*)>
+	bool init(Display * dpy)
+	{
+	    int error;
+	    is_enabled = ExtensionQuery(dpy, &extension, &error);
+	    return is_enabled;
+	}
+
+	template<Bool ExtensionQuery(Display*, int*, int*, int*, int*, int*)>
+	bool init(Display * dpy)
+	{
+	    int opcode;
+	    int error;
+	    is_enabled = ExtensionQuery(dpy, &opcode, &extension, &error, NULL, NULL);
+
+	    if (!is_enabled)
+		extension = -1;
+
+	    return is_enabled;
+	}
+
+	int isEnabled () const { return is_enabled; }
+	int get () const { return extension; }
+
+    private:
+
+	bool is_enabled;
+	int extension;
 };
 
 class Ping :
@@ -724,6 +759,7 @@
     { pingTimer.setCallback(callback); }
 
 public:
+
     Display* dpy;
     compiz::private_screen::Extension xSync;
     compiz::private_screen::Extension xRandr;
@@ -744,7 +780,6 @@
 
     Window wmSnSelectionWindow;
 
-    int    clientPointerDeviceId;
     Cursor normalCursor;
     Cursor busyCursor;
     Cursor invisibleCursor;
@@ -753,6 +788,7 @@
     bool initialized;
 
 private:
+
     CompScreen* screen;
     compiz::private_screen::Extension xkbEvent;
 
@@ -822,6 +858,7 @@
     ::compiz::private_screen::History
 {
     public:
+
 	CompScreenImpl ();
 	~CompScreenImpl ();
 
@@ -919,7 +956,8 @@
 	CompWindowList & serverWindows ();
 	CompWindowList & destroyedWindows ();
 
-	void warpPointer (int dx, int dy);
+	void warpPointer (int dx,
+			  int dy);
 
 	Time getCurrentTime ();
 
@@ -929,7 +967,8 @@
 
 	void focusDefaultWindow ();
 
-	void insertWindow (CompWindow *w, Window aboveId);
+	void insertWindow (CompWindow *w,
+			   Window     aboveId);
 	void unhookWindow (CompWindow *w);
 
 	void insertServerWindow (CompWindow *w, Window aboveId);
@@ -981,7 +1020,9 @@
 
 	void runCommand (CompString command);
 
-	void moveViewport (int tx, int ty, bool sync);
+	void moveViewport (int  tx,
+			   int  ty,
+			   bool sync);
 
 	void sendWindowActivationRequest (Window id);
 
@@ -1026,32 +1067,32 @@
 
 	void updateSupportedWmHints ();
 
-	unsigned int showingDesktopMask() const;
-	virtual bool grabsEmpty() const;
-	virtual void sizePluginClasses(unsigned int size);
+	unsigned int showingDesktopMask () const;
+	virtual bool grabsEmpty () const;
+	virtual void sizePluginClasses (unsigned int size);
 	virtual void setWindowState (unsigned int state, Window id);
-	virtual void addToDestroyedWindows(CompWindow * cw);
+	virtual void addToDestroyedWindows (CompWindow * cw);
 	virtual void processEvents ();
 	virtual void alwaysHandleEvent (XEvent *event);
 
 	virtual ServerGrabInterface * serverGrabInterface ();
 
 	virtual void updatePassiveKeyGrabs () const;
-	virtual void updatePassiveButtonGrabs(Window serverFrame);
+	virtual void updatePassiveButtonGrabs (Window serverFrame);
 
-	virtual bool displayInitialised() const;
+	virtual bool displayInitialised () const;
 	virtual void applyStartupProperties (CompWindow *window);
-	virtual void updateClientList();
-	virtual CompWindow * getTopWindow() const;
-	virtual CompWindow * getTopServerWindow() const;
-	virtual CoreOptions& getCoreOptions();
-	virtual Colormap colormap() const;
+	virtual void updateClientList ();
+	virtual CompWindow * getTopWindow () const;
+	virtual CompWindow * getTopServerWindow () const;
+	virtual CoreOptions& getCoreOptions ();
+	virtual Colormap colormap () const;
 	virtual void setCurrentDesktop (unsigned int desktop);
-	virtual Window activeWindow() const;
-	virtual bool grabWindowIsNot(Window w) const;
-	virtual void incrementPendingDestroys();
-	virtual void setNextActiveWindow(Window id);
-	virtual Window getNextActiveWindow() const;
+	virtual Window activeWindow () const;
+	virtual bool grabWindowIsNot (Window w) const;
+	virtual void incrementPendingDestroys ();
+	virtual void setNextActiveWindow (Window id);
+	virtual Window getNextActiveWindow () const;
 	virtual CompWindow * focusTopMostWindow ();
 
     public :
@@ -1120,43 +1161,54 @@
 
 
     private:
-        virtual bool _setOptionForPlugin(const char *, const char *, CompOption::Value &);
-        virtual bool _initPluginForScreen(CompPlugin *);
-        virtual void _finiPluginForScreen(CompPlugin *);
-        virtual void _handleEvent(XEvent *event);
-        virtual void _logMessage(const char *, CompLogLevel, const char*);
-        virtual void _enterShowDesktopMode();
-        virtual void _leaveShowDesktopMode(CompWindow *);
-        virtual void _addSupportedAtoms(std::vector<Atom>& atoms);
+	virtual bool _setOptionForPlugin (const char *, const char *, CompOption::Value &);
+	virtual bool _initPluginForScreen (CompPlugin *);
+	virtual void _finiPluginForScreen (CompPlugin *);
+	virtual void _handleEvent (XEvent *event);
+	virtual void _logMessage (const char               *,
+				  CompLogLevel, const char *);
+	virtual void _enterShowDesktopMode ();
+	virtual void _leaveShowDesktopMode (CompWindow *);
+	virtual void _addSupportedAtoms (std::vector<Atom>& atoms);
 
-        // These are stubs - but allow mocking of AbstractCompWindow
-        virtual void _fileWatchAdded(CompFileWatch *);
-        virtual void _fileWatchRemoved(CompFileWatch *);
-        virtual void _sessionEvent(CompSession::Event, CompOption::Vector &);
-        virtual void _handleCompizEvent(const char *, const char *, CompOption::Vector &);
-        virtual bool _fileToImage(CompString &, CompSize &, int &, void *&);
-        virtual bool _imageToFile(CompString &, CompString &, CompSize &, int, void *);
-        virtual CompMatch::Expression * _matchInitExp(const CompString&);
-        virtual void _matchExpHandlerChanged();
-        virtual void _matchPropertyChanged(CompWindow *);
-        virtual void _outputChangeNotify();
+	// These are stubs - but allow mocking of AbstractCompWindow
+	virtual void _fileWatchAdded (CompFileWatch *);
+	virtual void _fileWatchRemoved (CompFileWatch *);
+	virtual void _sessionEvent (CompSession::Event  ,
+				    CompOption::Vector &);
+	virtual void _handleCompizEvent (const char         *,
+					 const char         *,
+					 CompOption::Vector &);
+	virtual bool _fileToImage (CompString &,
+				   CompSize   &,
+				   int        &,
+				   void       *&);
+	virtual bool _imageToFile (CompString &,
+				   CompString &,
+				   CompSize   &,
+				   int         ,
+				   void       *);
+	virtual CompMatch::Expression * _matchInitExp (const CompString &);
+	virtual void _matchExpHandlerChanged ();
+	virtual void _matchPropertyChanged (CompWindow *);
+	virtual void _outputChangeNotify ();
 
 	void grabServer ();
 	void ungrabServer ();
 	void syncServer ();
 
-        bool handlePingTimeout();
+	bool handlePingTimeout();
 
-        Window below;
-	CompTimer autoRaiseTimer_;
-	Window    autoRaiseWindow_;
-	CompIcon *defaultIcon_;
+	Window                                      below;
+	CompTimer                                   autoRaiseTimer_;
+	Window                                      autoRaiseWindow_;
+	CompIcon                                    *defaultIcon_;
 	compiz::private_screen::GrabManager mutable grabManager;
-    	ValueHolder valueHolder;
-        bool 	eventHandled;
-        PrivateScreen privateScreen;
-        compiz::private_screen::WindowManager windowManager;
-        unsigned int showingDesktopMask_;
+	ValueHolder                                 valueHolder;
+	bool                                        eventHandled;
+	PrivateScreen                               privateScreen;
+	compiz::private_screen::WindowManager       windowManager;
+	unsigned int                                showingDesktopMask_;
 };
 
 #endif