Skip to content
This repository has been archived by the owner on Jan 26, 2024. It is now read-only.

disallow clients to resize themselves #351

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

disallow clients to resize themselves #351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f041e
rename Client.resize
sevz17 Dec 9, 2022
b419e38
disallow clients to resize themselves
sevz17 Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions dwl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ typedef struct {
struct wl_listener maximize;
struct wl_listener unmap;
struct wl_listener destroy;
struct wl_listener resize;
struct wl_listener set_title;
struct wl_listener fullscreen;
struct wlr_box prev; /* layout-relative, includes border */
Expand All @@ -125,7 +126,7 @@ typedef struct {
unsigned int bw;
unsigned int tags;
int isfloating, isurgent, isfullscreen;
uint32_t resize; /* configure serial of a pending resize */
uint32_t resize_serial; /* configure serial of a pending resize */
} Client;

typedef struct {
Expand Down Expand Up @@ -279,6 +280,7 @@ static void quitsignal(int signo);
static void rendermon(struct wl_listener *listener, void *data);
static void requeststartdrag(struct wl_listener *listener, void *data);
static void resize(Client *c, struct wlr_box geo, int interact);
static void resizenotify(struct wl_listener *listener, void *data);
static void run(char *startup_cmd);
static Client *selclient(void);
static void setcursor(struct wl_listener *listener, void *data);
Expand Down Expand Up @@ -764,10 +766,10 @@ commitnotify(struct wl_listener *listener, void *data)
arrange(c->mon);

/* mark a pending resize as completed */
if (c->resize && (c->resize <= c->surface.xdg->current.configure_serial
if (c->resize_serial && (c->resize_serial <= c->surface.xdg->current.configure_serial
|| (c->surface.xdg->current.geometry.width == c->surface.xdg->pending.geometry.width
&& c->surface.xdg->current.geometry.height == c->surface.xdg->pending.geometry.height)))
c->resize = 0;
c->resize_serial = 0;
}

void
Expand Down Expand Up @@ -984,6 +986,7 @@ createnotify(struct wl_listener *listener, void *data)
c->bw = borderpx;

LISTEN(&xdg_surface->events.map, &c->map, mapnotify);
LISTEN(&xdg_surface->toplevel->events.request_resize, &c->resize, resizenotify);
LISTEN(&xdg_surface->events.unmap, &c->unmap, unmapnotify);
LISTEN(&xdg_surface->events.destroy, &c->destroy, destroynotify);
LISTEN(&xdg_surface->toplevel->events.set_title, &c->set_title, updatetitle);
Expand Down Expand Up @@ -1131,6 +1134,7 @@ destroynotify(struct wl_listener *listener, void *data)
wl_list_remove(&c->map.link);
wl_list_remove(&c->unmap.link);
wl_list_remove(&c->destroy.link);
wl_list_remove(&c->resize.link);
wl_list_remove(&c->set_title.link);
wl_list_remove(&c->fullscreen.link);
#ifdef XWAYLAND
Expand Down Expand Up @@ -1833,7 +1837,7 @@ rendermon(struct wl_listener *listener, void *data)
* this monitor. */
/* Checking m->un_map for every client is not optimal but works */
wl_list_for_each(c, &clients, link) {
if ((c->resize && m->un_map) || (c->type == XDGShell
if ((c->resize_serial && m->un_map) || (c->type == XDGShell
&& (c->surface.xdg->pending.geometry.width !=
c->surface.xdg->current.geometry.width
|| c->surface.xdg->pending.geometry.height !=
Expand Down Expand Up @@ -1882,10 +1886,17 @@ resize(Client *c, struct wlr_box geo, int interact)
wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw);

/* wlroots makes this a no-op if size hasn't changed */
c->resize = client_set_size(c, c->geom.width - 2 * c->bw,
c->resize_serial = client_set_size(c, c->geom.width - 2 * c->bw,
c->geom.height - 2 * c->bw);
}

void
resizenotify(struct wl_listener *listener, void *data)
{
Client *c = wl_container_of(listener, c, resize);
resize(c, c->geom, 0);
}

void
run(char *startup_cmd)
{
Expand Down Expand Up @@ -2679,6 +2690,7 @@ createnotifyx11(struct wl_listener *listener, void *data)
LISTEN(&xsurface->events.unmap, &c->unmap, unmapnotify);
LISTEN(&xsurface->events.request_activate, &c->activate, activatex11);
LISTEN(&xsurface->events.request_configure, &c->configure, configurex11);
LISTEN(&xsurface->events.request_resize, &c->resize, resizenotify);
LISTEN(&xsurface->events.set_hints, &c->set_hints, sethints);
LISTEN(&xsurface->events.set_title, &c->set_title, updatetitle);
LISTEN(&xsurface->events.destroy, &c->destroy, destroynotify);
Expand Down