aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Vanlaer <vincent.vanlaer@skynet.be>2018-02-08 13:13:33 +0100
committerVincent Vanlaer <vincent.vanlaer@skynet.be>2018-02-08 13:13:33 +0100
commit74264d4f6243fc8ff87e66faf1940d3dd9d5b501 (patch)
treeac3cf204cecb11f8faec7f477dc17cb6f90a2517
parent84234b43114307892516935d1026fef0c5fdc68e (diff)
Rename roots_seat_cancel_transform
-rw-r--r--include/rootston/seat.h2
-rw-r--r--rootston/keyboard.c2
-rw-r--r--rootston/seat.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index 0eb3bee8..2be8e467 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -89,7 +89,7 @@ void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view,
void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view);
-void roots_seat_cancel_transform(struct roots_seat *seat);
+void roots_seat_end_compositor_grab(struct roots_seat *seat);
struct roots_seat_view *roots_seat_view_from_view( struct roots_seat *seat,
struct roots_view *view);
diff --git a/rootston/keyboard.c b/rootston/keyboard.c
index e399ac96..ddf541b4 100644
--- a/rootston/keyboard.c
+++ b/rootston/keyboard.c
@@ -159,7 +159,7 @@ static bool keyboard_execute_compositor_binding(struct roots_keyboard *keyboard,
if (keysym == XKB_KEY_Escape) {
wlr_seat_pointer_end_grab(keyboard->seat->seat);
wlr_seat_keyboard_end_grab(keyboard->seat->seat);
- roots_seat_cancel_transform(keyboard->seat);
+ roots_seat_end_compositor_grab(keyboard->seat);
}
return false;
diff --git a/rootston/seat.c b/rootston/seat.c
index 559a8b7f..edb98095 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -779,7 +779,7 @@ void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view) {
ROOTS_XCURSOR_ROTATE, seat->cursor->cursor);
}
-void roots_seat_cancel_transform(struct roots_seat *seat) {
+void roots_seat_end_compositor_grab(struct roots_seat *seat) {
struct roots_cursor *cursor = seat->cursor;
struct roots_view *view = roots_seat_get_focus(seat);