accessibility/cinnamon-hover-click: Keep the active click action

in sync with Clutter.

Muffin resets the click mode back to single after performing a non-
single-click dwell-click action, but the user control does not
update to reflect this.

ClutterSeat has a signal to notify about this already, use it to
update gsettings, and add a listener to cinnamon-hover-click to
sync the button state.

Fixes #13360.

Author: mtwebster

files/usr/bin/cinnamon-hover-click

@@ -99,6 +99,7 @@ class HoverClickWindow(XApp.GtkWindow):
 
         self.show_all()
         self.settings.connect("changed::hoverclick-layout", self.update_layout)
+        self.settings.connect("changed::hoverclick-action", self.on_action_changed)
         self.connect("delete-event", self.exit)
         GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGTERM, self.exit)
 
@@ -111,6 +112,24 @@ class HoverClickWindow(XApp.GtkWindow):
 
         self.settings.set_string("hoverclick-action", action)
 
+    def on_action_changed(self, settings, key):
+        if self.doing_setup:
+            return
+
+        action = settings.get_string("hoverclick-action")
+        button_map = {
+            "single": self.single_click_button,
+            "double": self.double_click_button,
+            "drag": self.drag_button,
+            "secondary": self.right_click_button
+        }
+
+        button = button_map.get(action)
+        if button and not button.get_active():
+            self.doing_setup = True
+            button.set_active(True)
+            self.doing_setup = False
+
     def on_button_press_event(self, button, event):
         had_button, button = event.get_button()
 

js/ui/accessibility.js

@@ -20,6 +20,10 @@ const HOVERKEY_ACTIONS = {
     "secondary": Clutter.PointerA11yDwellClickType.SECONDARY
 }
 
+const HOVERKEY_ACTION_NAMES = Object.fromEntries(
+    Object.entries(HOVERKEY_ACTIONS).map(([k, v]) => [v, k])
+);
+
 function A11yHandler(){
     this._init();
 }
@@ -41,6 +45,7 @@ A11yHandler.prototype = {
         this._events_flash = false;
         this._events_sound = false
         this._hoverclick_enabled = false;
+        this._updatingHoverclickAction = false;
 
         /* Options */
         this.state_on_sound = null;
@@ -51,6 +56,10 @@ A11yHandler.prototype = {
         let seat = Clutter.get_default_backend().get_default_seat();
         this.keymap = seat.get_keymap();
 
+        seat.connect('ptr-a11y-dwell-click-type-changed', (seat, clickType) => {
+            this._onDwellClickTypeChanged(clickType);
+        });
+
         this.caps = this.keymap.get_caps_lock_state();
         this.num = this.keymap.get_num_lock_state();
 
@@ -89,6 +98,10 @@ A11yHandler.prototype = {
     },
 
     hoverkey_action_changed: function(settings, key) {
+        if (this._updatingHoverclickAction) {
+            return;
+        }
+
         let action = global.settings.get_string("hoverclick-action");
 
         seat = Clutter.get_default_backend().get_default_seat();
@@ -100,6 +113,15 @@ A11yHandler.prototype = {
         }
     },
 
+    _onDwellClickTypeChanged: function(clickType) {
+        let actionName = HOVERKEY_ACTION_NAMES[clickType];
+        if (actionName && global.settings.get_string("hoverclick-action") !== actionName) {
+            this._updatingHoverclickAction = true;
+            global.settings.set_string("hoverclick-action", actionName);
+            this._updatingHoverclickAction = false;
+        }
+    },
+
     on_keymap_state_changed: function(keymap) {
         let new_caps = this.keymap.get_caps_lock_state();
         let new_num = this.keymap.get_num_lock_state();