Merge lp:~alan-griffiths/compiz-core/more-PrivateScreen-tidy-up into lp:compiz-core/0.9.8

[Alan Griffiths]

More tidy-up of PrivateScreen code

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2012-05-04 11:55:34 +0000
+++ src/privatescreen.h	2012-05-07 16:39:19 +0000
@@ -75,11 +75,13 @@
 
     int outputDeviceForGeometry(const CompWindow::Geometry& gm, int strategy,
 	    CompScreen* screen) const;
+    void updateOutputDevices(CoreOptions& coreOptions, CompScreen* screen);
+
+private:
     void setGeometryOnDevice(unsigned int nOutput, int x, int y,
 	    const int width, const int height);
     void adoptDevices(unsigned int nOutput);
 
-private:
     static CompRect computeWorkareaForBox(const CompRect& box,
 	    const CompWindowList& windows);
 
@@ -712,105 +714,101 @@
 	int  getXkbEvent() const { return xkbEvent.get(); }
 	std::vector<XineramaScreenInfo>& getScreenInfo () { return screenInfo; }
 	SnDisplay* getSnDisplay () const { return snDisplay; }
-	char const* displayString () const { return displayString_; }
-	CompRegion const& getRegion () const { return region; }
-	XWindowAttributes const& getAttrib () const { return attrib; }
-	Window rootWindow() const { return root; }
-	void identifyEdgeWindow(Window id);
-
-	void setPlugins(CompOption::Value::Vector const& vList);
-	void initPlugins();
-
-	void updateClientList () { windowManager.updateClientList (*this); }
-
-	void detectOutputDevices (CoreOptions& coreOptions);
-	void updateOutputDevices (CoreOptions& coreOptions);
-
-    public:
-	Display    *dpy;
-	::compiz::private_screen::Extension xSync;
-	::compiz::private_screen::Extension xRandr;
-	::compiz::private_screen::Extension xShape;
-	::compiz::private_screen::History history;
-
-	::compiz::private_screen::ViewPort viewPort;
-	::compiz::private_screen::StartupSequenceImpl startupSequence;
-	::compiz::private_screen::GrabManager grabManager;
-	::compiz::private_screen::EventManager eventManager;
-	::compiz::private_screen::Ping ping;
-	::compiz::private_screen::OrphanData orphanData;
-	::compiz::private_screen::OutputDevices outputDevices;
-	::compiz::private_screen::WindowManager windowManager;
-
-    private:
-	CompScreen* screen;
-	::compiz::private_screen::Extension xkbEvent;
-
-	//TODO? Pull these two out as a class?
-	bool xineramaExtension;
-	std::vector<XineramaScreenInfo> screenInfo;
-
-	SnDisplay *snDisplay;
-
-	char   displayString_[256];
-
-	KeyCode escapeKeyCode;
-	KeyCode returnKeyCode;
-
-    public:
-	Colormap colormap;
-	int      screenNum;
-
-	unsigned int nDesktop;
-	unsigned int currentDesktop;
-
-    private:
-	CompRegion   region;
-
-	Window	      root;
-
-	XWindowAttributes attrib;
-    public:
-
-	CompOutput         fullscreenOutput;
-
-	CompScreenEdge screenEdge[SCREEN_EDGE_NUM];
-
-    private:
-	SnMonitorContext                 *snContext;
-
-    public:
-	Window wmSnSelectionWindow;
-    private:
-	Atom   wmSnAtom;
-	Time   wmSnTimestamp;
-
-    public:
-	Cursor normalCursor;
-	Cursor busyCursor;
-	Cursor invisibleCursor;
-
-	CompRect workArea;
-
-	unsigned int showingDesktopMask;
-
-    private:
-	unsigned long *desktopHintData;
-	int           desktopHintSize;
-
-    public:
-	bool initialized;
-
-    private:
-	bool handlePingTimeout ();
-
-	Window	edgeWindow;
-
-	CompTimer    pingTimer;
-	CompTimer               edgeDelayTimer;
-	CompDelayedEdgeSettings edgeDelaySettings;
-	Window	xdndWindow;
-	::compiz::private_screen::PluginManager pluginManager;
+	const char* displayString() const
+    {
+	return displayString_;
+    }
+
+    const CompRegion& getRegion() const
+    {
+	return region;
+    }
+
+    const XWindowAttributes& getAttrib() const
+    {
+	return attrib;
+    }
+
+    Window rootWindow() const
+    {
+	return root;
+    }
+
+    void identifyEdgeWindow(Window id);
+    void setPlugins(const CompOption::Value::Vector& vList);
+    void initPlugins();
+
+    void updateClientList()
+    {
+	windowManager.updateClientList(*this);
+    }
+
+    void detectOutputDevices(CoreOptions& coreOptions);
+    void updateOutputDevices(CoreOptions& coreOptions);
+
+public:
+    Display* dpy;
+    compiz::private_screen::Extension xSync;
+    compiz::private_screen::Extension xRandr;
+    compiz::private_screen::Extension xShape;
+    compiz::private_screen::History history;
+    compiz::private_screen::ViewPort viewPort;
+    compiz::private_screen::StartupSequenceImpl startupSequence;
+    compiz::private_screen::GrabManager grabManager;
+    compiz::private_screen::EventManager eventManager;
+    compiz::private_screen::Ping ping;
+    compiz::private_screen::OrphanData orphanData;
+    compiz::private_screen::OutputDevices outputDevices;
+    compiz::private_screen::WindowManager windowManager;
+
+    Colormap colormap;
+    int screenNum;
+    unsigned int nDesktop;
+    unsigned int currentDesktop;
+
+    CompOutput fullscreenOutput;
+    CompScreenEdge screenEdge[SCREEN_EDGE_NUM];
+
+    Window wmSnSelectionWindow;
+
+    Cursor normalCursor;
+    Cursor busyCursor;
+    Cursor invisibleCursor;
+    CompRect workArea;
+    unsigned int showingDesktopMask;
+
+    bool initialized;
+
+private:
+    bool handlePingTimeout();
+
+    CompScreen* screen;
+    compiz::private_screen::Extension xkbEvent;
+    //TODO? Pull these two out as a class?
+    bool xineramaExtension;
+    std::vector<XineramaScreenInfo> screenInfo;
+    SnDisplay* snDisplay;
+    char displayString_[256];
+    KeyCode escapeKeyCode;
+    KeyCode returnKeyCode;
+
+    CompRegion region;
+    Window root;
+    XWindowAttributes attrib;
+
+    SnMonitorContext* snContext;
+
+    Atom wmSnAtom;
+    Time wmSnTimestamp;
+
+    unsigned long *desktopHintData;
+    int desktopHintSize;
+
+    Window edgeWindow;
+    CompTimer pingTimer;
+    CompTimer edgeDelayTimer;
+    CompDelayedEdgeSettings edgeDelaySettings;
+    Window xdndWindow;compiz::private_screen::PluginManager pluginManager;
 };
 
 class CompManager

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-05-04 11:55:34 +0000
+++ src/screen.cpp	2012-05-07 16:39:19 +0000
@@ -1988,32 +1988,32 @@
 	    if (outputDevs[i].intersects(outputDevs[j]))
 		overlappingOutputs = true;
 }
+
 void
-PrivateScreen::updateOutputDevices (CoreOptions& coreOptions)
+cps::OutputDevices::updateOutputDevices(CoreOptions& coreOptions, CompScreen* screen)
 {
-    CompOption::Value::Vector &list = coreOptions.optionGetOutputs ();
-    unsigned int              nOutput = 0;
-    int		              x, y, bits;
-    unsigned int              uWidth, uHeight;
-    int                       width, height;
-    int		              x1, y1, x2, y2;
-
-    foreach (CompOption::Value &value, list)
+    CompOption::Value::Vector& list = coreOptions.optionGetOutputs();
+    unsigned int nOutput = 0;
+    int x, y, bits;
+    unsigned int uWidth, uHeight;
+    int width, height;
+    int x1, y1, x2, y2;
+    foreach(CompOption::Value & value, list)
     {
-	x      = 0;
-	y      = 0;
-	uWidth  = (unsigned) screen->width ();
-	uHeight = (unsigned) screen->height ();
+	x = 0;
+	y = 0;
+	uWidth = (unsigned) screen->width();
+	uHeight = (unsigned) screen->height();
 
-	bits = XParseGeometry (value.s ().c_str (), &x, &y, &uWidth, &uHeight);
-	width  = (int) uWidth;
+	bits = XParseGeometry(value.s().c_str(), &x, &y, &uWidth, &uHeight);
+	width = (int) uWidth;
 	height = (int) uHeight;
 
 	if (bits & XNegative)
-	    x = screen->width () + x - width;
+	    x = screen->width() + x - width;
 
 	if (bits & YNegative)
-	    y = screen->height () + y - height;
+	    y = screen->height() + y - height;
 
 	x1 = x;
 	y1 = y;
@@ -2024,19 +2024,24 @@
 	    x1 = 0;
 	if (y1 < 0)
 	    y1 = 0;
-	if (x2 > screen->width ())
-	    x2 = screen->width ();
-	if (y2 > screen->height ())
-	    y2 = screen->height ();
+	if (x2 > screen->width())
+	    x2 = screen->width();
+	if (y2 > screen->height())
+	    y2 = screen->height();
 
 	if (x1 < x2 && y1 < y2)
 	{
-	    outputDevices.setGeometryOnDevice(nOutput, x1, y1, x2 - x1, y2 - y1);
+	    setGeometryOnDevice(nOutput, x1, y1, x2 - x1, y2 - y1);
 	    nOutput++;
 	}
     }
+    adoptDevices(nOutput);
+}
 
-    outputDevices.adoptDevices(nOutput);
+void
+PrivateScreen::updateOutputDevices (CoreOptions& coreOptions)
+{
+    outputDevices.updateOutputDevices(coreOptions, screen);
 
     /* clear out fullscreen monitor hints of all windows as
        suggested on monitor layout changes in EWMH */
@@ -5224,22 +5229,22 @@
     startupSequence(this),
     grabManager (screen),
     eventManager (),
-    screen(screen),
-    screenInfo (),
-    snDisplay(0),
     nDesktop (1),
     currentDesktop (0),
-    root(None),
-    snContext (0),
     wmSnSelectionWindow (None),
-    wmSnAtom (None),
     normalCursor (None),
     busyCursor (None),
     invisibleCursor (None),
     showingDesktopMask (0),
+    initialized (false),
+    screen(screen),
+    screenInfo (),
+    snDisplay(0),
+    root(None),
+    snContext (0),
+    wmSnAtom (None),
     desktopHintData (0),
     desktopHintSize (0),
-    initialized (false),
     edgeWindow (None),
     edgeDelayTimer (),
     xdndWindow (None)