sad/dwl
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "respect size hints"

Browse Source 
This reverts commit 72e0a560d9.
This commit is contained in:
Leonardo Hernández Hernández 2023-07-08 20:07:27 -06:00
parent a4a83e95e6
commit 31bf1cbaf6
No known key found for this signature in database
GPG Key ID: E538897EE11B9624
2 changed files with 22 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
client.h
View File

@ -16,31 +16,6 @@ client_is_x11(Client *c)
#endif #endif
} }
static inline void
client_get_size_hints(Client *c, struct wlr_box *max, struct wlr_box *min)
{
struct wlr_xdg_toplevel *toplevel;
struct wlr_xdg_toplevel_state *state;
#ifdef XWAYLAND
if (client_is_x11(c)) {
xcb_size_hints_t *size_hints = c->surface.xwayland->size_hints;
if (size_hints) {
max->width = size_hints->max_width;
max->height = size_hints->max_height;
min->width = size_hints->min_width;
min->height = size_hints->min_height;
}
return;
}
#endif
toplevel = c->surface.xdg->toplevel;
state = &toplevel->current;
max->width = state->max_width;
max->height = state->max_height;
min->width = state->min_width;
min->height = state->min_height;
}
static inline struct wlr_surface * static inline struct wlr_surface *
client_surface(Client *c) client_surface(Client *c)
{ {
@ -190,7 +165,6 @@ client_get_parent(Client *c)
#endif #endif
if (c->surface.xdg->toplevel->parent) if (c->surface.xdg->toplevel->parent)
toplevel_from_wlr_surface(c->surface.xdg->toplevel->parent->base->surface, &p, NULL); toplevel_from_wlr_surface(c->surface.xdg->toplevel->parent->base->surface, &p, NULL);
return p; return p;
} }
@ -207,25 +181,36 @@ client_get_title(Client *c)
static inline int static inline int
client_is_float_type(Client *c) client_is_float_type(Client *c)
{ {
struct wlr_box min = {0}, max = {0}; struct wlr_xdg_toplevel *toplevel;
client_get_size_hints(c, &max, &min); struct wlr_xdg_toplevel_state state;
#ifdef XWAYLAND #ifdef XWAYLAND
if (client_is_x11(c)) { if (client_is_x11(c)) {
struct wlr_xwayland_surface *surface = c->surface.xwayland; struct wlr_xwayland_surface *surface = c->surface.xwayland;
xcb_size_hints_t *size_hints;
if (surface->modal) if (surface->modal)
return 1; return 1;
for (size_t i = 0; i < surface->window_type_len; i++) for (size_t i = 0; i < surface->window_type_len; i++)
if (surface->window_type[i] == netatom[NetWMWindowTypeDialog] if (surface->window_type[i] == netatom[NetWMWindowTypeDialog] ||
|| surface->window_type[i] == netatom[NetWMWindowTypeSplash] surface->window_type[i] == netatom[NetWMWindowTypeSplash] ||
|| surface->window_type[i] == netatom[NetWMWindowTypeToolbar] surface->window_type[i] == netatom[NetWMWindowTypeToolbar] ||
|| surface->window_type[i] == netatom[NetWMWindowTypeUtility]) surface->window_type[i] == netatom[NetWMWindowTypeUtility])
return 1; return 1;
size_hints = surface->size_hints;
return size_hints && size_hints->min_width > 0 && size_hints->min_height > 0
&& (size_hints->max_width == size_hints->min_width
|| size_hints->max_height == size_hints->min_height);
} }
#endif #endif
return ((min.width > 0 || min.height > 0 || max.width > 0 || max.height > 0)
&& (min.width == max.width || min.height == max.height)); toplevel = c->surface.xdg->toplevel;
state = toplevel->current;
return (state.min_width != 0 && state.min_height != 0
&& (state.min_width == state.max_width
|| state.min_height == state.max_height))
|| toplevel->parent;
} }
static inline int static inline int

16
dwl.c
View File

@ -399,19 +399,9 @@ static xcb_atom_t netatom[NetLast];
void void
applybounds(Client *c, struct wlr_box *bbox) applybounds(Client *c, struct wlr_box *bbox)
{ {
if (!c->isfullscreen) { /* set minimum possible */
struct wlr_box min = {0}, max = {0}; c->geom.width = MAX(1, c->geom.width);
client_get_size_hints(c, &max, &min); c->geom.height = MAX(1, c->geom.height);
/* try to set size hints */
c->geom.width = MAX(min.width + (2 * (int)c->bw), c->geom.width);
c->geom.height = MAX(min.height + (2 * (int)c->bw), c->geom.height);
/* Some clients set their max size to INT_MAX, which does not violate the
* protocol but it's unnecesary, as they can set their max size to zero. */
if (max.width > 0 && !(2 * c->bw > INT_MAX - max.width)) /* Checks for overflow */
c->geom.width = MIN(max.width + (2 * c->bw), c->geom.width);
if (max.height > 0 && !(2 * c->bw > INT_MAX - max.height)) /* Checks for overflow */
c->geom.height = MIN(max.height + (2 * c->bw), c->geom.height);
}
if (c->geom.x >= bbox->x + bbox->width) if (c->geom.x >= bbox->x + bbox->width)
c->geom.x = bbox->x + bbox->width - c->geom.width; c->geom.x = bbox->x + bbox->width - c->geom.width;