summaryrefslogtreecommitdiff
path: root/src/screen.cpp
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-02-05 00:03:50 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-02-05 00:03:50 +0800
commit66f4693a0bc49c2cac25a37823fdbbb14d3aa970 (patch)
tree682f87e77b2386e93a1237162b525e5f4f085459 /src/screen.cpp
parent08c22af5823771444b8c189c265a526ccb998068 (diff)
parentd6769e8e58c5582dbcfb1b713a3e44673f75f451 (diff)
downloadunity-window-decorator-66f4693a0bc49c2cac25a37823fdbbb14d3aa970.tar.gz
unity-window-decorator-66f4693a0bc49c2cac25a37823fdbbb14d3aa970.tar.bz2
Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
Conflicts: plugins/place/src/place.cpp
Diffstat (limited to 'src/screen.cpp')
-rw-r--r--src/screen.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/screen.cpp b/src/screen.cpp
index 5429e71..d9d2731 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -2123,6 +2123,18 @@ PrivateScreen::setSupportingWmCheck ()
}
void
+CompScreen::updateSupportedWmHints ()
+{
+ std::vector<Atom> atoms;
+
+ addSupportedAtoms (atoms);
+
+ XChangeProperty (dpy (), root (), Atoms::supported,
+ XA_ATOM, 32, PropModeReplace,
+ (const unsigned char *) &atoms.at (0), atoms.size ());
+}
+
+void
CompScreen::addSupportedAtoms (std::vector<Atom> &atoms)
{
WRAPABLE_HND_FUNC (17, addSupportedAtoms, atoms);
@@ -2220,10 +2232,6 @@ CompScreen::addSupportedAtoms (std::vector<Atom> &atoms)
atoms.push_back (Atoms::restackWindow);
atoms.push_back (Atoms::wmFullscreenMonitors);
-
- XChangeProperty (dpy (), root (), Atoms::supported,
- XA_ATOM, 32, PropModeReplace,
- (const unsigned char *) &atoms.at (0), atoms.size ());
}
void
@@ -4077,7 +4085,6 @@ CompScreen::init (const char *name)
unsigned int nchildren;
int defaultDepth, nvisinfo;
XSetWindowAttributes attrib;
- std::vector<Atom> atomList;
CompOption::Value::Vector vList;
@@ -4410,7 +4417,7 @@ CompScreen::init (const char *name)
priv->setDesktopHints ();
priv->setSupportingWmCheck ();
- addSupportedAtoms (atomList);
+ updateSupportedWmHints ();
priv->normalCursor = XCreateFontCursor (dpy, XC_left_ptr);
priv->busyCursor = XCreateFontCursor (dpy, XC_watch);