[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] kwin/libkwineffects: Temporarily revert to XDisplayWidth/Height
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2013-03-11 14:15:38
Message-ID: 20130311141538.2C232A604F () git ! kde ! org
[Download RAW message or body]

Git commit c61081ffed38a2f124631d41cede6e2b839026c9 by Martin Gräßlin.
Committed on 11/03/2013 at 15:14.
Pushed by graesslin into branch 'master'.

Temporarily revert to XDisplayWidth/Height

We don't like broken master. Proper fix coming later on.

BUG: 316040

M  +8    -0    kwin/libkwineffects/kwinglobals.h

http://commits.kde.org/kde-workspace/c61081ffed38a2f124631d41cede6e2b839026c9

diff --git a/kwin/libkwineffects/kwinglobals.h b/kwin/libkwineffects/kwinglobals.h
index 68e18b4..867b0a3 100644
--- a/kwin/libkwineffects/kwinglobals.h
+++ b/kwin/libkwineffects/kwinglobals.h
@@ -177,15 +177,23 @@ KWIN_EXPORT xcb_screen_t *defaultScreen()
 inline
 KWIN_EXPORT int displayWidth()
 {
+#if 0
     xcb_screen_t *screen = defaultScreen();
     return screen ? screen->width_in_pixels : 0;
+#else
+    return XDisplayWidth(display(), DefaultScreen(display()));
+#endif
 }
 
 inline
 KWIN_EXPORT int displayHeight()
 {
+#if 0
     xcb_screen_t *screen = defaultScreen();
     return screen ? screen->height_in_pixels : 0;
+#else
+    return XDisplayHeight(display(), DefaultScreen(display()));
+#endif
 }
 
 /** @internal */
[prev in list] [next in list] [prev in thread] [next in thread]