mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 01:34:18 +00:00 
			
		
		
		
	If status line is at the top, the offset needs to be adjusted when
drawing pane numbers. Based on a diff from John O'Meara.
This commit is contained in:
		@@ -32,7 +32,7 @@ int	screen_redraw_check_active(u_int, u_int, int, struct window *,
 | 
				
			|||||||
void	screen_redraw_draw_borders(struct client *, int, u_int);
 | 
					void	screen_redraw_draw_borders(struct client *, int, u_int);
 | 
				
			||||||
void	screen_redraw_draw_panes(struct client *, u_int);
 | 
					void	screen_redraw_draw_panes(struct client *, u_int);
 | 
				
			||||||
void	screen_redraw_draw_status(struct client *, u_int);
 | 
					void	screen_redraw_draw_status(struct client *, u_int);
 | 
				
			||||||
void	screen_redraw_draw_number(struct client *, struct window_pane *);
 | 
					void	screen_redraw_draw_number(struct client *, struct window_pane *, u_int);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CELL_INSIDE 0
 | 
					#define CELL_INSIDE 0
 | 
				
			||||||
#define CELL_LEFTRIGHT 1
 | 
					#define CELL_LEFTRIGHT 1
 | 
				
			||||||
@@ -354,7 +354,7 @@ screen_redraw_draw_panes(struct client *c, u_int top)
 | 
				
			|||||||
		for (i = 0; i < wp->sy; i++)
 | 
							for (i = 0; i < wp->sy; i++)
 | 
				
			||||||
			tty_draw_pane(tty, wp, i, wp->xoff, top + wp->yoff);
 | 
								tty_draw_pane(tty, wp, i, wp->xoff, top + wp->yoff);
 | 
				
			||||||
		if (c->flags & CLIENT_IDENTIFY)
 | 
							if (c->flags & CLIENT_IDENTIFY)
 | 
				
			||||||
			screen_redraw_draw_number(c, wp);
 | 
								screen_redraw_draw_number(c, wp, top);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -372,7 +372,7 @@ screen_redraw_draw_status(struct client *c, u_int top)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Draw number on a pane. */
 | 
					/* Draw number on a pane. */
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
screen_redraw_draw_number(struct client *c, struct window_pane *wp)
 | 
					screen_redraw_draw_number(struct client *c, struct window_pane *wp, u_int top)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct tty		*tty = &c->tty;
 | 
						struct tty		*tty = &c->tty;
 | 
				
			||||||
	struct session		*s = c->session;
 | 
						struct session		*s = c->session;
 | 
				
			||||||
@@ -396,6 +396,9 @@ screen_redraw_draw_number(struct client *c, struct window_pane *wp)
 | 
				
			|||||||
	px = wp->sx / 2; py = wp->sy / 2;
 | 
						px = wp->sx / 2; py = wp->sy / 2;
 | 
				
			||||||
	xoff = wp->xoff; yoff = wp->yoff;
 | 
						xoff = wp->xoff; yoff = wp->yoff;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (top)
 | 
				
			||||||
 | 
							yoff++;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (wp->sx < len * 6 || wp->sy < 5) {
 | 
						if (wp->sx < len * 6 || wp->sy < 5) {
 | 
				
			||||||
		tty_cursor(tty, xoff + px - len / 2, yoff + py);
 | 
							tty_cursor(tty, xoff + px - len / 2, yoff + py);
 | 
				
			||||||
		goto draw_text;
 | 
							goto draw_text;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user