aboutsummaryrefslogtreecommitdiffstats
path: root/sway/input/seatop_resize_floating.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2019-03-16 17:47:39 +1000
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-03-17 10:02:04 -0600
commit7b9ae42331e49fea0f566fa7592855dee5da1991 (patch)
treeba03e7826af566f871580cd2a1ec344013cebd4f /sway/input/seatop_resize_floating.c
parentReplace seatup allows_events with button callback (diff)
downloadsway-7b9ae42331e49fea0f566fa7592855dee5da1991.tar.gz
sway-7b9ae42331e49fea0f566fa7592855dee5da1991.tar.zst
sway-7b9ae42331e49fea0f566fa7592855dee5da1991.zip
Introduce default seatop
This introduces a `default` seat operation which is used when no mouse buttons are being held. This means there is now always a seat operation in progress. It allows us to separate `default` code from the standard cursor management code. The sway_seatop_impl struct has gained callbacks `axis`, `rebase` and `end`, and lost callbacks `finish` and `abort`. `axis` and `rebase` are only used by the default seatop. `end` is called when a seatop is being replaced by another one and allows the seatop to free any resources, though no seatop currently needs to do this. `finish` is no longer required, as each seatop can gracefully finish in their `button` callback. And `abort` is not needed, as calling `end` would achieve the same thing. The struct has also gained a bool named allow_set_cursor which allows the client to set a new cursor during `default` and `down` seatops. Seatops would previously store which button they were started with and stop when that button was released. This behaviour is changed so that it only ends once all buttons are released. So you can start a drag with $mod+left, then click and hold right, release left and it'll continue dragging while the right button is held. The motion callback now accepts dx and dy. Most seatops don't use this as they store the cursor position when the seatop is started and compare it with the current cursor position. This approach doesn't make sense for the default seatop though, hence why dx and dy are needed. The pressed_buttons array has been moved from the sway_cursor struct to the default seatop's data. This is only used for the default seatop to check bindings. The total pressed button count remains in the sway_cursor struct though, because all the other seatops check it to know if they should end. The `down` seatop no longer has a `moved` property. This was used to track if the cursor moved and to recheck focus_follows_mouse, but seems to work without it. The logic for focus_follows_mouse has been refactored. As part of this I've removed the call to wlr_seat_keyboard_has_grab as we don't appear to use keyboard grabs. The functions for handling relative motion, absolute motion and tool axis have been changed. Previously the handler functions were handle_cursor_motion, handle_cursor_motion_absolute and handle_tool_axis. The latter two both called cursor_motion_absolute. Both handle_cursor_motion and cursor_motion_absolute did very similar things. These are now simplified into three handlers and a single common function called cursor_motion. All three handlers call cursor_motion. As cursor_motion works with relative distances, the absolute and tool axis handlers convert them to relative first.
Diffstat (limited to 'sway/input/seatop_resize_floating.c')
-rw-r--r--sway/input/seatop_resize_floating.c29
1 files changed, 14 insertions, 15 deletions
diff --git a/sway/input/seatop_resize_floating.c b/sway/input/seatop_resize_floating.c
index 18c6db73..b6950bbf 100644
--- a/sway/input/seatop_resize_floating.c
+++ b/sway/input/seatop_resize_floating.c
@@ -17,7 +17,16 @@ struct seatop_resize_floating_event {
17 double ref_con_lx, ref_con_ly; // container's x/y at start of op 17 double ref_con_lx, ref_con_ly; // container's x/y at start of op
18}; 18};
19 19
20static void handle_motion(struct sway_seat *seat, uint32_t time_msec) { 20static void handle_button(struct sway_seat *seat, uint32_t time_msec,
21 struct wlr_input_device *device, uint32_t button,
22 enum wlr_button_state state) {
23 if (seat->cursor->pressed_button_count == 0) {
24 seatop_begin_default(seat);
25 }
26}
27
28static void handle_motion(struct sway_seat *seat, uint32_t time_msec,
29 double dx, double dy) {
21 struct seatop_resize_floating_event *e = seat->seatop_data; 30 struct seatop_resize_floating_event *e = seat->seatop_data;
22 struct sway_container *con = e->con; 31 struct sway_container *con = e->con;
23 enum wlr_edges edge = e->edge; 32 enum wlr_edges edge = e->edge;
@@ -107,31 +116,22 @@ static void handle_motion(struct sway_seat *seat, uint32_t time_msec) {
107 arrange_container(con); 116 arrange_container(con);
108} 117}
109 118
110static void handle_finish(struct sway_seat *seat, uint32_t time_msec) {
111 cursor_set_image(seat->cursor, "left_ptr", NULL);
112}
113
114static void handle_abort(struct sway_seat *seat) {
115 cursor_set_image(seat->cursor, "left_ptr", NULL);
116}
117
118static void handle_unref(struct sway_seat *seat, struct sway_container *con) { 119static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
119 struct seatop_resize_floating_event *e = seat->seatop_data; 120 struct seatop_resize_floating_event *e = seat->seatop_data;
120 if (e->con == con) { 121 if (e->con == con) {
121 seatop_abort(seat); 122 seatop_begin_default(seat);
122 } 123 }
123} 124}
124 125
125static const struct sway_seatop_impl seatop_impl = { 126static const struct sway_seatop_impl seatop_impl = {
127 .button = handle_button,
126 .motion = handle_motion, 128 .motion = handle_motion,
127 .finish = handle_finish,
128 .abort = handle_abort,
129 .unref = handle_unref, 129 .unref = handle_unref,
130}; 130};
131 131
132void seatop_begin_resize_floating(struct sway_seat *seat, 132void seatop_begin_resize_floating(struct sway_seat *seat,
133 struct sway_container *con, uint32_t button, enum wlr_edges edge) { 133 struct sway_container *con, enum wlr_edges edge) {
134 seatop_abort(seat); 134 seatop_end(seat);
135 135
136 struct seatop_resize_floating_event *e = 136 struct seatop_resize_floating_event *e =
137 calloc(1, sizeof(struct seatop_resize_floating_event)); 137 calloc(1, sizeof(struct seatop_resize_floating_event));
@@ -154,7 +154,6 @@ void seatop_begin_resize_floating(struct sway_seat *seat,
154 154
155 seat->seatop_impl = &seatop_impl; 155 seat->seatop_impl = &seatop_impl;
156 seat->seatop_data = e; 156 seat->seatop_data = e;
157 seat->seatop_button = button;
158 157
159 container_raise_floating(con); 158 container_raise_floating(con);
160 159