From 417a3b8ef9e18539d602fa97d08cdff8e6b45894 Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Tue, 7 May 2024 14:56:44 -0400 Subject: [PATCH 1/3] (#3379 #3307) Fix accidentally consuming input events on alt key up --- src/miral/minimal_window_manager.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/miral/minimal_window_manager.cpp b/src/miral/minimal_window_manager.cpp index e15b8d963e3..c35b8c12778 100644 --- a/src/miral/minimal_window_manager.cpp +++ b/src/miral/minimal_window_manager.cpp @@ -197,10 +197,8 @@ bool miral::MinimalWindowManager::handle_keyboard_event(MirKeyboardEvent const* switch (mir_keyboard_event_scan_code(event)) { case KEY_LEFTALT: - if (self->application_selector.complete() != nullptr) - return true; - break; - default:; + self->application_selector.complete(); + default:; } } From 89edf6a86f2bb89d84b85730e25f8a317505d537 Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Tue, 7 May 2024 14:58:56 -0400 Subject: [PATCH 2/3] (logging) remove chatty logs that are no longer required --- src/server/frontend_wayland/keyboard_helper.cpp | 16 ---------------- src/server/frontend_wayland/wl_keyboard.cpp | 9 --------- 2 files changed, 25 deletions(-) diff --git a/src/server/frontend_wayland/keyboard_helper.cpp b/src/server/frontend_wayland/keyboard_helper.cpp index e6002d55b60..bb343bc4491 100644 --- a/src/server/frontend_wayland/keyboard_helper.cpp +++ b/src/server/frontend_wayland/keyboard_helper.cpp @@ -21,7 +21,6 @@ #include "mir/events/keyboard_event.h" #include "mir/input/seat.h" #include "mir/fatal.h" -#include "mir/log.h" #include // memcpy #include @@ -62,7 +61,6 @@ void mf::KeyboardHelper::handle_event(std::shared_ptr const& eve switch (mir_input_event_get_type(mir_event_get_input_event(event.get()))) { case mir_input_event_type_keyboard_resync: - mir::log_debug("mir_input_event_type_keyboard_resync is causing modifiers to be refreshed"); refresh_modifiers(); break; @@ -150,20 +148,6 @@ void mf::KeyboardHelper::set_keymap(std::shared_ptr const& new_keyma void mf::KeyboardHelper::set_modifiers(MirXkbModifiers const& new_modifiers) { - mir::log_debug( - "Modifiers are being set from: depressed=0x%08x, latched=0x%08x, locked=0x%08x, effective_layout=0x%08x", - modifiers.depressed, - modifiers.latched, - modifiers.locked, - modifiers.effective_layout); - - mir::log_debug( - "Modifiers are being set to: depressed=0x%08x, latched=0x%08x, locked=0x%08x, effective_layout=0x%08x", - new_modifiers.depressed, - new_modifiers.latched, - new_modifiers.locked, - new_modifiers.effective_layout); - if (new_modifiers != modifiers) { modifiers = new_modifiers; diff --git a/src/server/frontend_wayland/wl_keyboard.cpp b/src/server/frontend_wayland/wl_keyboard.cpp index 35f04ab80b8..ccf96cdf87c 100644 --- a/src/server/frontend_wayland/wl_keyboard.cpp +++ b/src/server/frontend_wayland/wl_keyboard.cpp @@ -83,8 +83,6 @@ void mf::WlKeyboard::focus_on(WlSurface* surface) auto const serial = client->next_serial(nullptr); send_enter_event(serial, surface->raw_resource(), &key_state); wl_array_release(&key_state); - mir::log_debug("Surface (id=%u) has been focused and is refreshing its modifiers", - wl_resource_get_id(surface->raw_resource())); helper->refresh_modifiers(); } @@ -112,13 +110,6 @@ void mf::WlKeyboard::send_key(std::shared_ptr const& eve void mf::WlKeyboard::send_modifiers(MirXkbModifiers const& modifiers) { - mir::log_debug( - "Sending modifiers event: depressed=0x%08x, latched=0x%08x, locked=0x%08x, effective_layout=0x%08x", - modifiers.depressed, - modifiers.latched, - modifiers.locked, - modifiers.effective_layout); - auto const serial = client->next_serial(nullptr); send_modifiers_event( serial, From 509b13246d6b792f210a34af7e6306d48619da6a Mon Sep 17 00:00:00 2001 From: Alan Griffiths Date: Tue, 7 May 2024 21:52:44 +0100 Subject: [PATCH 3/3] Fix whitespace and explicit fallthrough --- src/miral/minimal_window_manager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/miral/minimal_window_manager.cpp b/src/miral/minimal_window_manager.cpp index c35b8c12778..c9f44716ef6 100644 --- a/src/miral/minimal_window_manager.cpp +++ b/src/miral/minimal_window_manager.cpp @@ -198,7 +198,8 @@ bool miral::MinimalWindowManager::handle_keyboard_event(MirKeyboardEvent const* { case KEY_LEFTALT: self->application_selector.complete(); - default:; + [[fallthrough]]; + default:; } }