|
|
|
|
#include <wlr/types/wlr_cursor.h>
|
|
|
|
|
#include <wlr/util/edges.h>
|
|
|
|
|
#include "sway/commands.h"
|
|
|
|
|
#include "sway/desktop/transaction.h"
|
|
|
|
|
#include "sway/input/cursor.h"
|
|
|
|
|
#include "sway/input/seat.h"
|
|
|
|
|
#include "sway/tree/arrange.h"
|
|
|
|
|
#include "sway/tree/container.h"
|
|
|
|
|
#include "sway/tree/view.h"
|
|
|
|
|
|
|
|
|
|
struct seatop_resize_tiling_event {
|
|
|
|
|
struct sway_container *con; // leaf container
|
|
|
|
|
|
|
|
|
|
// con, or ancestor of con which will be resized horizontally/vertically
|
|
|
|
|
struct sway_container *h_con;
|
|
|
|
|
struct sway_container *v_con;
|
|
|
|
|
|
|
|
|
|
// sibling con(s) that will be resized to accommodate
|
|
|
|
|
struct sway_container *h_sib;
|
|
|
|
|
struct sway_container *v_sib;
|
|
|
|
|
|
|
|
|
|
enum wlr_edges edge;
|
|
|
|
|
enum wlr_edges edge_x, edge_y;
|
|
|
|
|
double ref_lx, ref_ly; // cursor's x/y at start of op
|
|
|
|
|
double h_con_orig_width; // width of the horizontal ancestor at start
|
|
|
|
|
double v_con_orig_height; // height of the vertical ancestor at start
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct sway_container *container_get_resize_sibling(
|
|
|
|
|
struct sway_container *con, uint32_t edge) {
|
|
|
|
|
if (!con) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
list_t *siblings = container_get_siblings(con);
|
|
|
|
|
int index = container_sibling_index(con);
|
|
|
|
|
int offset = edge & (WLR_EDGE_TOP | WLR_EDGE_LEFT) ? -1 : 1;
|
|
|
|
|
|
|
|
|
|
if (siblings->length == 1) {
|
|
|
|
|
return NULL;
|
|
|
|
|
} else {
|
|
|
|
|
return siblings->items[index + offset];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
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.
6 years ago
|
|
|
static void handle_button(struct sway_seat *seat, uint32_t time_msec,
|
|
|
|
|
struct wlr_input_device *device, uint32_t button,
|
|
|
|
|
enum wlr_button_state state) {
|
|
|
|
|
struct seatop_resize_tiling_event *e = seat->seatop_data;
|
|
|
|
|
|
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.
6 years ago
|
|
|
if (seat->cursor->pressed_button_count == 0) {
|
|
|
|
|
if (e->h_con) {
|
|
|
|
|
container_set_resizing(e->h_con, false);
|
|
|
|
|
container_set_resizing(e->h_sib, false);
|
|
|
|
|
if (e->h_con->pending.parent) {
|
|
|
|
|
arrange_container(e->h_con->pending.parent);
|
|
|
|
|
} else {
|
|
|
|
|
arrange_workspace(e->h_con->pending.workspace);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (e->v_con) {
|
|
|
|
|
container_set_resizing(e->v_con, false);
|
|
|
|
|
container_set_resizing(e->v_sib, false);
|
|
|
|
|
if (e->v_con->pending.parent) {
|
|
|
|
|
arrange_container(e->v_con->pending.parent);
|
|
|
|
|
} else {
|
|
|
|
|
arrange_workspace(e->v_con->pending.workspace);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
transaction_commit_dirty();
|
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.
6 years ago
|
|
|
seatop_begin_default(seat);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
|
|
|
|
|
struct seatop_resize_tiling_event *e = seat->seatop_data;
|
|
|
|
|
int amount_x = 0;
|
|
|
|
|
int amount_y = 0;
|
|
|
|
|
int moved_x = seat->cursor->cursor->x - e->ref_lx;
|
|
|
|
|
int moved_y = seat->cursor->cursor->y - e->ref_ly;
|
|
|
|
|
|
|
|
|
|
if (e->h_con) {
|
|
|
|
|
if (e->edge & WLR_EDGE_LEFT) {
|
|
|
|
|
amount_x = (e->h_con_orig_width - moved_x) - e->h_con->pending.width;
|
|
|
|
|
} else if (e->edge & WLR_EDGE_RIGHT) {
|
|
|
|
|
amount_x = (e->h_con_orig_width + moved_x) - e->h_con->pending.width;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (e->v_con) {
|
|
|
|
|
if (e->edge & WLR_EDGE_TOP) {
|
|
|
|
|
amount_y = (e->v_con_orig_height - moved_y) - e->v_con->pending.height;
|
|
|
|
|
} else if (e->edge & WLR_EDGE_BOTTOM) {
|
|
|
|
|
amount_y = (e->v_con_orig_height + moved_y) - e->v_con->pending.height;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (amount_x != 0) {
|
|
|
|
|
container_resize_tiled(e->h_con, e->edge_x, amount_x);
|
|
|
|
|
}
|
|
|
|
|
if (amount_y != 0) {
|
|
|
|
|
container_resize_tiled(e->v_con, e->edge_y, amount_y);
|
|
|
|
|
}
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_unref(struct sway_seat *seat, struct sway_container *con) {
|
|
|
|
|
struct seatop_resize_tiling_event *e = seat->seatop_data;
|
|
|
|
|
if (e->con == con) {
|
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.
6 years ago
|
|
|
seatop_begin_default(seat);
|
|
|
|
|
}
|
|
|
|
|
if (e->h_sib == con || e->v_sib == con) {
|
|
|
|
|
seatop_begin_default(seat);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct sway_seatop_impl seatop_impl = {
|
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.
6 years ago
|
|
|
.button = handle_button,
|
|
|
|
|
.pointer_motion = handle_pointer_motion,
|
|
|
|
|
.unref = handle_unref,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void seatop_begin_resize_tiling(struct sway_seat *seat,
|
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.
6 years ago
|
|
|
struct sway_container *con, enum wlr_edges edge) {
|
|
|
|
|
seatop_end(seat);
|
|
|
|
|
|
|
|
|
|
struct seatop_resize_tiling_event *e =
|
|
|
|
|
calloc(1, sizeof(struct seatop_resize_tiling_event));
|
|
|
|
|
if (!e) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
e->con = con;
|
|
|
|
|
e->edge = edge;
|
|
|
|
|
|
|
|
|
|
e->ref_lx = seat->cursor->cursor->x;
|
|
|
|
|
e->ref_ly = seat->cursor->cursor->y;
|
|
|
|
|
|
|
|
|
|
if (edge & (WLR_EDGE_LEFT | WLR_EDGE_RIGHT)) {
|
|
|
|
|
e->edge_x = edge & (WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
|
|
|
|
|
e->h_con = container_find_resize_parent(e->con, e->edge_x);
|
|
|
|
|
e->h_sib = container_get_resize_sibling(e->h_con, e->edge_x);
|
|
|
|
|
|
|
|
|
|
if (e->h_con) {
|
|
|
|
|
container_set_resizing(e->h_con, true);
|
|
|
|
|
container_set_resizing(e->h_sib, true);
|
|
|
|
|
e->h_con_orig_width = e->h_con->pending.width;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (edge & (WLR_EDGE_TOP | WLR_EDGE_BOTTOM)) {
|
|
|
|
|
e->edge_y = edge & (WLR_EDGE_TOP | WLR_EDGE_BOTTOM);
|
|
|
|
|
e->v_con = container_find_resize_parent(e->con, e->edge_y);
|
|
|
|
|
e->v_sib = container_get_resize_sibling(e->v_con, e->edge_y);
|
|
|
|
|
|
|
|
|
|
if (e->v_con) {
|
|
|
|
|
container_set_resizing(e->v_con, true);
|
|
|
|
|
container_set_resizing(e->v_sib, true);
|
|
|
|
|
e->v_con_orig_height = e->v_con->pending.height;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
seat->seatop_impl = &seatop_impl;
|
|
|
|
|
seat->seatop_data = e;
|
|
|
|
|
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
|
|
|
|
|
}
|
