diff --git a/khotkeys/libkhotkeysprivate/windows_handler.cpp b/khotkeys/libkhotkeysprivate/windows_handler.cpp index eb02374a..cf238337 100644 --- a/khotkeys/libkhotkeysprivate/windows_handler.cpp +++ b/khotkeys/libkhotkeysprivate/windows_handler.cpp @@ -186,8 +186,6 @@ Window_data::Window_data( WId id_P ) role = windows_handler->get_window_role( id_P ); wclass = windows_handler->get_window_class( id_P ); type = kwin_info.windowType( SUPPORTED_WINDOW_TYPES_MASK ); - if( type == NET::Override ) // HACK consider non-NETWM fullscreens to be normal too - type = NET::Normal; if( type == NET::Unknown ) type = NET::Normal; } diff --git a/khotkeys/libkhotkeysprivate/windows_handler.h b/khotkeys/libkhotkeysprivate/windows_handler.h index cf484dce..e49eab90 100644 --- a/khotkeys/libkhotkeysprivate/windows_handler.h +++ b/khotkeys/libkhotkeysprivate/windows_handler.h @@ -28,7 +28,7 @@ namespace KHotKeys { const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET::DockMask - | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask + | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask; diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index a94b5f2a..5dc62b18 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -156,7 +156,7 @@ void KStart::sendRule() { } const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET::DockMask - | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask + | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask; void KStart::windowAdded(WId w){ @@ -382,8 +382,6 @@ int main( int argc, char *argv[] ) windowtype = NET::Menu; else if ( s == "dialog" ) windowtype = NET::Dialog; - else if ( s == "override" ) - windowtype = NET::Override; else if ( s == "topmenu" ) windowtype = NET::TopMenu; else @@ -429,9 +427,6 @@ int main( int argc, char *argv[] ) if( i.isSupported( NET::FullScreen )) { state |= NET::FullScreen; mask |= NET::FullScreen; - } else { - windowtype = NET::Override; - fullscreen = true; } } diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index a80cfb15..4d386cf0 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -286,7 +286,7 @@ void KSysTrayCmd::checkExistingWindows() } const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET::DockMask - | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask + | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask; void KSysTrayCmd::windowAdded(WId w) diff --git a/kwin/client.cpp b/kwin/client.cpp index 9f2fe502..c016a0b0 100644 --- a/kwin/client.cpp +++ b/kwin/client.cpp @@ -620,13 +620,6 @@ void Client::detectNoBorder() default: abort(); } - // NET::Override is some strange beast without clear definition, usually - // just meaning "noborder", so let's treat it only as such flag, and ignore it as - // a window type otherwise (SUPPORTED_WINDOW_TYPES_MASK doesn't include it) - if (info->windowType(SUPPORTED_MANAGED_WINDOW_TYPES_MASK | NET::OverrideMask) == NET::Override) { - noborder = true; - app_noborder = true; - } } void Client::updateFrameExtents() diff --git a/kwin/netinfo.cpp b/kwin/netinfo.cpp index faf58f75..e5699641 100644 --- a/kwin/netinfo.cpp +++ b/kwin/netinfo.cpp @@ -82,7 +82,6 @@ RootInfo *RootInfo::create() NET::ToolbarMask | NET::MenuMask | NET::DialogMask | - NET::OverrideMask | NET::UtilityMask | NET::SplashMask | // No compositing window types here unless we support them also as managed window types diff --git a/libs/taskmanager/groupmanager.cpp b/libs/taskmanager/groupmanager.cpp index c03c4d11..0f68cfb5 100644 --- a/libs/taskmanager/groupmanager.cpp +++ b/libs/taskmanager/groupmanager.cpp @@ -277,7 +277,7 @@ bool GroupManagerPrivate::addTask(::TaskManager::Task *task) } NET::WindowType type = task->info().windowType(NET::NormalMask | NET::DialogMask | - NET::OverrideMask | NET::UtilityMask); + NET::UtilityMask); if (type == NET::Utility) { //kDebug() << "skipping utility window" << task->name(); skip = true; diff --git a/libs/taskmanager/taskmanager.cpp b/libs/taskmanager/taskmanager.cpp index 2894dfda..a864ca00 100644 --- a/libs/taskmanager/taskmanager.cpp +++ b/libs/taskmanager/taskmanager.cpp @@ -227,8 +227,7 @@ void TaskManager::windowAdded(WId w) // ignore NET::Tool and other special window types NET::WindowType wType = info.windowType(NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | - NET::OverrideMask | NET::TopMenuMask | - NET::UtilityMask | NET::SplashMask); + NET::TopMenuMask | NET::UtilityMask | NET::SplashMask); if (info.transientFor() > 0) { const WId transientFor = info.transientFor(); @@ -251,7 +250,7 @@ void TaskManager::windowAdded(WId w) } } - if (wType != NET::Normal && wType != NET::Override && wType != NET::Unknown && + if (wType != NET::Normal && wType != NET::Unknown && wType != NET::Dialog && wType != NET::Utility) { return; } diff --git a/plasma/desktop/applets/pager/pager.cpp b/plasma/desktop/applets/pager/pager.cpp index 3c957217..52728fdf 100644 --- a/plasma/desktop/applets/pager/pager.cpp +++ b/plasma/desktop/applets/pager/pager.cpp @@ -556,7 +556,7 @@ void Pager::recalculateWindowRects() KWindowInfo info = KWindowSystem::windowInfo(window, NET::WMGeometry | NET::WMFrameExtents | NET::WMWindowType | NET::WMDesktop | NET::WMState | NET::XAWMState | NET::WMVisibleName); - NET::WindowType type = info.windowType(NET::NormalMask | NET::DialogMask | NET::OverrideMask | + NET::WindowType type = info.windowType(NET::NormalMask | NET::DialogMask | NET::UtilityMask | NET::DesktopMask | NET::DockMask | NET::TopMenuMask | NET::SplashMask | NET::ToolbarMask | NET::MenuMask); diff --git a/plasma/desktop/applets/windowlist/WindowList.cpp b/plasma/desktop/applets/windowlist/WindowList.cpp index 92bd21a3..929870f2 100644 --- a/plasma/desktop/applets/windowlist/WindowList.cpp +++ b/plasma/desktop/applets/windowlist/WindowList.cpp @@ -208,7 +208,7 @@ void WindowList::showMenu(bool onlyCurrentDesktop) for (int i = 0; i < windows.count(); ++i) { KWindowInfo window = KWindowSystem::windowInfo(windows.at(i), (NET::WMGeometry | NET::WMFrameExtents | NET::WMWindowType | NET::WMDesktop | NET::WMState | NET::XAWMState | NET::WMVisibleName)); - NET::WindowType type = window.windowType(NET::NormalMask | NET::DialogMask | NET::OverrideMask | NET::UtilityMask | NET::DesktopMask | NET::DockMask | NET::TopMenuMask | NET::SplashMask | NET::ToolbarMask | NET::MenuMask); + NET::WindowType type = window.windowType(NET::NormalMask | NET::DialogMask | NET::UtilityMask | NET::DesktopMask | NET::DockMask | NET::TopMenuMask | NET::SplashMask | NET::ToolbarMask | NET::MenuMask); if ((onlyCurrentDesktop && !window.isOnDesktop(KWindowSystem::currentDesktop())) || type == NET::Desktop || type == NET::Dock || type == NET::TopMenu || type == NET::Splash || type == NET::Menu || type == NET::Toolbar || window.hasState(NET::SkipPager)) { windows.removeAt(i); diff --git a/plasma/generic/runners/windows/windowsrunner.cpp b/plasma/generic/runners/windows/windowsrunner.cpp index 9bd006d4..c6804225 100644 --- a/plasma/generic/runners/windows/windowsrunner.cpp +++ b/plasma/generic/runners/windows/windowsrunner.cpp @@ -76,10 +76,9 @@ void WindowsRunner::gatherInfo() // ignore NET::Tool and other special window types NET::WindowType wType = info.windowType(NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | - NET::OverrideMask | NET::TopMenuMask | - NET::UtilityMask | NET::SplashMask); + NET::TopMenuMask | NET::UtilityMask | NET::SplashMask); - if (wType != NET::Normal && wType != NET::Override && wType != NET::Unknown && + if (wType != NET::Normal && wType != NET::Unknown && wType != NET::Dialog && wType != NET::Utility) { continue; }