Workspace::allowFullClientRaising operates on AbstractCliet

This commit is contained in:
Martin Gräßlin 2015-03-12 11:46:08 +01:00
parent 1d7d1787a8
commit b1026aa162
2 changed files with 4 additions and 4 deletions

View file

@ -601,13 +601,13 @@ bool Workspace::allowClientActivation(const KWin::AbstractClient *c, xcb_timesta
// a window to be fully raised upon its own request (XRaiseWindow), // a window to be fully raised upon its own request (XRaiseWindow),
// if refused, it will be raised only on top of windows belonging // if refused, it will be raised only on top of windows belonging
// to the same application // to the same application
bool Workspace::allowFullClientRaising(const KWin::Client *c, xcb_timestamp_t time) bool Workspace::allowFullClientRaising(const KWin::AbstractClient *c, xcb_timestamp_t time)
{ {
int level = c->rules()->checkFSP(options->focusStealingPreventionLevel()); int level = c->rules()->checkFSP(options->focusStealingPreventionLevel());
if (session_saving && level <= 2) { // <= normal if (session_saving && level <= 2) { // <= normal
return true; return true;
} }
Client* ac = mostRecentlyActivatedClient(); AbstractClient* ac = mostRecentlyActivatedClient();
if (level == 0) // none if (level == 0) // none
return true; return true;
if (level == 4) // extreme if (level == 4) // extreme
@ -617,7 +617,7 @@ bool Workspace::allowFullClientRaising(const KWin::Client *c, xcb_timestamp_t ti
return true; // no active client -> always allow return true; // no active client -> always allow
} }
// TODO window urgency -> return true? // TODO window urgency -> return true?
if (Client::belongToSameApplication(c, ac, true)) { if (AbstractClient::belongToSameApplication(c, ac, true)) {
qCDebug(KWIN_CORE) << "Raising: Belongs to active application"; qCDebug(KWIN_CORE) << "Raising: Belongs to active application";
return true; return true;
} }

View file

@ -480,7 +480,7 @@ private:
ToplevelList constrainedStackingOrder(); ToplevelList constrainedStackingOrder();
void raiseClientWithinApplication(Client* c); void raiseClientWithinApplication(Client* c);
void lowerClientWithinApplication(Client* c); void lowerClientWithinApplication(Client* c);
bool allowFullClientRaising(const Client* c, xcb_timestamp_t timestamp); bool allowFullClientRaising(const AbstractClient* c, xcb_timestamp_t timestamp);
bool keepTransientAbove(const Client* mainwindow, const Client* transient); bool keepTransientAbove(const Client* mainwindow, const Client* transient);
void blockStackingUpdates(bool block); void blockStackingUpdates(bool block);
void updateToolWindows(bool also_hide); void updateToolWindows(bool also_hide);