circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2018-09-25 17:02:41 +01:00
parent cbf1504fca 7d59f82cf9
commit 7cf00d6b72
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tmux.h
View File

@@ -63,11 +63,8 @@ struct tmuxproc;
#define TMUX_CONF "/etc/tmux.conf"
#endif
/*
* Minimum layout cell size, NOT including separator line. The scroll region
* cannot be one line in height so this must be at least two.
*/
#define PANE_MINIMUM 2
/* Minimum layout cell size, NOT including border lines. */
#define PANE_MINIMUM 1
/* Minimum and maximum window size. */
#define WINDOW_MINIMUM PANE_MINIMUM

20
tty.c
View File

@@ -1441,7 +1441,9 @@ tty_cmd_insertline(struct tty *tty, const struct tty_ctx *ctx)
!tty_pane_full_width(tty, ctx) ||
tty_fake_bce(tty, ctx->wp, ctx->bg) ||
!tty_term_has(tty->term, TTYC_CSR) ||
!tty_term_has(tty->term, TTYC_IL1)) {
!tty_term_has(tty->term, TTYC_IL1) ||
ctx->wp->sx == 1 ||
ctx->wp->sy == 1) {
tty_redraw_region(tty, ctx);
return;
}
@@ -1463,7 +1465,9 @@ tty_cmd_deleteline(struct tty *tty, const struct tty_ctx *ctx)
!tty_pane_full_width(tty, ctx) ||
tty_fake_bce(tty, ctx->wp, ctx->bg) ||
!tty_term_has(tty->term, TTYC_CSR) ||
!tty_term_has(tty->term, TTYC_DL1)) {
!tty_term_has(tty->term, TTYC_DL1) ||
ctx->wp->sx == 1 ||
ctx->wp->sy == 1) {
tty_redraw_region(tty, ctx);
return;
}
@@ -1524,7 +1528,9 @@ tty_cmd_reverseindex(struct tty *tty, const struct tty_ctx *ctx)
!tty_pane_full_width(tty, ctx) ||
tty_fake_bce(tty, wp, 8) ||
!tty_term_has(tty->term, TTYC_CSR) ||
!tty_term_has(tty->term, TTYC_RI)) {
!tty_term_has(tty->term, TTYC_RI) ||
ctx->wp->sx == 1 ||
ctx->wp->sy == 1) {
tty_redraw_region(tty, ctx);
return;
}
@@ -1549,7 +1555,9 @@ tty_cmd_linefeed(struct tty *tty, const struct tty_ctx *ctx)
if (ctx->bigger ||
(!tty_pane_full_width(tty, ctx) && !tty_use_margin(tty)) ||
tty_fake_bce(tty, wp, 8) ||
!tty_term_has(tty->term, TTYC_CSR)) {
!tty_term_has(tty->term, TTYC_CSR) ||
wp->sx == 1 ||
wp->sy == 1) {
tty_redraw_region(tty, ctx);
return;
}
@@ -1586,7 +1594,9 @@ tty_cmd_scrollup(struct tty *tty, const struct tty_ctx *ctx)
if (ctx->bigger ||
(!tty_pane_full_width(tty, ctx) && !tty_use_margin(tty)) ||
tty_fake_bce(tty, wp, 8) ||
!tty_term_has(tty->term, TTYC_CSR)) {
!tty_term_has(tty->term, TTYC_CSR) ||
wp->sx == 1 ||
wp->sy == 1) {
tty_redraw_region(tty, ctx);
return;
}

2
window-copy.c
View File

@@ -1299,7 +1299,7 @@ window_copy_write_line(struct window_pane *wp, struct screen_write_ctx *ctx,
style_apply(&gc, oo, "mode-style");
gc.flags |= GRID_FLAG_NOPALETTE;
if (py == 0) {
if (py == 0 && s->rupper < s->rlower) {
if (data->searchmark == NULL) {
size = xsnprintf(hdr, sizeof hdr,
"[%u/%u]", data->oy, screen_hsize(data->backing));