From b9f6f9ba5029344203127dc7a538eb28817f65ec Mon Sep 17 00:00:00 2001 From: Joshua Ervin Date: Fri, 28 Dec 2018 11:55:13 -0800 Subject: [PATCH] Fixed monocle and fullscreen for multi-monitor use --- berry | Bin 33544 -> 33504 bytes berryc | Bin 17800 -> 17800 bytes wm.c | 12 ++++++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/berry b/berry index 35c6462e6eae135c9ff15b436e62aa8d4f6cdd4f..155835597cb9ad8c63d0488c217421f2a518f997 100755 GIT binary patch delta 8133 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 X_vDapr#N#%*=tXZlBctCPY(J&7&%j| delta 8134 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 diff --git a/wm.c b/wm.c index 840dd08..bb56cd0 100644 --- a/wm.c +++ b/wm.c @@ -419,8 +419,10 @@ free_monitors(void) static void fullscreen(struct client *c) { - move_absolute(c, 0, 0); - resize_absolute(c, screen_width, screen_height); + int mon; + mon = ws_m_list[c->ws]; + move_absolute(c, m_list[mon].x, m_list[mon].y); + resize_absolute(c, m_list[mon].w, m_list[mon].h); if (!c->fullscreen) XChangeProperty(display, c->win, net_atom[NetWMState], XA_ATOM, 32, PropModeReplace, (unsigned char *)&net_atom[NetWMStateFullscreen], 1); else @@ -1022,8 +1024,10 @@ move_to_front(struct client *c) static void monocle(struct client *c) { - move_absolute(c, 0, conf.top_gap); - resize_absolute(c, screen_width, screen_height - conf.top_gap); + int mon; + mon = ws_m_list[c->ws]; + move_absolute(c, m_list[mon].x, m_list[mon].y + conf.top_gap); + resize_absolute(c, m_list[mon].w, m_list[mon].h - conf.top_gap); } static void