mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-30 06:59:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

common: flesh out enum lab_edge and prefer over wlr_edges/wlr_direction

Browse source 
I like the new common/edge.h. I don't like how inconsistently we use it.

Current situation:

 - enum wlr_edges and wlr_direction are designed to be used as bitset,
   and are defined compatibly

 - enum lab_edge is *also* designed to be used as bitset, but
   incompatible with the others (LEFT/RIGHT come before UP/DOWN)

 - we use an inconsistent mix of all three *AND* uint32_t (usually with
   the WLR_EDGE constants rather than the LAB_EDGE constants), and
   convert between them on an ad-hoc basis, sometimes implicitly

Let's clean this up:

 - reorder enum lab_edge to be compatible with the two wlr enums
   (check this by static_assert)

 - use TOP/BOTTOM naming rather than UP/DOWN (matches wlr_edges)

 - add constants for the remaining possible combinations of the 4 edges

 - use lab_edge for all internal edge/direction fields, consistently

 - add lab_edge_is_cardinal() as a sanity check before casting to
   enum wlr_direction, and then eliminate all of direction.c/h

Instead of "enum wlr_edges direction", we now have
"enum lab_edge direction" which is not that much better. At least we
are now clear that we're overloading one enum with two meanings.
This commit is contained in:
John Lindgren 2025-08-26 20:27:34 -04:00
parent 4d1be7eada
commit ef766d16f0
26 changed files with 294 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/interactive.c
View file

@ -55,7 +55,7 @@ interactive_anchor_to_cursor(struct server *server, struct wlr_box *geo)
}
void
interactive_begin(struct view *view, enum input_mode mode, uint32_t edges)
interactive_begin(struct view *view, enum input_mode mode, enum lab_edge edges)
{
/*
* This function sets up an interactive move or resize operation, where
@ -170,8 +170,8 @@ edge_from_cursor(struct seat *seat, struct output **dest_output,
enum lab_edge *edge1, enum lab_edge *edge2)
{
*dest_output = NULL;
*edge1 = LAB_EDGE_INVALID;
*edge2 = LAB_EDGE_INVALID;
*edge1 = LAB_EDGE_NONE;
*edge2 = LAB_EDGE_NONE;
if (!view_is_floating(seat->server->grabbed_view)) {
return false;
@ -202,9 +202,9 @@ edge_from_cursor(struct seat *seat, struct output **dest_output,
int right = area->x + area->width - cursor_x;
if (top < rc.snap_edge_range) {
*edge1 = LAB_EDGE_UP;
*edge1 = LAB_EDGE_TOP;
} else if (bottom < rc.snap_edge_range) {
*edge1 = LAB_EDGE_DOWN;
*edge1 = LAB_EDGE_BOTTOM;
} else if (left < rc.snap_edge_range) {
*edge1 = LAB_EDGE_LEFT;
} else if (right < rc.snap_edge_range) {
@ -213,7 +213,7 @@ edge_from_cursor(struct seat *seat, struct output **dest_output,
return false;
}
if (*edge1 == LAB_EDGE_UP || *edge1 == LAB_EDGE_DOWN) {
if (*edge1 == LAB_EDGE_TOP || *edge1 == LAB_EDGE_BOTTOM) {
if (left < rc.snap_edge_corner_range) {
*edge2 = LAB_EDGE_LEFT;
} else if (right < rc.snap_edge_corner_range) {
@ -221,9 +221,9 @@ edge_from_cursor(struct seat *seat, struct output **dest_output,
}
} else if (*edge1 == LAB_EDGE_LEFT || *edge1 == LAB_EDGE_RIGHT) {
if (top < rc.snap_edge_corner_range) {
*edge2 = LAB_EDGE_UP;
*edge2 = LAB_EDGE_TOP;
} else if (bottom < rc.snap_edge_corner_range) {
*edge2 = LAB_EDGE_DOWN;
*edge2 = LAB_EDGE_BOTTOM;
}
}
@ -246,7 +246,7 @@ snap_to_edge(struct view *view)
* Don't store natural geometry here (it was
* stored already in interactive_begin())
*/
if (edge == LAB_EDGE_UP && rc.snap_top_maximize) {
if (edge == LAB_EDGE_TOP && rc.snap_top_maximize) {
/* <topMaximize> */
view_maximize(view, VIEW_AXIS_BOTH,
/*store_natural_geometry*/ false);