===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -c -r1.77 -r1.78
*** src/usr.bin/tmux/screen.c	2021/11/01 09:34:49	1.77
--- src/usr.bin/tmux/screen.c	2021/11/03 13:37:17	1.78
***************
*** 1,4 ****
! /* $OpenBSD: screen.c,v 1.77 2021/11/01 09:34:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: screen.c,v 1.78 2021/11/03 13:37:17 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 82,87 ****
--- 82,89 ----
  	s->path = NULL;
  
  	s->cstyle = SCREEN_CURSOR_DEFAULT;
+ 	s->default_cstyle = SCREEN_CURSOR_DEFAULT;
+ 	s->default_mode = 0;
  	s->ccolour = -1;
  	s->default_ccolour = -1;
  	s->tabs = NULL;
***************
*** 152,189 ****
  		bit_set(s->tabs, i);
  }
  
! /* Set screen cursor style. */
  void
! screen_set_cursor_style(struct screen *s, u_int style)
  {
- 	log_debug("%s: new %u, was %u", __func__, style, s->cstyle);
  	switch (style) {
  	case 0:
! 		s->cstyle = SCREEN_CURSOR_DEFAULT;
  		break;
  	case 1:
! 		s->cstyle = SCREEN_CURSOR_BLOCK;
! 		s->mode |= MODE_CURSOR_BLINKING;
  		break;
  	case 2:
! 		s->cstyle = SCREEN_CURSOR_BLOCK;
! 		s->mode &= ~MODE_CURSOR_BLINKING;
  		break;
  	case 3:
! 		s->cstyle = SCREEN_CURSOR_UNDERLINE;
! 		s->mode |= MODE_CURSOR_BLINKING;
  		break;
  	case 4:
! 		s->cstyle = SCREEN_CURSOR_UNDERLINE;
! 		s->mode &= ~MODE_CURSOR_BLINKING;
  		break;
  	case 5:
! 		s->cstyle = SCREEN_CURSOR_BAR;
! 		s->mode |= MODE_CURSOR_BLINKING;
  		break;
  	case 6:
! 		s->cstyle = SCREEN_CURSOR_BAR;
! 		s->mode &= ~MODE_CURSOR_BLINKING;
  		break;
  	}
  }
--- 154,191 ----
  		bit_set(s->tabs, i);
  }
  
! /* Set screen cursor style and mode. */
  void
! screen_set_cursor_style(u_int style, enum screen_cursor_style *cstyle,
!     int *mode)
  {
  	switch (style) {
  	case 0:
! 		*cstyle = SCREEN_CURSOR_DEFAULT;
  		break;
  	case 1:
! 		*cstyle = SCREEN_CURSOR_BLOCK;
! 		*mode |= MODE_CURSOR_BLINKING;
  		break;
  	case 2:
! 		*cstyle = SCREEN_CURSOR_BLOCK;
! 		*mode &= ~MODE_CURSOR_BLINKING;
  		break;
  	case 3:
! 		*cstyle = SCREEN_CURSOR_UNDERLINE;
! 		*mode |= MODE_CURSOR_BLINKING;
  		break;
  	case 4:
! 		*cstyle = SCREEN_CURSOR_UNDERLINE;
! 		*mode &= ~MODE_CURSOR_BLINKING;
  		break;
  	case 5:
! 		*cstyle = SCREEN_CURSOR_BAR;
! 		*mode |= MODE_CURSOR_BLINKING;
  		break;
  	case 6:
! 		*cstyle = SCREEN_CURSOR_BAR;
! 		*mode &= ~MODE_CURSOR_BLINKING;
  		break;
  	}
  }