Revision: 2549
          http://tmux.svn.sourceforge.net/tmux/?rev=2549&view=rev
Author:   tcunha
Date:     2011-07-08 22:58:30 +0000 (Fri, 08 Jul 2011)

Log Message:
-----------
Sync OpenBSD patchset 936:

Do not continue to send data to suspended/locked clients or there will
be a huge rush of it after they are resumed/unlocked. The main output
path was fine but status line updates and the terminal state reset code
were missed.

Modified Paths:
--------------
    trunk/screen-redraw.c
    trunk/server-client.c

Modified: trunk/screen-redraw.c
===================================================================
--- trunk/screen-redraw.c       2011-07-08 16:44:06 UTC (rev 2548)
+++ trunk/screen-redraw.c       2011-07-08 22:58:30 UTC (rev 2549)
@@ -1,4 +1,4 @@
-/* $Id: screen-redraw.c,v 1.53 2010-09-18 15:43:53 tcunha Exp $ */
+/* $Id$ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <[email protected]>
@@ -176,6 +176,10 @@
        u_int                    i, j, type;
        int                      status, fg, bg;
 
+       /* Suspended clients should not be updated. */
+       if (c->flags & CLIENT_SUSPENDED)
+               return;
+
        /* Get status line, er, status. */
        if (c->message_string != NULL || c->prompt_string != NULL)
                status = 1;

Modified: trunk/server-client.c
===================================================================
--- trunk/server-client.c       2011-07-08 16:44:06 UTC (rev 2548)
+++ trunk/server-client.c       2011-07-08 22:58:30 UTC (rev 2549)
@@ -1,4 +1,4 @@
-/* $Id: server-client.c,v 1.62 2011-05-22 16:25:02 tcunha Exp $ */
+/* $Id$ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <[email protected]>
@@ -473,6 +473,9 @@
        struct options          *wo = &w->options;
        int                      status, mode;
 
+       if (c->flags & CLIENT_SUSPENDED)
+               return;
+
        tty_region(&c->tty, 0, c->tty.sy - 1);
 
        status = options_get_number(oo, "status");


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to