rules: add window rule to force tearing on or off
This allows the user to override which presentation mode individual apps request
This commit is contained in:
parent
1dab5fb328
commit
5316cf8d50
7 changed files with 68 additions and 38 deletions
|
@ -329,7 +329,7 @@ void WaylandCompositor::composite(RenderLoop *renderLoop)
|
|||
|
||||
const bool wantsAdaptiveSync = activeWindow && activeWindow->isOnOutput(output) && activeWindow->wantsAdaptiveSync();
|
||||
const bool vrr = (output->capabilities() & Output::Capability::Vrr) && (output->vrrPolicy() == VrrPolicy::Always || (output->vrrPolicy() == VrrPolicy::Automatic && wantsAdaptiveSync));
|
||||
const bool tearing = (output->capabilities() & Output::Capability::Tearing) && options->allowTearing() && activeFullscreenItem && activeFullscreenItem->presentationHint() == PresentationModeHint::Async;
|
||||
const bool tearing = (output->capabilities() & Output::Capability::Tearing) && options->allowTearing() && activeFullscreenItem && activeWindow->wantsTearing(activeFullscreenItem->presentationHint() == PresentationModeHint::Async);
|
||||
if (vrr) {
|
||||
frame->setPresentationMode(tearing ? PresentationMode::AdaptiveAsync : PresentationMode::AdaptiveSync);
|
||||
} else {
|
||||
|
|
|
@ -724,6 +724,11 @@ void RulesModel::populateRuleList()
|
|||
RulePolicy::ForceRule, RuleItem::Boolean,
|
||||
i18n("Adaptive Sync"), i18n("Appearance & Fixes"),
|
||||
QIcon::fromTheme("monitor-symbolic")));
|
||||
|
||||
addRule(new RuleItem(QLatin1String("tearing"),
|
||||
RulePolicy::ForceRule, RuleItem::Boolean,
|
||||
i18n("Allow Tearing"), i18n("Appearance & Fixes"),
|
||||
QIcon::fromTheme("monitor-symbolic")));
|
||||
}
|
||||
|
||||
const QHash<QString, QString> RulesModel::x11PropertyHash()
|
||||
|
|
|
@ -76,6 +76,7 @@ Rules::Rules()
|
|||
, disableglobalshortcutsrule(UnusedForceRule)
|
||||
, desktopfilerule(UnusedSetRule)
|
||||
, adaptivesyncrule(UnusedForceRule)
|
||||
, tearingrule(UnusedForceRule)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -160,6 +161,7 @@ void Rules::readFromSettings(const RuleSettings *settings)
|
|||
READ_SET_RULE(desktopfile);
|
||||
READ_FORCE_RULE(layer, );
|
||||
READ_FORCE_RULE(adaptivesync, );
|
||||
READ_FORCE_RULE(tearing, );
|
||||
}
|
||||
|
||||
#undef READ_MATCH_STRING
|
||||
|
@ -255,7 +257,7 @@ void Rules::write(RuleSettings *settings) const
|
|||
// returns true if it doesn't affect anything
|
||||
bool Rules::isEmpty() const
|
||||
{
|
||||
return (placementrule == UnusedForceRule
|
||||
return placementrule == UnusedForceRule
|
||||
&& positionrule == UnusedSetRule
|
||||
&& sizerule == UnusedSetRule
|
||||
&& minsizerule == UnusedForceRule
|
||||
|
@ -291,7 +293,8 @@ bool Rules::isEmpty() const
|
|||
&& disableglobalshortcutsrule == UnusedForceRule
|
||||
&& desktopfilerule == UnusedSetRule
|
||||
&& layerrule == UnusedForceRule
|
||||
&& adaptivesyncrule == UnusedForceRule);
|
||||
&& adaptivesyncrule == UnusedForceRule
|
||||
&& tearingrule == UnusedForceRule;
|
||||
}
|
||||
|
||||
Rules::ForceRule Rules::convertForceRule(int v)
|
||||
|
@ -686,6 +689,7 @@ APPLY_RULE(shortcut, Shortcut, QString)
|
|||
APPLY_FORCE_RULE(disableglobalshortcuts, DisableGlobalShortcuts, bool)
|
||||
APPLY_RULE(desktopfile, DesktopFile, QString)
|
||||
APPLY_FORCE_RULE(adaptivesync, AdaptiveSync, bool)
|
||||
APPLY_FORCE_RULE(tearing, Tearing, bool)
|
||||
|
||||
#undef APPLY_RULE
|
||||
#undef APPLY_FORCE_RULE
|
||||
|
@ -745,6 +749,7 @@ bool Rules::discardUsed(bool withdrawn)
|
|||
DISCARD_USED_SET_RULE(desktopfile);
|
||||
DISCARD_USED_FORCE_RULE(layer);
|
||||
DISCARD_USED_FORCE_RULE(adaptivesync);
|
||||
DISCARD_USED_FORCE_RULE(tearing);
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
@ -893,6 +898,7 @@ CHECK_FORCE_RULE(DisableGlobalShortcuts, bool)
|
|||
CHECK_RULE(DesktopFile, QString)
|
||||
CHECK_FORCE_RULE(Layer, Layer)
|
||||
CHECK_FORCE_RULE(AdaptiveSync, bool)
|
||||
CHECK_FORCE_RULE(Tearing, bool)
|
||||
|
||||
#undef CHECK_RULE
|
||||
#undef CHECK_FORCE_RULE
|
||||
|
|
|
@ -78,6 +78,7 @@ public:
|
|||
QString checkDesktopFile(QString desktopFile, bool init = false) const;
|
||||
Layer checkLayer(Layer layer) const;
|
||||
bool checkAdaptiveSync(bool adaptivesync) const;
|
||||
bool checkTearing(bool requestsTearing) const;
|
||||
|
||||
private:
|
||||
MaximizeMode checkMaximizeVert(MaximizeMode mode, bool init) const;
|
||||
|
@ -189,6 +190,7 @@ public:
|
|||
bool applyDesktopFile(QString &desktopFile, bool init) const;
|
||||
bool applyLayer(enum Layer &layer) const;
|
||||
bool applyAdaptiveSync(bool &adaptivesync) const;
|
||||
bool applyTearing(bool &tearing) const;
|
||||
|
||||
private:
|
||||
#endif
|
||||
|
@ -295,6 +297,8 @@ private:
|
|||
SetRule desktopfilerule;
|
||||
bool adaptivesync;
|
||||
ForceRule adaptivesyncrule;
|
||||
bool tearing;
|
||||
ForceRule tearingrule;
|
||||
friend QDebug &operator<<(QDebug &stream, const Rules *);
|
||||
};
|
||||
|
||||
|
|
|
@ -450,5 +450,14 @@
|
|||
<label>AdaptiveSync rule type</label>
|
||||
<default code="true">Rules::UnusedForceRule</default>
|
||||
</entry>
|
||||
|
||||
<entry name="tearing" type="Bool">
|
||||
<label>Allow Tearing</label>
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="tearingrule" type="Int">
|
||||
<label>Tearing rule type</label>
|
||||
<default code="true">Rules::UnusedForceRule</default>
|
||||
</entry>
|
||||
</group>
|
||||
</kcfg>
|
||||
|
|
|
@ -4032,6 +4032,11 @@ bool Window::wantsAdaptiveSync() const
|
|||
return rules()->checkAdaptiveSync(isFullScreen());
|
||||
}
|
||||
|
||||
bool Window::wantsTearing(bool tearingRequested) const
|
||||
{
|
||||
return rules()->checkTearing(tearingRequested);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns @c true if the Window can be minimized; otherwise @c false.
|
||||
*
|
||||
|
|
|
@ -1004,6 +1004,7 @@ public:
|
|||
virtual void setFullScreen(bool set);
|
||||
|
||||
bool wantsAdaptiveSync() const;
|
||||
bool wantsTearing(bool tearingRequested) const;
|
||||
|
||||
QRectF geometryRestore() const;
|
||||
void setGeometryRestore(const QRectF &rect);
|
||||
|
|
Loading…
Reference in a new issue