From 5b03bf72fa7c14ed35c4d13c3649da4dd94cc8a0 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 21 Jun 2022 22:11:08 +0200 Subject: [PATCH] NO-OP: code style --- libs/gtkmm2ext/gtkmm2ext/keyboard.h | 8 ++++---- libs/gtkmm2ext/keyboard.cc | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h index 09d549cd32..5f88c2c0e4 100644 --- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h +++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h @@ -80,15 +80,15 @@ public: static const char* tertiary_modifier_name (); static const char* level4_modifier_name (); - static const char* button2_name (); - static const char* momentary_push_name (); - static const char* group_override_event_name (); - static const char* primary_modifier_short_name (); static const char* secondary_modifier_short_name (); static const char* tertiary_modifier_short_name (); static const char* level4_modifier_short_name (); + static const char* button2_name (); + static const char* momentary_push_name (); + static const char* group_override_event_name (); + bool key_is_down (uint32_t keyval); guint modifier_state (); diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 7a0fd97a5b..526035ba46 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -197,6 +197,7 @@ guint Keyboard::snap_delta_mod = Keyboard::SecondaryModifier | Keyboard::Level4M #endif guint Keyboard::group_override_modifiers = Keyboard::TertiaryModifier; + const char* Keyboard::group_override_event_name () { @@ -651,7 +652,7 @@ Keyboard::is_button2_event (GdkEventButton* ev) { return (ev->button == 2) || ((ev->button == 1) && Keyboard::button2_modifiers != 0 && - ((ev->state & Keyboard::button2_modifiers) == Keyboard::button2_modifiers)); + ((ev->state & Keyboard::button2_modifiers) == Keyboard::button2_modifier ())); } bool @@ -659,7 +660,7 @@ Keyboard::is_momentary_push_event (GdkEventButton* ev) { return (is_button2_event (ev)) || ((ev->button == 1) && Keyboard::momentary_push_modifiers != 0 && - ((ev->state & RelevantModifierKeyMask) == Keyboard::momentary_push_modifiers)); + ((ev->state & RelevantModifierKeyMask) == Keyboard::momentary_push_modifier ())); } bool