vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove disabled TabGroup feature 

Summary:
This has been commented out since 2014, I doubt it will come back.
This is a big amount of code, maintenance will be easier without it.

Reviewers: #kwin, zzag

Reviewed By: #kwin, zzag

Subscribers: romangg, graesslin, kwin

Tags: #kwin, #documentation

Differential Revision: https://phabricator.kde.org/D23069
icc-effect-5.17.5
Frederik Gladhorn 2019-09-14 10:58:12 +02:00
parent a98b8207eb
commit b64e67ce7c
46 changed files with 56 additions and 1482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -395,7 +395,6 @@ set(kwin_KDEINIT_SRCS
client_machine.cpp client_machine.cpp
cursor.cpp cursor.cpp
debug_console.cpp debug_console.cpp
tabgroup.cpp
focuschain.cpp focuschain.cpp
globalshortcuts.cpp globalshortcuts.cpp
input.cpp input.cpp

104
abstract_client.cpp
View File

@ -32,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "tabbox.h" #include "tabbox.h"
#endif #endif
#include "screenedge.h" #include "screenedge.h"
#include "tabgroup.h"
#include "useractions.h" #include "useractions.h"
#include "workspace.h" #include "workspace.h"
@ -125,96 +124,11 @@ bool AbstractClient::isTransient() const
return false; return false;
} }
void AbstractClient::setTabGroup(TabGroup* group)
{
tab_group = group;
emit tabGroupChanged();
}
void AbstractClient::setClientShown(bool shown) void AbstractClient::setClientShown(bool shown)
{ {
Q_UNUSED(shown) Q_UNUSED(shown)
} }
bool AbstractClient::untab(const QRect &toGeometry, bool clientRemoved)
{
TabGroup *group = tab_group;
if (group && group->remove(this)) { // remove sets the tabgroup to "0", therefore the pointer is cached
if (group->isEmpty()) {
delete group;
}
if (clientRemoved)
return true; // there's been a broadcast signal that this client is now removed - don't touch it
setClientShown(!(isMinimized() || isShade()));
bool keepSize = toGeometry.size() == size();
bool changedSize = false;
if (quickTileMode() != QuickTileMode(QuickTileFlag::None)) {
changedSize = true;
setQuickTileMode(QuickTileFlag::None); // if we leave a quicktiled group, assume that the user wants to untile
}
if (toGeometry.isValid()) {
if (maximizeMode() != MaximizeRestore) {
changedSize = true;
maximize(MaximizeRestore); // explicitly calling for a geometry -> unmaximize
}
if (keepSize && changedSize) {
setGeometryRestore(geometry()); // checkWorkspacePosition() invokes it
QPoint cpoint = Cursor::pos();
QPoint point = cpoint;
point.setX((point.x() - toGeometry.x()) * geometryRestore().width() / toGeometry.width());
point.setY((point.y() - toGeometry.y()) * geometryRestore().height() / toGeometry.height());
auto geometry_restore = geometryRestore();
geometry_restore.moveTo(cpoint-point);
setGeometryRestore(geometry_restore);
} else {
setGeometryRestore(toGeometry); // checkWorkspacePosition() invokes it
}
setGeometry(geometryRestore());
checkWorkspacePosition();
}
return true;
}
return false;
}
bool AbstractClient::tabTo(AbstractClient *other, bool behind, bool activate)
{
Q_ASSERT(other && other != this);
if (tab_group && tab_group == other->tabGroup()) { // special case: move inside group
tab_group->move(this, other, behind);
return true;
}
GeometryUpdatesBlocker blocker(this);
const bool wasBlocking = signalsBlocked();
blockSignals(true); // prevent client emitting "retabbed to nowhere" cause it's about to be entabbed the next moment
untab();
blockSignals(wasBlocking);
TabGroup *newGroup = other->tabGroup() ? other->tabGroup() : new TabGroup(other);
if (!newGroup->add(this, other, behind, activate)) {
if (newGroup->count() < 2) { // adding "c" to "to" failed for whatever reason
newGroup->remove(other);
delete newGroup;
}
return false;
}
return true;
}
void AbstractClient::syncTabGroupFor(QString property, bool fromThisClient)
{
if (tab_group)
tab_group->sync(property.toLatin1().data(), fromThisClient ? this : tab_group->current());
}
bool AbstractClient::isCurrentTab() const
{
return !tab_group || tab_group->current() == this;
}
MaximizeMode AbstractClient::requestedMaximizeMode() const MaximizeMode AbstractClient::requestedMaximizeMode() const
{ {
return maximizeMode(); return maximizeMode();
@ -1195,14 +1109,6 @@ bool AbstractClient::performMouseCommand(Options::MouseCommand cmd, const QPoint
if (!isDesktop()) // No point in changing the opacity of the desktop if (!isDesktop()) // No point in changing the opacity of the desktop
setOpacity(qMax(opacity() - 0.1, 0.1)); setOpacity(qMax(opacity() - 0.1, 0.1));
break; break;
case Options::MousePreviousTab:
if (tabGroup())
tabGroup()->activatePrev();
break;
case Options::MouseNextTab:
if (tabGroup())
tabGroup()->activateNext();
break;
case Options::MouseClose: case Options::MouseClose:
closeWindow(); closeWindow();
break; break;
@ -1258,7 +1164,6 @@ bool AbstractClient::performMouseCommand(Options::MouseCommand cmd, const QPoint
updateCursor(); updateCursor();
break; break;
} }
case Options::MouseDragTab:
case Options::MouseNothing: case Options::MouseNothing:
default: default:
replay = true; replay = true;
@ -1405,10 +1310,6 @@ void AbstractClient::updateGeometryBeforeUpdateBlocking()
m_geometryBeforeUpdateBlocking = geometry(); m_geometryBeforeUpdateBlocking = geometry();
} }
void AbstractClient::updateTabGroupStates(TabGroup::States)
{
}
void AbstractClient::doMove(int, int) void AbstractClient::doMove(int, int)
{ {
} }
@ -1742,8 +1643,8 @@ bool AbstractClient::processDecorationButtonPress(QMouseEvent *event, bool ignor
com = active ? options->commandActiveTitlebar3() : options->commandInactiveTitlebar3(); com = active ? options->commandActiveTitlebar3() : options->commandInactiveTitlebar3();
if (event->button() == Qt::LeftButton if (event->button() == Qt::LeftButton
&& com != Options::MouseOperationsMenu // actions where it's not possible to get the matching && com != Options::MouseOperationsMenu // actions where it's not possible to get the matching
&& com != Options::MouseMinimize // mouse release event && com != Options::MouseMinimize) // mouse release event
&& com != Options::MouseDragTab) { {
setMoveResizePointerMode(mousePosition()); setMoveResizePointerMode(mousePosition());
setMoveResizePointerButtonDown(true); setMoveResizePointerButtonDown(true);
setMoveOffset(event->pos()); setMoveOffset(event->pos());
@ -1763,7 +1664,6 @@ bool AbstractClient::processDecorationButtonPress(QMouseEvent *event, bool ignor
com == Options::MouseActivate || com == Options::MouseActivate ||
com == Options::MouseActivateRaiseAndPassClick || com == Options::MouseActivateRaiseAndPassClick ||
com == Options::MouseActivateAndPassClick || com == Options::MouseActivateAndPassClick ||
com == Options::MouseDragTab ||
com == Options::MouseNothing); com == Options::MouseNothing);
} }

61
abstract_client.h
View File

@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "toplevel.h" #include "toplevel.h"
#include "options.h" #include "options.h"
#include "rules.h" #include "rules.h"
#include "tabgroup.h"
#include "cursor.h" #include "cursor.h"
#include <memory> #include <memory>
@ -75,12 +74,6 @@ class KWIN_EXPORT AbstractClient : public Toplevel
*/ */
Q_PROPERTY(bool fullScreenable READ isFullScreenable) Q_PROPERTY(bool fullScreenable READ isFullScreenable)
/**
* Whether this Client is the currently visible Client in its Client Group (Window Tabs).
* For change connect to the visibleChanged signal on the Client's Group.
*/
Q_PROPERTY(bool isCurrentTab READ isCurrentTab)
/** /**
* Whether this Client is active or not. Use Workspace::activateClient() to activate a Client. * Whether this Client is active or not. Use Workspace::activateClient() to activate a Client.
* @see Workspace::activateClient * @see Workspace::activateClient
@ -318,11 +311,6 @@ class KWIN_EXPORT AbstractClient : public Toplevel
*/ */
Q_PROPERTY(bool unresponsive READ unresponsive NOTIFY unresponsiveChanged) Q_PROPERTY(bool unresponsive READ unresponsive NOTIFY unresponsiveChanged)
/**
* The "Window Tabs" Group this Client belongs to.
*/
Q_PROPERTY(KWin::TabGroup* tabGroup READ tabGroup NOTIFY tabGroupChanged SCRIPTABLE false)
/** /**
* The color scheme set on this client * The color scheme set on this client
* Absolute file path, or name of palette in the user's config directory following KColorSchemes format. * Absolute file path, or name of palette in the user's config directory following KColorSchemes format.
@ -494,36 +482,9 @@ public:
return m_minimized; return m_minimized;
} }
virtual void setFullScreen(bool set, bool user = true) = 0; virtual void setFullScreen(bool set, bool user = true) = 0;
// Tabbing functions
Q_INVOKABLE inline bool tabBefore(AbstractClient *other, bool activate) { return tabTo(other, false, activate); }
Q_INVOKABLE inline bool tabBehind(AbstractClient *other, bool activate) { return tabTo(other, true, activate); }
/**
* Syncs the *dynamic* @p property @p fromThisClient or the currentTab() to
* all members of the tabGroup() (if there is one)
*
* eg. if you call:
* @code
* client->setProperty("kwin_tiling_floats", true);
* client->syncTabGroupFor("kwin_tiling_floats", true)
* @endcode
* all clients in this tabGroup will have property("kwin_tiling_floats").toBool() == true
*
* WARNING: non dynamic properties are ignored - you're not supposed to alter/update such explicitly
*/
Q_INVOKABLE void syncTabGroupFor(QString property, bool fromThisClient = false);
TabGroup *tabGroup() const;
/**
* Set tab group - this is to be invoked by TabGroup::add/remove(client) and NO ONE ELSE
*/
void setTabGroup(TabGroup* group);
virtual void setClientShown(bool shown); virtual void setClientShown(bool shown);
Q_INVOKABLE bool untab(const QRect &toGeometry = QRect(), bool clientRemoved = false);
/**
* When a click is done in the decoration and it calls the group
* to change the visible client it starts to move-resize the new
* client, this function stops it.
*/
bool isCurrentTab() const;
virtual QRect geometryRestore() const = 0; virtual QRect geometryRestore() const = 0;
/** /**
* The currently applied maximize mode * The currently applied maximize mode
@ -917,11 +878,6 @@ Q_SIGNALS:
void hasApplicationMenuChanged(bool); void hasApplicationMenuChanged(bool);
void applicationMenuActiveChanged(bool); void applicationMenuActiveChanged(bool);
void unresponsiveChanged(bool); void unresponsiveChanged(bool);
/**
* Emitted whenever the Client's TabGroup changed. That is whenever the Client is moved to
* another group, but not when a Client gets added or removed to the Client's ClientGroup.
*/
void tabGroupChanged();
protected: protected:
AbstractClient(); AbstractClient();
@ -1053,13 +1009,6 @@ protected:
*/ */
void addRepaintDuringGeometryUpdates(); void addRepaintDuringGeometryUpdates();
/**
* Convenient method to update the TabGroup states if there is one present.
* Marked as virtual as TabGroup does not yet handle AbstractClient, but only
* subclasses of AbstractClient. Given that the default implementation does nothing.
*/
virtual void updateTabGroupStates(TabGroup::States states);
/** /**
* @returns whether the Client is currently in move resize mode * @returns whether the Client is currently in move resize mode
*/ */
@ -1303,7 +1252,6 @@ private:
QKeySequence _shortcut; QKeySequence _shortcut;
WindowRules m_rules; WindowRules m_rules;
TabGroup* tab_group = nullptr;
static bool s_haveResizeEffect; static bool s_haveResizeEffect;
}; };
@ -1371,11 +1319,6 @@ inline void AbstractClient::setPendingGeometryUpdate(PendingGeometry_t update)
m_pendingGeometryUpdate = update; m_pendingGeometryUpdate = update;
} }
inline TabGroup* AbstractClient::tabGroup() const
{
return tab_group;
}
} }
Q_DECLARE_METATYPE(KWin::AbstractClient*) Q_DECLARE_METATYPE(KWin::AbstractClient*)

11
activation.cpp
View File

@ -388,8 +388,6 @@ void Workspace::takeActivity(AbstractClient* c, ActivityFlags flags)
} }
flags &= ~ActivityFocus; flags &= ~ActivityFocus;
} }
if (c->tabGroup() && c->tabGroup()->current() != c)
c->tabGroup()->setCurrent(c);
if (!c->isShown(true)) { // shouldn't happen, call activateClient() if needed if (!c->isShown(true)) { // shouldn't happen, call activateClient() if needed
qCWarning(KWIN_CORE) << "takeActivity: not shown" ; qCWarning(KWIN_CORE) << "takeActivity: not shown" ;
return; return;
@ -466,15 +464,6 @@ bool Workspace::activateNextClient(AbstractClient* c)
AbstractClient* get_focus = NULL; AbstractClient* get_focus = NULL;
// precedence on keeping the current tabgroup active. to the user that's the same window
if (c && c->tabGroup() && c->isShown(false)) {
if (c == c->tabGroup()->current())
c->tabGroup()->activateNext();
get_focus = c->tabGroup()->current();
if (get_focus == c) // single tab case - should not happen
get_focus = NULL;
}
const int desktop = VirtualDesktopManager::self()->current(); const int desktop = VirtualDesktopManager::self()->current();
if (!get_focus && showingDesktop()) if (!get_focus && showingDesktop())

1
atoms.cpp
View File

@ -60,7 +60,6 @@ Atoms::Atoms()
, net_wm_sync_request_counter(QByteArrayLiteral("_NET_WM_SYNC_REQUEST_COUNTER")) , net_wm_sync_request_counter(QByteArrayLiteral("_NET_WM_SYNC_REQUEST_COUNTER"))
, net_wm_sync_request(QByteArrayLiteral("_NET_WM_SYNC_REQUEST")) , net_wm_sync_request(QByteArrayLiteral("_NET_WM_SYNC_REQUEST"))
, kde_net_wm_shadow(QByteArrayLiteral("_KDE_NET_WM_SHADOW")) , kde_net_wm_shadow(QByteArrayLiteral("_KDE_NET_WM_SHADOW"))
, kde_net_wm_tab_group(QByteArrayLiteral("_KDE_NET_WM_TAB_GROUP"))
, kde_first_in_window_list(QByteArrayLiteral("_KDE_FIRST_IN_WINDOWLIST")) , kde_first_in_window_list(QByteArrayLiteral("_KDE_FIRST_IN_WINDOWLIST"))
, kde_color_sheme(QByteArrayLiteral("_KDE_NET_WM_COLOR_SCHEME")) , kde_color_sheme(QByteArrayLiteral("_KDE_NET_WM_COLOR_SCHEME"))
, kde_skip_close_animation(QByteArrayLiteral("_KDE_NET_WM_SKIP_CLOSE_ANIMATION")) , kde_skip_close_animation(QByteArrayLiteral("_KDE_NET_WM_SKIP_CLOSE_ANIMATION"))

1
atoms.h
View File

@ -69,7 +69,6 @@ public:
Xcb::Atom net_wm_sync_request_counter; Xcb::Atom net_wm_sync_request_counter;
Xcb::Atom net_wm_sync_request; Xcb::Atom net_wm_sync_request;
Xcb::Atom kde_net_wm_shadow; Xcb::Atom kde_net_wm_shadow;
Xcb::Atom kde_net_wm_tab_group;
Xcb::Atom kde_first_in_window_list; Xcb::Atom kde_first_in_window_list;
Xcb::Atom kde_color_sheme; Xcb::Atom kde_color_sheme;
Xcb::Atom kde_skip_close_animation; Xcb::Atom kde_skip_close_animation;

52
client.cpp
View File

@ -170,17 +170,6 @@ Client::Client()
} }
}); });
connect(this, &Client::tabGroupChanged, this,
[this] {
auto group = tabGroup();
if (group) {
unsigned long data[] = {qHash(group)}; //->id();
m_client.changeProperty(atoms->kde_net_wm_tab_group, XCB_ATOM_CARDINAL, 32, 1, data);
}
else
m_client.deleteProperty(atoms->kde_net_wm_tab_group);
});
// SELI TODO: Initialize xsizehints?? // SELI TODO: Initialize xsizehints??
} }
@ -257,8 +246,7 @@ void Client::releaseWindow(bool on_shutdown)
// Only when the window is being unmapped, not when closing down KWin (NETWM sections 5.5,5.7) // Only when the window is being unmapped, not when closing down KWin (NETWM sections 5.5,5.7)
info->setDesktop(0); info->setDesktop(0);
info->setState(0, info->state()); // Reset all state flags info->setState(0, info->state()); // Reset all state flags
} else }
untab();
xcb_connection_t *c = connection(); xcb_connection_t *c = connection();
m_client.deleteProperty(atoms->kde_net_wm_user_creation_time); m_client.deleteProperty(atoms->kde_net_wm_user_creation_time);
m_client.deleteProperty(atoms->net_frame_extents); m_client.deleteProperty(atoms->net_frame_extents);
@ -614,7 +602,7 @@ bool Client::noBorder() const
bool Client::userCanSetNoBorder() const bool Client::userCanSetNoBorder() const
{ {
return !isFullScreen() && !isShade() && !tabGroup(); return !isFullScreen() && !isShade();
} }
void Client::setNoBorder(bool set) void Client::setNoBorder(bool set)
@ -774,9 +762,6 @@ void Client::doMinimize()
updateVisibility(); updateVisibility();
updateAllowedActions(); updateAllowedActions();
workspace()->updateMinimizedOfTransients(this); workspace()->updateMinimizedOfTransients(this);
// Update states of all other windows in this group
if (tabGroup())
tabGroup()->updateStates(this, TabGroup::Minimized);
} }
QRect Client::iconGeometry() const QRect Client::iconGeometry() const
@ -826,10 +811,6 @@ void Client::setShade(ShadeMode mode)
decoration->borders(border_left, border_right, border_top, border_bottom); decoration->borders(border_left, border_right, border_top, border_bottom);
#endif #endif
// Update states of all other windows in this group
if (tabGroup())
tabGroup()->updateStates(this, TabGroup::Shaded);
if (was_shade == isShade()) { if (was_shade == isShade()) {
// Decoration may want to update after e.g. hover-shade changes // Decoration may want to update after e.g. hover-shade changes
emit shadeChanged(); emit shadeChanged();
@ -912,9 +893,7 @@ void Client::shadeHover()
void Client::shadeUnhover() void Client::shadeUnhover()
{ {
if (!tabGroup() || tabGroup()->current() == this || setShade(ShadeNormal);
tabGroup()->current()->shadeMode() == ShadeNormal)
setShade(ShadeNormal);
cancelShadeHoverTimer(); cancelShadeHoverTimer();
} }
@ -934,7 +913,7 @@ void Client::updateVisibility()
{ {
if (deleting) if (deleting)
return; return;
if (hidden && isCurrentTab()) { if (hidden) {
info->setState(NET::Hidden, NET::Hidden); info->setState(NET::Hidden, NET::Hidden);
setSkipTaskbar(true); // Also hide from taskbar setSkipTaskbar(true); // Also hide from taskbar
if (compositing() && options->hiddenPreviews() == HiddenPreviewsAlways) if (compositing() && options->hiddenPreviews() == HiddenPreviewsAlways)
@ -943,8 +922,7 @@ void Client::updateVisibility()
internalHide(); internalHide();
return; return;
} }
if (isCurrentTab()) setSkipTaskbar(originalSkipTaskbar()); // Reset from 'hidden'
setSkipTaskbar(originalSkipTaskbar()); // Reset from 'hidden'
if (isMinimized()) { if (isMinimized()) {
info->setState(NET::Hidden, NET::Hidden); info->setState(NET::Hidden, NET::Hidden);
if (compositing() && options->hiddenPreviews() == HiddenPreviewsAlways) if (compositing() && options->hiddenPreviews() == HiddenPreviewsAlways)
@ -1270,10 +1248,6 @@ void Client::doSetDesktop(int desktop, int was_desk)
Q_UNUSED(desktop) Q_UNUSED(desktop)
Q_UNUSED(was_desk) Q_UNUSED(was_desk)
updateVisibility(); updateVisibility();
// Update states of all other windows in this group
if (tabGroup())
tabGroup()->updateStates(this, TabGroup::Desktop);
} }
/** /**
@ -1377,10 +1351,6 @@ void Client::updateActivities(bool includeTransients)
FocusChain::self()->update(this, FocusChain::MakeFirst); FocusChain::self()->update(this, FocusChain::MakeFirst);
updateVisibility(); updateVisibility();
updateWindowRules(Rules::Activity); updateWindowRules(Rules::Activity);
// Update states of all other windows in this group
if (tabGroup())
tabGroup()->updateStates(this, TabGroup::Activity);
} }
/** /**
@ -1596,8 +1566,6 @@ void Client::setClientShown(bool shown)
if (shown != hidden) if (shown != hidden)
return; // nothing to change return; // nothing to change
hidden = !shown; hidden = !shown;
if (options->isInactiveTabsSkipTaskbar())
setSkipTaskbar(hidden); // TODO: Causes reshuffle of the taskbar
if (shown) { if (shown) {
map(); map();
takeFocus(); takeFocus();
@ -1606,8 +1574,7 @@ void Client::setClientShown(bool shown)
} else { } else {
unmap(); unmap();
// Don't move tabs to the end of the list when another tab get's activated // Don't move tabs to the end of the list when another tab get's activated
if (isCurrentTab()) FocusChain::self()->update(this, FocusChain::MakeLast);
FocusChain::self()->update(this, FocusChain::MakeLast);
addWorkspaceRepaint(visibleRect()); addWorkspaceRepaint(visibleRect());
} }
} }
@ -2106,13 +2073,6 @@ bool Client::belongsToSameApplication(const AbstractClient *other, SameApplicati
return Client::belongToSameApplication(this, c2, checks); return Client::belongToSameApplication(this, c2, checks);
} }
void Client::updateTabGroupStates(TabGroup::States states)
{
if (auto t = tabGroup()) {
t->updateStates(this, states);
}
}
QSize Client::resizeIncrements() const QSize Client::resizeIncrements() const
{ {
return m_geometryHints.resizeIncrements(); return m_geometryHints.resizeIncrements();

7
client.h
View File

@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// kwin // kwin
#include "options.h" #include "options.h"
#include "rules.h" #include "rules.h"
#include "tabgroup.h"
#include "abstract_client.h" #include "abstract_client.h"
#include "xcbutils.h" #include "xcbutils.h"
// Qt // Qt
@ -346,8 +345,6 @@ private:
bool buttonReleaseEvent(xcb_window_t w, int button, int state, int x, int y, int x_root, int y_root); bool buttonReleaseEvent(xcb_window_t w, int button, int state, int x, int y, int x_root, int y_root);
bool motionNotifyEvent(xcb_window_t w, int state, int x, int y, int x_root, int y_root); bool motionNotifyEvent(xcb_window_t w, int state, int x, int y, int x_root, int y_root);
Client* findAutogroupCandidate() const;
protected: protected:
void debug(QDebug& stream) const override; void debug(QDebug& stream) const override;
void addDamage(const QRegion &damage) override; void addDamage(const QRegion &damage) override;
@ -362,7 +359,6 @@ protected:
void doSetSkipSwitcher() override; void doSetSkipSwitcher() override;
bool belongsToDesktop() const override; bool belongsToDesktop() const override;
void setGeometryRestore(const QRect &geo) override; void setGeometryRestore(const QRect &geo) override;
void updateTabGroupStates(TabGroup::States states) override;
void doMove(int x, int y) override; void doMove(int x, int y) override;
bool doStartMoveResize() override; bool doStartMoveResize() override;
void doPerformMoveResize() override; void doPerformMoveResize() override;
@ -596,8 +592,7 @@ inline Group* Client::group()
inline bool Client::isShown(bool shaded_is_shown) const inline bool Client::isShown(bool shaded_is_shown) const
{ {
return !isMinimized() && (!isShade() || shaded_is_shown) && !hidden && return !isMinimized() && (!isShade() || shaded_is_shown) && !hidden;
(!tabGroup() || tabGroup()->current() == this);
} }
inline bool Client::isHiddenInternal() const inline bool Client::isHiddenInternal() const

2
deleted.cpp
View File

@ -43,7 +43,6 @@ Deleted::Deleted()
, m_minimized(false) , m_minimized(false)
, m_modal(false) , m_modal(false)
, m_wasClient(false) , m_wasClient(false)
, m_wasCurrentTab(true)
, m_decorationRenderer(nullptr) , m_decorationRenderer(nullptr)
, m_fullscreen(false) , m_fullscreen(false)
, m_keepAbove(false) , m_keepAbove(false)
@ -131,7 +130,6 @@ void Deleted::copyToDeleted(Toplevel* c)
connect(c, &AbstractClient::windowClosed, this, &Deleted::mainClientClosed); connect(c, &AbstractClient::windowClosed, this, &Deleted::mainClientClosed);
} }
m_fullscreen = client->isFullScreen(); m_fullscreen = client->isFullScreen();
m_wasCurrentTab = client->isCurrentTab();
m_keepAbove = client->keepAbove(); m_keepAbove = client->keepAbove();
m_keepBelow = client->keepBelow(); m_keepBelow = client->keepBelow();
m_caption = client->caption(); m_caption = client->caption();

4
deleted.h
View File

@ -87,9 +87,6 @@ public:
return m_fullscreen; return m_fullscreen;
} }
bool isCurrentTab() const {
return m_wasCurrentTab;
}
bool keepAbove() const { bool keepAbove() const {
return m_keepAbove; return m_keepAbove;
} }
@ -220,7 +217,6 @@ private:
bool m_modal; bool m_modal;
QList<AbstractClient*> m_mainClients; QList<AbstractClient*> m_mainClients;
bool m_wasClient; bool m_wasClient;
bool m_wasCurrentTab;
Decoration::Renderer *m_decorationRenderer; Decoration::Renderer *m_decorationRenderer;
double m_opacity; double m_opacity;
NET::WindowType m_type = NET::Unknown; NET::WindowType m_type = NET::Unknown;

22
doc/windowbehaviour/index.docbook
View File

@ -42,8 +42,7 @@ you can configure how titlebars and windows react to
mouse clicks. <guilabel>Moving</guilabel> allows you to configure how mouse clicks. <guilabel>Moving</guilabel> allows you to configure how
windows move and place themselves when started. The windows move and place themselves when started. The
<guilabel>Advanced</guilabel> options cover some specialized options <guilabel>Advanced</guilabel> options cover some specialized options
like <quote>window tabbing</quote> and <quote>window like <quote>window shading</quote>.
shading</quote>.
</para> </para>
<note> <note>
@ -279,7 +278,7 @@ restores the window to its normal size.
<para>Similar options are available for <guilabel>Wheel event</guilabel>. <para>Similar options are available for <guilabel>Wheel event</guilabel>.
</para> </para>
<!--FIXME Raise/Lower Shade/Unshade Maximize/Restore Keep Above/Below Move to Previous/Next Desktop Change Opacity Switch to Window Tab to the Left/Reght --> <!--FIXME Raise/Lower Shade/Unshade Maximize/Restore Keep Above/Below Move to Previous/Next Desktop Change Opacity -->
<tip> <tip>
<para> <para>
@ -340,7 +339,7 @@ are already on top.
</varlistentry> </varlistentry>
<!--FIXME missing: <!--FIXME missing:
Minimize, Shade, Close, Start Window Tab Drag Minimize, Shade, Close
--> -->
<varlistentry> <varlistentry>
@ -531,7 +530,7 @@ Increase Opacity + Decrease Opacity
<!--FIXME <!--FIXME
Mouse Wheel has different choices: Mouse Wheel has different choices:
Raise/Lower, Shade/Unshade, Maximize/Restore, Keep Above/Below, Raise/Lower, Shade/Unshade, Maximize/Restore, Keep Above/Below,
Move to Previous/Next Desktop, Change Opacity, Switch to Window Tab to the Left/Right Move to Previous/Next Desktop, Change Opacity
Nothing Nothing
--> -->
@ -639,19 +638,6 @@ the spinbox to configure the delay un-shading.
</variablelist> </variablelist>
<variablelist> <variablelist>
<title>Window Tabbing</title>
<varlistentry>
<term><guilabel>Automatically group similar windows</guilabel></term>
<listitem><para>When turned on attempt to automatically detect when a newly opened window is
related to an existing one and place them in the same window group.</para></listitem>
</varlistentry>
<varlistentry>
<term><guilabel>Switch to automatically grouped windows immediately</guilabel></term>
<listitem><para>When turned on immediately switch to any new window tabs that were
automatically added to the current group.</para></listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><guilabel>Placement</guilabel></term> <term><guilabel>Placement</guilabel></term>

10
effects.cpp
View File

@ -561,8 +561,7 @@ void EffectsHandlerImpl::slotClientShown(KWin::Toplevel *t)
Client *c = static_cast<Client*>(t); Client *c = static_cast<Client*>(t);
disconnect(c, &Toplevel::windowShown, this, &EffectsHandlerImpl::slotClientShown); disconnect(c, &Toplevel::windowShown, this, &EffectsHandlerImpl::slotClientShown);
setupClientConnections(c); setupClientConnections(c);
if (!c->tabGroup()) // the "window" has already been there emit windowAdded(c->effectWindow());
emit windowAdded(c->effectWindow());
} }
void EffectsHandlerImpl::slotShellClientShown(Toplevel *t) void EffectsHandlerImpl::slotShellClientShown(Toplevel *t)
@ -1856,7 +1855,6 @@ TOPLEVEL_HELPER(bool, isOutline, isOutline)
CLIENT_HELPER_WITH_DELETED(bool, isMinimized, isMinimized, false) CLIENT_HELPER_WITH_DELETED(bool, isMinimized, isMinimized, false)
CLIENT_HELPER_WITH_DELETED(bool, isModal, isModal, false) CLIENT_HELPER_WITH_DELETED(bool, isModal, isModal, false)
CLIENT_HELPER_WITH_DELETED(bool, isFullScreen, isFullScreen, false) CLIENT_HELPER_WITH_DELETED(bool, isFullScreen, isFullScreen, false)
CLIENT_HELPER_WITH_DELETED(bool, isCurrentTab, isCurrentTab, false)
CLIENT_HELPER_WITH_DELETED(bool, keepAbove, keepAbove, false) CLIENT_HELPER_WITH_DELETED(bool, keepAbove, keepAbove, false)
CLIENT_HELPER_WITH_DELETED(bool, keepBelow, keepBelow, false) CLIENT_HELPER_WITH_DELETED(bool, keepBelow, keepBelow, false)
CLIENT_HELPER_WITH_DELETED(QString, caption, caption, QString()); CLIENT_HELPER_WITH_DELETED(QString, caption, caption, QString());
@ -1864,6 +1862,12 @@ CLIENT_HELPER_WITH_DELETED(QVector<uint>, desktops, x11DesktopIds, QVector<uint>
#undef CLIENT_HELPER_WITH_DELETED #undef CLIENT_HELPER_WITH_DELETED
// legacy from tab groups, can be removed when no effects use this any more.
bool EffectWindowImpl::isCurrentTab() const
{
return true;
}
QString EffectWindowImpl::windowClass() const QString EffectWindowImpl::windowClass() const
{ {
return toplevel->resourceName() + QLatin1Char(' ') + toplevel->resourceClass(); return toplevel->resourceName() + QLatin1Char(' ') + toplevel->resourceClass();

4
effects/desktopgrid/desktopgrid.cpp
View File

@ -1436,10 +1436,6 @@ bool DesktopGridEffect::isRelevantWithPresentWindows(EffectWindow *w) const
return false; return false;
} }
if (!w->isCurrentTab()) {
return false;
}
if (!w->isOnCurrentActivity()) { if (!w->isOnCurrentActivity()) {
return false; return false;
} }

2
effects/flipswitch/flipswitch.cpp
View File

@ -370,8 +370,6 @@ void FlipSwitchEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data,
w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DESKTOP); w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DESKTOP);
if (w->isMinimized()) if (w->isMinimized())
w->enablePainting(EffectWindow::PAINT_DISABLED_BY_MINIMIZE); w->enablePainting(EffectWindow::PAINT_DISABLED_BY_MINIMIZE);
if (!w->isCurrentTab())
w->enablePainting(EffectWindow::PAINT_DISABLED_BY_TAB_GROUP);
} else { } else {
if ((m_start || m_stop) && !w->isDesktop() && w->isOnCurrentDesktop()) if ((m_start || m_stop) && !w->isDesktop() && w->isOnCurrentDesktop())
data.setTranslucent(); data.setTranslucent();

4
effects/highlightwindow/highlightwindow.cpp
View File

@ -51,7 +51,7 @@ HighlightWindowEffect::~HighlightWindowEffect()
static bool isInitiallyHidden(EffectWindow* w) static bool isInitiallyHidden(EffectWindow* w)
{ {
// Is the window initially hidden until it is highlighted? // Is the window initially hidden until it is highlighted?
return w->isMinimized() || !w->isCurrentTab() || !w->isOnCurrentDesktop(); return w->isMinimized() || !w->isOnCurrentDesktop();
} }
void HighlightWindowEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) void HighlightWindowEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time)
@ -97,8 +97,6 @@ void HighlightWindowEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData&
if (opacity != m_windowOpacity.end() && *opacity > 0.01) { if (opacity != m_windowOpacity.end() && *opacity > 0.01) {
if (w->isMinimized()) if (w->isMinimized())
w->enablePainting(EffectWindow::PAINT_DISABLED_BY_MINIMIZE); w->enablePainting(EffectWindow::PAINT_DISABLED_BY_MINIMIZE);
if (!w->isCurrentTab())
w->enablePainting(EffectWindow::PAINT_DISABLED_BY_TAB_GROUP);
if (!w->isOnCurrentDesktop()) if (!w->isOnCurrentDesktop())
w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DESKTOP); w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DESKTOP);
} }

6
effects/presentwindows/presentwindows.cpp
View File

@ -289,8 +289,6 @@ void PresentWindowsEffect::prePaintWindow(EffectWindow *w, WindowPrePaintData &d
} }
w->enablePainting(EffectWindow::PAINT_DISABLED_BY_MINIMIZE); // Display always w->enablePainting(EffectWindow::PAINT_DISABLED_BY_MINIMIZE); // Display always
w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DESKTOP); w->enablePainting(EffectWindow::PAINT_DISABLED_BY_DESKTOP);
if (winData->visible)
w->enablePainting(EffectWindow::PAINT_DISABLED_BY_TAB_GROUP);
// Calculate window's opacity // Calculate window's opacity
// TODO: Minimized windows or windows not on the current desktop are only 75% visible? // TODO: Minimized windows or windows not on the current desktop are only 75% visible?
@ -1620,7 +1618,7 @@ void PresentWindowsEffect::setActive(bool active)
DataHash::iterator winData = m_windowData.find(w); DataHash::iterator winData = m_windowData.find(w);
if (winData != m_windowData.end()) if (winData != m_windowData.end())
winData->visible = (w->isOnDesktop(desktop) || w->isOnAllDesktops()) && winData->visible = (w->isOnDesktop(desktop) || w->isOnAllDesktops()) &&
!w->isMinimized() && (w->isCurrentTab() || winData->visible); !w->isMinimized();
} }
if (m_closeView) if (m_closeView)
m_closeView->hide(); m_closeView->hide();
@ -1681,8 +1679,6 @@ bool PresentWindowsEffect::isSelectableWindow(EffectWindow *w)
return false; return false;
if (!w->acceptsFocus()) if (!w->acceptsFocus())
return false; return false;
if (!w->isCurrentTab())
return false;
if (w->isSkipSwitcher()) if (w->isSkipSwitcher())
return false; return false;
if (m_closeView && w == effects->findWindow(m_closeView->winId())) if (m_closeView && w == effects->findWindow(m_closeView->winId()))

2
effects/slideback/slideback.cpp
View File

@ -299,7 +299,7 @@ void SlideBackEffect::slotTabBoxClosed()
bool SlideBackEffect::isWindowUsable(EffectWindow* w) bool SlideBackEffect::isWindowUsable(EffectWindow* w)
{ {
return w && (w->isNormalWindow() || w->isDialog()) && !w->keepAbove() && !w->isDeleted() && !w->isMinimized() return w && (w->isNormalWindow() || w->isDialog()) && !w->keepAbove() && !w->isDeleted() && !w->isMinimized()
&& w->isCurrentTab() && w->isPaintingEnabled(); && w->isPaintingEnabled();
} }
bool SlideBackEffect::intersects(EffectWindow* windowUnder, const QRect &windowOverGeometry) bool SlideBackEffect::intersects(EffectWindow* windowUnder, const QRect &windowOverGeometry)

70
geometry.cpp
View File

@ -548,8 +548,6 @@ QPoint Workspace::adjustClientPosition(AbstractClient* c, QPoint pos, bool unres
continue; // is minimized continue; // is minimized
if (!(*l)->isShown(false)) if (!(*l)->isShown(false))
continue; continue;
if ((*l)->tabGroup() && (*l) != (*l)->tabGroup()->current())
continue; // is not active tab
if (!((*l)->isOnDesktop(c->desktop()) || c->isOnDesktop((*l)->desktop()))) if (!((*l)->isOnDesktop(c->desktop()) || c->isOnDesktop((*l)->desktop())))
continue; // wrong virtual desktop continue; // wrong virtual desktop
if (!(*l)->isOnCurrentActivity()) if (!(*l)->isOnCurrentActivity())
@ -1360,8 +1358,8 @@ QSize Client::sizeForClientSize(const QSize& wsize, Sizemode mode, bool noframe)
// basesize, minsize, maxsize, paspect and resizeinc have all values defined, // basesize, minsize, maxsize, paspect and resizeinc have all values defined,
// even if they're not set in flags - see getWmNormalHints() // even if they're not set in flags - see getWmNormalHints()
QSize min_size = tabGroup() ? tabGroup()->minSize() : minSize(); QSize min_size = minSize();
QSize max_size = tabGroup() ? tabGroup()->maxSize() : maxSize(); QSize max_size = maxSize();
if (isDecorated()) { if (isDecorated()) {
QSize decominsize(0, 0); QSize decominsize(0, 0);
QSize border_size(borderLeft() + borderRight(), borderTop() + borderBottom()); QSize border_size(borderLeft() + borderRight(), borderTop() + borderBottom());
@ -1531,10 +1529,6 @@ void Client::getWmNormalHints()
// align to eventual new contraints // align to eventual new contraints
maximize(max_mode); maximize(max_mode);
} }
// Update min/max size of this group
if (tabGroup())
tabGroup()->updateMinMaxSize();
if (isManaged()) { if (isManaged()) {
// update to match restrictions // update to match restrictions
QSize new_size = adjustedSize(); QSize new_size = adjustedSize();
@ -1913,8 +1907,8 @@ bool Client::isResizable() const
mode == PositionLeft || mode == PositionBottomLeft) && rules()->checkPosition(invalidPoint) != invalidPoint) mode == PositionLeft || mode == PositionBottomLeft) && rules()->checkPosition(invalidPoint) != invalidPoint)
return false; return false;
QSize min = tabGroup() ? tabGroup()->minSize() : minSize(); QSize min = minSize();
QSize max = tabGroup() ? tabGroup()->maxSize() : maxSize(); QSize max = maxSize();
return min.width() < max.width() || min.height() < max.height(); return min.width() < max.width() || min.height() < max.height();
} }
@ -2009,10 +2003,8 @@ void Client::setGeometry(int x, int y, int w, int h, ForceGeometry_t force)
screens()->setCurrent(this); screens()->setCurrent(this);
workspace()->updateStackingOrder(); workspace()->updateStackingOrder();
// need to regenerate decoration pixmaps when either // need to regenerate decoration pixmaps when
// - size is changed // - size is changed
// - maximize mode is changed to MaximizeRestore, when size unchanged
// which can happen when untabbing maximized windows
if (resized) { if (resized) {
if (oldClientSize != QSize(w,h)) if (oldClientSize != QSize(w,h))
discardWindowPixmap(); discardWindowPixmap();
@ -2020,11 +2012,6 @@ void Client::setGeometry(int x, int y, int w, int h, ForceGeometry_t force)
emit geometryShapeChanged(this, geometryBeforeUpdateBlocking()); emit geometryShapeChanged(this, geometryBeforeUpdateBlocking());
addRepaintDuringGeometryUpdates(); addRepaintDuringGeometryUpdates();
updateGeometryBeforeUpdateBlocking(); updateGeometryBeforeUpdateBlocking();
// Update states of all other windows in this group
if (tabGroup())
tabGroup()->updateStates(this, TabGroup::Geometry);
// TODO: this signal is emitted too often // TODO: this signal is emitted too often
emit geometryChanged(); emit geometryChanged();
} }
@ -2082,10 +2069,6 @@ void Client::plainResize(int w, int h, ForceGeometry_t force)
emit geometryShapeChanged(this, geometryBeforeUpdateBlocking()); emit geometryShapeChanged(this, geometryBeforeUpdateBlocking());
addRepaintDuringGeometryUpdates(); addRepaintDuringGeometryUpdates();
updateGeometryBeforeUpdateBlocking(); updateGeometryBeforeUpdateBlocking();
// Update states of all other windows in this group
if (tabGroup())
tabGroup()->updateStates(this, TabGroup::Geometry);
// TODO: this signal is emitted too often // TODO: this signal is emitted too often
emit geometryChanged(); emit geometryChanged();
} }
@ -2120,9 +2103,6 @@ void AbstractClient::move(int x, int y, ForceGeometry_t force)
// client itself is not damaged // client itself is not damaged
addRepaintDuringGeometryUpdates(); addRepaintDuringGeometryUpdates();
updateGeometryBeforeUpdateBlocking(); updateGeometryBeforeUpdateBlocking();
// Update states of all other windows in this group
updateTabGroupStates(TabGroup::Geometry);
emit geometryChanged(); emit geometryChanged();
} }
@ -2172,34 +2152,6 @@ void AbstractClient::setMaximize(bool vertically, bool horizontally)
} }
// Update states of all other windows in this group
class TabSynchronizer
{
public:
TabSynchronizer(AbstractClient *client, TabGroup::States syncStates) :
m_client(client) , m_states(syncStates)
{
if (client->tabGroup())
client->tabGroup()->blockStateUpdates(true);
}
~TabSynchronizer()
{
syncNow();
}
void syncNow()
{
if (m_client && m_client->tabGroup()) {
m_client->tabGroup()->blockStateUpdates(false);
m_client->tabGroup()->updateStates(dynamic_cast<Client*>(m_client), m_states);
}
m_client = 0;
}
private:
AbstractClient *m_client;
TabGroup::States m_states;
};
static bool changeMaximizeRecursion = false; static bool changeMaximizeRecursion = false;
void Client::changeMaximize(bool horizontal, bool vertical, bool adjust) void Client::changeMaximize(bool horizontal, bool vertical, bool adjust)
{ {
@ -2249,8 +2201,6 @@ void Client::changeMaximize(bool horizontal, bool vertical, bool adjust)
return; return;
GeometryUpdatesBlocker blocker(this); GeometryUpdatesBlocker blocker(this);
// QT synchronizing required because we eventually change from QT to Maximized
TabSynchronizer syncer(this, TabGroup::Maximized|TabGroup::QuickTile);
// maximing one way and unmaximizing the other way shouldn't happen, // maximing one way and unmaximizing the other way shouldn't happen,
// so restore first and then maximize the other way // so restore first and then maximize the other way
@ -2450,8 +2400,6 @@ void Client::changeMaximize(bool horizontal, bool vertical, bool adjust)
break; break;
} }
syncer.syncNow(); // important because of window rule updates!
updateAllowedActions(); updateAllowedActions();
updateWindowRules(Rules::MaximizeVert|Rules::MaximizeHoriz|Rules::Position|Rules::Size); updateWindowRules(Rules::MaximizeVert|Rules::MaximizeHoriz|Rules::Position|Rules::Size);
emit quickTileModeChanged(); emit quickTileModeChanged();
@ -2487,7 +2435,6 @@ void Client::setFullScreen(bool set, bool user)
if (set) { if (set) {
m_fullscreenMode = FullScreenNormal; m_fullscreenMode = FullScreenNormal;
untab();
workspace()->raiseClient(this); workspace()->raiseClient(this);
} else { } else {
m_fullscreenMode = FullScreenNone; m_fullscreenMode = FullScreenNone;
@ -3244,7 +3191,6 @@ void AbstractClient::setQuickTileMode(QuickTileMode mode, bool keyboard)
GeometryUpdatesBlocker blocker(this); GeometryUpdatesBlocker blocker(this);
if (mode == QuickTileMode(QuickTileFlag::Maximize)) { if (mode == QuickTileMode(QuickTileFlag::Maximize)) {
TabSynchronizer syncer(this, TabGroup::QuickTile|TabGroup::Geometry|TabGroup::Maximized);
m_quickTileMode = int(QuickTileFlag::None); m_quickTileMode = int(QuickTileFlag::None);
if (maximizeMode() == MaximizeFull) { if (maximizeMode() == MaximizeFull) {
setMaximize(false, false); setMaximize(false, false);
@ -3275,8 +3221,6 @@ void AbstractClient::setQuickTileMode(QuickTileMode mode, bool keyboard)
// restore from maximized so that it is possible to tile maximized windows with one hit or by dragging // restore from maximized so that it is possible to tile maximized windows with one hit or by dragging
if (maximizeMode() != MaximizeRestore) { if (maximizeMode() != MaximizeRestore) {
TabSynchronizer syncer(this, TabGroup::QuickTile|TabGroup::Geometry|TabGroup::Maximized);
if (mode != QuickTileMode(QuickTileFlag::None)) { if (mode != QuickTileMode(QuickTileFlag::None)) {
// decorations may turn off some borders when tiled // decorations may turn off some borders when tiled
const ForceGeometry_t geom_mode = isDecorated() ? ForceGeometrySet : NormalGeometrySet; const ForceGeometry_t geom_mode = isDecorated() ? ForceGeometrySet : NormalGeometrySet;
@ -3298,8 +3242,6 @@ void AbstractClient::setQuickTileMode(QuickTileMode mode, bool keyboard)
} }
if (mode != QuickTileMode(QuickTileFlag::None)) { if (mode != QuickTileMode(QuickTileFlag::None)) {
TabSynchronizer syncer(this, TabGroup::QuickTile|TabGroup::Geometry);
QPoint whichScreen = keyboard ? geometry().center() : Cursor::pos(); QPoint whichScreen = keyboard ? geometry().center() : Cursor::pos();
// If trying to tile to the side that the window is already tiled to move the window to the next // If trying to tile to the side that the window is already tiled to move the window to the next
@ -3364,8 +3306,6 @@ void AbstractClient::setQuickTileMode(QuickTileMode mode, bool keyboard)
} }
if (mode == QuickTileMode(QuickTileFlag::None)) { if (mode == QuickTileMode(QuickTileFlag::None)) {
TabSynchronizer syncer(this, TabGroup::QuickTile|TabGroup::Geometry);
m_quickTileMode = int(QuickTileFlag::None); m_quickTileMode = int(QuickTileFlag::None);
// Untiling, so just restore geometry, and we're done. // Untiling, so just restore geometry, and we're done.
if (!geometryRestore().isValid()) // invalid if we started maximized and wait for placement if (!geometryRestore().isValid()) // invalid if we started maximized and wait for placement

2
input.cpp
View File

@ -2140,7 +2140,7 @@ Toplevel *InputRedirection::findManagedToplevel(const QPoint &pos)
continue; continue;
} }
if (AbstractClient *c = dynamic_cast<AbstractClient*>(t)) { if (AbstractClient *c = dynamic_cast<AbstractClient*>(t)) {
if (!c->isOnCurrentActivity() || !c->isOnCurrentDesktop() || c->isMinimized() || !c->isCurrentTab() || c->isHiddenInternal()) { if (!c->isOnCurrentActivity() || !c->isOnCurrentDesktop() || c->isMinimized() || c->isHiddenInternal()) {
continue; continue;
} }
} }

5
kcmkwin/kwinoptions/actions.ui
View File

@ -500,11 +500,6 @@
<string>Change opacity</string> <string>Change opacity</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Switch to window tab to the left/right</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Do nothing</string> <string>Do nothing</string>

39
kcmkwin/kwinoptions/advanced.ui
View File

@ -113,33 +113,6 @@
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="windowTabbingLabel">
<property name="text">
<string>Window tabbing:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="autogroupInForeground">
<property name="whatsThis">
<string>When turned on immediately switch to any new window tabs that were automatically added to the current group.</string>
</property>
<property name="text">
<string>&amp;Switch to automatically grouped windows immediately</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="inactiveTabsSkipTaskbar">
<property name="whatsThis">
<string>When turned on hide all tabs that are not active from the taskbar.</string>
</property>
<property name="text">
<string>&amp;Hide inactive window tabs from the taskbar</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="specialWindowsLabel"> <widget class="QLabel" name="specialWindowsLabel">
<property name="text"> <property name="text">
<string>&amp;Special windows:</string> <string>&amp;Special windows:</string>
@ -149,7 +122,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="2" column="1">
<widget class="QCheckBox" name="hideUtilityWindowsForInactive"> <widget class="QCheckBox" name="hideUtilityWindowsForInactive">
<property name="whatsThis"> <property name="whatsThis">
<string>When turned on, utility windows (tool windows, torn-off menus,...) of inactive applications will be hidden and will be shown only when the application becomes active. Note that applications have to mark the windows with the proper window type for this feature to work.</string> <string>When turned on, utility windows (tool windows, torn-off menus,...) of inactive applications will be hidden and will be shown only when the application becomes active. Note that applications have to mark the windows with the proper window type for this feature to work.</string>
@ -159,16 +132,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QCheckBox" name="autogroupSimilarWindows">
<property name="whatsThis">
<string>When turned on attempt to automatically detect when a newly opened window is related to an existing one and place them in the same window group.</string>
</property>
<property name="text">
<string>&amp;Group similar windows automatically</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

16
kcmkwin/kwinoptions/mouse.cpp
View File

@ -216,7 +216,6 @@ const char* const tbl_TiAc[] = {
"Shade", "Shade",
"Close", "Close",
"Operations menu", "Operations menu",
"Start window tab drag",
"Nothing", "Nothing",
"" ""
}; };
@ -232,7 +231,6 @@ const char* const tbl_TiInAc[] = {
"Shade", "Shade",
"Close", "Close",
"Operations menu", "Operations menu",
"Start window tab drag",
"Nothing", "Nothing",
"" ""
}; };
@ -279,7 +277,6 @@ const char* const tbl_TiWAc[] = {
"Above/Below", "Above/Below",
"Previous/Next Desktop", "Previous/Next Desktop",
"Change Opacity", "Change Opacity",
"Switch to Window Tab to the Left/Right",
"Nothing", "Nothing",
"" ""
}; };
@ -291,7 +288,6 @@ const char* const tbl_AllW[] = {
"Above/Below", "Above/Below",
"Previous/Next Desktop", "Previous/Next Desktop",
"Change Opacity", "Change Opacity",
"Switch to Window Tab to the Left/Right",
"Nothing", "Nothing",
"" ""
}; };
@ -393,11 +389,11 @@ void KTitleBarActionsConfig::load()
KConfigGroup cg(config, "MouseBindings"); KConfigGroup cg(config, "MouseBindings");
setComboText(m_ui->coTiAct1, cg.readEntry("CommandActiveTitlebar1", "Raise").toLatin1()); setComboText(m_ui->coTiAct1, cg.readEntry("CommandActiveTitlebar1", "Raise").toLatin1());
setComboText(m_ui->coTiAct2, cg.readEntry("CommandActiveTitlebar2", "Start Window Tab Drag").toLatin1()); setComboText(m_ui->coTiAct2, cg.readEntry("CommandActiveTitlebar2", "Nothing").toLatin1());
setComboText(m_ui->coTiAct3, cg.readEntry("CommandActiveTitlebar3", "Operations menu").toLatin1()); setComboText(m_ui->coTiAct3, cg.readEntry("CommandActiveTitlebar3", "Operations menu").toLatin1());
setComboText(m_ui->coTiAct4, cg.readEntry("CommandTitlebarWheel", "Switch to Window Tab to the Left/Right").toLatin1()); setComboText(m_ui->coTiAct4, cg.readEntry("CommandTitlebarWheel", "Nothing").toLatin1());
setComboText(m_ui->coTiInAct1, cg.readEntry("CommandInactiveTitlebar1", "Activate and raise").toLatin1()); setComboText(m_ui->coTiInAct1, cg.readEntry("CommandInactiveTitlebar1", "Activate and raise").toLatin1());
setComboText(m_ui->coTiInAct2, cg.readEntry("CommandInactiveTitlebar2", "Start Window Tab Drag").toLatin1()); setComboText(m_ui->coTiInAct2, cg.readEntry("CommandInactiveTitlebar2", "Nothing").toLatin1());
setComboText(m_ui->coTiInAct3, cg.readEntry("CommandInactiveTitlebar3", "Operations menu").toLatin1()); setComboText(m_ui->coTiInAct3, cg.readEntry("CommandInactiveTitlebar3", "Operations menu").toLatin1());
} }
@ -432,11 +428,11 @@ void KTitleBarActionsConfig::defaults()
{ {
setComboText(m_ui->coTiDbl, "Maximize"); setComboText(m_ui->coTiDbl, "Maximize");
setComboText(m_ui->coTiAct1, "Raise"); setComboText(m_ui->coTiAct1, "Raise");
setComboText(m_ui->coTiAct2, "Start Window Tab Drag"); setComboText(m_ui->coTiAct2, "Nothing");
setComboText(m_ui->coTiAct3, "Operations menu"); setComboText(m_ui->coTiAct3, "Operations menu");
setComboText(m_ui->coTiAct4, "Switch to Window Tab to the Left/Right"); setComboText(m_ui->coTiAct4, "Nothing");
setComboText(m_ui->coTiInAct1, "Activate and raise"); setComboText(m_ui->coTiInAct1, "Activate and raise");
setComboText(m_ui->coTiInAct2, "Start Window Tab Drag"); setComboText(m_ui->coTiInAct2, "Nothing");
setComboText(m_ui->coTiInAct3, "Operations menu"); setComboText(m_ui->coTiInAct3, "Operations menu");
setComboText(m_ui->leftClickMaximizeButton, tbl_Max[0]); setComboText(m_ui->leftClickMaximizeButton, tbl_Max[0]);
setComboText(m_ui->middleClickMaximizeButton, tbl_Max[1]); setComboText(m_ui->middleClickMaximizeButton, tbl_Max[1]);

35
kcmkwin/kwinoptions/mouse.ui
View File

@ -127,11 +127,6 @@
<string>Change opacity</string> <string>Change opacity</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Switch to window tab to the left/right</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Do nothing</string> <string>Do nothing</string>
@ -271,11 +266,6 @@
<string>Show actions menu</string> <string>Show actions menu</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Start window tab drag</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Do nothing</string> <string>Do nothing</string>
@ -338,11 +328,6 @@
<string>Show actions menu</string> <string>Show actions menu</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Start window tab drag</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Do nothing</string> <string>Do nothing</string>
@ -396,11 +381,6 @@
<string>Show actions menu</string> <string>Show actions menu</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Start window tab drag</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Do nothing</string> <string>Do nothing</string>
@ -463,11 +443,6 @@
<string>Show actions menu</string> <string>Show actions menu</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Start window tab drag</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Do nothing</string> <string>Do nothing</string>
@ -521,11 +496,6 @@
<string>Show actions menu</string> <string>Show actions menu</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Start window tab drag</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Do nothing</string> <string>Do nothing</string>
@ -588,11 +558,6 @@
<string>Show actions menu</string> <string>Show actions menu</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Start window tab drag</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Do nothing</string> <string>Do nothing</string>

32
kcmkwin/kwinoptions/windows.cpp
View File

@ -53,8 +53,6 @@
#define KWIN_FOCUS_STEALING "FocusStealingPreventionLevel" #define KWIN_FOCUS_STEALING "FocusStealingPreventionLevel"
#define KWIN_HIDE_UTILITY "HideUtilityWindowsForInactive" #define KWIN_HIDE_UTILITY "HideUtilityWindowsForInactive"
#define KWIN_INACTIVE_SKIP_TASKBAR "InactiveTabsSkipTaskbar" #define KWIN_INACTIVE_SKIP_TASKBAR "InactiveTabsSkipTaskbar"
#define KWIN_AUTOGROUP_SIMILAR "AutogroupSimilarWindows"
#define KWIN_AUTOGROUP_FOREGROUND "AutogroupInForeground"
#define KWIN_SEPARATE_SCREEN_FOCUS "SeparateScreenFocus" #define KWIN_SEPARATE_SCREEN_FOCUS "SeparateScreenFocus"
#define KWIN_ACTIVE_MOUSE_SCREEN "ActiveMouseScreen" #define KWIN_ACTIVE_MOUSE_SCREEN "ActiveMouseScreen"
@ -389,14 +387,10 @@ KAdvancedConfig::KAdvancedConfig(bool _standAlone, KConfig *_config, QWidget *pa
m_ui->placementCombo->setItemData(6, "UnderMouse"); m_ui->placementCombo->setItemData(6, "UnderMouse");
connect(m_ui->shadeHoverOn, SIGNAL(toggled(bool)), this, SLOT(shadeHoverChanged(bool))); connect(m_ui->shadeHoverOn, SIGNAL(toggled(bool)), this, SLOT(shadeHoverChanged(bool)));
connect(m_ui->inactiveTabsSkipTaskbar, SIGNAL(toggled(bool)), SLOT(changed()));
connect(m_ui->autogroupSimilarWindows, SIGNAL(toggled(bool)), SLOT(changed()));
connect(m_ui->autogroupInForeground, SIGNAL(toggled(bool)), SLOT(changed()));
connect(m_ui->shadeHoverOn, SIGNAL(toggled(bool)), SLOT(changed())); connect(m_ui->shadeHoverOn, SIGNAL(toggled(bool)), SLOT(changed()));
connect(m_ui->shadeHover, SIGNAL(valueChanged(int)), SLOT(changed())); connect(m_ui->shadeHover, SIGNAL(valueChanged(int)), SLOT(changed()));
connect(m_ui->placementCombo, SIGNAL(activated(int)), SLOT(changed())); connect(m_ui->placementCombo, SIGNAL(activated(int)), SLOT(changed()));
connect(m_ui->hideUtilityWindowsForInactive, SIGNAL(toggled(bool)), SLOT(changed())); connect(m_ui->hideUtilityWindowsForInactive, SIGNAL(toggled(bool)), SLOT(changed()));
m_ui->inactiveTabsSkipTaskbar->setVisible(false); // TODO: We want translations in case this is fixed...
load(); load();
} }
@ -447,9 +441,6 @@ void KAdvancedConfig::load(void)
m_ui->placementCombo->setCurrentIndex(idx); m_ui->placementCombo->setCurrentIndex(idx);
setHideUtilityWindowsForInactive(cg.readEntry(KWIN_HIDE_UTILITY, true)); setHideUtilityWindowsForInactive(cg.readEntry(KWIN_HIDE_UTILITY, true));
setInactiveTabsSkipTaskbar(cg.readEntry(KWIN_INACTIVE_SKIP_TASKBAR, false));
setAutogroupSimilarWindows(cg.readEntry(KWIN_AUTOGROUP_SIMILAR, false));
setAutogroupInForeground(cg.readEntry(KWIN_AUTOGROUP_FOREGROUND, true));
emit KCModule::changed(false); emit KCModule::changed(false);
} }
@ -464,13 +455,8 @@ void KAdvancedConfig::save(void)
v = getShadeHoverInterval(); v = getShadeHoverInterval();
if (v < 0) v = 0; if (v < 0) v = 0;
cg.writeEntry(KWIN_SHADEHOVER_INTERVAL, v); cg.writeEntry(KWIN_SHADEHOVER_INTERVAL, v);
cg.writeEntry(KWIN_PLACEMENT, m_ui->placementCombo->itemData(m_ui->placementCombo->currentIndex()).toString()); cg.writeEntry(KWIN_PLACEMENT, m_ui->placementCombo->itemData(m_ui->placementCombo->currentIndex()).toString());
cg.writeEntry(KWIN_HIDE_UTILITY, m_ui->hideUtilityWindowsForInactive->isChecked()); cg.writeEntry(KWIN_HIDE_UTILITY, m_ui->hideUtilityWindowsForInactive->isChecked());
cg.writeEntry(KWIN_INACTIVE_SKIP_TASKBAR, m_ui->inactiveTabsSkipTaskbar->isChecked());
cg.writeEntry(KWIN_AUTOGROUP_SIMILAR, m_ui->autogroupSimilarWindows->isChecked());
cg.writeEntry(KWIN_AUTOGROUP_FOREGROUND, m_ui->autogroupInForeground->isChecked());
if (standAlone) { if (standAlone) {
config->sync(); config->sync();
@ -489,9 +475,6 @@ void KAdvancedConfig::defaults()
setShadeHoverInterval(250); setShadeHoverInterval(250);
m_ui->placementCombo->setCurrentIndex(0); // default to Smart m_ui->placementCombo->setCurrentIndex(0); // default to Smart
setHideUtilityWindowsForInactive(true); setHideUtilityWindowsForInactive(true);
setInactiveTabsSkipTaskbar(false);
setAutogroupSimilarWindows(false);
setAutogroupInForeground(true);
emit KCModule::changed(true); emit KCModule::changed(true);
} }
@ -501,21 +484,6 @@ void KAdvancedConfig::setHideUtilityWindowsForInactive(bool s)
m_ui->hideUtilityWindowsForInactive->setChecked(s); m_ui->hideUtilityWindowsForInactive->setChecked(s);
} }
void KAdvancedConfig::setInactiveTabsSkipTaskbar(bool s)
{
m_ui->inactiveTabsSkipTaskbar->setChecked(s);
}
void KAdvancedConfig::setAutogroupSimilarWindows(bool s)
{
m_ui->autogroupSimilarWindows->setChecked(s);
}
void KAdvancedConfig::setAutogroupInForeground(bool s)
{
m_ui->autogroupInForeground->setChecked(s);
}
KWinMovingConfigForm::KWinMovingConfigForm(QWidget* parent) KWinMovingConfigForm::KWinMovingConfigForm(QWidget* parent)
: QWidget(parent) : QWidget(parent)
{ {

3
kcmkwin/kwinoptions/windows.h
View File

@ -183,9 +183,6 @@ private:
KWinAdvancedConfigForm *m_ui; KWinAdvancedConfigForm *m_ui;
void setHideUtilityWindowsForInactive(bool); void setHideUtilityWindowsForInactive(bool);
void setInactiveTabsSkipTaskbar(bool);
void setAutogroupSimilarWindows(bool);
void setAutogroupInForeground(bool);
}; };
#endif // KKWMWINDOWS_H #endif // KKWMWINDOWS_H

6
kwin.kcfg
View File

@ -6,7 +6,7 @@
<kcfgfile arg="true" /> <kcfgfile arg="true" />
<group name="MouseBindings"> <group name="MouseBindings">
<entry name="CommandTitlebarWheel" type="String"> <entry name="CommandTitlebarWheel" type="String">
<default>Switch to Window Tab to the Left/Right</default> <default>Nothing</default>
</entry> </entry>
<entry name="CommandAllKey" type="String"> <entry name="CommandAllKey" type="String">
<default>Alt</default> <default>Alt</default>
@ -18,7 +18,7 @@
<default>Raise</default> <default>Raise</default>
</entry> </entry>
<entry name="CommandActiveTitlebar2" type="String"> <entry name="CommandActiveTitlebar2" type="String">
<default>Start Window Tab Drag</default> <default>Nothing</default>
</entry> </entry>
<entry name="CommandActiveTitlebar3" type="String"> <entry name="CommandActiveTitlebar3" type="String">
<default>Operations menu</default> <default>Operations menu</default>
@ -27,7 +27,7 @@
<default>Activate and raise</default> <default>Activate and raise</default>
</entry> </entry>
<entry name="CommandInactiveTitlebar2" type="String"> <entry name="CommandInactiveTitlebar2" type="String">
<default>Start Window Tab Drag</default> <default>Nothing</default>
</entry> </entry>
<entry name="CommandInactiveTitlebar3" type="String"> <entry name="CommandInactiveTitlebar3" type="String">
<default>Operations menu</default> <default>Operations menu</default>

4
kwinbindings.cpp
View File

@ -46,10 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
initShortcut(QStringLiteral(name), i18n(name), key, target, &fnSlot); initShortcut(QStringLiteral(name), i18n(name), key, target, &fnSlot);
DEF(I18N_NOOP("Walk Through Window Tabs"), 0, slotActivateNextTab);
DEF(I18N_NOOP("Walk Through Window Tabs (Reverse)"), 0, slotActivatePrevTab);
DEF(I18N_NOOP("Remove Window From Group"), 0, slotUntab);
DEF(I18N_NOOP("Window Operations Menu"), DEF(I18N_NOOP("Window Operations Menu"),
Qt::ALT + Qt::Key_F3, slotWindowOperations); Qt::ALT + Qt::Key_F3, slotWindowOperations);
DEF2("Window Close", I18N_NOOP("Close Window"), DEF2("Window Close", I18N_NOOP("Close Window"),

6
layers.cpp
View File

@ -853,16 +853,10 @@ void Client::restackWindow(xcb_window_t above, int detail, NET::RequestSource sr
void Client::doSetKeepAbove() void Client::doSetKeepAbove()
{ {
// Update states of all other windows in this group
if (tabGroup())
tabGroup()->updateStates(this, TabGroup::Layer);
} }
void Client::doSetKeepBelow() void Client::doSetKeepBelow()
{ {
// Update states of all other windows in this group
if (tabGroup())
tabGroup()->updateStates(this, TabGroup::Layer);
} }
bool Client::belongsToDesktop() const bool Client::belongsToDesktop() const

3
libkwineffects/kwineffects.h
View File

@ -2097,7 +2097,7 @@ public:
PAINT_DISABLED_BY_DESKTOP = 1 << 2, PAINT_DISABLED_BY_DESKTOP = 1 << 2,
/** Window will not be painted because it is minimized */ /** Window will not be painted because it is minimized */
PAINT_DISABLED_BY_MINIMIZE = 1 << 3, PAINT_DISABLED_BY_MINIMIZE = 1 << 3,
/** Window will not be painted because it is not the active window in a client group */ /** Deprecated, tab groups have been removed: Window will not be painted because it is not the active window in a client group */
PAINT_DISABLED_BY_TAB_GROUP = 1 << 4, PAINT_DISABLED_BY_TAB_GROUP = 1 << 4,
/** Window will not be painted because it's not on the current activity */ /** Window will not be painted because it's not on the current activity */
PAINT_DISABLED_BY_ACTIVITY = 1 << 5 PAINT_DISABLED_BY_ACTIVITY = 1 << 5
@ -2332,6 +2332,7 @@ public:
virtual void unminimize() = 0; virtual void unminimize() = 0;
Q_SCRIPTABLE virtual void closeWindow() = 0; Q_SCRIPTABLE virtual void closeWindow() = 0;
/// deprecated
virtual bool isCurrentTab() const = 0; virtual bool isCurrentTab() const = 0;
/** /**

104
manage.cpp
View File

@ -340,51 +340,6 @@ bool Client::manage(xcb_window_t w, bool isMapped)
// Create client group if the window will have a decoration // Create client group if the window will have a decoration
bool dontKeepInArea = false; bool dontKeepInArea = false;
setTabGroup(NULL);
if (!noBorder() && false) {
const bool autogrouping = rules()->checkAutogrouping(options->isAutogroupSimilarWindows());
const bool autogroupInFg = rules()->checkAutogroupInForeground(options->isAutogroupInForeground());
// Automatically add to previous groups on session restore
if (session && session->tabGroupClient && !workspace()->hasClient(session->tabGroupClient))
session->tabGroupClient = NULL;
if (session && session->tabGroupClient && session->tabGroupClient != this) {
tabBehind(session->tabGroupClient, autogroupInFg);
} else if (isMapped && autogrouping) {
// If the window is already mapped (Restarted KWin) add any windows that already have the
// same geometry to the same client group. (May incorrectly handle maximized windows)
foreach (Client *other, workspace()->clientList()) {
if (other->maximizeMode() != MaximizeFull &&
geom == QRect(other->pos(), other->clientSize()) &&
desk == other->desktop() && activities() == other->activities()) {
tabBehind(other, autogroupInFg);
break;
}
}
}
if (!(tabGroup() || isMapped || session)) {
// Attempt to automatically group similar windows
Client* similar = findAutogroupCandidate();
if (similar && !similar->noBorder()) {
if (autogroupInFg) {
similar->setDesktop(desk); // can happen when grouping by id. ...
similar->setMinimized(false); // ... or anyway - still group, but "here" and visible
}
if (!similar->isMinimized()) { // do not attempt to tab in background of a hidden group
geom = QRect(similar->pos() + similar->clientPos(), similar->clientSize());
updateDecoration(false);
if (tabBehind(similar, autogroupInFg)) {
// Don't move entire group
geom = QRect(similar->pos() + similar->clientPos(), similar->clientSize());
placementDone = true;
dontKeepInArea = true;
}
}
}
}
}
readColorScheme(colorSchemeCookie); readColorScheme(colorSchemeCookie);
readApplicationMenuServiceName(applicationMenuServiceNameCookie); readApplicationMenuServiceName(applicationMenuServiceNameCookie);
@ -734,63 +689,4 @@ void Client::embedClient(xcb_window_t w, xcb_visualid_t visualid, xcb_colormap_t
updateMouseGrab(); updateMouseGrab();
} }
// To accept "mainwindow#1" to "mainwindow#2"
static QByteArray truncatedWindowRole(QByteArray a)
{
int i = a.indexOf('#');
if (i == -1)
return a;
QByteArray b(a);
b.truncate(i);
return b;
}
Client* Client::findAutogroupCandidate() const
{
// Attempt to find a similar window to the input. If we find multiple possibilities that are in
// different groups then ignore all of them. This function is for automatic window grouping.
Client *found = NULL;
// See if the window has a group ID to match with
QString wGId = rules()->checkAutogroupById(QString());
if (!wGId.isEmpty()) {
foreach (Client *c, workspace()->clientList()) {
if (activities() != c->activities())
continue; // don't cross activities
if (wGId == c->rules()->checkAutogroupById(QString())) {
if (found && found->tabGroup() != c->tabGroup()) { // We've found two, ignore both
found = NULL;
break; // Continue to the next test
}
found = c;
}
}
if (found)
return found;
}
// If this is a transient window don't take a guess
if (isTransient())
return NULL;
// If we don't have an ID take a guess
if (rules()->checkAutogrouping(options->isAutogroupSimilarWindows())) {
QByteArray wRole = truncatedWindowRole(windowRole());
foreach (Client *c, workspace()->clientList()) {
if (desktop() != c->desktop() || activities() != c->activities())
continue;
QByteArray wRoleB = truncatedWindowRole(c->windowRole());
if (resourceClass() == c->resourceClass() && // Same resource class
wRole == wRoleB && // Same window role
c->isNormalWindow()) { // Normal window TODO: Can modal windows be "normal"?
if (found && found->tabGroup() != c->tabGroup()) // We've found two, ignore both
return NULL;
found = c;
}
}
}
return found;
}
} // namespace } // namespace

45
options.cpp
View File

@ -106,9 +106,6 @@ Options::Options(QObject *parent)
, m_focusStealingPreventionLevel(0) , m_focusStealingPreventionLevel(0)
, m_killPingTimeout(0) , m_killPingTimeout(0)
, m_hideUtilityWindowsForInactive(false) , m_hideUtilityWindowsForInactive(false)
, m_inactiveTabsSkipTaskbar(false)
, m_autogroupSimilarWindows(false)
, m_autogroupInForeground(false)
, m_compositingMode(Options::defaultCompositingMode()) , m_compositingMode(Options::defaultCompositingMode())
, m_useCompositing(Options::defaultUseCompositing()) , m_useCompositing(Options::defaultUseCompositing())
, m_hiddenPreviews(Options::defaultHiddenPreviews()) , m_hiddenPreviews(Options::defaultHiddenPreviews())
@ -559,33 +556,6 @@ void Options::setHideUtilityWindowsForInactive(bool hideUtilityWindowsForInactiv
emit hideUtilityWindowsForInactiveChanged(); emit hideUtilityWindowsForInactiveChanged();
} }
void Options::setInactiveTabsSkipTaskbar(bool inactiveTabsSkipTaskbar)
{
if (m_inactiveTabsSkipTaskbar == inactiveTabsSkipTaskbar) {
return;
}
m_inactiveTabsSkipTaskbar = inactiveTabsSkipTaskbar;
emit inactiveTabsSkipTaskbarChanged();
}
void Options::setAutogroupSimilarWindows(bool autogroupSimilarWindows)
{
if (m_autogroupSimilarWindows == autogroupSimilarWindows) {
return;
}
m_autogroupSimilarWindows = autogroupSimilarWindows;
emit autogroupSimilarWindowsChanged();
}
void Options::setAutogroupInForeground(bool autogroupInForeground)
{
if (m_autogroupInForeground == autogroupInForeground) {
return;
}
m_autogroupInForeground = autogroupInForeground;
emit autogroupInForegroundChanged();
}
void Options::setCompositingMode(int compositingMode) void Options::setCompositingMode(int compositingMode)
{ {
if (m_compositingMode == static_cast<CompositingType>(compositingMode)) { if (m_compositingMode == static_cast<CompositingType>(compositingMode)) {
@ -788,14 +758,14 @@ void Options::loadConfig()
// Mouse bindings // Mouse bindings
config = KConfigGroup(m_settings->config(), "MouseBindings"); config = KConfigGroup(m_settings->config(), "MouseBindings");
// TODO: add properties for missing options // TODO: add properties for missing options
CmdTitlebarWheel = mouseWheelCommand(config.readEntry("CommandTitlebarWheel", "Switch to Window Tab to the Left/Right")); CmdTitlebarWheel = mouseWheelCommand(config.readEntry("CommandTitlebarWheel", "Nothing"));
CmdAllModKey = (config.readEntry("CommandAllKey", "Alt") == QStringLiteral("Meta")) ? Qt::Key_Meta : Qt::Key_Alt; CmdAllModKey = (config.readEntry("CommandAllKey", "Alt") == QStringLiteral("Meta")) ? Qt::Key_Meta : Qt::Key_Alt;
CmdAllWheel = mouseWheelCommand(config.readEntry("CommandAllWheel", "Nothing")); CmdAllWheel = mouseWheelCommand(config.readEntry("CommandAllWheel", "Nothing"));
setCommandActiveTitlebar1(mouseCommand(config.readEntry("CommandActiveTitlebar1", "Raise"), true)); setCommandActiveTitlebar1(mouseCommand(config.readEntry("CommandActiveTitlebar1", "Raise"), true));
setCommandActiveTitlebar2(mouseCommand(config.readEntry("CommandActiveTitlebar2", "Start Window Tab Drag"), true)); setCommandActiveTitlebar2(mouseCommand(config.readEntry("CommandActiveTitlebar2", "Nothing"), true));
setCommandActiveTitlebar3(mouseCommand(config.readEntry("CommandActiveTitlebar3", "Operations menu"), true)); setCommandActiveTitlebar3(mouseCommand(config.readEntry("CommandActiveTitlebar3", "Operations menu"), true));
setCommandInactiveTitlebar1(mouseCommand(config.readEntry("CommandInactiveTitlebar1", "Activate and raise"), true)); setCommandInactiveTitlebar1(mouseCommand(config.readEntry("CommandInactiveTitlebar1", "Activate and raise"), true));
setCommandInactiveTitlebar2(mouseCommand(config.readEntry("CommandInactiveTitlebar2", "Start Window Tab Drag"), true)); setCommandInactiveTitlebar2(mouseCommand(config.readEntry("CommandInactiveTitlebar2", "Nothing"), true));
setCommandInactiveTitlebar3(mouseCommand(config.readEntry("CommandInactiveTitlebar3", "Operations menu"), true)); setCommandInactiveTitlebar3(mouseCommand(config.readEntry("CommandInactiveTitlebar3", "Operations menu"), true));
setCommandWindow1(mouseCommand(config.readEntry("CommandWindow1", "Activate, raise and pass click"), false)); setCommandWindow1(mouseCommand(config.readEntry("CommandWindow1", "Activate, raise and pass click"), false));
setCommandWindow2(mouseCommand(config.readEntry("CommandWindow2", "Activate and pass click"), false)); setCommandWindow2(mouseCommand(config.readEntry("CommandWindow2", "Activate and pass click"), false));
@ -857,9 +827,6 @@ void Options::syncFromKcfgc()
setSnapOnlyWhenOverlapping(m_settings->snapOnlyWhenOverlapping()); setSnapOnlyWhenOverlapping(m_settings->snapOnlyWhenOverlapping());
setKillPingTimeout(m_settings->killPingTimeout()); setKillPingTimeout(m_settings->killPingTimeout());
setHideUtilityWindowsForInactive(m_settings->hideUtilityWindowsForInactive()); setHideUtilityWindowsForInactive(m_settings->hideUtilityWindowsForInactive());
setInactiveTabsSkipTaskbar(m_settings->inactiveTabsSkipTaskbar());
setAutogroupSimilarWindows(m_settings->autogroupSimilarWindows());
setAutogroupInForeground(m_settings->autogroupInForeground());
setBorderlessMaximizedWindows(m_settings->borderlessMaximizedWindows()); setBorderlessMaximizedWindows(m_settings->borderlessMaximizedWindows());
setElectricBorderMaximize(m_settings->electricBorderMaximize()); setElectricBorderMaximize(m_settings->electricBorderMaximize());
setElectricBorderTiling(m_settings->electricBorderTiling()); setElectricBorderTiling(m_settings->electricBorderTiling());
@ -1042,7 +1009,6 @@ Options::MouseCommand Options::mouseCommand(const QString &name, bool restricted
if (lowerName == QStringLiteral("resize")) return restricted ? MouseResize : MouseUnrestrictedResize; if (lowerName == QStringLiteral("resize")) return restricted ? MouseResize : MouseUnrestrictedResize;
if (lowerName == QStringLiteral("shade")) return MouseShade; if (lowerName == QStringLiteral("shade")) return MouseShade;
if (lowerName == QStringLiteral("minimize")) return MouseMinimize; if (lowerName == QStringLiteral("minimize")) return MouseMinimize;
if (lowerName == QStringLiteral("start window tab drag")) return MouseDragTab;
if (lowerName == QStringLiteral("close")) return MouseClose; if (lowerName == QStringLiteral("close")) return MouseClose;
if (lowerName == QStringLiteral("increase opacity")) return MouseOpacityMore; if (lowerName == QStringLiteral("increase opacity")) return MouseOpacityMore;
if (lowerName == QStringLiteral("decrease opacity")) return MouseOpacityLess; if (lowerName == QStringLiteral("decrease opacity")) return MouseOpacityLess;
@ -1059,9 +1025,8 @@ Options::MouseWheelCommand Options::mouseWheelCommand(const QString &name)
if (lowerName == QStringLiteral("above/below")) return MouseWheelAboveBelow; if (lowerName == QStringLiteral("above/below")) return MouseWheelAboveBelow;
if (lowerName == QStringLiteral("previous/next desktop")) return MouseWheelPreviousNextDesktop; if (lowerName == QStringLiteral("previous/next desktop")) return MouseWheelPreviousNextDesktop;
if (lowerName == QStringLiteral("change opacity")) return MouseWheelChangeOpacity; if (lowerName == QStringLiteral("change opacity")) return MouseWheelChangeOpacity;
if (lowerName == QStringLiteral("switch to window tab to the left/right")) return MouseWheelChangeCurrentTab;
if (lowerName == QStringLiteral("nothing")) return MouseWheelNothing; if (lowerName == QStringLiteral("nothing")) return MouseWheelNothing;
return MouseWheelChangeCurrentTab; return MouseWheelNothing;
} }
bool Options::showGeometryTip() const bool Options::showGeometryTip() const
@ -1089,8 +1054,6 @@ Options::MouseCommand Options::wheelToMouseCommand(MouseWheelCommand com, int de
return delta > 0 ? MousePreviousDesktop : MouseNextDesktop; return delta > 0 ? MousePreviousDesktop : MouseNextDesktop;
case MouseWheelChangeOpacity: case MouseWheelChangeOpacity:
return delta > 0 ? MouseOpacityMore : MouseOpacityLess; return delta > 0 ? MouseOpacityMore : MouseOpacityLess;
case MouseWheelChangeCurrentTab:
return delta > 0 ? MousePreviousTab : MouseNextTab;
default: default:
return MouseNothing; return MouseNothing;
} }

40
options.h
View File

@ -158,9 +158,6 @@ class KWIN_EXPORT Options : public QObject
* Whether to hide utility windows for inactive applications. * Whether to hide utility windows for inactive applications.
*/ */
Q_PROPERTY(bool hideUtilityWindowsForInactive READ isHideUtilityWindowsForInactive WRITE setHideUtilityWindowsForInactive NOTIFY hideUtilityWindowsForInactiveChanged) Q_PROPERTY(bool hideUtilityWindowsForInactive READ isHideUtilityWindowsForInactive WRITE setHideUtilityWindowsForInactive NOTIFY hideUtilityWindowsForInactiveChanged)
Q_PROPERTY(bool inactiveTabsSkipTaskbar READ isInactiveTabsSkipTaskbar WRITE setInactiveTabsSkipTaskbar NOTIFY inactiveTabsSkipTaskbarChanged)
Q_PROPERTY(bool autogroupSimilarWindows READ isAutogroupSimilarWindows WRITE setAutogroupSimilarWindows NOTIFY autogroupSimilarWindowsChanged)
Q_PROPERTY(bool autogroupInForeground READ isAutogroupInForeground WRITE setAutogroupInForeground NOTIFY autogroupInForegroundChanged)
Q_PROPERTY(int compositingMode READ compositingMode WRITE setCompositingMode NOTIFY compositingModeChanged) Q_PROPERTY(int compositingMode READ compositingMode WRITE setCompositingMode NOTIFY compositingModeChanged)
Q_PROPERTY(bool useCompositing READ isUseCompositing WRITE setUseCompositing NOTIFY useCompositingChanged) Q_PROPERTY(bool useCompositing READ isUseCompositing WRITE setUseCompositing NOTIFY useCompositingChanged)
Q_PROPERTY(int hiddenPreviews READ hiddenPreviews WRITE setHiddenPreviews NOTIFY hiddenPreviewsChanged) Q_PROPERTY(int hiddenPreviews READ hiddenPreviews WRITE setHiddenPreviews NOTIFY hiddenPreviewsChanged)
@ -362,11 +359,6 @@ public:
NoOp, NoOp,
SetupWindowShortcutOp, SetupWindowShortcutOp,
ApplicationRulesOp, ApplicationRulesOp,
RemoveTabFromGroupOp, // Remove from group
CloseTabGroupOp, // Close the group
ActivateNextTabOp, // Move left in the group
ActivatePreviousTabOp, // Move right in the group
TabDragOp,
}; };
WindowOperation operationTitlebarDblClick() const { WindowOperation operationTitlebarDblClick() const {
@ -396,14 +388,14 @@ public:
MouseNextDesktop, MousePreviousDesktop, MouseNextDesktop, MousePreviousDesktop,
MouseAbove, MouseBelow, MouseAbove, MouseBelow,
MouseOpacityMore, MouseOpacityLess, MouseOpacityMore, MouseOpacityLess,
MouseClose, MousePreviousTab, MouseNextTab, MouseDragTab, MouseClose,
MouseNothing MouseNothing
}; };
enum MouseWheelCommand { enum MouseWheelCommand {
MouseWheelRaiseLower, MouseWheelShadeUnshade, MouseWheelMaximizeRestore, MouseWheelRaiseLower, MouseWheelShadeUnshade, MouseWheelMaximizeRestore,
MouseWheelAboveBelow, MouseWheelPreviousNextDesktop, MouseWheelAboveBelow, MouseWheelPreviousNextDesktop,
MouseWheelChangeOpacity, MouseWheelChangeCurrentTab, MouseWheelChangeOpacity,
MouseWheelNothing MouseWheelNothing
}; };
@ -520,16 +512,6 @@ public:
return m_hideUtilityWindowsForInactive; return m_hideUtilityWindowsForInactive;
} }
bool isInactiveTabsSkipTaskbar() const {
return m_inactiveTabsSkipTaskbar;
}
bool isAutogroupSimilarWindows() const {
return m_autogroupSimilarWindows;
}
bool isAutogroupInForeground() const {
return m_autogroupInForeground;
}
/** /**
* Returns the animation time factor for desktop effects. * Returns the animation time factor for desktop effects.
*/ */
@ -641,9 +623,6 @@ public:
void setBorderlessMaximizedWindows(bool borderlessMaximizedWindows); void setBorderlessMaximizedWindows(bool borderlessMaximizedWindows);
void setKillPingTimeout(int killPingTimeout); void setKillPingTimeout(int killPingTimeout);
void setHideUtilityWindowsForInactive(bool hideUtilityWindowsForInactive); void setHideUtilityWindowsForInactive(bool hideUtilityWindowsForInactive);
void setInactiveTabsSkipTaskbar(bool inactiveTabsSkipTaskbar);
void setAutogroupSimilarWindows(bool autogroupSimilarWindows);
void setAutogroupInForeground(bool autogroupInForeground);
void setCompositingMode(int compositingMode); void setCompositingMode(int compositingMode);
void setUseCompositing(bool useCompositing); void setUseCompositing(bool useCompositing);
void setHiddenPreviews(int hiddenPreviews); void setHiddenPreviews(int hiddenPreviews);
@ -676,7 +655,7 @@ public:
return MouseRaise; return MouseRaise;
} }
static MouseCommand defaultCommandActiveTitlebar2() { static MouseCommand defaultCommandActiveTitlebar2() {
return MouseDragTab; return MouseNothing;
} }
static MouseCommand defaultCommandActiveTitlebar3() { static MouseCommand defaultCommandActiveTitlebar3() {
return MouseOperationsMenu; return MouseOperationsMenu;
@ -685,7 +664,7 @@ public:
return MouseActivateAndRaise; return MouseActivateAndRaise;
} }
static MouseCommand defaultCommandInactiveTitlebar2() { static MouseCommand defaultCommandInactiveTitlebar2() {
return MouseDragTab; return MouseNothing;
} }
static MouseCommand defaultCommandInactiveTitlebar3() { static MouseCommand defaultCommandInactiveTitlebar3() {
return MouseOperationsMenu; return MouseOperationsMenu;
@ -712,7 +691,7 @@ public:
return MouseUnrestrictedResize; return MouseUnrestrictedResize;
} }
static MouseWheelCommand defaultCommandTitlebarWheel() { static MouseWheelCommand defaultCommandTitlebarWheel() {
return MouseWheelChangeCurrentTab; return MouseWheelNothing;
} }
static MouseWheelCommand defaultCommandAllWheel() { static MouseWheelCommand defaultCommandAllWheel() {
return MouseWheelNothing; return MouseWheelNothing;
@ -720,9 +699,6 @@ public:
static uint defaultKeyCmdAllModKey() { static uint defaultKeyCmdAllModKey() {
return Qt::Key_Alt; return Qt::Key_Alt;
} }
static bool defaultAutogroupInForeground() {
return true;
}
static CompositingType defaultCompositingMode() { static CompositingType defaultCompositingMode() {
return OpenGLCompositing; return OpenGLCompositing;
} }
@ -827,9 +803,6 @@ Q_SIGNALS:
void borderlessMaximizedWindowsChanged(); void borderlessMaximizedWindowsChanged();
void killPingTimeoutChanged(); void killPingTimeoutChanged();
void hideUtilityWindowsForInactiveChanged(); void hideUtilityWindowsForInactiveChanged();
void inactiveTabsSkipTaskbarChanged();
void autogroupSimilarWindowsChanged();
void autogroupInForegroundChanged();
void compositingModeChanged(); void compositingModeChanged();
void useCompositingChanged(); void useCompositingChanged();
void hiddenPreviewsChanged(); void hiddenPreviewsChanged();
@ -869,9 +842,6 @@ private:
int m_focusStealingPreventionLevel; int m_focusStealingPreventionLevel;
int m_killPingTimeout; int m_killPingTimeout;
bool m_hideUtilityWindowsForInactive; bool m_hideUtilityWindowsForInactive;
bool m_inactiveTabsSkipTaskbar;
bool m_autogroupSimilarWindows;
bool m_autogroupInForeground;
CompositingType m_compositingMode; CompositingType m_compositingMode;
bool m_useCompositing; bool m_useCompositing;

2
placement.cpp
View File

@ -176,8 +176,6 @@ static inline bool isIrrelevant(const AbstractClient *client, const AbstractClie
return true; return true;
if (client == regarding) if (client == regarding)
return true; return true;
if (!client->isCurrentTab())
return true;
if (!client->isShown(false)) if (!client->isShown(false))
return true; return true;
if (!client->isOnDesktop(desktop)) if (!client->isOnDesktop(desktop))

2
scene.cpp
View File

@ -823,8 +823,6 @@ void Scene::Window::resetPaintingEnabled()
if (AbstractClient *c = dynamic_cast<AbstractClient*>(toplevel)) { if (AbstractClient *c = dynamic_cast<AbstractClient*>(toplevel)) {
if (c->isMinimized()) if (c->isMinimized())
disable_painting |= PAINT_DISABLED_BY_MINIMIZE; disable_painting |= PAINT_DISABLED_BY_MINIMIZE;
if (c->tabGroup() && c != c->tabGroup()->current())
disable_painting |= PAINT_DISABLED_BY_TAB_GROUP;
if (c->isHiddenInternal()) { if (c->isHiddenInternal()) {
disable_painting |= PAINT_DISABLED; disable_painting |= PAINT_DISABLED;
} }

2
scene.h
View File

@ -319,8 +319,6 @@ public:
PAINT_DISABLED_BY_DESKTOP = 1 << 2, PAINT_DISABLED_BY_DESKTOP = 1 << 2,
// Window will not be painted because it is minimized // Window will not be painted because it is minimized
PAINT_DISABLED_BY_MINIMIZE = 1 << 3, PAINT_DISABLED_BY_MINIMIZE = 1 << 3,
// Window will not be painted because it is not the active window in a client group
PAINT_DISABLED_BY_TAB_GROUP = 1 << 4,
// Window will not be painted because it's not on the current activity // Window will not be painted because it's not on the current activity
PAINT_DISABLED_BY_ACTIVITY = 1 << 5 PAINT_DISABLED_BY_ACTIVITY = 1 << 5
}; };

5
scripting/scripting_model.cpp
View File

@ -142,11 +142,6 @@ bool ClientLevel::exclude(AbstractClient *client) const
return true; return true;
} }
} }
if (exclusions & ClientModel::NonSelectedWindowTabExclusion) {
if (!client->isCurrentTab()) {
return true;
}
}
if (exclusions & ClientModel::NotAcceptingFocusExclusion) { if (exclusions & ClientModel::NotAcceptingFocusExclusion) {
if (!client->wantsInput()) { if (!client->wantsInput()) {
return true; return true;

5
shell_client.cpp
View File

@ -1028,7 +1028,6 @@ void ShellClient::setFullScreen(bool set, bool user)
m_fullScreen = set; m_fullScreen = set;
if (set) { if (set) {
untab();
workspace()->raiseClient(this); workspace()->raiseClient(this);
} }
RequestGeometryBlocker requestBlocker(this); RequestGeometryBlocker requestBlocker(this);
@ -1111,10 +1110,10 @@ bool ShellClient::userCanSetFullScreen() const
bool ShellClient::userCanSetNoBorder() const bool ShellClient::userCanSetNoBorder() const
{ {
if (m_serverDecoration && m_serverDecoration->mode() == ServerSideDecorationManagerInterface::Mode::Server) { if (m_serverDecoration && m_serverDecoration->mode() == ServerSideDecorationManagerInterface::Mode::Server) {
return !isFullScreen() && !isShade() && !tabGroup(); return !isFullScreen() && !isShade();
} }
if (m_xdgDecoration && m_xdgDecoration->requestedMode() != XdgDecorationInterface::Mode::ClientSide) { if (m_xdgDecoration && m_xdgDecoration->requestedMode() != XdgDecorationInterface::Mode::ClientSide) {
return !isFullScreen() && !isShade() && !tabGroup(); return !isFullScreen() && !isShade();
} }
return false; return false;
} }

13
sm.cpp
View File

@ -201,8 +201,6 @@ void Workspace::storeClient(KConfigGroup &cg, int num, Client *c)
cg.writeEntry(QLatin1String("windowType") + n, windowTypeToTxt(c->windowType())); cg.writeEntry(QLatin1String("windowType") + n, windowTypeToTxt(c->windowType()));
cg.writeEntry(QLatin1String("shortcut") + n, c->shortcut().toString()); cg.writeEntry(QLatin1String("shortcut") + n, c->shortcut().toString());
cg.writeEntry(QLatin1String("stackingOrder") + n, unconstrained_stacking_order.indexOf(c)); cg.writeEntry(QLatin1String("stackingOrder") + n, unconstrained_stacking_order.indexOf(c));
// KConfig doesn't support long so we need to live with less precision on 64-bit systems
cg.writeEntry(QLatin1String("tabGroup") + n, static_cast<int>(reinterpret_cast<long>(c->tabGroup())));
cg.writeEntry(QLatin1String("activities") + n, c->activities()); cg.writeEntry(QLatin1String("activities") + n, c->activities());
} }
@ -286,8 +284,6 @@ void Workspace::addSessionInfo(KConfigGroup &cg)
info->shortcut = cg.readEntry(QLatin1String("shortcut") + n, QString()); info->shortcut = cg.readEntry(QLatin1String("shortcut") + n, QString());
info->active = (active_client == i); info->active = (active_client == i);
info->stackingOrder = cg.readEntry(QLatin1String("stackingOrder") + n, -1); info->stackingOrder = cg.readEntry(QLatin1String("stackingOrder") + n, -1);
info->tabGroup = cg.readEntry(QLatin1String("tabGroup") + n, 0);
info->tabGroupClient = NULL;
info->activities = cg.readEntry(QLatin1String("activities") + n, QStringList()); info->activities = cg.readEntry(QLatin1String("activities") + n, QStringList());
} }
} }
@ -362,15 +358,6 @@ SessionInfo* Workspace::takeSessionInfo(Client* c)
} }
} }
} }
// Set tabGroupClient for other clients in the same group
if (realInfo && realInfo->tabGroup) {
foreach (SessionInfo * info, session) {
if (!info->tabGroupClient && info->tabGroup == realInfo->tabGroup)
info->tabGroupClient = c;
}
}
return realInfo; return realInfo;
} }

2
sm.h
View File

@ -66,9 +66,7 @@ struct SessionInfo {
bool active; // means 'was active in the saved session' bool active; // means 'was active in the saved session'
int stackingOrder; int stackingOrder;
float opacity; float opacity;
int tabGroup; // Unique identifier for the client group that this window is in
Client* tabGroupClient; // The first client created that has an identical identifier
QStringList activities; QStringList activities;
}; };

360
tabgroup.cpp
View File

@ -1,360 +0,0 @@
/*******************************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2011/2012 The KWin team <kwin@kde.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*******************************************************************************/
#include "tabgroup.h"
#include "client.h"
#include "effects.h"
#include "workspace.h"
namespace KWin
{
TabGroup::TabGroup(AbstractClient *c)
: m_clients()
, m_current(c)
, m_minSize(c->minSize())
, m_maxSize(c->maxSize())
, m_stateUpdatesBlocked(0)
, m_pendingUpdates(TabGroup::None)
{
QIcon icon(c->icon());
m_clients << c;
c->setTabGroup(this);
c->setClientShown(true);
}
TabGroup::~TabGroup()
{
}
void TabGroup::activateNext()
{
int index = m_clients.indexOf(m_current);
setCurrent(m_clients.at((index < m_clients.count() - 1) ? index + 1 : 0));
}
void TabGroup::activatePrev()
{
int index = m_clients.indexOf(m_current);
setCurrent(m_clients.at((index > 0) ? index - 1 : m_clients.count() - 1));
}
bool TabGroup::add(AbstractClient* c, AbstractClient *other, bool after, bool becomeVisible)
{
Q_ASSERT(!c->tabGroup());
if (contains(c) || !contains(other))
return false;
// Tabbed windows MUST have a decoration
c->setNoBorder(false);
if (c->noBorder())
return false;
// If it's not possible to have the same states then ungroup them, TODO: Check all states
// We do this here as the ungroup code in updateStates() cannot be called until add() completes
bool cannotTab = false;
ShadeMode oldShadeMode = c->shadeMode();
QRect oldGeom = c->geometry();
int oldDesktop = c->desktop();
c->setShade(m_current->shadeMode());
cannotTab = c->shadeMode() != m_current->shadeMode();
if (!cannotTab) {
c->setDesktop(m_current->desktop());
cannotTab = c->desktop() != m_current->desktop();
}
if (!cannotTab) {
c->setGeometry(m_current->geometry());
cannotTab = c->geometry() != m_current->geometry();
}
if (cannotTab) {
c->setShade(oldShadeMode);
c->setDesktop(oldDesktop);
c->setGeometry(oldGeom);
// trigger decoration repaint on the group to make sure that hover animations are properly reset.
m_current->triggerDecorationRepaint();
return false; // cannot tab
}
// Actually add to new group ----------------------------------------
// Notify effects of merge
if (effects)
static_cast<EffectsHandlerImpl*>(effects)->slotTabAdded(c->effectWindow(), other->effectWindow());
// next: aling the client states BEFORE adding it to the group
// otherwise the caused indirect state changes would be taken as the dominating ones and break
// the main client
// example: QuickTiling is aligned to None, this restores the former QuickTiled size and alignes
// all other windows in the group - including the actual main client! - to this size and thus
// breaks the actually required alignment to the main windows geometry (because that now has the
// restored geometry of the formerly Q'tiled window) - bug #303937
updateStates(m_current, All, c);
int index = other ? m_clients.indexOf(other) : m_clients.size();
index += after;
if (index > m_clients.size())
index = m_clients.size();
m_clients.insert(index, c);
c->setTabGroup(this); // Let the client know which group it belongs to
updateMinMaxSize();
if (!becomeVisible)
c->setClientShown(false);
else {
c->setClientShown(true);
if (!effects || c->readyForPainting()) {
setCurrent(c);
if (options->focusPolicyIsReasonable())
workspace()->requestFocus( c );
}
else {
if (options->focusPolicyIsReasonable())
workspace()->requestFocus( m_current );
m_current = c; // setCurrent will be called by Toplevel::setReadyForPainting()
}
}
m_current->triggerDecorationRepaint();
return true;
}
bool TabGroup::remove(AbstractClient* c)
{
if (!c)
return false;
int index = m_clients.indexOf(c);
if (index < 0)
return false;
c->setTabGroup(NULL);
m_clients.removeAt(index);
updateMinMaxSize();
if (m_clients.count() == 1) { // split
remove(m_clients.at(0));
}
if (m_clients.isEmpty()) { // remaining singleton "tab"
c->setClientShown(true);
return true; // group is gonna be deleted after this anyway
}
if (c == m_current) {
m_current = index < m_clients.count() ? m_clients.at(index) : m_clients.last();
m_current->setClientShown(true);
if (effects) // "c -> m_current" because c was m_current
static_cast<EffectsHandlerImpl*>(effects)->slotCurrentTabAboutToChange(c->effectWindow(), m_current->effectWindow());
}
// Notify effects of removal
if (effects)
static_cast<EffectsHandlerImpl*>(effects)->slotTabRemoved(c->effectWindow(), m_current->effectWindow());
m_current->triggerDecorationRepaint();
return true;
}
void TabGroup::closeAll()
{
// NOTICE - in theory it's OK to use the list because closing sends an event to the client and
// due to the async X11 nature, the client would be released and thus removed from m_clients
// after this function exits.
// However later Wayland support or similar might not share this bahaviour - and we really had
// enough trouble with a polluted client list around the tabbing code ....
auto list(m_clients);
for (auto i = list.constBegin(), end = list.constEnd(); i != end; ++i)
if (*i != m_current)
(*i)->closeWindow();
m_current->closeWindow();
}
void TabGroup::move(AbstractClient *c, AbstractClient *other, bool after)
{
if (c == other)
return;
int from = m_clients.indexOf(c);
if (from < 0)
return;
int to = other ? m_clients.indexOf(other) : m_clients.size() - 1;
if (to < 0)
return;
to += after;
if (to >= m_clients.size())
to = m_clients.size() - 1;
if (from == to)
return;
m_clients.move(from, to);
m_current->triggerDecorationRepaint();
}
bool TabGroup::isActive() const
{
return contains(Workspace::self()->activeClient());
}
void TabGroup::setCurrent(AbstractClient* c, bool force)
{
if ((c == m_current && !force) || !contains(c))
return;
// Notify effects of switch
if (effects)
static_cast<EffectsHandlerImpl*>(effects)->slotCurrentTabAboutToChange(m_current->effectWindow(), c->effectWindow());
m_current = c;
c->setClientShown(true); // reduce flicker?
for (auto i = m_clients.constBegin(), end = m_clients.constEnd(); i != end; ++i)
(*i)->setClientShown((*i) == m_current);
}
void TabGroup::sync(const char *property, AbstractClient *c)
{
if (c->metaObject()->indexOfProperty(property) > -1) {
qCWarning(KWIN_CORE, "caught attempt to sync non dynamic property: %s", property);
return;
}
QVariant v = c->property(property);
for (auto i = m_clients.begin(), end = m_clients.end(); i != end; ++i) {
if (*i != m_current)
(*i)->setProperty(property, v);
}
}
void TabGroup::updateMinMaxSize()
{
// Determine entire group's minimum and maximum sizes
// TODO this used to be signalled out but i didn't find a receiver - or got an idea what this would be good for
// find purpose & solution or kick it
// QSize oldMin = m_minSize;
// QSize oldMax = m_maxSize;
m_minSize = QSize(0, 0);
m_maxSize = QSize(INT_MAX, INT_MAX);
for (auto i = m_clients.constBegin(); i != m_clients.constEnd(); ++i) {
m_minSize = m_minSize.expandedTo((*i)->minSize());
m_maxSize = m_maxSize.boundedTo((*i)->maxSize());
}
// TODO: this actually resolves a conflict that should be caught when adding?
m_maxSize = m_maxSize.expandedTo(m_minSize);
// calculate this _once_ to get a common size.
// TODO this leaves another unresolved conflict about the base increment (luckily not used too often)
const QSize size = m_current->clientSize().expandedTo(m_minSize).boundedTo(m_maxSize);
if (size != m_current->clientSize()) {
const QRect r(m_current->pos(), m_current->sizeForClientSize(size));
for (auto i = m_clients.constBegin(), end = m_clients.constEnd(); i != end; ++i)
(*i)->setGeometry(r);
}
}
void TabGroup::blockStateUpdates(bool more) {
more ? ++m_stateUpdatesBlocked : --m_stateUpdatesBlocked;
if (m_stateUpdatesBlocked < 0) {
m_stateUpdatesBlocked = 0;
qCWarning(KWIN_CORE, "TabGroup: Something is messed up with TabGroup::blockStateUpdates() invocation\nReleased more than blocked!");
}
}
void TabGroup::updateStates(AbstractClient* main, States states, AbstractClient* only)
{
if (main == only)
return; // there's no need to only align "us" to "us"
if (m_stateUpdatesBlocked > 0) {
m_pendingUpdates |= states;
return;
}
states |= m_pendingUpdates;
m_pendingUpdates = TabGroup::None;
QVector<AbstractClient*> toBeRemoved, onlyDummy;
auto *list = &m_clients;
if (only) {
onlyDummy << only;
list = &onlyDummy;
}
for (auto i = list->constBegin(), end = list->constEnd(); i != end; ++i) {
auto *c = (*i);
if (c != main) {
if ((states & Minimized) && c->isMinimized() != main->isMinimized()) {
if (main->isMinimized())
c->minimize(true);
else
c->unminimize(true);
}
// the order QuickTile -> Maximized -> Geometry is somewhat important because one will change the other
// don't change w/o good reason and care
if ((states & QuickTile) && c->quickTileMode() != main->quickTileMode())
c->setQuickTileMode(main->quickTileMode());
if ((states & Maximized) && c->maximizeMode() != main->maximizeMode())
c->maximize(main->maximizeMode());
// the order Shaded -> Geometry is somewhat important because one will change the other
if ((states & Shaded))
c->setShade(main->shadeMode());
if ((states & Geometry) && c->geometry() != main->geometry())
c->setGeometry(main->geometry());
if (states & Desktop) {
if (c->isOnAllDesktops() != main->isOnAllDesktops())
c->setOnAllDesktops(main->isOnAllDesktops());
if (c->desktop() != main->desktop())
c->setDesktop(main->desktop());
}
if ((states & Activity) && c->activities() != main->activities()) {
c->setOnActivities(main->activities());
}
if (states & Layer) {
if (c->keepAbove() != main->keepAbove())
c->setKeepAbove(main->keepAbove());
if (c->keepBelow() != main->keepBelow())
c->setKeepBelow(main->keepBelow());
}
// If it's not possible to have the same states then ungroup them, TODO: Check all states
if (((states & Geometry) && c->geometry() != main->geometry()) ||
((states & Desktop) && c->desktop() != main->desktop()))
toBeRemoved << c;
}
}
for (auto i = toBeRemoved.constBegin(), end = toBeRemoved.constEnd(); i != end; ++i)
remove(*i);
}
}

209
tabgroup.h
View File

@ -1,209 +0,0 @@
/*******************************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2011/2012 The KWin team <kwin@kde.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*******************************************************************************/
#ifndef KWIN_TABGROUP_H
#define KWIN_TABGROUP_H
#include <QObject>
#include "utils.h"
namespace KWin
{
class AbstractClient;
/**
* This class represents a group of clients for use in window tabbing. All
* clients in the group share the same geometry and state information; I.e if
* one client changes then all others should also be changed.
*
* A group contains at least one client and DOES NOT contain multiple
* copies of the same client. A client MUST NOT be in two groups at the same
* time. All decorated clients SHOULD be in a group, even if it's a group of
* one client.
*
* rohanp: Had to convert this object to a QObject to make it easier for adding
* scripting interface to TabGroup.
*
* If a group contains multiple clients then only one will ever be mapped at
* any given time.
*/
class TabGroup
{
public:
/**
* Creates a new group containing \p c.
*/
explicit TabGroup(AbstractClient* c);
~TabGroup();
enum State {
None = 0, Minimized = 1<<0, Maximized = 1<<1, Shaded = 1<<2,
Geometry = 1<<3, Desktop = 1<<4, Activity = 1<<5,
Layer = 1<<6, QuickTile = 1<<7, All = 0xffffffff
};
Q_DECLARE_FLAGS(States, State)
/**
* Activate next tab (flips)
*/
void activateNext();
/**
* Activate previous tab (flips)
*/
void activatePrev();
/**
* Allows to alter several attributes in random order and trigger a general update at the end
* (must still be explicitly called)
* this is to prevent side effects, mostly for geometry adjustments during maximization and QuickTiling
*/
void blockStateUpdates(bool);
/**
* Close all clients in this group.
*/
void closeAll();
/**
* Whether client \p c is member of this group
*/
bool contains(AbstractClient* c) const;
/**
* The amount of clients in this group
*/
int count() const;
/**
* Returns whether or not this group contains the active client.
*/
bool isActive() const;
/**
* Returns whether this group is empty (used by workspace to remove it)
*/
bool isEmpty() const;
/**
* Returns the list of all the clients contained in this group in their current order.
*/
const QVector<AbstractClient*> &clients() const;
/**
* Returns the currently visible client.
*/
AbstractClient* current() const;
/**
* Makes \p c the visible client in the group - force is only used when the window becomes ready for painting.
* Any other usage just causes pointless action
*/
void setCurrent(AbstractClient* c, bool force = false);
/**
* Alignes the dynamic Qt @param property of all clients to the one of @param c
*/
void sync(const char *property, AbstractClient *c);
/**
* Returns combined minimum size of all clients in the group.
*/
QSize minSize() const;
/**
* Returns combined maximum size of all clients in the group.
*/
QSize maxSize() const;
/**
* Ensures that all the clients in the group have identical geometries and states using
* \p main as the primary client to copy the settings off. If \p only is set then only
* that client is updated to match \p main.
*/
void updateStates(AbstractClient* main, States states, AbstractClient* only = NULL);
/**
* updates geometry restrictions of this group, basically called from Client::getWmNormalHints(), otherwise rather private
*/
void updateMinMaxSize();
Q_SIGNALS:
void minSizeChanged();
void maxSizeChanged();
private:
friend class AbstractClient;
friend class Client;
// friend bool Client::tabTo(Client*, bool, bool);
bool add(KWin::AbstractClient *c, AbstractClient *other, bool behind, bool activateC);
void move(KWin::AbstractClient* c, KWin::AbstractClient* before, bool behind);
// friend bool Client::untab(const QRect&);
bool remove(KWin::AbstractClient *c);
QVector<AbstractClient*> m_clients;
AbstractClient *m_current;
QSize m_minSize;
QSize m_maxSize;
int m_stateUpdatesBlocked;
States m_pendingUpdates;
};
inline bool TabGroup::contains(AbstractClient* c) const
{
return c && m_clients.contains(c);
}
inline int TabGroup::count() const
{
return m_clients.count();
}
inline const QVector<AbstractClient*> &TabGroup::clients() const
{
return m_clients;
}
inline bool TabGroup::isEmpty() const
{
return m_clients.isEmpty();
}
inline AbstractClient* TabGroup::current() const
{
return m_current;
}
inline QSize TabGroup::minSize() const
{
return m_minSize;
}
inline QSize TabGroup::maxSize() const
{
return m_maxSize;
}
}
Q_DECLARE_OPERATORS_FOR_FLAGS(KWin::TabGroup::States)
#endif

4
toplevel.cpp
View File

@ -504,10 +504,6 @@ void Toplevel::setReadyForPainting()
if (compositing()) { if (compositing()) {
addRepaintFull(); addRepaintFull();
emit windowShown(this); emit windowShown(this);
if (auto *cl = dynamic_cast<AbstractClient*>(this)) {
if (cl->tabGroup() && cl->tabGroup()->current() == cl)
cl->tabGroup()->setCurrent(cl, true);
}
} }
} }
} }

181
useractions.cpp
View File

@ -83,8 +83,6 @@ UserActionsMenu::UserActionsMenu(QObject *parent)
, m_desktopMenu(NULL) , m_desktopMenu(NULL)
, m_screenMenu(NULL) , m_screenMenu(NULL)
, m_activityMenu(NULL) , m_activityMenu(NULL)
, m_addTabsMenu(NULL)
, m_switchToTabMenu(NULL)
, m_scriptsMenu(NULL) , m_scriptsMenu(NULL)
, m_resizeOperation(NULL) , m_resizeOperation(NULL)
, m_moveOperation(NULL) , m_moveOperation(NULL)
@ -96,8 +94,6 @@ UserActionsMenu::UserActionsMenu(QObject *parent)
, m_noBorderOperation(NULL) , m_noBorderOperation(NULL)
, m_minimizeOperation(NULL) , m_minimizeOperation(NULL)
, m_closeOperation(NULL) , m_closeOperation(NULL)
, m_removeFromTabGroup(NULL)
, m_closeTabGroup(NULL)
{ {
} }
@ -354,20 +350,6 @@ void UserActionsMenu::init()
setShortcut(m_minimizeOperation, QStringLiteral("Window Minimize")); setShortcut(m_minimizeOperation, QStringLiteral("Window Minimize"));
m_minimizeOperation->setData(Options::MinimizeOp); m_minimizeOperation->setData(Options::MinimizeOp);
// Actions for window tabbing
if (false) {
m_removeFromTabGroup = m_menu->addAction(i18n("&Untab"));
setShortcut(m_removeFromTabGroup, QStringLiteral("Untab"));
m_removeFromTabGroup->setData(Options::RemoveTabFromGroupOp);
m_closeTabGroup = m_menu->addAction(i18n("Close Entire &Group"));
m_closeTabGroup->setIcon(QIcon::fromTheme(QStringLiteral("window-close")));
setShortcut(m_closeTabGroup, QStringLiteral("Close TabGroup"));
m_closeTabGroup->setData(Options::CloseTabGroupOp);
m_menu->addSeparator();
}
action = m_menu->addMenu(advancedMenu); action = m_menu->addMenu(advancedMenu);
action->setText(i18n("&More Actions")); action->setText(i18n("&More Actions"));
action->setIcon(QIcon::fromTheme(QStringLiteral("view-more-symbolic"))); action->setIcon(QIcon::fromTheme(QStringLiteral("view-more-symbolic")));
@ -386,8 +368,6 @@ void UserActionsMenu::discard()
m_multipleDesktopsMenu = nullptr; m_multipleDesktopsMenu = nullptr;
m_screenMenu = NULL; m_screenMenu = NULL;
m_activityMenu = NULL; m_activityMenu = NULL;
m_switchToTabMenu = NULL;
m_addTabsMenu = NULL;
m_scriptsMenu = NULL; m_scriptsMenu = NULL;
} }
@ -428,17 +408,9 @@ void UserActionsMenu::menuAboutToShow()
m_closeOperation->setEnabled(m_client->isCloseable()); m_closeOperation->setEnabled(m_client->isCloseable());
m_shortcutOperation->setEnabled(m_client->rules()->checkShortcut(QString()).isNull()); m_shortcutOperation->setEnabled(m_client->rules()->checkShortcut(QString()).isNull());
if (false) {
initTabbingPopups();
m_addTabsMenu->setPalette(m_client->palette());
} else {
delete m_addTabsMenu;
m_addTabsMenu = 0;
}
// drop the existing scripts menu // drop the existing scripts menu
delete m_scriptsMenu; delete m_scriptsMenu;
m_scriptsMenu = NULL; m_scriptsMenu = nullptr;
// ask scripts whether they want to add entries for the given Client // ask scripts whether they want to add entries for the given Client
QList<QAction*> scriptActions = Scripting::self()->actionsForUserActionMenu(m_client.data(), m_scriptsMenu); QList<QAction*> scriptActions = Scripting::self()->actionsForUserActionMenu(m_client.data(), m_scriptsMenu);
if (!scriptActions.isEmpty()) { if (!scriptActions.isEmpty()) {
@ -475,118 +447,6 @@ void UserActionsMenu::showHideActivityMenu()
#endif #endif
} }
void UserActionsMenu::selectPopupClientTab(QAction* action)
{
if (!m_client || !m_client->tabGroup() || !action->data().isValid()) {
return;
}
if (AbstractClient *other = action->data().value<AbstractClient*>()) {
m_client->tabGroup()->setCurrent(other);
return;
}
// failed conversion, try "1" & "2", being prev and next
int direction = action->data().toInt();
if (direction == 1) {
m_client->tabGroup()->activatePrev();
} else if (direction == 2) {
m_client->tabGroup()->activateNext();
}
}
static QString shortCaption(const QString &s)
{
if (s.length() < 64)
return s;
QString ss = s;
return ss.replace(32,s.length()-64, QStringLiteral("..."));
}
void UserActionsMenu::rebuildTabListPopup()
{
Q_ASSERT(m_switchToTabMenu);
m_switchToTabMenu->clear();
// whatever happens "0x1" and "0x2" are no heap positions ;-)
m_switchToTabMenu->addAction(i18nc("Switch to tab -> Previous", "Previous"))->setData(1);
m_switchToTabMenu->addAction(i18nc("Switch to tab -> Next", "Next"))->setData(2);
m_switchToTabMenu->addSeparator();
if (!m_client) {
return;
}
for (auto i = m_client->tabGroup()->clients().constBegin(),
end = m_client->tabGroup()->clients().constEnd(); i != end; ++i) {
if ((*i)->noBorder() || *i == m_client->tabGroup()->current())
continue; // cannot tab there anyway
m_switchToTabMenu->addAction(shortCaption((*i)->caption()))->setData(QVariant::fromValue(*i));
}
}
void UserActionsMenu::entabPopupClient(QAction* action)
{
if (m_client.isNull() || !action->data().isValid()) {
return;
}
AbstractClient *other = action->data().value<AbstractClient*>();
if (!Workspace::self()->allClientList().contains(other)) { // might have been lost betwenn pop-up and selection
return;
}
m_client->tabBehind(other, true);
if (options->focusPolicyIsReasonable()) {
Workspace::self()->requestFocus(m_client);
}
}
void UserActionsMenu::rebuildTabGroupPopup()
{
Q_ASSERT(m_addTabsMenu);
m_addTabsMenu->clear();
const auto &clientList = Workspace::self()->allClientList();
for (auto i = clientList.constBegin(), end = clientList.constEnd(); i != end; ++i) {
if (*i == m_client.data() || (*i)->noBorder())
continue;
m_addTabsMenu->addAction(shortCaption((*i)->caption()))->setData(QVariant::fromValue(*i));
}
if (m_addTabsMenu->actions().isEmpty())
m_addTabsMenu->addAction(i18nc("There's no window available to be attached as tab to this one", "None available"))->setEnabled(false);
}
void UserActionsMenu::initTabbingPopups()
{
bool needTabManagers = false;
Q_ASSERT(m_client);
if (!m_client)
return;
if (m_client->tabGroup() && m_client->tabGroup()->count() > 1) {
needTabManagers = true;
if (!m_switchToTabMenu) {
m_switchToTabMenu = new QMenu(i18n("Switch to Tab"), m_menu);
connect(m_switchToTabMenu, &QMenu::triggered, this, &UserActionsMenu::selectPopupClientTab);
connect(m_switchToTabMenu, &QMenu::aboutToShow, this, &UserActionsMenu::rebuildTabListPopup);
m_menu->insertMenu(m_removeFromTabGroup, m_switchToTabMenu);
}
} else {
delete m_switchToTabMenu;
m_switchToTabMenu = 0;
}
if (!m_addTabsMenu) {
m_addTabsMenu = new QMenu(i18n("&Attach as tab to"), m_menu);
connect(m_addTabsMenu, &QMenu::triggered, this, &UserActionsMenu::entabPopupClient);
connect(m_addTabsMenu, &QMenu::aboutToShow, this, &UserActionsMenu::rebuildTabGroupPopup);
m_menu->insertMenu(m_removeFromTabGroup, m_addTabsMenu);
}
m_addTabsMenu->menuAction()->setEnabled(!m_client->isFullScreen());
m_removeFromTabGroup->setVisible(needTabManagers);
m_closeTabGroup->setVisible(needTabManagers);
}
void UserActionsMenu::initDesktopPopup() void UserActionsMenu::initDesktopPopup()
{ {
if (kwinApp()->operationMode() == Application::OperationModeWaylandOnly || if (kwinApp()->operationMode() == Application::OperationModeWaylandOnly ||
@ -1270,24 +1130,8 @@ void Workspace::performWindowOperation(AbstractClient* c, Options::WindowOperati
case Options::LowerOp: case Options::LowerOp:
lowerClient(c); lowerClient(c);
break; break;
case Options::TabDragOp: // Handled by decoration itself
case Options::NoOp: case Options::NoOp:
break; break;
case Options::RemoveTabFromGroupOp:
if (c->untab(c->geometry().translated(cascadeOffset(c))) && options->focusPolicyIsReasonable())
takeActivity(c, ActivityFocus | ActivityRaise);
break;
case Options::ActivateNextTabOp:
if (c->tabGroup())
c->tabGroup()->activateNext();
break;
case Options::ActivatePreviousTabOp:
if (c->tabGroup())
c->tabGroup()->activatePrev();
break;
case Options::CloseTabGroupOp:
c->tabGroup()->closeAll();
break;
} }
} }
@ -1309,9 +1153,6 @@ Options::WindowOperation Client::mouseButtonToWindowOperation(Qt::MouseButtons b
else if (button == Qt::RightButton) else if (button == Qt::RightButton)
com = active ? options->commandActiveTitlebar3() : options->commandInactiveTitlebar3(); com = active ? options->commandActiveTitlebar3() : options->commandInactiveTitlebar3();
// TODO: Complete the list
if (com == Options::MouseDragTab)
return Options::TabDragOp;
if (com == Options::MouseOperationsMenu) if (com == Options::MouseOperationsMenu)
return Options::OperationsOp; return Options::OperationsOp;
return Options::NoOp; return Options::NoOp;
@ -1647,24 +1488,6 @@ void Workspace::slotWindowToDesktopDown()
} }
} }
void Workspace::slotActivateNextTab()
{
if (active_client && active_client->tabGroup())
active_client->tabGroup()->activateNext();
}
void Workspace::slotActivatePrevTab()
{
if (active_client && active_client->tabGroup())
active_client->tabGroup()->activatePrev();
}
void Workspace::slotUntab()
{
if (active_client)
active_client->untab(active_client->geometry().translated(cascadeOffset(active_client)));
}
/** /**
* Kill Window feature, similar to xkill. * Kill Window feature, similar to xkill.
*/ */
@ -1762,8 +1585,6 @@ bool Workspace::switchWindow(AbstractClient *c, Direction direction, QPoint curP
} }
} }
if (switchTo) { if (switchTo) {
if (switchTo->tabGroup())
switchTo = switchTo->tabGroup()->current();
activateClient(switchTo); activateClient(switchTo);
} }

40
useractions.h
View File

@ -120,26 +120,6 @@ private Q_SLOTS:
* Adjust the items according to the respective Client. * Adjust the items according to the respective Client.
*/ */
void menuAboutToShow(); void menuAboutToShow();
/**
* Adjusts the add to tab group menu to the current value of the Client.
*/
void rebuildTabGroupPopup();
/**
* Adjusts the switch to tab menu to the current values of the Client.
*/
void rebuildTabListPopup();
/**
* Adds the Client as tab to the Client identified by the @p action.
*
* @param action The invoked action containing the Client to which the active Client should be tabbed.
*/
void entabPopupClient(QAction *action);
/**
* Activates the selected tabbed Client.
*
* @param action The invoked action containing the tabbed Client which should be activated.
*/
void selectPopupClientTab(QAction *action);
/** /**
* Adjusts the desktop popup to the current values and the location of * Adjusts the desktop popup to the current values and the location of
* the Client. * the Client.
@ -210,10 +190,6 @@ private:
* Oh, and an 'all' option too of course * Oh, and an 'all' option too of course
*/ */
void initActivityPopup(); void initActivityPopup();
/**
* Creates the Window Tabbing related menus.
*/
void initTabbingPopups();
/** /**
* Shows a helper Dialog to inform the user how to get back in case he triggered * Shows a helper Dialog to inform the user how to get back in case he triggered
* an action which hides the window decoration (e.g. NoBorder or Fullscreen). * an action which hides the window decoration (e.g. NoBorder or Fullscreen).
@ -241,14 +217,6 @@ private:
* The activities sub menu. * The activities sub menu.
*/ */
QMenu* m_activityMenu; QMenu* m_activityMenu;
/**
* Menu to add the group to other group.
*/
QMenu* m_addTabsMenu;
/**
* Menu to change tab.
*/
QMenu* m_switchToTabMenu;
/** /**
* Menu for further entries added by scripts. * Menu for further entries added by scripts.
*/ */
@ -264,14 +232,6 @@ private:
QAction* m_minimizeOperation; QAction* m_minimizeOperation;
QAction* m_closeOperation; QAction* m_closeOperation;
QAction* m_shortcutOperation; QAction* m_shortcutOperation;
/**
* Remove client from group.
*/
QAction* m_removeFromTabGroup;
/**
* Close all clients in the group.
*/
QAction* m_closeTabGroup;
/** /**
* The Client for which the menu is shown. * The Client for which the menu is shown.
*/ */

5
workspace.cpp
View File

@ -695,8 +695,6 @@ void Workspace::removeClient(Client* c)
m_userActionsMenu->close(); m_userActionsMenu->close();
} }
c->untab(QRect(), true);
if (client_keys_client == c) if (client_keys_client == c)
setupWindowShortcutDone(false); setupWindowShortcutDone(false);
if (!c->shortcut().isEmpty()) { if (!c->shortcut().isEmpty()) {
@ -780,8 +778,7 @@ void Workspace::updateToolWindows(bool also_hide)
// TODO: What if Client's transiency/group changes? should this be called too? (I'm paranoid, am I not?) // TODO: What if Client's transiency/group changes? should this be called too? (I'm paranoid, am I not?)
if (!options->isHideUtilityWindowsForInactive()) { if (!options->isHideUtilityWindowsForInactive()) {
for (ClientList::ConstIterator it = clients.constBegin(); it != clients.constEnd(); ++it) for (ClientList::ConstIterator it = clients.constBegin(); it != clients.constEnd(); ++it)
if (!(*it)->tabGroup() || (*it)->tabGroup()->current() == *it) (*it)->hideClient(false);
(*it)->hideClient(false);
return; return;
} }
const Group* group = nullptr; const Group* group = nullptr;

4
workspace.h
View File

@ -455,10 +455,6 @@ public Q_SLOTS:
void updateClientArea(); void updateClientArea();
void slotActivateNextTab(); // Slot to move left the active Client.
void slotActivatePrevTab(); // Slot to move right the active Client.
void slotUntab(); // Slot to remove the active client from its group.
private Q_SLOTS: private Q_SLOTS:
void desktopResized(); void desktopResized();
void selectWmInputEventMask(); void selectWmInputEventMask();