FIX(client): Fix using the keyboad to change local volume adjustment

Previously, when using keyboard arrows, the new slider widget action
applied the new local volume but did not save it. That was because it
used the sliderReleased event to save the value, which is not triggered
by keyboard updates.

We could simply save the local volume on every sliderChange instead of
on sliderRelease, but that would cause many writes to the disk
in a short period of time and possibly lag the client.

This commit introduces an event filter in addition to the sliderChanged event,
which is observing key releases. If the slider has focus and left/right is released,
it is then calling the save slot of the slider.

Fixes mumble-voip#6211

src/mumble/CMakeLists.txt

@@ -291,6 +291,8 @@ set(MUMBLE_SOURCES
 
 	"widgets/CompletablePage.cpp"
 	"widgets/CompletablePage.h"
+	"widgets/EventFilters.cpp"
+	"widgets/EventFilters.h"
 	"widgets/MUComboBox.cpp"
 	"widgets/MUComboBox.h"
 	"widgets/MultiStyleWidgetWrapper.cpp"

src/mumble/ListenerVolumeSlider.cpp

@@ -7,10 +7,19 @@
 #include "Channel.h"
 #include "ChannelListenerManager.h"
 #include "ServerHandler.h"
-#include "VolumeAdjustment.h"
 #include "Global.h"
 
-ListenerVolumeSlider::ListenerVolumeSlider(QWidget *parent) : VolumeSliderWidgetAction(parent) {
+#include <QDebug>
+
+ListenerVolumeSlider::ListenerVolumeSlider(QWidget *parent) : VolumeSliderWidgetAction(parent), m_currentTimer(0) {
+	connect(&m_sendTimer, &QTimer::timeout, this, &ListenerVolumeSlider::sendToServer);
+	connect(&m_resetTimer, &QTimer::timeout, this, [=]() {
+		qDebug() << "reset timer";
+		m_currentTimer = 0;
+	});
+
+	m_sendTimer.setSingleShot(true);
+	m_resetTimer.setSingleShot(true);
 }
 
 void ListenerVolumeSlider::setListenedChannel(const Channel &channel) {
@@ -28,7 +37,7 @@ void ListenerVolumeSlider::on_VolumeSlider_valueChanged(int value) {
 	displayTooltip(value);
 }
 
-void ListenerVolumeSlider::on_VolumeSlider_sliderReleased() {
+void ListenerVolumeSlider::on_VolumeSlider_changeCompleted() {
 	ServerHandlerPtr handler = Global::get().sh;
 
 	if (!handler || !m_channel || !m_volumeSlider) {
@@ -39,18 +48,40 @@ void ListenerVolumeSlider::on_VolumeSlider_sliderReleased() {
 
 	if (handler->m_version >= Mumble::Protocol::PROTOBUF_INTRODUCTION_VERSION) {
 		// With the new audio protocol, volume adjustments for listeners are handled on the server and thus we want
-		// to avoid spamming updates to the adjustments, which is why we only update them once the slider is released.
-		MumbleProto::UserState mpus;
-		mpus.set_session(Global::get().uiSession);
+		// to avoid spamming updates to the adjustments, which is why we only update them with a delay.
 
-		MumbleProto::UserState::VolumeAdjustment *adjustmentMsg = mpus.add_listening_volume_adjustment();
-		adjustmentMsg->set_listening_channel(m_channel->iId);
-		adjustmentMsg->set_volume_adjustment(adjustment.factor);
+		m_channelBuffer    = m_channel->iId;
+		m_adjustmentBuffer = adjustment;
+
+		// Timer values: 0, 50, 150, 350, 750, 1000
+		m_sendTimer.start(m_currentTimer);
+		m_currentTimer = std::min(1000u, (m_currentTimer + 25) * 2);
 
-		handler->sendMessage(mpus);
 	} else {
 		// Before the new audio protocol, volume adjustments for listeners are handled locally
 		Global::get().channelListenerManager->setListenerVolumeAdjustment(Global::get().uiSession, m_channel->iId,
 																		  adjustment);
+		qDebug() << "local " << adjustment.dbAdjustment;
+	}
+}
+
+void ListenerVolumeSlider::sendToServer() {
+	ServerHandlerPtr handler = Global::get().sh;
+
+	m_resetTimer.start(3000);
+
+	if (!handler) {
+		return;
 	}
+
+	MumbleProto::UserState mpus;
+	mpus.set_session(Global::get().uiSession);
+
+	qDebug() << "to server " << m_adjustmentBuffer.dbAdjustment;
+
+	MumbleProto::UserState::VolumeAdjustment *adjustmentMsg = mpus.add_listening_volume_adjustment();
+	adjustmentMsg->set_listening_channel(m_channelBuffer);
+	adjustmentMsg->set_volume_adjustment(m_adjustmentBuffer.factor);
+
+	handler->sendMessage(mpus);
 }

src/mumble/ListenerVolumeSlider.h

@@ -6,8 +6,11 @@
 #ifndef MUMBLE_MUMBLE_LISTENERLOCALVOLUMESLIDER_H_
 #define MUMBLE_MUMBLE_LISTENERLOCALVOLUMESLIDER_H_
 
+#include "VolumeAdjustment.h"
 #include "VolumeSliderWidgetAction.h"
 
+#include <QTimer>
+
 class Channel;
 
 class ListenerVolumeSlider : public VolumeSliderWidgetAction {
@@ -20,12 +23,20 @@ class ListenerVolumeSlider : public VolumeSliderWidgetAction {
 	void setListenedChannel(const Channel &channel);
 
 private:
-	/// The channel of the listener proxy this dialog is operating on
+	/// The channel of the listener proxy this widget is operating on
 	const Channel *m_channel;
 
+	QTimer m_sendTimer;
+	QTimer m_resetTimer;
+	unsigned int m_currentTimer;
+	int m_channelBuffer;
+	VolumeAdjustment m_adjustmentBuffer;
+
+	void sendToServer();
+
 private slots:
 	void on_VolumeSlider_valueChanged(int value) override;
-	void on_VolumeSlider_sliderReleased() override;
+	void on_VolumeSlider_changeCompleted() override;
 };
 
 #endif

src/mumble/UserLocalVolumeSlider.cpp

@@ -35,7 +35,7 @@ void UserLocalVolumeSlider::on_VolumeSlider_valueChanged(int value) {
 	}
 }
 
-void UserLocalVolumeSlider::on_VolumeSlider_sliderReleased() {
+void UserLocalVolumeSlider::on_VolumeSlider_changeCompleted() {
 	ClientUser *user = ClientUser::get(m_clientSession);
 	if (user) {
 		if (!user->qsHash.isEmpty()) {

src/mumble/UserLocalVolumeSlider.h

@@ -13,7 +13,7 @@ class ClientUser;
 class UserLocalVolumeSlider : public VolumeSliderWidgetAction {
 	Q_OBJECT
 
-	/// The session ID for the user that the dialog is changing the volume for.
+	/// The session ID for the user that the widget is changing the volume for.
 	unsigned int m_clientSession;
 
 public:
@@ -24,7 +24,7 @@ class UserLocalVolumeSlider : public VolumeSliderWidgetAction {
 
 private slots:
 	void on_VolumeSlider_valueChanged(int value);
-	void on_VolumeSlider_sliderReleased();
+	void on_VolumeSlider_changeCompleted();
 };
 
 #endif

src/mumble/VolumeSliderWidgetAction.cpp

@@ -5,6 +5,7 @@
 
 #include "VolumeSliderWidgetAction.h"
 #include "VolumeAdjustment.h"
+#include "widgets/EventFilters.h"
 
 #include <QSlider>
 #include <QToolTip>
@@ -16,10 +17,20 @@ VolumeSliderWidgetAction::VolumeSliderWidgetAction(QObject *parent)
 	m_volumeSlider->setAccessibleName(tr("Slider for volume adjustment"));
 	m_volumeSlider->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
+	KeyEventObserver *keyEventFilter = new KeyEventObserver(this, QEvent::KeyRelease, false,
+															{ Qt::Key_Left, Qt::Key_Right, Qt::Key_Up, Qt::Key_Down });
+	m_volumeSlider->installEventFilter(keyEventFilter);
+	MouseWheelEventObserver *wheelEventFilter = new MouseWheelEventObserver(this, Qt::ScrollEnd, false);
+	m_volumeSlider->installEventFilter(wheelEventFilter);
+
 	connect(m_volumeSlider.get(), &QSlider::valueChanged, this,
 			&VolumeSliderWidgetAction::on_VolumeSlider_valueChanged);
 	connect(m_volumeSlider.get(), &QSlider::sliderReleased, this,
-			&VolumeSliderWidgetAction::on_VolumeSlider_sliderReleased);
+			&VolumeSliderWidgetAction::on_VolumeSlider_changeCompleted);
+	connect(keyEventFilter, &KeyEventObserver::keyEventObserved, this,
+			&VolumeSliderWidgetAction::on_VolumeSlider_changeCompleted);
+	connect(wheelEventFilter, &MouseWheelEventObserver::wheelEventObserved, this,
+			&VolumeSliderWidgetAction::on_VolumeSlider_changeCompleted);
 
 	setDefaultWidget(m_volumeSlider.get());
 

src/mumble/VolumeSliderWidgetAction.h

@@ -27,7 +27,7 @@ class VolumeSliderWidgetAction : public QWidgetAction {
 
 protected slots:
 	virtual void on_VolumeSlider_valueChanged(int){};
-	virtual void on_VolumeSlider_sliderReleased(){};
+	virtual void on_VolumeSlider_changeCompleted(){};
 };
 
 #endif

src/mumble/widgets/EventFilters.cpp

@@ -0,0 +1,78 @@
+// Copyright 2023 The Mumble Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file at the root of the
+// Mumble source tree or at <https://www.mumble.info/LICENSE>.
+
+#include "EventFilters.h"
+
+#include <algorithm>
+
+#include <QKeyEvent>
+#include <QWheelEvent>
+#include <QWidget>
+
+#include <QDebug>
+
+KeyEventObserver::KeyEventObserver(QObject *parent, QEvent::Type eventType, bool consume,
+								   std::initializer_list< Qt::Key > keys)
+	: QObject(parent), m_eventType(eventType), m_consume(consume), m_keys(keys) {
+}
+
+bool KeyEventObserver::eventFilter(QObject *obj, QEvent *event) {
+	QWidget *widget = static_cast< QWidget * >(obj);
+
+	if (!widget || !widget->hasFocus()) {
+		return false;
+	}
+
+	QKeyEvent *keyEvent = static_cast< QKeyEvent * >(event);
+
+	if (!keyEvent || keyEvent->type() != m_eventType) {
+		return false;
+	}
+
+	Qt::Key key = static_cast< Qt::Key >(keyEvent->key());
+
+	if (std::find(m_keys.begin(), m_keys.end(), key) == m_keys.end()) {
+		return false;
+	}
+
+	emit keyEventObserved();
+
+	return m_consume;
+}
+
+MouseWheelEventObserver::MouseWheelEventObserver(QObject *parent, Qt::ScrollPhase phase, bool consume)
+	: QObject(parent), m_phase(phase), m_consume(consume) {
+}
+
+bool MouseWheelEventObserver::eventFilter(QObject *obj, QEvent *event) {
+	QWidget *widget = static_cast< QWidget * >(obj);
+
+	qDebug() << "eventFilter";
+
+	if (!widget || !widget->hasFocus()) {
+		return false;
+	}
+
+	qDebug() << "focus";
+
+	QWheelEvent *wheelEvent = static_cast< QWheelEvent * >(event);
+
+	if (!wheelEvent) {
+		return false;
+	}
+
+	qDebug() << "wheelEvent";
+
+	if (wheelEvent->phase() != m_phase) {
+		qDebug() << "phase " << wheelEvent->phase();
+		return false;
+	}
+
+	qDebug() << "observed";
+
+	emit wheelEventObserved(wheelEvent->pixelDelta());
+
+	return m_consume;
+}

src/mumble/widgets/EventFilters.h

@@ -0,0 +1,51 @@
+// Copyright 2023 The Mumble Developers. All rights reserved.
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file at the root of the
+// Mumble source tree or at <https://www.mumble.info/LICENSE>.
+
+#ifndef MUMBLE_MUMBLE_WIDGETS_EVENTFILTERS_H_
+#define MUMBLE_MUMBLE_WIDGETS_EVENTFILTERS_H_
+
+#include <initializer_list>
+#include <vector>
+
+#include <QEvent>
+#include <QObject>
+#include <QPoint>
+
+class KeyEventObserver : public QObject {
+	Q_OBJECT
+
+private:
+	QEvent::Type m_eventType;
+	bool m_consume;
+	std::vector< Qt::Key > m_keys;
+
+public:
+	KeyEventObserver(QObject *parent, QEvent::Type eventType, bool consume, std::initializer_list< Qt::Key > keys);
+
+protected:
+	bool eventFilter(QObject *obj, QEvent *event) override;
+
+signals:
+	void keyEventObserved();
+};
+
+class MouseWheelEventObserver : public QObject {
+	Q_OBJECT
+
+private:
+	Qt::ScrollPhase m_phase;
+	bool m_consume;
+
+public:
+	MouseWheelEventObserver(QObject *parent, Qt::ScrollPhase phase, bool consume);
+
+protected:
+	bool eventFilter(QObject *obj, QEvent *event) override;
+
+signals:
+	void wheelEventObserved(QPoint delta);
+};
+
+#endif