format

Author: CMurtagh-LGTM

src/wayland/input_method/input_method.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+
 #include <qobject.h>
 #include <qtclasshelpermacros.h>
 #include <qwayland-input-method-unstable-v2.h>
@@ -54,7 +55,11 @@ class InputMethodHandle
 private:
 	void zwp_input_method_v2_activate() override;
 	void zwp_input_method_v2_deactivate() override;
-	void zwp_input_method_v2_surrounding_text(const QString& text, uint32_t cursor, uint32_t anchor) override;
+	void zwp_input_method_v2_surrounding_text(
+	    const QString& text,
+	    uint32_t cursor,
+	    uint32_t anchor
+	) override;
 	void zwp_input_method_v2_text_change_cause(uint32_t cause) override;
 	void zwp_input_method_v2_content_type(uint32_t hint, uint32_t purpose) override;
 	void zwp_input_method_v2_done() override;

src/wayland/input_method/key_map_state.cpp

@@ -98,7 +98,7 @@ std::string_view KeyMapState::keyStateName(wl_keyboard_key_state state) {
 }
 
 bool KeyMapState::keyRepeats(xkb_keycode_t key) const {
-	 return xkb_keymap_key_repeats(this->xkbKeymap, key);
+	return xkb_keymap_key_repeats(this->xkbKeymap, key);
 }
 
 xkb_context* KeyMapState::xkbContext = xkb_context_new(XKB_CONTEXT_NO_FLAGS);

src/wayland/input_method/keyboard_grab.cpp

@@ -21,7 +21,11 @@
 #include "types.hpp"
 #include "virtual_keyboard.hpp"
 
-QS_LOGGING_CATEGORY(inputMethodKeyboardKeys, "quickshell.wayland.inputMethod.keyboardKeys", QtWarningMsg);
+QS_LOGGING_CATEGORY(
+    inputMethodKeyboardKeys,
+    "quickshell.wayland.inputMethod.keyboardKeys",
+    QtWarningMsg
+);
 
 namespace qs::wayland::input_method::impl {
 
@@ -31,7 +35,7 @@ InputMethodKeyboardGrab::InputMethodKeyboardGrab(
 )
     : QObject(parent)
     , zwp_input_method_keyboard_grab_v2(keyboard) {
-	this->mRepeatTimer.callOnTimeout(this, [this](){
+	this->mRepeatTimer.callOnTimeout(this, [this]() {
 		this->mRepeatTimer.setInterval(1000 / this->mRepeatRate);
 		this->handleKey(this->mRepeatKey);
 	});
@@ -94,9 +98,10 @@ void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_key(
 
 	key += WAYLAND_KEY_OFFSET;
 
-	qCInfo(inputMethodKeyboardKeys) << KeyMapState::keyStateName(static_cast<wl_keyboard_key_state>(state))
-	         << this->mKeyMapState.keyName(key) << "[" << key << "]"
-	         << this->mKeyMapState.getChar(key);
+	qCInfo(inputMethodKeyboardKeys) << KeyMapState::keyStateName(
+	    static_cast<wl_keyboard_key_state>(state)
+	) << this->mKeyMapState.keyName(key)
+	                                << "[" << key << "]" << this->mKeyMapState.getChar(key);
 
 	const xkb_keysym_t sym = this->mKeyMapState.getOneSym(key);
 
@@ -118,7 +123,7 @@ void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_key(
 
 	if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
 		const bool keyHandled = this->handleKey(key);
-		if (keyHandled){
+		if (keyHandled) {
 			if (this->mKeyMapState.keyRepeats(key) && this->mRepeatRate > 0) {
 				this->mRepeatKey = key;
 				this->mRepeatTimer.setInterval(this->mRepeatDelay);
@@ -135,7 +140,7 @@ void InputMethodKeyboardGrab::zwp_input_method_keyboard_grab_v2_key(
 	this->mVirturalKeyboard->sendKey(key, static_cast<wl_keyboard_key_state>(state));
 }
 
-bool InputMethodKeyboardGrab::handleKey(xkb_keycode_t key){
+bool InputMethodKeyboardGrab::handleKey(xkb_keycode_t key) {
 	const xkb_keysym_t sym = this->mKeyMapState.getOneSym(key);
 	if (sym == XKB_KEY_Up) {
 		emit this->directionPress(DirectionKey::Up);

src/wayland/input_method/keyboard_grab.hpp

@@ -2,8 +2,8 @@
 
 #include <qobject.h>
 #include <qtclasshelpermacros.h>
-#include <qwayland-input-method-unstable-v2.h>
 #include <qtimer.h>
+#include <qwayland-input-method-unstable-v2.h>
 
 #include "key_map_state.hpp"
 #include "types.hpp"

src/wayland/input_method/qml.hpp

@@ -64,20 +64,28 @@ class InputMethod: public QObject {
 	/// If the input method has grabbed the keyboard
 	Q_PROPERTY(bool hasKeyboard READ hasKeyboard NOTIFY hasKeyboardChanged);
 	/// Provides virtual text in the text input so the user can visualise what they write
-	Q_PROPERTY(QString preeditString READ preeditString WRITE setPreeditString NOTIFY preeditStringChanged);
+	Q_PROPERTY(
+	    QString preeditString READ preeditString WRITE setPreeditString NOTIFY preeditStringChanged
+	);
 	/// If `cursorBegin == cursorEnd == -1` the text input will not show a cursor
 	/// If `cursorBegin == cursorEnd == n` or `cursorBegin == n && cursorEnd == -1` the text input will show a cursor at n
 	/// If `cursorBegin == n` and `cursorEnd == m` the text from n to m will be highlighted
 	Q_PROPERTY(int32_t cursorBegin READ cursorBegin WRITE setCursorBegin NOTIFY cursorBeginChanged);
 	Q_PROPERTY(int32_t cursorEnd READ cursorEnd WRITE setCursorEnd NOTIFY cursorEndChanged);
 	/// The text around the where we will insert
 	Q_PROPERTY(QString surroundingText READ surroundingText NOTIFY surroundingTextChanged);
-	Q_PROPERTY(uint32_t surroundingTextCurosr READ surroundingTextCursor NOTIFY surroundingTextChanged);
-	Q_PROPERTY(uint32_t surroundingTextAnchor READ surroundingTextAnchor NOTIFY surroundingTextChanged);
+	Q_PROPERTY(
+	    uint32_t surroundingTextCurosr READ surroundingTextCursor NOTIFY surroundingTextChanged
+	);
+	Q_PROPERTY(
+	    uint32_t surroundingTextAnchor READ surroundingTextAnchor NOTIFY surroundingTextChanged
+	);
 	/// The content_hint of the text input see https://wayland.app/protocols/text-input-unstable-v3#zwp_text_input_v3:enum:content_hint
 	Q_PROPERTY(QMLContentHint::Enum contentHint READ contentHint NOTIFY contentHintChanged);
 	/// The content_purpose of the text input see https://wayland.app/protocols/text-input-unstable-v3#zwp_text_input_v3:enum:content_purpose
-	Q_PROPERTY(QMLContentPurpose::Enum contentPurpose READ contentPurpose NOTIFY contentPurposeChanged);
+	Q_PROPERTY(
+	    QMLContentPurpose::Enum contentPurpose READ contentPurpose NOTIFY contentPurposeChanged
+	);
 	/// Clear the preedit text when the keyboard grab is released
 	Q_PROPERTY(
 	    bool clearPreeditOnKeyboardRelease MEMBER mClearPreeditOnKeyboardRelease NOTIFY

src/wayland/input_method/qml_helpers.cpp

@@ -13,29 +13,49 @@ namespace qs::wayland::input_method {
 
 KeyboardTextEdit::KeyboardTextEdit(QObject* parent): InputMethod(parent) {
 	QObject::connect(
-		this,
-		&InputMethod::hasKeyboardChanged,
-		this,
-		&KeyboardTextEdit::onHasKeyboardChanged
+	    this,
+	    &InputMethod::hasKeyboardChanged,
+	    this,
+	    &KeyboardTextEdit::onHasKeyboardChanged
 	);
 
 	QObject::connect(
-		this,
-		&InputMethod::surroundingTextChanged,
-		this,
-		&KeyboardTextEdit::onSurroundingTextChanged
+	    this,
+	    &InputMethod::surroundingTextChanged,
+	    this,
+	    &KeyboardTextEdit::onSurroundingTextChanged
 	);
 }
 
 void KeyboardTextEdit::onHasKeyboardChanged() {
-	if(!this->hasKeyboard()) {
+	if (!this->hasKeyboard()) {
 		return;
 	}
 	QObject::connect(this->keyboard(), &Keyboard::keyPress, this, &KeyboardTextEdit::onKeyPress);
-	QObject::connect(this->keyboard(), &Keyboard::returnPress, this, &KeyboardTextEdit::onReturnPress);
-	QObject::connect(this->keyboard(), &Keyboard::directionPress, this, &KeyboardTextEdit::onDirectionPress);
-	QObject::connect(this->keyboard(), &Keyboard::backspacePress, this, &KeyboardTextEdit::onBackspacePress);
-	QObject::connect(this->keyboard(), &Keyboard::deletePress, this, &KeyboardTextEdit::onDeletePress);
+	QObject::connect(
+	    this->keyboard(),
+	    &Keyboard::returnPress,
+	    this,
+	    &KeyboardTextEdit::onReturnPress
+	);
+	QObject::connect(
+	    this->keyboard(),
+	    &Keyboard::directionPress,
+	    this,
+	    &KeyboardTextEdit::onDirectionPress
+	);
+	QObject::connect(
+	    this->keyboard(),
+	    &Keyboard::backspacePress,
+	    this,
+	    &KeyboardTextEdit::onBackspacePress
+	);
+	QObject::connect(
+	    this->keyboard(),
+	    &Keyboard::deletePress,
+	    this,
+	    &KeyboardTextEdit::onDeletePress
+	);
 }
 
 QJSValue KeyboardTextEdit::transform() const { return this->mTransform; }

src/wayland/input_method/qml_helpers.hpp

@@ -14,7 +14,7 @@ namespace qs::wayland::input_method {
 /// A cursor enables some control over the composition of the text.
 /// When return is pressed the transform function is called and the returned string is sent to the input text
 /// and the keyboard is released.
-/// 
+///
 /// ```
 ///  KeyboardTextEdit {
 ///   id: keyboard_text_edit

src/wayland/input_method/types.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
+#include <qobject.h>
 #include <qqmlintegration.h>
 #include <qtclasshelpermacros.h>
 #include <qtmetamacros.h>
-#include <xkbcommon/xkbcommon.h>
 #include <wayland-text-input-unstable-v3-client-protocol.h>
-#include <qobject.h>
+#include <xkbcommon/xkbcommon.h>
 
 namespace qs::wayland::input_method {
 
@@ -15,9 +15,7 @@ class QMLDirectionKey: public QObject {
 	QML_SINGLETON;
 
 public:
-	enum Enum : quint8 {
-		Up, Down, Left, Right
-	};
+	enum Enum : quint8 { Up, Down, Left, Right };
 	Q_ENUM(Enum);
 
 	Q_INVOKABLE static QString toString(Enum direction);
@@ -53,7 +51,7 @@ class QMLContentPurpose: public QObject {
 	QML_SINGLETON;
 
 public:
-	enum Enum : quint8{
+	enum Enum : quint8 {
 		Normal = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NORMAL,
 		Alpha = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_ALPHA,
 		Digits = ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_DIGITS,
@@ -97,5 +95,5 @@ using ContentPurpose = QMLContentPurpose::Enum;
 using TextChangeCause = QMLTextChangeCause::Enum;
 
 inline constexpr xkb_keycode_t WAYLAND_KEY_OFFSET = 8;
-}
-} // namespace qs::wayland::input_method::impl
+} // namespace impl
+} // namespace qs::wayland::input_method