From b7025d7a97e5c9841a9acd1427ebaa58a89a84e3 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 20 Apr 2015 07:23:30 +0000 Subject: [PATCH] kdeui: remove support for override/unmanaged window type --- kdeui/windowmanagement/netwm.cpp | 20 +-------------- kdeui/windowmanagement/netwm_def.h | 41 +++++++++++++----------------- 2 files changed, 19 insertions(+), 42 deletions(-) diff --git a/kdeui/windowmanagement/netwm.cpp b/kdeui/windowmanagement/netwm.cpp index e734e14c..ad5f03d8 100644 --- a/kdeui/windowmanagement/netwm.cpp +++ b/kdeui/windowmanagement/netwm.cpp @@ -92,7 +92,6 @@ static Atom kde_net_wm_frame_strut = 0; static Atom net_wm_fullscreen_monitors = 0; // KDE extensions -static Atom kde_net_wm_window_type_override = 0; static Atom kde_net_wm_window_type_topmenu = 0; static Atom kde_net_wm_temporary_rules = 0; static Atom kde_net_wm_frame_overlap = 0; @@ -254,7 +253,7 @@ static int wcmp(const void *a, const void *b) { } -static const int netAtomCount = 88; +static const int netAtomCount = 87; static void create_netwm_atoms(Display *d) { static const char * const names[netAtomCount] = { @@ -343,7 +342,6 @@ static void create_netwm_atoms(Display *d) { "_NET_WM_STATE_STAYS_ON_TOP", "_KDE_NET_WM_FRAME_STRUT", - "_KDE_NET_WM_WINDOW_TYPE_OVERRIDE", "_KDE_NET_WM_WINDOW_TYPE_TOPMENU", "_KDE_NET_WM_TEMPORARY_RULES", "_NET_WM_FRAME_OVERLAP", @@ -443,7 +441,6 @@ static void create_netwm_atoms(Display *d) { &net_wm_state_stays_on_top, &kde_net_wm_frame_strut, - &kde_net_wm_window_type_override, &kde_net_wm_window_type_topmenu, &kde_net_wm_temporary_rules, &kde_net_wm_frame_overlap, @@ -1175,8 +1172,6 @@ void NETRootInfo::setSupported() { if (p->properties[ WINDOW_TYPES ] & DNDIconMask) atoms[pnum++] = net_wm_window_type_dnd; // KDE extensions - if (p->properties[ WINDOW_TYPES ] & OverrideMask) - atoms[pnum++] = kde_net_wm_window_type_override; if (p->properties[ WINDOW_TYPES ] & TopMenuMask) atoms[pnum++] = kde_net_wm_window_type_topmenu; } @@ -1422,8 +1417,6 @@ void NETRootInfo::updateSupportedProperties( Atom atom ) else if( atom == net_wm_window_type_dnd ) p->properties[ WINDOW_TYPES ] |= DNDIconMask; // KDE extensions - else if( atom == kde_net_wm_window_type_override ) - p->properties[ WINDOW_TYPES ] |= OverrideMask; else if( atom == kde_net_wm_window_type_topmenu ) p->properties[ WINDOW_TYPES ] |= TopMenuMask; @@ -3264,14 +3257,6 @@ void NETWinInfo::setWindowType(WindowType type) { long data[2]; switch (type) { - case Override: - // spec extension: override window type. we must comply with the spec - // and provide a fall back (normal seems best) - data[0] = kde_net_wm_window_type_override; - data[1] = net_wm_window_type_normal; - len = 2; - break; - case Dialog: data[0] = net_wm_window_type_dialog; data[1] = None; @@ -4176,8 +4161,6 @@ void NETWinInfo::update(const unsigned long dirty_props[]) { p->types[ pos++ ] = ComboBox; else if ((Atom) types[count] == net_wm_window_type_dnd) p->types[ pos++ ] = DNDIcon; - else if ((Atom) types[count] == kde_net_wm_window_type_override) - p->types[ pos++ ] = Override; else if ((Atom) types[count] == kde_net_wm_window_type_topmenu) p->types[ pos++ ] = TopMenu; @@ -4555,7 +4538,6 @@ bool NET::typeMatchesMask( WindowType type, unsigned long mask ) { CHECK_TYPE_MASK( Toolbar ) CHECK_TYPE_MASK( Menu ) CHECK_TYPE_MASK( Dialog ) - CHECK_TYPE_MASK( Override ) CHECK_TYPE_MASK( TopMenu ) CHECK_TYPE_MASK( Utility ) CHECK_TYPE_MASK( Splash ) diff --git a/kdeui/windowmanagement/netwm_def.h b/kdeui/windowmanagement/netwm_def.h index 73cae22a..de8caaaf 100644 --- a/kdeui/windowmanagement/netwm_def.h +++ b/kdeui/windowmanagement/netwm_def.h @@ -334,47 +334,43 @@ public: indicates that this is a dialog window **/ Dialog = 5, - /** - @deprecated has unclear meaning and is KDE-only - **/ - Override = 6, // NON STANDARD /** indicates a toplevel menu (AKA macmenu). This is a KDE extension to the _NET_WM_WINDOW_TYPE mechanism. **/ - TopMenu = 7, // NON STANDARD + TopMenu = 6, // NON STANDARD /** indicates a utility window **/ - Utility = 8, + Utility = 7, /** indicates that this window is a splash screen window. **/ - Splash = 9, + Splash = 8, /** indicates a dropdown menu (from a menubar typically) **/ - DropdownMenu = 10, + DropdownMenu = 9, /** indicates a popup menu (a context menu typically) **/ - PopupMenu = 11, + PopupMenu = 10, /** indicates a tooltip window **/ - Tooltip = 12, + Tooltip = 11, /** indicates a notification window **/ - Notification = 13, + Notification = 12, /** indicates that the window is a list for a combobox **/ - ComboBox = 14, + ComboBox = 13, /** indicates a window that represents the dragged object during DND operation **/ - DNDIcon = 15 + DNDIcon = 14 }; /** @@ -388,16 +384,15 @@ public: ToolbarMask = 1<<3, ///< @see Toolbar MenuMask = 1<<4, ///< @see Menu DialogMask = 1<<5, ///< @see Dialog - OverrideMask = 1<<6, ///< @see Override - TopMenuMask = 1<<7, ///< @see TopMenu - UtilityMask = 1<<8, ///< @see Utility - SplashMask = 1<<9, ///< @see Splash - DropdownMenuMask = 1<<10, ///< @see DropdownMenu - PopupMenuMask = 1<<11, ///< @see PopupMenu - TooltipMask = 1<<12, ///< @see Tooltip - NotificationMask = 1<<13, ///< @see Notification - ComboBoxMask = 1<<14, ///< @see ComboBox - DNDIconMask = 1<<15, ///< @see DNDIcon + TopMenuMask = 1<<6, ///< @see TopMenu + UtilityMask = 1<<7, ///< @see Utility + SplashMask = 1<<8, ///< @see Splash + DropdownMenuMask = 1<<9, ///< @see DropdownMenu + PopupMenuMask = 1<<10, ///< @see PopupMenu + TooltipMask = 1<<11, ///< @see Tooltip + NotificationMask = 1<<12, ///< @see Notification + ComboBoxMask = 1<<13, ///< @see ComboBox + DNDIconMask = 1<<14, ///< @see DNDIcon AllTypesMask = 0LU-1 ///< All window types. };