circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 01:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 844:

Browse Source 
Support -x and -y for new-session to specify the initial size of the
window if created detached with -d.
This commit is contained in:
Tiago Cunha 2011-01-21 23:55:26 +00:00
parent 6d9fe6c3aa
commit 7a68cff1db
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd-new-session.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-new-session.c,v 1.82 2011-01-07 14:45:34 tcunha Exp $ */ /* $Id: cmd-new-session.c,v 1.83 2011-01-21 23:55:26 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -19,6 +19,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <pwd.h> #include <pwd.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
@ -34,8 +35,9 @@ int cmd_new_session_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_new_session_entry = { const struct cmd_entry cmd_new_session_entry = {
"new-session", "new", "new-session", "new",
"dn:s:t:", 0, 1, "dn:s:t:x:y:", 0, 1,
"[-d] [-n window-name] [-s session-name] [-t target-session] [command]", "[-d] [-n window-name] [-s session-name] [-t target-session] "
"[-x width] [-y height] [command]",
CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON, CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON,
NULL, NULL,
cmd_new_session_check, cmd_new_session_check,
@ -47,6 +49,9 @@ cmd_new_session_check(struct args *args)
{ {
if (args_has(args, 't') && (args->argc != 0 || args_has(args, 'n'))) if (args_has(args, 't') && (args->argc != 0 || args_has(args, 'n')))
return (-1); return (-1);
if (!args_has(args, 'd') &&
(args_has(args, 'x') || args_has(args, 'y')))
return (-1);
return (0); return (0);
} }
@ -60,7 +65,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
struct environ env; struct environ env;
struct termios tio, *tiop; struct termios tio, *tiop;
struct passwd *pw; struct passwd *pw;
const char *newname, *target, *update, *cwd; const char *newname, *target, *update, *cwd, *errstr;
char *overrides, *cmd, *cause; char *overrides, *cmd, *cause;
int detached, idx; int detached, idx;
u_int sx, sy, i; u_int sx, sy, i;
@ -149,6 +154,22 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
if (detached) { if (detached) {
sx = 80; sx = 80;
sy = 24; sy = 24;
if (args_has(args, 'x')) {
sx = strtonum(
args_get(args, 'x'), 1, USHRT_MAX, &errstr);
if (errstr != NULL) {
ctx->error(ctx, "width %s", errstr);
return (-1);
}
}
if (args_has(args, 'y')) {
sy = strtonum(
args_get(args, 'y'), 1, USHRT_MAX, &errstr);
if (errstr != NULL) {
ctx->error(ctx, "height %s", errstr);
return (-1);
}
}
} else if (ctx->cmdclient != NULL) { } else if (ctx->cmdclient != NULL) {
sx = ctx->cmdclient->tty.sx; sx = ctx->cmdclient->tty.sx;
sy = ctx->cmdclient->tty.sy; sy = ctx->cmdclient->tty.sy;

11
tmux.1
View File

@ -1,4 +1,4 @@
.\" $Id: tmux.1,v 1.294 2011-01-21 23:53:45 tcunha Exp $ .\" $Id: tmux.1,v 1.295 2011-01-21 23:55:26 tcunha Exp $
.\" .\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\" .\"
@ -595,6 +595,8 @@ Lock all clients attached to
.Op Fl n Ar window-name .Op Fl n Ar window-name
.Op Fl s Ar session-name .Op Fl s Ar session-name
.Op Fl t Ar target-session .Op Fl t Ar target-session
.Op Fl x Ar width
.Op Fl y Ar height
.Op Ar shell-command .Op Ar shell-command
.Xc .Xc
.D1 (alias: Ic new ) .D1 (alias: Ic new )
@ -608,6 +610,13 @@ is given.
and and
.Ar shell-command .Ar shell-command
are the name of and shell command to execute in the initial window. are the name of and shell command to execute in the initial window.
If
.Fl d
is used,
.Fl x
and
.Fl y
specify the size of the initial window (80 by 24 if not given).
.Pp .Pp
If run from a terminal, any If run from a terminal, any
.Xr termios 4 .Xr termios 4