From a10357fae06dded1818d4b12105680f9a08803fb Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Tue, 21 Jul 2020 18:47:30 -0400 Subject: condense appid/title logic --- dwl.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dwl.c b/dwl.c index da10035..8b4d4e2 100644 --- a/dwl.c +++ b/dwl.c @@ -281,17 +281,14 @@ applyrules(Client *c) /* rule matching */ c->isfloating = 0; - if (c->isxdg) { - if (!(appid = c->xdg_surface->toplevel->app_id)) - appid = broken; - if (!(title = c->xdg_surface->toplevel->title)) - title = broken; - } else { - if (!(appid = c->xwayland_surface->class)) - appid = broken; - if (!(title = c->xwayland_surface->title)) - title = broken; - } + appid = c->isxdg ? c->xdg_surface->toplevel->app_id : + c->xwayland_surface->class; + title = c->isxdg ? c->xdg_surface->toplevel->title : + c->xwayland_surface->title; + if (!appid) + appid = broken; + if (!title) + title = broken; for (r = rules; r < END(rules); r++) { if ((!r->title || strstr(title, r->title)) -- cgit v1.2.3