diff options
author | okan | 2015-11-11 14:22:01 +0000 |
---|---|---|
committer | okan | 2015-11-11 14:22:01 +0000 |
commit | f6f5e0fe9eb0a0ce66ee5d0720182bfadf2cf800 (patch) | |
tree | 55799ebc2fe2f87b956e1440a0b2ce413bbffe64 /menu.c | |
parent | 29e76eaac34fcdbc70eaccb72c3f68b638a4c5b2 (diff) | |
download | cwm-f6f5e0fe9eb0a0ce66ee5d0720182bfadf2cf800.tar.gz |
Partial revert of replacing screen_area() with region_find(); until a
fix for a regression is found; this bug has been around for a long time
it seems, but this change exposed it. Likely need to track clients in to
and out of regions.
Diffstat (limited to 'menu.c')
-rw-r--r-- | menu.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: menu.c,v 1.88 2015/11/09 20:03:29 okan Exp $ + * $OpenBSD: menu.c,v 1.89 2015/11/11 14:22:01 okan Exp $ */ #include <sys/types.h> @@ -331,7 +331,6 @@ static void menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq) { struct screen_ctx *sc = mc->sc; - struct region_ctx *rc; struct menu *mi; struct geom area; int n, xsave, ysave; @@ -372,8 +371,7 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq) mc->num++; } - rc = region_find(sc, mc->geom.x, mc->geom.y); - area = rc->work; + area = screen_area(sc, mc->geom.x, mc->geom.y, CWM_GAP); area.w += area.x - Conf.bwidth * 2; area.h += area.y - Conf.bwidth * 2; |