mirror of
https://github.com/tmate-io/tmate.git
synced 2025-01-25 23:38:47 +01:00
Sync OpenBSD patchset 558:
When -h and -p are given to split-window, calculate the percentage size using the width instead of the height.
This commit is contained in:
parent
bce5aedc64
commit
1527ed0ff8
@ -1,4 +1,4 @@
|
|||||||
/* $Id: cmd-split-window.c,v 1.29 2009-11-14 17:56:39 tcunha Exp $ */
|
/* $Id: cmd-split-window.c,v 1.30 2009-11-22 00:12:33 tcunha Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
|
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -173,17 +173,21 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
|
|||||||
else
|
else
|
||||||
cwd = ctx->cmdclient->cwd;
|
cwd = ctx->cmdclient->cwd;
|
||||||
|
|
||||||
size = -1;
|
|
||||||
if (data->size != -1)
|
|
||||||
size = data->size;
|
|
||||||
else if (data->percentage != -1)
|
|
||||||
size = (w->active->sy * data->percentage) / 100;
|
|
||||||
hlimit = options_get_number(&s->options, "history-limit");
|
|
||||||
|
|
||||||
type = LAYOUT_TOPBOTTOM;
|
type = LAYOUT_TOPBOTTOM;
|
||||||
if (data->flag_horizontal)
|
if (data->flag_horizontal)
|
||||||
type = LAYOUT_LEFTRIGHT;
|
type = LAYOUT_LEFTRIGHT;
|
||||||
|
|
||||||
|
size = -1;
|
||||||
|
if (data->size != -1)
|
||||||
|
size = data->size;
|
||||||
|
else if (data->percentage != -1) {
|
||||||
|
if (type == LAYOUT_TOPBOTTOM)
|
||||||
|
size = (w->active->sy * data->percentage) / 100;
|
||||||
|
else
|
||||||
|
size = (w->active->sx * data->percentage) / 100;
|
||||||
|
}
|
||||||
|
hlimit = options_get_number(&s->options, "history-limit");
|
||||||
|
|
||||||
shell = options_get_string(&s->options, "default-shell");
|
shell = options_get_string(&s->options, "default-shell");
|
||||||
if (*shell == '\0' || areshell(shell))
|
if (*shell == '\0' || areshell(shell))
|
||||||
shell = _PATH_BSHELL;
|
shell = _PATH_BSHELL;
|
||||||
|
Loading…
Reference in New Issue
Block a user