diff options
| author | Philippe Mavridis <philippe.mavridis@yandex.com> | 2026-01-06 14:44:37 +0200 |
|---|---|---|
| committer | Philippe Mavridis <philippe.mavridis@yandex.com> | 2026-01-06 14:44:37 +0200 |
| commit | 72f6d856d83a41f90f97c414fde2513339ca80ba (patch) | |
| tree | 4846e6dd185b08eef66769c67043dd3fe06abd42 | |
| parent | 797db50eff718cfbbf698adc868d56c63cadb76e (diff) | |
| download | tdebase-drop/twin/beep-media-player-hack.tar.gz tdebase-drop/twin/beep-media-player-hack.zip | |
TWin: drop Beep Media Player hackdrop/twin/beep-media-player-hack
BMP has been unmaintained for a long time.
Signed-off-by: Philippe Mavridis <philippe.mavridis@yandex.com>
| -rw-r--r-- | twin/client.cpp | 116 | ||||
| -rw-r--r-- | twin/client.h | 13 | ||||
| -rw-r--r-- | twin/workspace.cpp | 1 |
3 files changed, 2 insertions, 128 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... diff --git a/twin/client.h b/twin/client.h index 178c718c4..ff93c3ad4 100644 --- a/twin/client.h +++ b/twin/client.h @@ -333,8 +333,6 @@ class Client : public TQObject, public KDecorationDefines uint ruleOpacityInactive(); uint ruleOpacityActive(); unsigned int opacity(); - bool isBMP(); - void setBMP(bool b); bool touches(const Client* c); void setShapable(bool b); bool hasStrut() const; @@ -611,7 +609,6 @@ class Client : public TQObject, public KDecorationDefines uint rule_opacity_active; //translucency rules uint rule_opacity_inactive; //dto. //int shadeOriginalHeight; - bool isBMP_; TQTimer* demandAttentionKNotifyTimer; bool activeMaximizing; @@ -989,16 +986,6 @@ inline TDEShortcut Client::shortcut() const return _shortcut; } -inline bool Client::isBMP() - { - return isBMP_; - } - -inline void Client::setBMP(bool b) - { - isBMP_ = b; - } - inline void Client::removeRule( Rules* rule ) { client_rules.remove( rule ); diff --git a/twin/workspace.cpp b/twin/workspace.cpp index a484cab12..0dfa8d877 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -613,7 +613,6 @@ void Workspace::addClient( Client* c, allowed_t ) { // waited with trans settings until window figured out if active or not ;) // tqWarning("%s", (const char*)(c->resourceClass())); - c->setBMP(c->resourceName() == "beep-media-player" || c->decorationId() == None); // first check if the window has it's own opinion of it's translucency ;) c->getWindowOpacity(); if (c->isDock()) |
