Revert this button_count change for now (breaking move/resize here).

Revert "Remove button increments/decrements from interface callbacks as these"

This reverts commit 2dce6d935f0b80624743c0e1382b924f2c31e137.

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index 5667a62..75fead3 100644 (file)
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -2076,6 +2076,11 @@ _e_wl_shell_move_grab_cb_button(struct wl_pointer_grab *grab, unsigned int times
    /* try to get the pointer */
    if (!(ptr = grab->pointer)) return;
 
+   if (state == WL_POINTER_BUTTON_STATE_RELEASED)
+     ptr->button_count--;
+   else
+     ptr->button_count++;
+
    if (ptr->button_count == 1)
      ptr->grab_serial = wl_display_get_serial(_e_wl_comp->wl.display);
 
@@ -2155,6 +2160,11 @@ _e_wl_shell_resize_grab_cb_button(struct wl_pointer_grab *grab, unsigned int tim
    /* try to get the pointer */
    if (!(ptr = grab->pointer)) return;
 
+   if (state == WL_POINTER_BUTTON_STATE_RELEASED)
+     ptr->button_count--;
+   else
+     ptr->button_count++;
+
    if (ptr->button_count == 1)
      ptr->grab_serial = wl_display_get_serial(_e_wl_comp->wl.display);