RomanNum3ral
/
breezy-desktop
mirror of https://github.com/wheaney/breezy-desktop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add force reset driver action to Breezy Desktop (#147)

This commit is contained in:
Wayne Heaney 2026-01-22 20:42:16 -08:00 committed by GitHub
parent 35da226988
commit 3c13552198
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 155 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
2.6.4 2.6.5

21
kwin/src/kcm/breezydesktopeffectkcm.cpp
View File

@ -444,6 +444,27 @@ BreezyDesktopEffectConfig::BreezyDesktopEffectConfig(QObject *parent, const KPlu
} }
}); });
} }
// Advanced tab: Force reset xr-driver (matches the Python UI's reset action)
if (auto btnResetDriver = widget()->findChild<QPushButton*>(QStringLiteral("buttonResetDriver"))) {
connect(btnResetDriver, &QPushButton::clicked, this, [this]() {
auto labelStatus = widget()->findChild<QLabel*>(QStringLiteral("labelResetDriverStatus"));
if (labelStatus) {
labelStatus->setVisible(false);
}
setRequestInProgress({sender()}, true);
const bool ok = XRDriverIPC::instance().resetDriver();
if (ok) {
showStatus(labelStatus, true, tr("Driver restarted."));
} else {
showStatus(labelStatus, false, tr("Failed to restart driver."));
}
setRequestInProgress({sender()}, false);
});
}
} }
BreezyDesktopEffectConfig::~BreezyDesktopEffectConfig() BreezyDesktopEffectConfig::~BreezyDesktopEffectConfig()

217
kwin/src/kcm/breezydesktopeffectkcm.ui
View File

@ -208,14 +208,72 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="labelDisplayHorizontalOffset">
<property name="text">
<string>Display Horizontal Offset:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="LabeledSlider" name="kcfg_DisplayHorizontalOffset">
<property name="decimalShift">
<double>2</double>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
</property>
<property name="tickStartOffset">
<double>50</double>
</property>
<property name="tickInterval">
<double>100</double>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tracking">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="labelDisplayVerticalOffset">
<property name="text">
<string>Display Vertical Offset:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="LabeledSlider" name="kcfg_DisplayVerticalOffset">
<property name="decimalShift">
<double>2</double>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
</property>
<property name="tickStartOffset">
<double>50</double>
</property>
<property name="tickInterval">
<double>100</double>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tracking">
<bool>true</bool>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="labelFollowThreshold"> <widget class="QLabel" name="labelFollowThreshold">
<property name="text"> <property name="text">
<string>Follow threshold:</string> <string>Follow threshold:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="7" column="1">
<widget class="LabeledSlider" name="kcfg_SmoothFollowThreshold"> <widget class="LabeledSlider" name="kcfg_SmoothFollowThreshold">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -237,7 +295,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="8" column="0">
<widget class="QLabel" name="labelVirtualDisplays"> <widget class="QLabel" name="labelVirtualDisplays">
<property name="text"> <property name="text">
<string>Add Virtual Display:</string> <string>Add Virtual Display:</string>
@ -250,7 +308,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="8" column="1">
<widget class="QWidget" name="widgetVirtualDisplayButtons"> <widget class="QWidget" name="widgetVirtualDisplayButtons">
<property name="visible"> <property name="visible">
<bool>false</bool> <bool>false</bool>
@ -313,7 +371,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2"> <item row="9" column="0" colspan="2">
<widget class="QWidget" name="widgetVirtualDisplayList"> <widget class="QWidget" name="widgetVirtualDisplayList">
<property name="visible"><bool>false</bool></property> <property name="visible"><bool>false</bool></property>
<property name="enabled"><bool>false</bool></property> <property name="enabled"><bool>false</bool></property>
@ -469,62 +527,34 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="4" column="0" colspan="2">
<widget class="QLabel" name="labelDisplayHorizontalOffset"> <widget class="QCheckBox" name="kcfg_RemoveVirtualDisplaysOnDisable">
<property name="text"> <property name="visible">
<string>Display Horizontal Offset:</string> <bool>false</bool>
</property> </property>
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Remove virtual displays on disable</string>
</property>
<property name="checked"><bool>true</bool></property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="5" column="0" colspan="2">
<widget class="LabeledSlider" name="kcfg_DisplayHorizontalOffset"> <widget class="QCheckBox" name="kcfg_MirrorPhysicalDisplays">
<property name="decimalShift"> <property name="text">
<double>2</double> <string>Mirror physical displays (may impact performance)</string>
</property> </property>
<property name="tickPosition"> <property name="checked"><bool>false</bool></property>
<enum>QSlider::NoTicks</enum>
</property>
<property name="tickStartOffset">
<double>50</double>
</property>
<property name="tickInterval">
<double>100</double>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tracking">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0" colspan="2">
<widget class="QLabel" name="labelDisplayVerticalOffset"> <widget class="QCheckBox" name="EnableMultitap">
<property name="text"> <property name="text">
<string>Display Vertical Offset:</string> <string>Enable multi-tap detection</string>
</property> </property>
</widget> <property name="checked"><bool>false</bool></property>
</item>
<item row="6" column="1">
<widget class="LabeledSlider" name="kcfg_DisplayVerticalOffset">
<property name="decimalShift">
<double>2</double>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
</property>
<property name="tickStartOffset">
<double>50</double>
</property>
<property name="tickInterval">
<double>100</double>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tracking">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="7" column="0">
@ -553,44 +583,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0" colspan="2"> <item row="8" column="0">
<widget class="QCheckBox" name="kcfg_RemoveVirtualDisplaysOnDisable">
<property name="visible">
<bool>false</bool>
</property>
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Remove virtual displays on disable</string>
</property>
<property name="checked"><bool>true</bool></property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="kcfg_MirrorPhysicalDisplays">
<property name="text">
<string>Mirror physical displays (may impact performance)</string>
</property>
<property name="checked"><bool>false</bool></property>
</widget>
</item>
<item row="10" column="0" colspan="2">
<widget class="QCheckBox" name="EnableMultitap">
<property name="text">
<string>Enable multi-tap detection</string>
</property>
<property name="checked"><bool>false</bool></property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="labelNeckSaverHorizontal"> <widget class="QLabel" name="labelNeckSaverHorizontal">
<property name="text"> <property name="text">
<string>Neck-saver horizontal:</string> <string>Neck-saver horizontal:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1"> <item row="8" column="1">
<widget class="LabeledSlider" name="NeckSaverHorizontalMultiplier"> <widget class="LabeledSlider" name="NeckSaverHorizontalMultiplier">
<property name="decimalShift"> <property name="decimalShift">
<double>2</double> <double>2</double>
@ -618,14 +618,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0"> <item row="9" column="0">
<widget class="QLabel" name="labelNeckSaverVertical"> <widget class="QLabel" name="labelNeckSaverVertical">
<property name="text"> <property name="text">
<string>Neck-saver vertical:</string> <string>Neck-saver vertical:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1"> <item row="9" column="1">
<widget class="LabeledSlider" name="NeckSaverVerticalMultiplier"> <widget class="LabeledSlider" name="NeckSaverVerticalMultiplier">
<property name="decimalShift"> <property name="decimalShift">
<double>2</double> <double>2</double>
@ -653,14 +653,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="0"> <item row="10" column="0">
<widget class="QLabel" name="labelDeadZoneThresholdDeg"> <widget class="QLabel" name="labelDeadZoneThresholdDeg">
<property name="text"> <property name="text">
<string>Dead-zone threshold (deg):</string> <string>Dead-zone threshold (deg):</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1"> <item row="10" column="1">
<widget class="LabeledSlider" name="DeadZoneThresholdDeg"> <widget class="LabeledSlider" name="DeadZoneThresholdDeg">
<property name="decimalShift"> <property name="decimalShift">
<double>1</double> <double>1</double>
@ -688,16 +688,43 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="0"> <item row="11" column="0">
<widget class="QLabel" name="labelMeasurementUnits"> <widget class="QLabel" name="labelMeasurementUnits">
<property name="text"> <property name="text">
<string>Measurement units:</string> <string>Measurement units:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1"> <item row="11" column="1">
<widget class="QComboBox" name="comboMeasurementUnits"/> <widget class="QComboBox" name="comboMeasurementUnits"/>
</item> </item>
<item row="12" column="0">
<widget class="QLabel" name="labelResetDriver">
<property name="text">
<string>Reset driver:</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QPushButton" name="buttonResetDriver">
<property name="text">
<string>Force reset driver</string>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QLabel" name="labelResetDriverStatus">
<property name="text">
<string/>
</property>
<property name="visible">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tabLicenseDetails"> <widget class="QWidget" name="tabLicenseDetails">

7
kwin/src/xrdriveripc/xrdriveripc.cpp
View File

@ -108,3 +108,10 @@ bool XRDriverIPC::verifyToken(const std::string &token) {
QString result = QString::fromUtf8(out).trimmed().toLower(); QString result = QString::fromUtf8(out).trimmed().toLower();
return result == QStringLiteral("true"); return result == QStringLiteral("true");
} }
bool XRDriverIPC::resetDriver() {
QByteArray out = invokePython(QStringLiteral("reset_driver"), {}, {});
if (out.isEmpty()) return false;
QString result = QString::fromUtf8(out).trimmed().toLower();
return result == QStringLiteral("true");
}

1
kwin/src/xrdriveripc/xrdriveripc.h
View File

@ -85,6 +85,7 @@ public:
bool writeControlFlags(const QJsonObject &flags); bool writeControlFlags(const QJsonObject &flags);
bool requestToken(const std::string &email); bool requestToken(const std::string &email);
bool verifyToken(const std::string &token); bool verifyToken(const std::string &token);
bool resetDriver();
private: private:

2
ui/modules/PyXRLinuxDriverIPC

@ -1 +1 @@
Subproject commit 6f1844829e11fcc7664398d4c95d8fbdb6341669 Subproject commit 60b417baa5721496a3a39d4929460575f2479838

6
ui/src/main.py
View File

@ -103,7 +103,7 @@ class BreezydesktopApplication(Adw.Application):
logo_icon_name='com.xronlinux.BreezyDesktop', logo_icon_name='com.xronlinux.BreezyDesktop',
version=self.version, version=self.version,
authors=['Wayne Heaney'], authors=['Wayne Heaney'],
copyright='© 2025 Wayne Heaney', copyright='© 2026 Wayne Heaney',
license_type=Gtk.License.GPL_3_0, license_type=Gtk.License.GPL_3_0,
wrap_license=True) wrap_license=True)
about.present() about.present()
@ -114,9 +114,7 @@ class BreezydesktopApplication(Adw.Application):
dialog.present() dialog.present()
def on_reset_driver_action(self, widget, _): def on_reset_driver_action(self, widget, _):
XRDriverIPC.get_instance().write_control_flags({ XRDriverIPC.get_instance().reset_driver(as_user=None)
'force_quit': True
})
def create_action(self, name, callback, shortcuts=None): def create_action(self, name, callback, shortcuts=None):
"""Add an application action. """Add an application action.