Merge branch 'KDE/4.10'

Conflicts:
	kwin/workspace.cpp

composite.cpp

@@ -918,8 +918,7 @@ void Toplevel::damageNotifyEvent(XDamageNotifyEvent* e)
 
 bool Toplevel::compositing() const
 {
-    Compositor *c = Compositor::self();
-    return c && c->hasScene();
+    return Workspace::self()->compositing();
 }
 
 void Client::damageNotifyEvent(XDamageNotifyEvent* e)

composite.h

@@ -139,7 +139,6 @@ public:
      * @see createCompositor
      **/
     static Compositor *self() {
-        Q_ASSERT(s_compositor);
         return s_compositor;
     }
     /**

kcmkwin/kwinoptions/kwinfocus.desktop

@@ -146,7 +146,7 @@ Comment[lv]=Šeit jūs varat konfigurēt logu fokusēšanās politiku
 Comment[mai]=विंडो फोकस पालिसी बिन्यस्त करू
 Comment[mk]=Конфигурирајте ја политиката на фокусирање на прозорците
 Comment[ml]=ജാലകം ഫോകസ് ചെയ്യേണ്ടതെങ്ങനെയെന്നു ക്രമീകരിക്കുക
-Comment[mr]=चौकट केंद्र करार संयोजीत करा
+Comment[mr]=चौकट केंद्रीत धोरण संयोजीत करा
 Comment[nb]=Sett opp praksis for vindusfokus
 Comment[nds]=Regeln för den Finsterfokus instellen
 Comment[ne]=सञ्झ्याल फोकस नीति कन्फिगर गर्नुहोस्

workspace.cpp

@@ -83,6 +83,7 @@ namespace KWin
 {
 
 extern int screen_number;
+extern bool is_multihead;
 
 #ifdef KWIN_BUILD_KAPPMENU
 static const char *KDED_SERVICE = "org.kde.kded";
@@ -1998,6 +1999,25 @@ QString Workspace::supportInformation() const
         }
         support.append(QLatin1String(property.name()) % ": " % options->property(property.name()).toString() % '\n');
     }
+    support.append("\nScreens\n");
+    support.append(  "=======\n");
+    support.append("Multi-Head: ");
+    if (is_multihead) {
+        support.append("yes\n");
+        support.append(QString("Head: %1\n").arg(screen_number));
+    } else {
+        support.append("no\n");
+    }
+    support.append(QString("Number of Screens: %1\n").arg(QApplication::desktop()->screenCount()));
+    for (int i=0; i<QApplication::desktop()->screenCount(); ++i) {
+        const QRect geo = QApplication::desktop()->screenGeometry(i);
+        support.append(QString("Screen %1 Geometry: %2,%3,%4x%5\n")
+                              .arg(i)
+                              .arg(geo.x())
+                              .arg(geo.y())
+                              .arg(geo.width())
+                              .arg(geo.height()));
+    }
     support.append("\nCompositing\n");
     support.append(  "===========\n");
     support.append("Qt Graphics System: ");

workspace.h

@@ -414,6 +414,11 @@ public:
         return movingClient;
     }
 
+    /**
+     * @returns Whether we have a Compositor and it is active (Scene created)
+     **/
+    bool compositing() const;
+
 public slots:
     // Keybindings
     //void slotSwitchToWindow( int );
@@ -625,11 +630,6 @@ private:
     static NET::WindowType txtToWindowType(const char* txt);
     static bool sessionInfoWindowTypeMatch(Client* c, SessionInfo* info);
 
-    /**
-     * @returns Whether we have a Compositor and it is active (Scene created)
-     **/
-    bool compositing() const;
-
     Client* active_client;
     Client* last_active_client;
     Client* most_recently_raised; // Used ONLY by raiseOrLowerClient()