mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-07 08:21:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

separate adjacent edges into another function

Browse source
This commit is contained in:
elviosak 2025-12-01 02:36:00 -03:00
parent b2750027da
commit 27bcffc66f
1 changed files with 37 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/interactive.c
View file

@ -174,6 +174,32 @@ interactive_begin(struct view *view, enum input_mode mode, enum lab_edge edges)
} }
} }
static enum lab_edge
find_adjacent_edges(struct seat *seat, struct output *output)
{
enum lab_edge adjacent = LAB_EDGE_NONE;
if (!output_is_usable(output)) {
return adjacent;
}
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_UP,
output->wlr_output, output->usable_area.x, output->usable_area.y)) {
adjacent |= LAB_EDGE_TOP;
}
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_DOWN,
output->wlr_output, output->usable_area.x, output->usable_area.y)) {
adjacent |= LAB_EDGE_BOTTOM;
}
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_LEFT,
output->wlr_output, output->usable_area.x, output->usable_area.y)) {
adjacent |= LAB_EDGE_LEFT;
}
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_RIGHT,
output->wlr_output, output->usable_area.x, output->usable_area.y)) {
adjacent |= LAB_EDGE_RIGHT;
}
return adjacent;
}
bool bool
edge_from_cursor(struct seat *seat, struct output **dest_output, edge_from_cursor(struct seat *seat, struct output **dest_output,
enum lab_edge *edge1, enum lab_edge *edge2) enum lab_edge *edge1, enum lab_edge *edge2)
@ -197,36 +223,9 @@ edge_from_cursor(struct seat *seat, struct output **dest_output,
} }
*dest_output = output; *dest_output = output;
/* Translate into output local coordinates */
double cursor_x = seat->cursor->x; double cursor_x = seat->cursor->x;
double cursor_y = seat->cursor->y; double cursor_y = seat->cursor->y;
int top_range, bottom_range, left_range, right_range;
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_UP,
output->wlr_output, cursor_x, cursor_y)) {
top_range = rc.snap_edge_range_inner;
} else {
top_range = rc.snap_edge_range_outer;
}
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_DOWN,
output->wlr_output, cursor_x, cursor_y)) {
bottom_range = rc.snap_edge_range_inner;
} else {
bottom_range = rc.snap_edge_range_outer;
}
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_LEFT,
output->wlr_output, cursor_x, cursor_y)){
left_range = rc.snap_edge_range_inner;
} else {
left_range = rc.snap_edge_range_outer;
}
if (wlr_output_layout_adjacent_output(seat->server->output_layout, WLR_DIRECTION_RIGHT,
output->wlr_output, cursor_x, cursor_y)){
right_range = rc.snap_edge_range_inner;
} else {
right_range = rc.snap_edge_range_outer;
}
/* Translate into output local coordinates */
wlr_output_layout_output_coords(seat->server->output_layout, wlr_output_layout_output_coords(seat->server->output_layout,
output->wlr_output, &cursor_x, &cursor_y); output->wlr_output, &cursor_x, &cursor_y);
@ -237,6 +236,16 @@ edge_from_cursor(struct seat *seat, struct output **dest_output,
int left = cursor_x - area->x; int left = cursor_x - area->x;
int right = area->x + area->width - cursor_x; int right = area->x + area->width - cursor_x;
enum lab_edge adjacent_edges = find_adjacent_edges(seat, output);
int top_range = adjacent_edges & LAB_EDGE_TOP ?
rc.snap_edge_range_inner : rc.snap_edge_range_outer;
int bottom_range = adjacent_edges & LAB_EDGE_BOTTOM ?
rc.snap_edge_range_inner : rc.snap_edge_range_outer;
int left_range = adjacent_edges & LAB_EDGE_LEFT ?
rc.snap_edge_range_inner : rc.snap_edge_range_outer;
int right_range = adjacent_edges & LAB_EDGE_RIGHT ?
rc.snap_edge_range_inner : rc.snap_edge_range_outer;
if (top < top_range) { if (top < top_range) {
*edge1 = LAB_EDGE_TOP; *edge1 = LAB_EDGE_TOP;
} else if (bottom < bottom_range) { } else if (bottom < bottom_range) {