Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: remove support for override/unmanaged window type (part 3)

Browse source
This commit is contained in:
Ivailo Monev 2015-04-20 14:10:36 +00:00
parent 30e798dbf9
commit 0bb66c0c17
11 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
khotkeys/libkhotkeysprivate/windows_handler.cpp
View file

@ -186,8 +186,6 @@ Window_data::Window_data( WId id_P )
role = windows_handler->get_window_role( id_P ); role = windows_handler->get_window_role( id_P );
wclass = windows_handler->get_window_class( id_P ); wclass = windows_handler->get_window_class( id_P );
type = kwin_info.windowType( SUPPORTED_WINDOW_TYPES_MASK ); 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 ) if( type == NET::Unknown )
type = NET::Normal; type = NET::Normal;
} }

2
khotkeys/libkhotkeysprivate/windows_handler.h
View file

@ -28,7 +28,7 @@ namespace KHotKeys
{ {
const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET::DockMask 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; | NET::UtilityMask | NET::SplashMask;

7
kstart/kstart.cpp
View file

@ -156,7 +156,7 @@ void KStart::sendRule() {
} }
const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET::DockMask 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; | NET::UtilityMask | NET::SplashMask;
void KStart::windowAdded(WId w){ void KStart::windowAdded(WId w){
@ -382,8 +382,6 @@ int main( int argc, char *argv[] )
windowtype = NET::Menu; windowtype = NET::Menu;
else if ( s == "dialog" ) else if ( s == "dialog" )
windowtype = NET::Dialog; windowtype = NET::Dialog;
else if ( s == "override" )
windowtype = NET::Override;
else if ( s == "topmenu" ) else if ( s == "topmenu" )
windowtype = NET::TopMenu; windowtype = NET::TopMenu;
else else
@ -429,9 +427,6 @@ int main( int argc, char *argv[] )
if( i.isSupported( NET::FullScreen )) { if( i.isSupported( NET::FullScreen )) {
state |= NET::FullScreen; state |= NET::FullScreen;
mask |= NET::FullScreen; mask |= NET::FullScreen;
} else {
windowtype = NET::Override;
fullscreen = true;
} }
} }

2
ksystraycmd/ksystraycmd.cpp
View file

@ -286,7 +286,7 @@ void KSysTrayCmd::checkExistingWindows()
} }
const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET::DockMask 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; | NET::UtilityMask | NET::SplashMask;
void KSysTrayCmd::windowAdded(WId w) void KSysTrayCmd::windowAdded(WId w)

7
kwin/client.cpp
View file

@ -620,13 +620,6 @@ void Client::detectNoBorder()
default: default:
abort(); 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() void Client::updateFrameExtents()

1
kwin/netinfo.cpp
View file

@ -82,7 +82,6 @@ RootInfo *RootInfo::create()
NET::ToolbarMask | NET::ToolbarMask |
NET::MenuMask | NET::MenuMask |
NET::DialogMask | NET::DialogMask |
NET::OverrideMask |
NET::UtilityMask | NET::UtilityMask |
NET::SplashMask | NET::SplashMask |
// No compositing window types here unless we support them also as managed window types // No compositing window types here unless we support them also as managed window types

2
libs/taskmanager/groupmanager.cpp
View file

@ -277,7 +277,7 @@ bool GroupManagerPrivate::addTask(::TaskManager::Task *task)
} }
NET::WindowType type = task->info().windowType(NET::NormalMask | NET::DialogMask | NET::WindowType type = task->info().windowType(NET::NormalMask | NET::DialogMask |
NET::OverrideMask | NET::UtilityMask); NET::UtilityMask);
if (type == NET::Utility) { if (type == NET::Utility) {
//kDebug() << "skipping utility window" << task->name(); //kDebug() << "skipping utility window" << task->name();
skip = true; skip = true;

5
libs/taskmanager/taskmanager.cpp
View file

@ -227,8 +227,7 @@ void TaskManager::windowAdded(WId w)
// ignore NET::Tool and other special window types // ignore NET::Tool and other special window types
NET::WindowType wType = info.windowType(NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::WindowType wType = info.windowType(NET::NormalMask | NET::DesktopMask | NET::DockMask |
NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask |
NET::OverrideMask | NET::TopMenuMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask);
NET::UtilityMask | NET::SplashMask);
if (info.transientFor() > 0) { if (info.transientFor() > 0) {
const WId transientFor = info.transientFor(); 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) { wType != NET::Dialog && wType != NET::Utility) {
return; return;
} }

2
plasma/desktop/applets/pager/pager.cpp
View file

@ -556,7 +556,7 @@ void Pager::recalculateWindowRects()
KWindowInfo info = KWindowSystem::windowInfo(window, NET::WMGeometry | NET::WMFrameExtents | KWindowInfo info = KWindowSystem::windowInfo(window, NET::WMGeometry | NET::WMFrameExtents |
NET::WMWindowType | NET::WMDesktop | NET::WMWindowType | NET::WMDesktop |
NET::WMState | NET::XAWMState | NET::WMVisibleName); 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::UtilityMask | NET::DesktopMask | NET::DockMask |
NET::TopMenuMask | NET::SplashMask | NET::ToolbarMask | NET::TopMenuMask | NET::SplashMask | NET::ToolbarMask |
NET::MenuMask); NET::MenuMask);

2
plasma/desktop/applets/windowlist/WindowList.cpp
View file

@ -208,7 +208,7 @@ void WindowList::showMenu(bool onlyCurrentDesktop)
for (int i = 0; i < windows.count(); ++i) { 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)); 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)) { 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); windows.removeAt(i);

5
plasma/generic/runners/windows/windowsrunner.cpp
View file

@ -76,10 +76,9 @@ void WindowsRunner::gatherInfo()
// ignore NET::Tool and other special window types // ignore NET::Tool and other special window types
NET::WindowType wType = info.windowType(NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::WindowType wType = info.windowType(NET::NormalMask | NET::DesktopMask | NET::DockMask |
NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask |
NET::OverrideMask | NET::TopMenuMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask);
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) { wType != NET::Dialog && wType != NET::Utility) {
continue; continue;
} }