1 files changed, 2 insertions, 114 deletions
diff --git a/twin/client.cpp b/twin/client.cpp
index e98cf05c8..2a57229cd 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -2841,63 +2841,7 @@ void Client::updateOpacity()
             setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active);
         else
             setOpacity(options->translucentActiveWindows, options->activeWindowOpacity);
-        if (isBMP())
-        // beep-media-player, only undecorated windows (gtk2 xmms, xmms doesn't work with compmgr at all - s.e.p. :P )
-            {
-            ClientList tmpGroupMembers = group()->members();
-            ClientList activeGroupMembers;
-            activeGroupMembers.append(this);
-            tmpGroupMembers.remove(this);
-            ClientList::Iterator it = tmpGroupMembers.begin();
-            while (it != tmpGroupMembers.end())
-            // search for next attached and not activated client and repeat if found
-                {
-                if ((*it) != this && (*it)->isBMP())
-                // potential "to activate" client found
-                    {
-//                     tqWarning("client found");
-                    if ((*it)->touches(this)) // first test, if the new client touches the just activated one
-                        {
-//                         tqWarning("found client touches me");
-                        if( ruleOpacityActive() )
-                            (*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active);
-                        else
-                            (*it)->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity);
-//                         tqWarning("activated, search restarted (1)");
-                        (*it)->setShadowSize(options->activeWindowShadowSize);
-                        activeGroupMembers.append(*it);
-                        tmpGroupMembers.remove(it);
-                        it = tmpGroupMembers.begin(); // restart, search next client
-                        continue;
-                        }
-                    else
-                        { // pot. client does not touch c, so we have to search if it touches some other activated client
-                        bool found = false;
-                        for( ClientList::ConstIterator it2 = activeGroupMembers.begin(); it2 != activeGroupMembers.end(); it2++ )
-                            {
-                            if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2))
-                                {
-//                                 tqWarning("found client touches other active client");
-                                if( ruleOpacityActive() )
-                                    (*it)->setOpacity(rule_opacity_active < 0xFFFFFFFF, rule_opacity_active);
-                                else
-                                    (*it)->setOpacity(options->translucentActiveWindows, options->activeWindowOpacity);
-                                (*it)->setShadowSize(options->activeWindowShadowSize);
-                                activeGroupMembers.append(*it);
-                                tmpGroupMembers.remove(it);
-                                it = tmpGroupMembers.begin(); // reset potential client search
-                                found = true;
-//                                 tqWarning("activated, search restarted (2)");
-                                break; // skip this loop
-                                }
-                            }
-                        if (found) continue;
-                        }
-                    }
-                    it++;
-                }
-            }
-        else if (isNormalWindow())
+        if (isNormalWindow())
         // activate dependend minor windows as well
             {
             for( ClientList::ConstIterator it = group()->members().begin(); it != group()->members().end(); it++ )
@@ -2918,63 +2862,7 @@ void Client::updateOpacity()
             setOpacity(options->translucentInactiveWindows && !(keepAbove() && options->keepAboveAsActive),
                     options->inactiveWindowOpacity);
         // deactivate dependend minor windows as well
-        if (isBMP())
-        // beep-media-player, only undecorated windows (gtk2 xmms, xmms doesn't work with compmgr at all - s.e.p. :P )
-            {
-            ClientList tmpGroupMembers = group()->members();
-            ClientList inactiveGroupMembers;
-            inactiveGroupMembers.append(this);
-            tmpGroupMembers.remove(this);
-            ClientList::Iterator it = tmpGroupMembers.begin();
-            while ( it != tmpGroupMembers.end() )
-            // search for next attached and not activated client and repeat if found
-                {
-                if ((*it) != this && (*it)->isBMP())
-                // potential "to activate" client found
-                    {
-//                     tqWarning("client found");
-                    if ((*it)->touches(this)) // first test, if the new client touches the just activated one
-                        {
-//                         tqWarning("found client touches me");
-                        if( (*it)->ruleOpacityInactive() )
-                            (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive());
-                        else
-                            (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity);
-                        (*it)->setShadowSize(options->inactiveWindowShadowSize);
-//                         tqWarning("deactivated, search restarted (1)");
-                        inactiveGroupMembers.append(*it);
-                        tmpGroupMembers.remove(it);
-                        it = tmpGroupMembers.begin(); // restart, search next client
-                        continue;
-                        }
-                    else // pot. client does not touch c, so we have to search if it touches some other activated client
-                        {
-                        bool found = false;
-                        for( ClientList::ConstIterator it2 = inactiveGroupMembers.begin(); it2 != inactiveGroupMembers.end(); it2++ )
-                            {
-                            if ((*it2) != this && (*it2) != (*it) && (*it)->touches(*it2))
-                                {
-//                                 tqWarning("found client touches other inactive client");
-                                if( (*it)->ruleOpacityInactive() )
-                                    (*it)->setOpacity((*it)->ruleOpacityInactive() < 0xFFFFFFFF, (*it)->ruleOpacityInactive());
-                                else
-                                    (*it)->setOpacity(options->translucentInactiveWindows && !((*it)->keepAbove() && options->keepAboveAsActive), options->inactiveWindowOpacity);
-                                (*it)->setShadowSize(options->inactiveWindowShadowSize);
-//                                 tqWarning("deactivated, search restarted (2)");
-                                inactiveGroupMembers.append(*it);
-                                tmpGroupMembers.remove(it);
-                                it = tmpGroupMembers.begin(); // reset potential client search
-                                found = true;
-                                break; // skip this loop
-                                }
-                            }
-                            if (found) continue;
-                        }
-                    }
-                    it++;
-                }
-            }
-        else if (isNormalWindow())
+        if (isNormalWindow())
             {
             for( ClientList::ConstIterator it = group()->members().begin(); it != group()->members().end(); it++ )
                 if ((*it)->isUtility()) //don't deactivate dialogs...