summaryrefslogtreecommitdiff
path: root/src/screen.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/screen.cpp')
-rw-r--r--src/screen.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/screen.cpp b/src/screen.cpp
index c9af3df..e56d2e0 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -4531,6 +4531,7 @@ CompScreen::init (const char *name)
XDefineCursor (dpy, priv->root, priv->normalCursor);
XUngrabServer (dpy);
+ XSync (dpy, FALSE);
priv->setAudibleBell (priv->optionGetAudibleBell ());
@@ -4541,6 +4542,13 @@ CompScreen::init (const char *name)
priv->addScreenActions ();
+ /* Need to set a default here so that the value isn't uninitialized
+ * when loading plugins FIXME: Should find a way to initialize options
+ * first and then set this value, or better yet, tie this value directly
+ * to the option */
+ priv->vpSize.setWidth (priv->optionGetHsize ());
+ priv->vpSize.setHeight (priv->optionGetVsize ());
+
priv->initialized = true;
/* TODO: Bailout properly when screenInitPlugins fails
@@ -4554,6 +4562,9 @@ CompScreen::init (const char *name)
/* The active plugins list might have been changed - load any
* new plugins */
+ priv->vpSize.setWidth (priv->optionGetHsize ());
+ priv->vpSize.setHeight (priv->optionGetVsize ());
+
if (priv->dirtyPluginList)
priv->updatePlugins ();
@@ -4583,8 +4594,7 @@ CompScreen::init (const char *name)
}
}
- priv->vpSize.setWidth (priv->optionGetHsize ());
- priv->vpSize.setHeight (priv->optionGetVsize ());
+ i = 0;
/* enforce restack on all windows */
i = 0;