===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/tmux/server.c	2009/09/22 12:38:10	1.40
--- src/usr.bin/tmux/server.c	2009/09/23 06:18:47	1.41
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.40 2009/09/22 12:38:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.41 2009/09/23 06:18:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 67,73 ****
  void	 	 server_check_window(struct window *);
  void		 server_check_redraw(struct client *);
  void		 server_set_title(struct client *);
- void		 server_redraw_locked(struct client *);
  void		 server_check_timers(struct client *);
  void		 server_second_timers(void);
  int		 server_update_socket(void);
--- 67,72 ----
***************
*** 160,167 ****
  	key_bindings_init();
  	utf8_build();
  
- 	server_locked = 0;
- 	server_password = NULL;
  	server_activity = time(NULL);
  
  	start_time = time(NULL);
--- 159,164 ----
***************
*** 382,389 ****
  
  	options_free(&global_s_options);
  	options_free(&global_w_options);
- 	if (server_password != NULL)
- 		xfree(server_password);
  
  	return (0);
  }
--- 379,384 ----
***************
*** 541,550 ****
  	}
  
  	if (c->flags & CLIENT_REDRAW) {
! 		if (server_locked)
! 			server_redraw_locked(c);
! 		else
!  			screen_redraw_screen(c, 0);
  		c->flags &= ~CLIENT_STATUS;
  	} else {
  		TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) {
--- 536,542 ----
  	}
  
  	if (c->flags & CLIENT_REDRAW) {
! 		screen_redraw_screen(c, 0);
  		c->flags &= ~CLIENT_STATUS;
  	} else {
  		TAILQ_FOREACH(wp, &c->session->curw->window->panes, entry) {
***************
*** 581,629 ****
  	xfree(title);
  }
  
- /* Redraw client when locked. */
- void
- server_redraw_locked(struct client *c)
- {
- 	struct screen_write_ctx	ctx;
- 	struct screen		screen;
- 	struct grid_cell	gc;
- 	u_int			colour, xx, yy, i;
- 	int    			style;
- 
- 	xx = c->tty.sx;
- 	yy = c->tty.sy - 1;
- 	if (xx == 0 || yy == 0)
- 		return;
- 	colour = options_get_number(&global_w_options, "clock-mode-colour");
- 	style = options_get_number(&global_w_options, "clock-mode-style");
- 
- 	memcpy(&gc, &grid_default_cell, sizeof gc);
- 	colour_set_fg(&gc, colour);
- 	gc.attr |= GRID_ATTR_BRIGHT;
- 
- 	screen_init(&screen, xx, yy, 0);
- 
- 	screen_write_start(&ctx, NULL, &screen);
- 	clock_draw(&ctx, colour, style);
- 
- 	if (password_failures != 0) {
- 		screen_write_cursormove(&ctx, 0, 0);
- 		screen_write_puts(
- 		    &ctx, &gc, "%u failed attempts", password_failures);
- 		if (time(NULL) < password_backoff)
- 			screen_write_puts(&ctx, &gc, "; sleeping");
- 	}
- 
- 	screen_write_stop(&ctx);
- 
- 	for (i = 0; i < screen_size_y(&screen); i++)
- 		tty_draw_line(&c->tty, &screen, i, 0, 0);
- 	screen_redraw_screen(c, 1);
- 
- 	screen_free(&screen);
- }
- 
  /* Check for timers on client. */
  void
  server_check_timers(struct client *c)
--- 573,578 ----
***************
*** 836,843 ****
  			status_prompt_key(c, key);
  			continue;
  		}
- 		if (server_locked)
- 			continue;
  
  		/* Check for mouse keys. */
  		if (key == KEYC_MOUSE) {
--- 785,790 ----
***************
*** 929,936 ****
  		tty_cursor(&c->tty, s->cx, s->cy, wp->xoff, wp->yoff);
  
  	mode = s->mode;
- 	if (server_locked)
- 		mode &= ~TTY_NOCURSOR;
  	tty_update_mode(&c->tty, mode);
  	tty_reset(&c->tty);
  }
--- 876,881 ----
***************
*** 1235,1246 ****
  server_second_timers(void)
  {
  	struct window		*w;
- 	struct client		*c;
  	struct window_pane	*wp;
  	u_int		 	 i;
  	int			 xtimeout;
- 	struct tm	 	 now, then;
- 	static time_t	 	 last_t = 0;
  	time_t		 	 t;
  
  	t = time(NULL);
--- 1180,1188 ----
***************
*** 1257,1285 ****
  		TAILQ_FOREACH(wp, &w->panes, entry) {
  			if (wp->mode != NULL && wp->mode->timer != NULL)
  				wp->mode->timer(wp);
- 		}
- 	}
- 
- 	if (password_backoff != 0 && t >= password_backoff) {
- 		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
- 			if ((c = ARRAY_ITEM(&clients, i)) != NULL)
- 				server_redraw_client(c);
- 		}
- 		password_backoff = 0;
- 	}
- 
- 	/* Check for a minute having passed. */
- 	gmtime_r(&t, &now);
- 	gmtime_r(&last_t, &then);
- 	if (now.tm_min == then.tm_min)
- 		return;
- 	last_t = t;
- 
- 	/* If locked, redraw all clients. */
- 	if (server_locked) {
- 		for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
- 			if ((c = ARRAY_ITEM(&clients, i)) != NULL)
- 				server_redraw_client(c);
  		}
  	}
  }
--- 1199,1204 ----