toby/dwl
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

track window width/height

Browse source
This commit is contained in:
Devin J. Pohly 2020-04-26 13:18:20 -05:00
parent 5dd8a5f22f
commit 48a8adb70a
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dwl.c
View file

@ -66,7 +66,7 @@ typedef struct {
struct wl_listener request_move; struct wl_listener request_move;
struct wl_listener request_resize; struct wl_listener request_resize;
Monitor *mon; Monitor *mon;
int x, y; /* layout-relative, includes border */ int x, y, w, h; /* layout-relative, includes border */
int bw; int bw;
unsigned int tags; unsigned int tags;
int isfloating; int isfloating;
@ -376,6 +376,10 @@ createnotify(struct wl_listener *listener, void *data)
Client *c = calloc(1, sizeof(*c)); Client *c = calloc(1, sizeof(*c));
c->xdg_surface = xdg_surface; c->xdg_surface = xdg_surface;
c->bw = borderpx; c->bw = borderpx;
struct wlr_box geom;
wlr_xdg_surface_get_geometry(c->xdg_surface, &geom);
c->w = geom.width + 2 * c->bw;
c->h = geom.height + 2 * c->bw;
/* Tell the client not to try anything fancy */ /* Tell the client not to try anything fancy */
wlr_xdg_toplevel_set_tiled(c->xdg_surface, true); wlr_xdg_toplevel_set_tiled(c->xdg_surface, true);
@ -660,8 +664,9 @@ motionnotify(uint32_t time)
if (cursor_mode == CurMove) { if (cursor_mode == CurMove) {
/* Move the grabbed client to the new position. */ /* Move the grabbed client to the new position. */
/* XXX assumes the surface is at (0,0) within grabc */ /* XXX assumes the surface is at (0,0) within grabc */
grabc->x = cursor->x - grabsx - grabc->bw; resize(grabc, cursor->x - grabsx - grabc->bw,
grabc->y = cursor->y - grabsy - grabc->bw; cursor->y - grabsy - grabc->bw,
grabc->w, grabc->h);
return; return;
} else if (cursor_mode == CurResize) { } else if (cursor_mode == CurResize) {
/* /*
@ -916,7 +921,11 @@ resize(Client *c, int x, int y, int w, int h)
{ {
c->x = x; c->x = x;
c->y = y; c->y = y;
wlr_xdg_toplevel_set_size(c->xdg_surface, w - 2 * c->bw, h - 2 * c->bw); c->w = w;
c->h = h;
/* wlroots makes this a no-op if size hasn't changed */
wlr_xdg_toplevel_set_size(c->xdg_surface,
c->w - 2 * c->bw, c->h - 2 * c->bw);
} }
void void
@ -927,13 +936,10 @@ resizemouse(const Arg *arg)
if (!grabc) if (!grabc)
return; return;
struct wlr_box sbox;
wlr_xdg_surface_get_geometry(grabc->xdg_surface, &sbox);
/* Doesn't work for X11 output - the next absolute motion event /* Doesn't work for X11 output - the next absolute motion event
* returns the cursor to where it started */ * returns the cursor to where it started */
wlr_cursor_warp_closest(cursor, NULL, wlr_cursor_warp_closest(cursor, NULL,
grabc->x + sbox.x + sbox.width + 2 * grabc->bw, grabc->x + grabc->w, grabc->y + grabc->h);
grabc->y + sbox.y + sbox.height + 2 * grabc->bw);
/* Float the window and tell motionnotify to resize it */ /* Float the window and tell motionnotify to resize it */
if (!grabc->isfloating && selmon->lt[selmon->sellt]->arrange) if (!grabc->isfloating && selmon->lt[selmon->sellt]->arrange)
@ -1218,7 +1224,6 @@ tile(Monitor *m)
{ {
unsigned int i, n = 0, h, mw, my, ty; unsigned int i, n = 0, h, mw, my, ty;
Client *c; Client *c;
struct wlr_box ca;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (VISIBLEON(c, m) && !c->isfloating) if (VISIBLEON(c, m) && !c->isfloating)
@ -1235,15 +1240,14 @@ tile(Monitor *m)
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || c->isfloating) if (!VISIBLEON(c, m) || c->isfloating)
continue; continue;
wlr_xdg_surface_get_geometry(c->xdg_surface, &ca);
if (i < m->nmaster) { if (i < m->nmaster) {
h = (m->w.height - my) / (MIN(n, m->nmaster) - i); h = (m->w.height - my) / (MIN(n, m->nmaster) - i);
resize(c, m->w.x, m->w.y + my, mw, h); resize(c, m->w.x, m->w.y + my, mw, h, 0);
my += ca.height + 2 * c->bw; my += c->h;
} else { } else {
h = (m->w.height - ty) / (n - i); h = (m->w.height - ty) / (n - i);
resize(c, m->w.x + mw, m->w.y + ty, m->w.width - mw, h); resize(c, m->w.x + mw, m->w.y + ty, m->w.width - mw, h, 0);
ty += ca.height + 2 * c->bw; ty += c->h;
} }
i++; i++;
} }