Prepend the group shortcut in the client search menu; from Thomas Adam.

Likewise, prepend shortcut in unhide menu.
This commit is contained in:
okan 2013-12-02 19:30:27 +00:00
parent 3207d6dcc9
commit d7f3078e8e
2 changed files with 6 additions and 5 deletions

View File

@ -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.59 2013/11/27 18:34:34 okan Exp $
* $OpenBSD: mousefunc.c,v 1.60 2013/12/02 19:30:27 okan Exp $
*/
#include <sys/param.h>
@ -231,7 +231,8 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg)
continue;
mi = xcalloc(1, sizeof(*mi));
(void)strlcpy(mi->text, wname, sizeof(mi->text));
(void)snprintf(mi->text, sizeof(mi->text),
"(%d) %s", cc->group->shortcut, wname);
mi->ctx = cc;
TAILQ_INSERT_TAIL(&menuq, mi, entry);
}

View File

@ -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: search.c,v 1.31 2013/04/30 21:11:07 okan Exp $
* $OpenBSD: search.c,v 1.32 2013/12/02 19:30:27 okan Exp $
*/
#include <sys/param.h>
@ -142,8 +142,8 @@ search_print_client(struct menu *mi, int list)
if (list)
cc->matchname = cc->name;
(void)snprintf(mi->print, sizeof(mi->print), "%c%s", flag,
cc->matchname);
(void)snprintf(mi->print, sizeof(mi->print), "(%d) %c%s",
cc->group->shortcut, flag, cc->matchname);
if (!list && cc->matchname != cc->name &&
strlen(mi->print) < sizeof(mi->print) - 1) {