1 files changed, 38 insertions, 25 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index fa604426..2fe5b202 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -4,8 +4,8 @@
 #include <libevdev/libevdev.h>
 #include <linux/input-event-codes.h>
 #include <errno.h>
+#include <time.h>
 #include <strings.h>
-#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_pointer.h>
@@ -20,7 +20,6 @@
 #include "util.h"
 #include "sway/commands.h"
 #include "sway/desktop.h"
-#include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
 #include "sway/input/keyboard.h"
 #include "sway/input/tablet.h"
@@ -32,6 +31,12 @@
 #include "sway/tree/workspace.h"
 #include "wlr-layer-shell-unstable-v1-protocol.h"
 
+static uint32_t get_current_time_msec(void) {
+        struct timespec now;
+        clock_gettime(CLOCK_MONOTONIC, &now);
+        return now.tv_sec * 1000 + now.tv_nsec / 1000000;
+}
+
 static struct wlr_surface *layer_surface_at(struct sway_output *output,
                 struct wl_list *layer, double ox, double oy, double *sx, double *sy) {
         struct sway_layer_surface *sway_layer;
@@ -383,7 +388,6 @@ static void handle_pointer_motion_relative(
 
         pointer_motion(cursor, e->time_msec, e->device, e->delta_x, e->delta_y,
                         e->unaccel_dx, e->unaccel_dy);
-        transaction_commit_dirty();
 }
 
 static void handle_pointer_motion_absolute(
@@ -401,7 +405,6 @@ static void handle_pointer_motion_absolute(
         double dy = ly - cursor->cursor->y;
 
         pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
-        transaction_commit_dirty();
 }
 
 void dispatch_cursor_button(struct sway_cursor *cursor,
@@ -431,7 +434,6 @@ static void handle_pointer_button(struct wl_listener *listener, void *data) {
         cursor_handle_activity_from_device(cursor, event->device);
         dispatch_cursor_button(cursor, event->device,
                         event->time_msec, event->button, event->state);
-        transaction_commit_dirty();
 }
 
 void dispatch_cursor_axis(struct sway_cursor *cursor,
@@ -444,7 +446,6 @@ static void handle_pointer_axis(struct wl_listener *listener, void *data) {
         struct wlr_event_pointer_axis *event = data;
         cursor_handle_activity_from_device(cursor, event->device);
         dispatch_cursor_axis(cursor, event);
-        transaction_commit_dirty();
 }
 
 static void handle_pointer_frame(struct wl_listener *listener, void *data) {
@@ -494,8 +495,6 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
                 pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
                 dispatch_cursor_button(cursor, event->device, event->time_msec,
                                 BTN_LEFT, WLR_BUTTON_PRESSED);
-                wlr_seat_pointer_notify_frame(wlr_seat);
-                transaction_commit_dirty();
         }
 }
 
@@ -508,11 +507,9 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
 
         if (cursor->simulating_pointer_from_touch) {
                 if (cursor->pointer_touch_id == cursor->seat->touch_id) {
-                        cursor->simulating_pointer_from_touch = false;
+                        cursor->pointer_touch_up = true;
                         dispatch_cursor_button(cursor, event->device, event->time_msec,
                                         BTN_LEFT, WLR_BUTTON_RELEASED);
-                        wlr_seat_pointer_notify_frame(wlr_seat);
-                        transaction_commit_dirty();
                 }
         } else {
                 wlr_seat_touch_notify_up(wlr_seat, event->time_msec, event->touch_id);
@@ -553,7 +550,6 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
                         dx = lx - cursor->cursor->x;
                         dy = ly - cursor->cursor->y;
                         pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
-                        transaction_commit_dirty();
                 }
         } else if (surface) {
                 wlr_seat_touch_notify_motion(wlr_seat, event->time_msec,
@@ -561,6 +557,24 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
         }
 }
 
+static void handle_touch_frame(struct wl_listener *listener, void *data) {
+        struct sway_cursor *cursor =
+                wl_container_of(listener, cursor, touch_frame);
+
+        struct wlr_seat *wlr_seat = cursor->seat->wlr_seat;
+
+        if (cursor->simulating_pointer_from_touch) {
+                wlr_seat_pointer_notify_frame(wlr_seat);
+
+                if (cursor->pointer_touch_up) {
+                        cursor->pointer_touch_up = false;
+                        cursor->simulating_pointer_from_touch = false;
+                }
+        } else {
+                wlr_seat_touch_notify_frame(wlr_seat);
+        }
+}
+
 static double apply_mapping_from_coord(double low, double high, double value) {
         if (isnan(value)) {
                 return value;
@@ -639,8 +653,6 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
                 wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tablet_v2_tool);
                 pointer_motion(cursor, time_msec, input_device->wlr_device, dx, dy, dx, dy);
         }
-
-        transaction_commit_dirty();
 }
 
 static void handle_tool_axis(struct wl_listener *listener, void *data) {
@@ -720,7 +732,6 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
                 dispatch_cursor_button(cursor, event->device, event->time_msec,
                         BTN_LEFT, WLR_BUTTON_RELEASED);
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-                transaction_commit_dirty();
         } else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) {
                 // If we started holding the tool tip down on a surface that accepts
                 // tablet v2, we should notify that surface if it gets released over a
@@ -733,7 +744,6 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
                         dispatch_cursor_button(cursor, event->device, event->time_msec,
                                 BTN_LEFT, WLR_BUTTON_PRESSED);
                         wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-                        transaction_commit_dirty();
                 }
         } else {
                 seatop_tablet_tool_tip(seat, sway_tool, event->time_msec, event->state);
@@ -820,7 +830,6 @@ static void handle_tool_button(struct wl_listener *listener, void *data) {
                         break;
                 }
                 wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
-                transaction_commit_dirty();
                 return;
         }
 
@@ -837,8 +846,8 @@ static void check_constraint_region(struct sway_cursor *cursor) {
 
                 struct sway_container *con = view->container;
 
-                double sx = cursor->cursor->x - con->content_x + view->geometry.x;
-                double sy = cursor->cursor->y - con->content_y + view->geometry.y;
+                double sx = cursor->cursor->x - con->pending.content_x + view->geometry.x;
+                double sy = cursor->cursor->y - con->pending.content_y + view->geometry.y;
 
                 if (!pixman_region32_contains_point(region,
                                 floor(sx), floor(sy), NULL)) {
@@ -849,8 +858,8 @@ static void check_constraint_region(struct sway_cursor *cursor) {
                                 double sy = (boxes[0].y1 + boxes[0].y2) / 2.;
 
                                 wlr_cursor_warp_closest(cursor->cursor, NULL,
-                                        sx + con->content_x - view->geometry.x,
-                                        sy + con->content_y - view->geometry.y);
+                                        sx + con->pending.content_x - view->geometry.x,
+                                        sy + con->pending.content_y - view->geometry.y);
 
                                 cursor_rebase(cursor);
                         }
@@ -1051,6 +1060,7 @@ void sway_cursor_destroy(struct sway_cursor *cursor) {
         wl_list_remove(&cursor->touch_down.link);
         wl_list_remove(&cursor->touch_up.link);
         wl_list_remove(&cursor->touch_motion.link);
+        wl_list_remove(&cursor->touch_frame.link);
         wl_list_remove(&cursor->tool_axis.link);
         wl_list_remove(&cursor->tool_tip.link);
         wl_list_remove(&cursor->tool_button.link);
@@ -1126,6 +1136,9 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
                 &cursor->touch_motion);
         cursor->touch_motion.notify = handle_touch_motion;
 
+        wl_signal_add(&wlr_cursor->events.touch_frame, &cursor->touch_frame);
+        cursor->touch_frame.notify = handle_touch_frame;
+
         wl_signal_add(&wlr_cursor->events.tablet_tool_axis,
                 &cursor->tool_axis);
         cursor->tool_axis.notify = handle_tool_axis;
@@ -1170,8 +1183,8 @@ void cursor_warp_to_container(struct sway_cursor *cursor,
                 return;
         }
 
-        double x = container->x + container->width / 2.0;
-        double y = container->y + container->height / 2.0;
+        double x = container->pending.x + container->pending.width / 2.0;
+        double y = container->pending.y + container->pending.height / 2.0;
 
         wlr_cursor_warp(cursor->cursor, NULL, x, y);
         cursor_unhide(cursor);
@@ -1284,8 +1297,8 @@ static void warp_to_constraint_cursor_hint(struct sway_cursor *cursor) {
                 struct sway_view *view = view_from_wlr_surface(constraint->surface);
                 struct sway_container *con = view->container;
 
-                double lx = sx + con->content_x - view->geometry.x;
-                double ly = sy + con->content_y - view->geometry.y;
+                double lx = sx + con->pending.content_x - view->geometry.x;
+                double ly = sy + con->pending.content_y - view->geometry.y;
 
                 wlr_cursor_warp(cursor->cursor, NULL, lx, ly);