circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-05 18:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:tmux/tmux

Browse Source
This commit is contained in:
Nicholas Marriott 2017-04-28 20:22:31 +01:00
commit 36202a63e9
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tmux.1
View File

@ -3199,7 +3199,6 @@ will generate
.Xr xterm 1 -style
function key sequences; these have a number included to indicate modifiers such
as Shift, Alt or Ctrl.
The default is off.
.El
.It Xo Ic show-options
.Op Fl gqsvw

17
tty.c
View File

@ -1117,7 +1117,7 @@ void
tty_cmd_scrollup(struct tty *tty, const struct tty_ctx *ctx)
{
struct window_pane *wp = ctx->wp;
u_int i;
u_int i, lines;
if ((!tty_pane_full_width(tty, ctx) && !tty_use_margin(tty)) ||
tty_fake_bce(tty, wp, 8) ||
@ -1131,12 +1131,21 @@ tty_cmd_scrollup(struct tty *tty, const struct tty_ctx *ctx)
tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower);
tty_margin_pane(tty, ctx);
if (ctx->num == 1 || !tty_term_has(tty->term, TTYC_INDN)) {
/*
* Konsole has a bug where it will ignore SU if the parameter is more
* than the height of the scroll region. Clamping the parameter doesn't
* hurt in any case.
*/
lines = tty->rlower - tty->rupper;
if (lines > ctx->num)
lines = ctx->num;
if (lines == 1 || !tty_term_has(tty->term, TTYC_INDN)) {
tty_cursor(tty, tty->rright, tty->rlower);
for (i = 0; i < ctx->num; i++)
for (i = 0; i < lines; i++)
tty_putc(tty, '\n');
} else
tty_putcode1(tty, TTYC_INDN, ctx->num);
tty_putcode1(tty, TTYC_INDN, lines);
}
void