mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
Move termpath and lockpath into cmdq; side effect is that 'lock' and
'term' now show up in the application menu.
This commit is contained in:
19
kbfunc.c
19
kbfunc.c
@@ -213,13 +213,21 @@ kbfunc_cmdexec(struct client_ctx *cc, union arg *arg)
|
||||
void
|
||||
kbfunc_term(struct client_ctx *cc, union arg *arg)
|
||||
{
|
||||
u_spawn(Conf.termpath);
|
||||
struct cmd *cmd;
|
||||
|
||||
TAILQ_FOREACH(cmd, &Conf.cmdq, entry)
|
||||
if (strcmp(cmd->name, "term") == 0)
|
||||
u_spawn(cmd->path);
|
||||
}
|
||||
|
||||
void
|
||||
kbfunc_lock(struct client_ctx *cc, union arg *arg)
|
||||
{
|
||||
u_spawn(Conf.lockpath);
|
||||
struct cmd *cmd;
|
||||
|
||||
TAILQ_FOREACH(cmd, &Conf.cmdq, entry)
|
||||
if (strcmp(cmd->name, "lock") == 0)
|
||||
u_spawn(cmd->path);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -309,6 +317,7 @@ void
|
||||
kbfunc_ssh(struct client_ctx *cc, union arg *arg)
|
||||
{
|
||||
struct screen_ctx *sc = cc->sc;
|
||||
struct cmd *cmdq;
|
||||
struct menu *mi;
|
||||
struct menu_q menuq;
|
||||
FILE *fp;
|
||||
@@ -323,6 +332,10 @@ kbfunc_ssh(struct client_ctx *cc, union arg *arg)
|
||||
return;
|
||||
}
|
||||
|
||||
TAILQ_FOREACH(cmdq, &Conf.cmdq, entry)
|
||||
if (strcmp(cmdq->name, "term") == 0)
|
||||
break;
|
||||
|
||||
TAILQ_INIT(&menuq);
|
||||
|
||||
lbuf = NULL;
|
||||
@@ -356,7 +369,7 @@ kbfunc_ssh(struct client_ctx *cc, union arg *arg)
|
||||
if (mi->text[0] == '\0')
|
||||
goto out;
|
||||
l = snprintf(cmd, sizeof(cmd), "%s -T '[ssh] %s' -e ssh %s",
|
||||
Conf.termpath, mi->text, mi->text);
|
||||
cmdq->path, mi->text, mi->text);
|
||||
if (l != -1 && l < sizeof(cmd))
|
||||
u_spawn(cmd);
|
||||
}
|
||||
|
Reference in New Issue
Block a user