Cleanup private headers.

2 files changed, 165 insertions, 246 deletions

diff --git a/src/privatescreen.h b/src/privatescreen.h
index 2bc3f2d..aeecfdb 100644
--- a/src/privatescreen.h
+++ b/src/privatescreen.h
@@ -17,13 +17,7 @@ typedef struct _CompWatchFd {
 } CompWatchFd;
 
 extern CompWindow *lastFoundWindow;
-extern CompWindow *lastDamagedWindow;
 extern bool	  useDesktopHints;
-extern bool       onlyCurrentScreen;
-
-extern int  defaultRefreshRate;
-extern const char *defaultTextureFilter;
-
 
 #define COMP_OPTION_ACTIVE_PLUGINS                   0
 #define COMP_OPTION_CLICK_TO_FOCUS                   1
@@ -196,142 +190,105 @@ class PrivateScreen {
 
 	void updatePassiveGrabs ();
 
-	short int
-	watchFdEvents (CompWatchFdHandle handle);
+	short int watchFdEvents (CompWatchFdHandle handle);
 
-	int
-	doPoll (int timeout);
+	int doPoll (int timeout);
 
-	void
-	handleTimers (struct timeval *tv);
+	void handleTimers (struct timeval *tv);
 
 	void addTimer (CompTimer *timer);
 	void removeTimer (CompTimer *timer);
 
-		void
-	updatePlugins ();
+	void updatePlugins ();
+
+	bool triggerButtonPressBindings (CompOption::Vector &options,
+					 XButtonEvent       *event,
+					 CompOption::Vector &arguments);
 
-	bool
-	triggerButtonPressBindings (CompOption::Vector &options,
-				    XButtonEvent       *event,
-				    CompOption::Vector &arguments);
+	bool triggerButtonReleaseBindings (CompOption::Vector &options,
+					   XButtonEvent       *event,
+					   CompOption::Vector &arguments);
 
-	bool
-	triggerButtonReleaseBindings (CompOption::Vector &options,
-				      XButtonEvent       *event,
+	bool triggerKeyPressBindings (CompOption::Vector &options,
+				      XKeyEvent          *event,
 				      CompOption::Vector &arguments);
 
-	bool
-	triggerKeyPressBindings (CompOption::Vector &options,
-				 XKeyEvent          *event,
-				 CompOption::Vector &arguments);
-
-	bool
-	triggerKeyReleaseBindings (CompOption::Vector &options,
-				   XKeyEvent          *event,
-				   CompOption::Vector &arguments);
-
-	bool
-	triggerStateNotifyBindings (CompOption::Vector  &options,
-				    XkbStateNotifyEvent *event,
-				    CompOption::Vector  &arguments);
-	bool
-	triggerEdgeEnter (unsigned int       edge,
-			  CompAction::State  state,
-     			  CompOption::Vector &arguments);
-
-	void
-	setAudibleBell (bool audible);
-
-	bool
-	handlePingTimeout ();
+	bool triggerKeyReleaseBindings (CompOption::Vector &options,
+					XKeyEvent          *event,
+					CompOption::Vector &arguments);
+
+	bool triggerStateNotifyBindings (CompOption::Vector  &options,
+					 XkbStateNotifyEvent *event,
+					 CompOption::Vector  &arguments);
+
+	bool triggerEdgeEnter (unsigned int       edge,
+			       CompAction::State  state,
+			       CompOption::Vector &arguments);
+
+	void setAudibleBell (bool audible);
+
+	bool handlePingTimeout ();
 	
-	bool
-	handleActionEvent (XEvent *event);
+	bool handleActionEvent (XEvent *event);
 
-	void
-	handleSelectionRequest (XEvent *event);
+	void handleSelectionRequest (XEvent *event);
 
-	void
-	handleSelectionClear (XEvent *event);
+	void handleSelectionClear (XEvent *event);
 	
-	bool
-	desktopHintEqual (unsigned long *data,
-			  int           size,
-			  int           offset,
-			  int           hintSize);
+	bool desktopHintEqual (unsigned long *data,
+			       int           size,
+			       int           offset,
+			       int           hintSize);
 
-	void
-	setDesktopHints ();
+	void setDesktopHints ();
 
-	void
-	setVirtualScreenSize (int hsize, int vsize);
+	void setVirtualScreenSize (int hsize, int vsize);
 
-	void
-	updateOutputDevices ();
+	void updateOutputDevices ();
 
-	void
-	detectOutputDevices ();
+	void detectOutputDevices ();
 
-	void
-	updateStartupFeedback ();
+	void updateStartupFeedback ();
 
-	void
-	updateScreenEdges ();
+	void updateScreenEdges ();
 
-	void
-	reshape (int w, int h);
+	void reshape (int w, int h);
 
-	bool
-	handleStartupSequenceTimeout();
+	bool handleStartupSequenceTimeout();
 
-	void
-	addSequence (SnStartupSequence *sequence);
+	void addSequence (SnStartupSequence *sequence);
 
-	void
-	removeSequence (SnStartupSequence *sequence);
+	void removeSequence (SnStartupSequence *sequence);
 
-	void
-	setSupportingWmCheck ();
+	void setSupportingWmCheck ();
 
-	void
-	setSupported ();
+	void setSupported ();
 
-	void
-	getDesktopHints ();
+	void getDesktopHints ();
 
-	void
-	grabUngrabOneKey (unsigned int modifiers,
-			  int          keycode,
-			  bool         grab);
+	void grabUngrabOneKey (unsigned int modifiers,
+			       int          keycode,
+			       bool         grab);
 
 
-	bool
-	grabUngrabKeys (unsigned int modifiers,
-			int          keycode,
-			bool         grab);
+	bool grabUngrabKeys (unsigned int modifiers,
+			     int          keycode,
+			     bool         grab);
 
-	bool
-	addPassiveKeyGrab (CompAction::KeyBinding &key);
+	bool addPassiveKeyGrab (CompAction::KeyBinding &key);
 
-	void
-	removePassiveKeyGrab (CompAction::KeyBinding &key);
+	void removePassiveKeyGrab (CompAction::KeyBinding &key);
 
-	void
-	updatePassiveKeyGrabs ();
+	void updatePassiveKeyGrabs ();
 
-	bool
-	addPassiveButtonGrab (CompAction::ButtonBinding &button);
+	bool addPassiveButtonGrab (CompAction::ButtonBinding &button);
 
-	void
-	removePassiveButtonGrab (CompAction::ButtonBinding &button);
+	void removePassiveButtonGrab (CompAction::ButtonBinding &button);
 
-	void
-	computeWorkareaForBox (BoxPtr pBox, XRectangle *area);
+	void computeWorkareaForBox (BoxPtr pBox, XRectangle *area);
 
 	void updateScreenInfo ();
 
-
 	void updateModifierMappings ();
 
 	unsigned int virtualToRealModMask (unsigned int modMask);
@@ -440,8 +397,8 @@ class PrivateScreen {
 
 	SnDisplay *snDisplay;
 
-	unsigned int      lastPing;
-	CompTimer   pingTimer;
+	unsigned int lastPing;
+	CompTimer    pingTimer;
 
 	Window activeWindow;
 
@@ -456,9 +413,9 @@ class PrivateScreen {
 	KeyCode returnKeyCode;
 
 	CompTimer autoRaiseTimer;
-	Window	      autoRaiseWindow;
+	Window    autoRaiseWindow;
 
-	CompTimer edgeDelayTimer;
+	CompTimer               edgeDelayTimer;
 	CompDelayedEdgeSettings edgeDelaySettings;
 
 	CompOption::Value plugin;
@@ -469,26 +426,26 @@ class PrivateScreen {
 	CompWindowList windows;
 	CompWindow::Map windowsMap;
 
-	Colormap	      colormap;
-	int		      screenNum;
+	Colormap colormap;
+	int      screenNum;
 
-	CompSize              size;
-	CompPoint             vp;
-	CompSize              vpSize;
-	unsigned int      nDesktop;
-	unsigned int      currentDesktop;
+	CompSize     size;
+	CompPoint    vp;
+	CompSize     vpSize;
+	unsigned int nDesktop;
+	unsigned int currentDesktop;
 	CompRegion   region;
 
 	Window	      root;
 
 	XWindowAttributes attrib;
-	Window	      grabWindow;
+	Window            grabWindow;
 
-	Cursor	      invisibleCursor;
+	Cursor  invisibleCursor;
 
-	int		      desktopWindowCount;
-	unsigned int      mapNum;
-	unsigned int      activeNum;
+	int          desktopWindowCount;
+	unsigned int mapNum;
+	unsigned int activeNum;
 
 	CompOutput::vector outputDevs;
 	int	           currentOutputDev;
@@ -498,13 +455,13 @@ class PrivateScreen {
 	XRectangle lastViewport;
 
 	CompActiveWindowHistory history[ACTIVE_WINDOW_HISTORY_NUM];
-	int			    currentHistory;
+	int                     currentHistory;
 
 	CompScreenEdge screenEdge[SCREEN_EDGE_NUM];
 
 	SnMonitorContext                 *snContext;
 	std::list<CompStartupSequence *> startupSequences;
-	CompTimer                  startupSequenceTimer;
+	CompTimer                        startupSequenceTimer;
 
 	std::list<CompGroup *> groups;
 
@@ -518,16 +475,15 @@ class PrivateScreen {
 	Cursor busyCursor;
 
 	CompWindow **clientList;
-	int	       nClientList;
+	int        nClientList;
 
 	std::list<ButtonGrab> buttonGrabs;	
-	std::list<KeyGrab> keyGrabs;
+	std::list<KeyGrab>    keyGrabs;
 
 	std::list<Grab *> grabs;
 
-	unsigned int    pendingDestroys;
+	unsigned int pendingDestroys;
 	
-
 	XRectangle workArea;
 
 	unsigned int showingDesktopMask;
@@ -538,7 +494,6 @@ class PrivateScreen {
         bool initialized;
 
 	CompOption::Vector opt;
-
 };
 
 #endif
diff --git a/src/privatewindow.h b/src/privatewindow.h
index 03af4d9..0897595 100644
--- a/src/privatewindow.h
+++ b/src/privatewindow.h
@@ -21,114 +21,84 @@ class PrivateWindow {
 	PrivateWindow (CompWindow *window);
 	~PrivateWindow ();
 
-	void
-	recalcNormalHints ();
+	void recalcNormalHints ();
 
-	void
-	updateFrameWindow ();
+	void updateFrameWindow ();
 
-	void
-	setWindowMatrix ();
+	void setWindowMatrix ();
 
-	bool
-	restack (Window aboveId);
+	bool restack (Window aboveId);
 
-	bool
-	initializeSyncCounter ();
+	bool initializeSyncCounter ();
 
-	bool
-	isGroupTransient (Window clientLeader);
+	bool isGroupTransient (Window clientLeader);
 
 
-	static bool
-	stackLayerCheck (CompWindow *w,
-			 Window	    clientLeader,
-			 CompWindow *below);
+	static bool stackLayerCheck (CompWindow *w,
+				     Window     clientLeader,
+				     CompWindow *below);
 
-	static bool
-	avoidStackingRelativeTo (CompWindow *w);
+	static bool avoidStackingRelativeTo (CompWindow *w);
 
-	static CompWindow *
-	findSiblingBelow (CompWindow *w,
-			  bool	     aboveFs);
+	static CompWindow * findSiblingBelow (CompWindow *w,
+					      bool       aboveFs);
 
-	static CompWindow *
-	findLowestSiblingBelow (CompWindow *w);
+	static CompWindow * findLowestSiblingBelow (CompWindow *w);
 
-	static bool
-	validSiblingBelow (CompWindow *w,
-			   CompWindow *sibling);
+	static bool validSiblingBelow (CompWindow *w,
+				       CompWindow *sibling);
 
-	void
-	saveGeometry (int mask);
+	void saveGeometry (int mask);
 
-	int
-	restoreGeometry (XWindowChanges *xwc, int mask);
+	int restoreGeometry (XWindowChanges *xwc, int mask);
 
-	void
-	reconfigureXWindow (unsigned int   valueMask,
-			    XWindowChanges *xwc);
+	void reconfigureXWindow (unsigned int   valueMask,
+				 XWindowChanges *xwc);
 
-	static bool
-	stackTransients (CompWindow     *w,
-			 CompWindow	*avoid,
-			 XWindowChanges *xwc);
+	static bool stackTransients (CompWindow     *w,
+				     CompWindow     *avoid,
+				     XWindowChanges *xwc);
 
-	static void
-	stackAncestors (CompWindow     *w, XWindowChanges *xwc);
+	static void stackAncestors (CompWindow *w, XWindowChanges *xwc);
 
-	static bool
-	isAncestorTo (CompWindow *transient,
-		      CompWindow *ancestor);
+	static bool isAncestorTo (CompWindow *transient,
+				  CompWindow *ancestor);
 
-	Window
-	getClientLeaderOfAncestor ();
+	Window getClientLeaderOfAncestor ();
 
-	CompWindow *
-	getModalTransient ();
+	CompWindow * getModalTransient ();
 
-	int
-	addWindowSizeChanges (XWindowChanges *xwc,
-			      CompWindow::Geometry old);
+	int addWindowSizeChanges (XWindowChanges *xwc,
+				  CompWindow::Geometry old);
 
-	int
-	addWindowStackChanges (XWindowChanges *xwc,
-			       CompWindow     *sibling);
+	int addWindowStackChanges (XWindowChanges *xwc,
+				   CompWindow     *sibling);
 
-	static CompWindow *
-	findValidStackSiblingBelow (CompWindow *w,
-				    CompWindow *sibling);
+	static CompWindow * findValidStackSiblingBelow (CompWindow *w,
+							CompWindow *sibling);
 
-	void
-	ensureWindowVisibility ();
+	void ensureWindowVisibility ();
 
-	void
-	reveal ();
+	void reveal ();
 
-	static void
-	revealAncestors (CompWindow *w,
-			 CompWindow *transient);
+	static void revealAncestors (CompWindow *w,
+				     CompWindow *transient);
 
-	static void
-	minimizeTransients (CompWindow *w,
-			    CompWindow *ancestor);
+	static void minimizeTransients (CompWindow *w,
+					CompWindow *ancestor);
 
-	static void
-	unminimizeTransients (CompWindow *w,
-			      CompWindow *ancestor);
+	static void unminimizeTransients (CompWindow *w,
+					  CompWindow *ancestor);
 
-	bool
-	getUsageTimestamp (Time *timestamp);
+	bool getUsageTimestamp (Time *timestamp);
 
-	bool
-	isWindowFocusAllowed (Time timestamp);
+	bool isWindowFocusAllowed (Time timestamp);
 
-	static void
-	handleDamageRect (CompWindow *w,
-			  int	   x,
-			  int	   y,
-			  int	   width,
-			  int	   height);
+	static void handleDamageRect (CompWindow *w,
+				      int         x,
+				      int         y,
+				      int         width,
+				      int         height);
 
 	bool reparent ();
 	void unreparent ();
@@ -202,40 +172,39 @@ class PrivateWindow {
 
 	CompWindow *window;
 
-	int		      refcnt;
-	Window	      id;
-	Window	      frame;
-	Window        wrapper;
-	unsigned int      mapNum;
-	unsigned int      activeNum;
-	XWindowAttributes attrib;
+	int                  refcnt;
+	Window	             id;
+	Window	             frame;
+	Window               wrapper;
+	unsigned int         mapNum;
+	unsigned int         activeNum;
+	XWindowAttributes    attrib;
 	CompWindow::Geometry geometry;
 	CompWindow::Geometry serverGeometry;
-	Window	      transientFor;
-	Window	      clientLeader;
-	XSizeHints	      sizeHints;
-
-	bool	      inputHint;
-	bool	      alpha;
-	int	      width;
-	int	      height;
-	CompRegion    region;
-	CompRegion    frameRegion;
-
-	unsigned int      wmType;
-	unsigned int      type;
-	unsigned int      state;
-	unsigned int      actions;
-	unsigned int      protocols;
-	unsigned int      mwmDecor;
-	unsigned int      mwmFunc;
-	bool	      invisible;
-	bool	      destroyed;
-
-	bool	      managed;
-
-	int		      destroyRefCnt;
-	int		      unmapRefCnt;
+	Window               transientFor;
+	Window               clientLeader;
+	XSizeHints	     sizeHints;
+
+	bool       inputHint;
+	bool       alpha;
+	int        width;
+	int        height;
+	CompRegion region;
+	CompRegion frameRegion;
+
+	unsigned int wmType;
+	unsigned int type;
+	unsigned int state;
+	unsigned int actions;
+	unsigned int protocols;
+	unsigned int mwmDecor;
+	unsigned int mwmFunc;
+	bool         invisible;
+	bool         destroyed;
+	bool         managed;
+
+	int destroyRefCnt;
+	int unmapRefCnt;
 
 	CompPoint initialViewport;
 
@@ -261,8 +230,7 @@ class PrivateWindow {
 	CompGroup *group;
 
 	unsigned int lastPong;
-	bool	 alive;
-
+	bool         alive;
 
 	CompWindowExtents input;
 	CompWindowExtents output;
@@ -279,20 +247,16 @@ class PrivateWindow {
 	int		   saveMask;
 
 	XSyncCounter  syncCounter;
-	XSyncValue	  syncValue;
-	XSyncAlarm	  syncAlarm;
+	XSyncValue    syncValue;
+	XSyncAlarm    syncAlarm;
 	unsigned long syncAlarmConnection;
-	CompTimer   syncWaitTimer;
+	CompTimer     syncWaitTimer;
 
-	bool     syncWait;
+	bool                 syncWait;
 	CompWindow::Geometry syncGeometry;
 
 	bool closeRequests;
 	Time lastCloseRequestTime;
-
-
-
-
 };
 
 #endif