mirror of
https://github.com/labwc/labwc.git
synced 2025-10-29 05:40:24 -04:00
common: flesh out enum lab_edge and prefer over wlr_edges/wlr_direction
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:
parent
4d1be7eada
commit
ef766d16f0
26 changed files with 294 additions and 320 deletions
|
|
@ -180,7 +180,7 @@ struct view {
|
|||
enum lab_tristate force_tearing;
|
||||
bool visible_on_all_workspaces;
|
||||
enum lab_edge tiled;
|
||||
uint32_t edges_visible; /* enum wlr_edges bitset */
|
||||
enum lab_edge edges_visible;
|
||||
bool inhibits_keybinds; /* also inhibits mousebinds */
|
||||
xkb_layout_index_t keyboard_layout;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue