2024f1da72
For example, create layout V[view view view] and resize the leftmost view using mod+rightclick. Previously, the edge between view 2 and 3 would be adjusted as well. Now this edge will remain constant, which matches the behaviour of i3. To do this operation correctly, the resize tiling seatop now keeps track of two containers, as the container that resizes horizontally will be a different container to the one which resizes vertically (one will be an ancestor). The tiling resize seatop now figures out these containers during the start of the operation and keeps references to them in the event. A new function container_find_resize_parent has been introduced to do this. This function is also used by the resize command. During cursor motion, the seatop logic is similar to before, but now has to choose the correct container to resize. In resize.c, container_resize_tiled and resize_tiled have been merged into one. One of them originally did nothing except pass the values through to the other. container_resize_tiled now takes a simplified approach where it just finds the immediate siblings on either side and resizes them without worrying about the others. The parellel_coord and parallel_size functions are no longer needed and have been removed.
110 lines
3 KiB
C
110 lines
3 KiB
C
#define _POSIX_C_SOURCE 200809L
|
|
#include <wlr/types/wlr_cursor.h>
|
|
#include <wlr/util/edges.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/input/cursor.h"
|
|
#include "sway/input/seat.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;
|
|
|
|
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 void handle_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->width;
|
|
} else if (e->edge & WLR_EDGE_RIGHT) {
|
|
amount_x = (e->h_con_orig_width + moved_x) - e->h_con->width;
|
|
}
|
|
}
|
|
if (e->v_con) {
|
|
if (e->edge & WLR_EDGE_TOP) {
|
|
amount_y = (e->v_con_orig_height - moved_y) - e->v_con->height;
|
|
} else if (e->edge & WLR_EDGE_BOTTOM) {
|
|
amount_y = (e->v_con_orig_height + moved_y) - e->v_con->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);
|
|
}
|
|
}
|
|
|
|
static void handle_finish(struct sway_seat *seat) {
|
|
cursor_set_image(seat->cursor, "left_ptr", NULL);
|
|
}
|
|
|
|
static void handle_abort(struct sway_seat *seat) {
|
|
cursor_set_image(seat->cursor, "left_ptr", NULL);
|
|
}
|
|
|
|
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) {
|
|
seatop_abort(seat);
|
|
}
|
|
}
|
|
|
|
static const struct sway_seatop_impl seatop_impl = {
|
|
.motion = handle_motion,
|
|
.finish = handle_finish,
|
|
.abort = handle_abort,
|
|
.unref = handle_unref,
|
|
};
|
|
|
|
void seatop_begin_resize_tiling(struct sway_seat *seat,
|
|
struct sway_container *con, uint32_t button, enum wlr_edges edge) {
|
|
seatop_abort(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);
|
|
|
|
if (e->h_con) {
|
|
e->h_con_orig_width = e->h_con->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);
|
|
|
|
if (e->v_con) {
|
|
e->v_con_orig_height = e->v_con->height;
|
|
}
|
|
}
|
|
|
|
seat->seatop_impl = &seatop_impl;
|
|
seat->seatop_data = e;
|
|
seat->seatop_button = button;
|
|
}
|