summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Reveman <davidr@novell.com>2009-01-28 16:41:31 -0500
committerDavid Reveman <davidr@novell.com>2009-01-28 16:41:31 -0500
commit8c42e990dae0dbbe5c70997c9bbb11c1199c3890 (patch)
treeea01cd59a93767ef851ba405376afb99148e1546
parentc1949935026925075217bd2821b6910928d251b9 (diff)
Make sure screen edges are created before they are used.
-rw-r--r--src/screen.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/screen.c b/src/screen.c
index 7468e2a7..29979de9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2373,19 +2373,6 @@ addScreen (CompDisplay *display,
s->redrawTime = 1000 / defaultRefreshRate;
s->optimalRedrawTime = s->redrawTime;
- reshape (s, s->attrib.width, s->attrib.height);
-
- detectRefreshRateOfScreen (s);
- detectOutputDevices (s);
- updateOutputDevices (s);
-
- s->lighting = FALSE;
- s->slowAnimations = FALSE;
-
- addScreenToDisplay (display, s);
-
- getDesktopHints (s);
-
attrib.override_redirect = 1;
attrib.event_mask = PropertyChangeMask;
@@ -2422,6 +2409,19 @@ addScreen (CompDisplay *display,
updateScreenEdges (s);
+ reshape (s, s->attrib.width, s->attrib.height);
+
+ detectRefreshRateOfScreen (s);
+ detectOutputDevices (s);
+ updateOutputDevices (s);
+
+ s->lighting = FALSE;
+ s->slowAnimations = FALSE;
+
+ addScreenToDisplay (display, s);
+
+ getDesktopHints (s);
+
s->normalCursor = XCreateFontCursor (dpy, XC_left_ptr);
s->busyCursor = XCreateFontCursor (dpy, XC_watch);