mirror of
https://codeberg.org/dnkl/foot.git
synced 2026-04-14 08:21:27 -04:00
wayland+input: add support for toplevel edge constraints
Edge constraints are new (not yet available in a wayland-protocols
release) toplevel states, acting as a complement to the existing tiled
states.
Tiled tells us we shouldn't draw shadows etc *outside our window
geometry*.
Constrained tells us the window cannot be resized in the constrained
direction.
This patch does a couple of things:
* Recognize the new states when debug logging
* Change is_top_left() etc to look at the new constrained state
instead of the tiled state. These functions are used when both
choosing cursor shape, and when determining if/how to resize a
window on a CSD edge click-and-drag.
* Update cursor shape selection to use the default (left_ptr) shape
when on a constrained edge (or corner).
* Update CSD resize triggering, to not trigger a resize when attempted
on a constrained edge (or corner).
See
86750c99ed:
An edge constraint is an complementery state to the tiled state,
meaning that it's not only tiled, but constrained in a way that it
can't resize in that direction.
This typically means that the constrained edge is tiled against a
monitor edge. An example configuration is two windows tiled next
to each other on a single monitor. Together they cover the whole
work area.
The left window would have the following tiled and edge constraint
state:
[ tiled_top, tiled_right, tiled_bottom, tiled_left,
constrained_top, constrained_bottom, constrained_left ]
while the right window would have the following:
[ tiled_top, tiled_right, tiled_bottom, tiled_left,
constrained_top, constrained_bottom, constrained_right ]
This aims to replace and deprecate the
`gtk_surface1.configure_edges` event and the
`gtk_surface1.edge_constraint` enum.
This commit is contained in:
Daniel Eklöf
parent
091aa90f1a
commit
23431e3ecf
4 changed files with 114 additions and 30 deletions
52
wayland.c
52
wayland.c
|
|
@ -852,6 +852,10 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
|
|||
bool is_tiled_bottom = false;
|
||||
bool is_tiled_left = false;
|
||||
bool is_tiled_right = false;
|
||||
bool is_constrained_top = false;
|
||||
bool is_constrained_bottom = false;
|
||||
bool is_constrained_left = false;
|
||||
bool is_constrained_right = false;
|
||||
bool is_suspended UNUSED = false;
|
||||
|
||||
#if defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG
|
||||
|
|
@ -869,6 +873,12 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
|
|||
[XDG_TOPLEVEL_STATE_TILED_BOTTOM] = "tiled:bottom",
|
||||
#if defined(XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION) /* wayland-protocols >= 1.32 */
|
||||
[XDG_TOPLEVEL_STATE_SUSPENDED] = "suspended",
|
||||
#endif
|
||||
#if defined(XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT_SINCE_VERSION)
|
||||
[XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT] = "constrained:left",
|
||||
[XDG_TOPLEVEL_STATE_CONSTRAINED_RIGHT] = "constrained:right",
|
||||
[XDG_TOPLEVEL_STATE_CONSTRAINED_TOP] = "constrained:top",
|
||||
[XDG_TOPLEVEL_STATE_CONSTRAINED_BOTTOM] = "constrained:bottom",
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
|
@ -889,10 +899,10 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
|
|||
case XDG_TOPLEVEL_STATE_SUSPENDED: is_suspended = true; break;
|
||||
#endif
|
||||
#if defined(XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT_SINCE_VERSION)
|
||||
case XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT: is_tiled_left = true; break;
|
||||
case XDG_TOPLEVEL_STATE_CONSTRAINED_RIGHT: is_tiled_right = true; break;
|
||||
case XDG_TOPLEVEL_STATE_CONSTRAINED_TOP: is_tiled_top = true; break;
|
||||
case XDG_TOPLEVEL_STATE_CONSTRAINED_BOTTOM: is_tiled_bottom = true; break;
|
||||
case XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT: is_constrained_left = true; break;
|
||||
case XDG_TOPLEVEL_STATE_CONSTRAINED_RIGHT: is_constrained_right = true; break;
|
||||
case XDG_TOPLEVEL_STATE_CONSTRAINED_TOP: is_constrained_top = true; break;
|
||||
case XDG_TOPLEVEL_STATE_CONSTRAINED_BOTTOM: is_constrained_bottom = true; break;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -933,6 +943,10 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
|
|||
win->configure.is_tiled_bottom = is_tiled_bottom;
|
||||
win->configure.is_tiled_left = is_tiled_left;
|
||||
win->configure.is_tiled_right = is_tiled_right;
|
||||
win->configure.is_constrained_top = is_constrained_top;
|
||||
win->configure.is_constrained_bottom = is_constrained_bottom;
|
||||
win->configure.is_constrained_left = is_constrained_left;
|
||||
win->configure.is_constrained_right = is_constrained_right;
|
||||
win->configure.width = width;
|
||||
win->configure.height = height;
|
||||
}
|
||||
|
|
@ -1056,14 +1070,22 @@ xdg_surface_configure(void *data, struct xdg_surface *xdg_surface,
|
|||
win->is_maximized = win->configure.is_maximized;
|
||||
win->is_fullscreen = win->configure.is_fullscreen;
|
||||
win->is_resizing = win->configure.is_resizing;
|
||||
|
||||
win->is_tiled_top = win->configure.is_tiled_top;
|
||||
win->is_tiled_bottom = win->configure.is_tiled_bottom;
|
||||
win->is_tiled_left = win->configure.is_tiled_left;
|
||||
win->is_tiled_right = win->configure.is_tiled_right;
|
||||
|
||||
win->is_constrained_top = win->configure.is_constrained_top;
|
||||
win->is_constrained_bottom = win->configure.is_constrained_bottom;
|
||||
win->is_constrained_left = win->configure.is_constrained_left;
|
||||
win->is_constrained_right = win->configure.is_constrained_right;
|
||||
|
||||
win->is_tiled = (win->is_tiled_top ||
|
||||
win->is_tiled_bottom ||
|
||||
win->is_tiled_left ||
|
||||
win->is_tiled_right);
|
||||
|
||||
win->csd_mode = win->configure.csd_mode;
|
||||
|
||||
bool enable_csd = win->csd_mode == CSD_YES && !win->is_fullscreen;
|
||||
|
|
@ -1239,13 +1261,23 @@ handle_global(void *data, struct wl_registry *registry,
|
|||
return;
|
||||
|
||||
/*
|
||||
* We *require* version 1, but _can_ use version 5. Version 2
|
||||
* adds 'tiled' window states. We use that information to
|
||||
* restore the window size when window is un-tiled. Version 5
|
||||
* adds 'wm_capabilities'. We use that information to draw
|
||||
* window decorations.
|
||||
* We *require* version 1, but _can_ use version 2, 5 or 7, if
|
||||
* available.
|
||||
*
|
||||
* Version 2 adds 'tiled' window states. We use this
|
||||
* information to restore the window size when window is
|
||||
* un-tiled.
|
||||
*
|
||||
* Version 5 adds 'wm_capabilities'. We use this information
|
||||
* to draw window decorations.
|
||||
*
|
||||
* Version 7 adds 'constrained' window states. We use this
|
||||
* information to determine whether to allow window resize
|
||||
* (via CSDs) or not.
|
||||
*/
|
||||
#if defined(XDG_TOPLEVEL_WM_CAPABILITIES_SINCE_VERSION)
|
||||
#if defined(XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT_SINCE_VERSION)
|
||||
const uint32_t preferred = XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT_SINCE_VERSION;
|
||||
#elif defined(XDG_TOPLEVEL_WM_CAPABILITIES_SINCE_VERSION)
|
||||
const uint32_t preferred = XDG_TOPLEVEL_WM_CAPABILITIES_SINCE_VERSION;
|
||||
#elif defined(XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION)
|
||||
const uint32_t preferred = XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue