===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -c -r1.176 -r1.177
*** src/usr.bin/tmux/status.c	2018/02/22 11:42:41	1.176
--- src/usr.bin/tmux/status.c	2018/08/19 16:45:03	1.177
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.176 2018/02/22 11:42:41 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.177 2018/08/19 16:45:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 157,163 ****
  		return;
  
  	if (c->message_string == NULL && c->prompt_string == NULL)
! 		c->flags |= CLIENT_STATUS;
  
  	timerclear(&tv);
  	tv.tv_sec = options_get_number(s->options, "status-interval");
--- 157,163 ----
  		return;
  
  	if (c->message_string == NULL && c->prompt_string == NULL)
! 		c->flags |= CLIENT_REDRAWSTATUS;
  
  	timerclear(&tv);
  	tv.tv_sec = options_get_number(s->options, "status-interval");
***************
*** 615,621 ****
  	}
  
  	c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE);
! 	c->flags |= CLIENT_STATUS;
  }
  
  /* Clear status line message. */
--- 615,621 ----
  	}
  
  	c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE);
! 	c->flags |= CLIENT_REDRAWSTATUS;
  }
  
  /* Clear status line message. */
***************
*** 630,636 ****
  
  	if (c->prompt_string == NULL)
  		c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
! 	c->flags |= CLIENT_REDRAW; /* screen was frozen and may have changed */
  
  	screen_reinit(&c->status.status);
  }
--- 630,636 ----
  
  	if (c->prompt_string == NULL)
  		c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
! 	c->flags |= CLIENT_ALLREDRAWFLAGS; /* was frozen and may have changed */
  
  	screen_reinit(&c->status.status);
  }
***************
*** 734,740 ****
  
  	if (~flags & PROMPT_INCREMENTAL)
  		c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE);
! 	c->flags |= CLIENT_STATUS;
  
  	if ((flags & PROMPT_INCREMENTAL) && *tmp != '\0') {
  		xasprintf(&cp, "=%s", tmp);
--- 734,740 ----
  
  	if (~flags & PROMPT_INCREMENTAL)
  		c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE);
! 	c->flags |= CLIENT_REDRAWSTATUS;
  
  	if ((flags & PROMPT_INCREMENTAL) && *tmp != '\0') {
  		xasprintf(&cp, "=%s", tmp);
***************
*** 763,769 ****
  	c->prompt_buffer = NULL;
  
  	c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
! 	c->flags |= CLIENT_REDRAW; /* screen was frozen and may have changed */
  
  	screen_reinit(&c->status.status);
  }
--- 763,769 ----
  	c->prompt_buffer = NULL;
  
  	c->tty.flags &= ~(TTY_NOCURSOR|TTY_FREEZE);
! 	c->flags |= CLIENT_ALLREDRAWFLAGS; /* was frozen and may have changed */
  
  	screen_reinit(&c->status.status);
  }
***************
*** 791,797 ****
  
  	c->prompt_hindex = 0;
  
! 	c->flags |= CLIENT_STATUS;
  
  	free(tmp);
  	format_free(ft);
--- 791,797 ----
  
  	c->prompt_hindex = 0;
  
! 	c->flags |= CLIENT_REDRAWSTATUS;
  
  	free(tmp);
  	format_free(ft);
***************
*** 938,944 ****
  			return (1);
  		case '\033': /* Escape */
  			c->prompt_mode = PROMPT_COMMAND;
! 			c->flags |= CLIENT_STATUS;
  			return (0);
  		}
  		*new_key = key;
--- 938,944 ----
  			return (1);
  		case '\033': /* Escape */
  			c->prompt_mode = PROMPT_COMMAND;
! 			c->flags |= CLIENT_REDRAWSTATUS;
  			return (0);
  		}
  		*new_key = key;
***************
*** 952,968 ****
  	case 's':
  	case 'a':
  		c->prompt_mode = PROMPT_ENTRY;
! 		c->flags |= CLIENT_STATUS;
  		break; /* switch mode and... */
  	case 'S':
  		c->prompt_mode = PROMPT_ENTRY;
! 		c->flags |= CLIENT_STATUS;
  		*new_key = '\025'; /* C-u */
  		return (1);
  	case 'i':
  	case '\033': /* Escape */
  		c->prompt_mode = PROMPT_ENTRY;
! 		c->flags |= CLIENT_STATUS;
  		return (0);
  	}
  
--- 952,968 ----
  	case 's':
  	case 'a':
  		c->prompt_mode = PROMPT_ENTRY;
! 		c->flags |= CLIENT_REDRAWSTATUS;
  		break; /* switch mode and... */
  	case 'S':
  		c->prompt_mode = PROMPT_ENTRY;
! 		c->flags |= CLIENT_REDRAWSTATUS;
  		*new_key = '\025'; /* C-u */
  		return (1);
  	case 'i':
  	case '\033': /* Escape */
  		c->prompt_mode = PROMPT_ENTRY;
! 		c->flags |= CLIENT_REDRAWSTATUS;
  		return (0);
  	}
  
***************
*** 1357,1363 ****
  		goto append_key;
  	}
  
! 	c->flags |= CLIENT_STATUS;
  	return (0);
  
  append_key:
--- 1357,1363 ----
  		goto append_key;
  	}
  
! 	c->flags |= CLIENT_REDRAWSTATUS;
  	return (0);
  
  append_key:
***************
*** 1392,1398 ****
  	}
  
  changed:
! 	c->flags |= CLIENT_STATUS;
  	if (c->prompt_flags & PROMPT_INCREMENTAL) {
  		s = utf8_tocstr(c->prompt_buffer);
  		xasprintf(&cp, "%c%s", prefix, s);
--- 1392,1398 ----
  	}
  
  changed:
! 	c->flags |= CLIENT_REDRAWSTATUS;
  	if (c->prompt_flags & PROMPT_INCREMENTAL) {
  		s = utf8_tocstr(c->prompt_buffer);
  		xasprintf(&cp, "%c%s", prefix, s);