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

List:       kde-commits
Subject:    kdebase/kstart
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2004-06-09 7:38:10
Message-ID: 20040609073810.743D29914 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Fix some obsolete stuff.


  M +23 -11    kstart.cpp   1.48


--- kdebase/kstart/kstart.cpp  #1.47:1.48
@@ -85,16 +85,20 @@ KStart::KStart()
 }
 
+const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET::DockMask
+    | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask
+    | NET::UtilityMask | NET::SplashMask;
+
 void KStart::windowAdded(WId w){
 
-    KWin::Info info = KWin::info( w );
+    KWin::WindowInfo info = KWin::windowInfo( w );
 
     // always ignore these window types
-    if( info.windowType == NET::TopMenu
-        || info.windowType == NET::Toolbar
-        || info.windowType == NET::Desktop )
+    if( info.windowType( SUPPORTED_WINDOW_TYPES_MASK ) == NET::TopMenu
+        || info.windowType( SUPPORTED_WINDOW_TYPES_MASK ) == NET::Toolbar
+        || info.windowType( SUPPORTED_WINDOW_TYPES_MASK ) == NET::Desktop )
         return;
 
     if ( window) {
-        QString title = info.name;
+        QString title = info.name();
         QRegExp r( window );
         if (r.match(title) == -1)
@@ -102,7 +106,7 @@ void KStart::windowAdded(WId w){
     } else {
         // accept only "normal" windows
-        if( info.windowType != NET::Unknown
-            && info.windowType != NET::Normal
-            && info.windowType != NET::Dialog )
+        if( info.windowType( SUPPORTED_WINDOW_TYPES_MASK ) != NET::Unknown
+            && info.windowType( SUPPORTED_WINDOW_TYPES_MASK ) != NET::Normal
+            && info.windowType( SUPPORTED_WINDOW_TYPES_MASK ) != NET::Dialog )
             return;
     }
@@ -183,5 +187,5 @@ void KStart::applyStyle(WId w ) {
 
     if (activate)
-      KWin::setActiveWindow( w );
+      KWin::forceActiveWindow( w );
 
     QApplication::flushX();
@@ -307,6 +311,14 @@ int main( int argc, char *argv[] )
   iconify = args->isSet("iconify");
   toSysTray = args->isSet("tosystray");
-  if ( fullscreen = args->isSet("fullscreen") )
+  if ( args->isSet("fullscreen") ) {
+      NETRootInfo i( qt_xdisplay(), NET::Supported );
+      if( i.isSupported( NET::FullScreen )) {
+          state |= NET::FullScreen;
+          mask |= NET::FullScreen;
+      } else {
       windowtype = NET::Override;
+          fullscreen = true;
+      }
+  }
 
   fcntl(ConnectionNumber(qt_xdisplay()), F_SETFD, 1);


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