diff options
| -rw-r--r-- | kbfunc.c | 3 | ||||
| -rw-r--r-- | mousefunc.c | 9 |
2 files changed, 4 insertions, 8 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: kbfunc.c,v 1.96 2014/08/25 12:49:19 okan Exp $ + * $OpenBSD: kbfunc.c,v 1.97 2014/09/01 18:17:32 okan Exp $ */ #include <sys/param.h> @@ -159,7 +159,6 @@ kbfunc_client_search(struct client_ctx *cc, union arg *arg) cc = (struct client_ctx *)mi->ctx; if (cc->flags & CLIENT_HIDDEN) client_unhide(cc); - if (old_cc) client_ptrsave(old_cc); client_ptrwarp(cc); diff --git a/mousefunc.c b/mousefunc.c index 7096e46..b1678ac 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -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: mousefunc.c,v 1.74 2014/09/01 18:04:58 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.75 2014/09/01 18:17:32 okan Exp $ */ #include <sys/param.h> @@ -194,7 +194,6 @@ mousefunc_menu_group(struct client_ctx *cc, union arg *arg) group_hidden_state(gc) ? "%d: [%s]" : "%d: %s", gc->num, sc->group_names[gc->num]); } - if (TAILQ_EMPTY(&menuq)) return; @@ -220,16 +219,15 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg) old_cc = client_current(); TAILQ_INIT(&menuq); - TAILQ_FOREACH(cc, &Clientq, entry) + TAILQ_FOREACH(cc, &Clientq, entry) { if (cc->flags & CLIENT_HIDDEN) { wname = (cc->label) ? cc->label : cc->name; if (wname == NULL) continue; - menuq_add(&menuq, cc, "(%d) %s", cc->group ? cc->group->num : 0, wname); } - + } if (TAILQ_EMPTY(&menuq)) return; @@ -257,7 +255,6 @@ mousefunc_menu_cmd(struct client_ctx *cc, union arg *arg) TAILQ_INIT(&menuq); TAILQ_FOREACH(cmd, &Conf.cmdq, entry) menuq_add(&menuq, cmd, "%s", cmd->name); - if (TAILQ_EMPTY(&menuq)) return; |