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

Sync OpenBSD patchset 1109:

Browse Source 
Tidy up by adding a macro for the pane being the full screen width, from
Ailin Nemui.
This commit is contained in:
Tiago Cunha 2012-05-12 14:58:43 +00:00
parent 8f29eeaae6
commit 470f521410
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tty.c
View File

@ -59,6 +59,9 @@ void tty_cell(struct tty *,
#define tty_use_rect(tty) \ #define tty_use_rect(tty) \
((tty)->xterm_version > 270) ((tty)->xterm_version > 270)
#define tty_pane_full_width(tty, ctx) \
((ctx)->xoff == 0 && screen_size_x((ctx)->wp->screen) >= (tty)->sx)
void void
tty_init(struct tty *tty, int fd, char *term) tty_init(struct tty *tty, int fd, char *term)
{ {
@ -781,10 +784,7 @@ tty_cmd_deletecharacter(struct tty *tty, const struct tty_ctx *ctx)
void void
tty_cmd_insertline(struct tty *tty, const struct tty_ctx *ctx) tty_cmd_insertline(struct tty *tty, const struct tty_ctx *ctx)
{ {
struct window_pane *wp = ctx->wp; if (!tty_pane_full_width(tty, ctx) ||
struct screen *s = wp->screen;
if (ctx->xoff != 0 || screen_size_x(s) < tty->sx ||
!tty_term_has(tty->term, TTYC_CSR) || !tty_term_has(tty->term, TTYC_CSR) ||
!tty_term_has(tty->term, TTYC_IL1)) { !tty_term_has(tty->term, TTYC_IL1)) {
tty_redraw_region(tty, ctx); tty_redraw_region(tty, ctx);
@ -802,10 +802,7 @@ tty_cmd_insertline(struct tty *tty, const struct tty_ctx *ctx)
void void
tty_cmd_deleteline(struct tty *tty, const struct tty_ctx *ctx) tty_cmd_deleteline(struct tty *tty, const struct tty_ctx *ctx)
{ {
struct window_pane *wp = ctx->wp; if (!tty_pane_full_width(tty, ctx) ||
struct screen *s = wp->screen;
if (ctx->xoff != 0 || screen_size_x(s) < tty->sx ||
!tty_term_has(tty->term, TTYC_CSR) || !tty_term_has(tty->term, TTYC_CSR) ||
!tty_term_has(tty->term, TTYC_DL1)) { !tty_term_has(tty->term, TTYC_DL1)) {
tty_redraw_region(tty, ctx); tty_redraw_region(tty, ctx);
@ -831,8 +828,7 @@ tty_cmd_clearline(struct tty *tty, const struct tty_ctx *ctx)
tty_cursor_pane(tty, ctx, 0, ctx->ocy); tty_cursor_pane(tty, ctx, 0, ctx->ocy);
if (ctx->xoff == 0 && screen_size_x(s) >= tty->sx && if (tty_pane_full_width(tty, ctx) && tty_term_has(tty->term, TTYC_EL)) {
tty_term_has(tty->term, TTYC_EL)) {
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
} else { } else {
for (i = 0; i < screen_size_x(s); i++) for (i = 0; i < screen_size_x(s); i++)
@ -851,8 +847,7 @@ tty_cmd_clearendofline(struct tty *tty, const struct tty_ctx *ctx)
tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy); tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);
if (ctx->xoff == 0 && screen_size_x(s) >= tty->sx && if (tty_pane_full_width(tty, ctx) && tty_term_has(tty->term, TTYC_EL))
tty_term_has(tty->term, TTYC_EL))
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
else { else {
for (i = ctx->ocx; i < screen_size_x(s); i++) for (i = ctx->ocx; i < screen_size_x(s); i++)
@ -880,13 +875,10 @@ tty_cmd_clearstartofline(struct tty *tty, const struct tty_ctx *ctx)
void void
tty_cmd_reverseindex(struct tty *tty, const struct tty_ctx *ctx) tty_cmd_reverseindex(struct tty *tty, const struct tty_ctx *ctx)
{ {
struct window_pane *wp = ctx->wp;
struct screen *s = wp->screen;
if (ctx->ocy != ctx->orupper) if (ctx->ocy != ctx->orupper)
return; return;
if (ctx->xoff != 0 || screen_size_x(s) < tty->sx || if (!tty_pane_full_width(tty, ctx) ||
!tty_term_has(tty->term, TTYC_CSR) || !tty_term_has(tty->term, TTYC_CSR) ||
!tty_term_has(tty->term, TTYC_RI)) { !tty_term_has(tty->term, TTYC_RI)) {
tty_redraw_region(tty, ctx); tty_redraw_region(tty, ctx);
@ -910,7 +902,7 @@ tty_cmd_linefeed(struct tty *tty, const struct tty_ctx *ctx)
if (ctx->ocy != ctx->orlower) if (ctx->ocy != ctx->orlower)
return; return;
if (ctx->xoff != 0 || screen_size_x(s) < tty->sx || if (!tty_pane_full_width(tty, ctx) ||
!tty_term_has(tty->term, TTYC_CSR)) { !tty_term_has(tty->term, TTYC_CSR)) {
if (tty_large_region(tty, ctx)) if (tty_large_region(tty, ctx))
wp->flags |= PANE_REDRAW; wp->flags |= PANE_REDRAW;
@ -952,8 +944,7 @@ tty_cmd_clearendofscreen(struct tty *tty, const struct tty_ctx *ctx)
tty_region_pane(tty, ctx, 0, screen_size_y(s) - 1); tty_region_pane(tty, ctx, 0, screen_size_y(s) - 1);
tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy); tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);
if (ctx->xoff == 0 && screen_size_x(s) >= tty->sx && if (tty_pane_full_width(tty, ctx) && tty_term_has(tty->term, TTYC_EL)) {
tty_term_has(tty->term, TTYC_EL)) {
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
if (ctx->ocy != screen_size_y(s) - 1) { if (ctx->ocy != screen_size_y(s) - 1) {
tty_cursor_pane(tty, ctx, 0, ctx->ocy + 1); tty_cursor_pane(tty, ctx, 0, ctx->ocy + 1);
@ -988,8 +979,7 @@ tty_cmd_clearstartofscreen(struct tty *tty, const struct tty_ctx *ctx)
tty_region_pane(tty, ctx, 0, screen_size_y(s) - 1); tty_region_pane(tty, ctx, 0, screen_size_y(s) - 1);
tty_cursor_pane(tty, ctx, 0, 0); tty_cursor_pane(tty, ctx, 0, 0);
if (ctx->xoff == 0 && screen_size_x(s) >= tty->sx && if (tty_pane_full_width(tty, ctx) && tty_term_has(tty->term, TTYC_EL)) {
tty_term_has(tty->term, TTYC_EL)) {
for (i = 0; i < ctx->ocy; i++) { for (i = 0; i < ctx->ocy; i++) {
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
tty_emulate_repeat(tty, TTYC_CUD, TTYC_CUD1, 1); tty_emulate_repeat(tty, TTYC_CUD, TTYC_CUD1, 1);
@ -1018,8 +1008,7 @@ tty_cmd_clearscreen(struct tty *tty, const struct tty_ctx *ctx)
tty_region_pane(tty, ctx, 0, screen_size_y(s) - 1); tty_region_pane(tty, ctx, 0, screen_size_y(s) - 1);
tty_cursor_pane(tty, ctx, 0, 0); tty_cursor_pane(tty, ctx, 0, 0);
if (ctx->xoff == 0 && screen_size_x(s) >= tty->sx && if (tty_pane_full_width(tty, ctx) && tty_term_has(tty->term, TTYC_EL)) {
tty_term_has(tty->term, TTYC_EL)) {
for (i = 0; i < screen_size_y(s); i++) { for (i = 0; i < screen_size_y(s); i++) {
tty_putcode(tty, TTYC_EL); tty_putcode(tty, TTYC_EL);
if (i != screen_size_y(s) - 1) { if (i != screen_size_y(s) - 1) {