[Plplot-cvs] SF.net SVN: plplot:[11046] trunk

[<ai...@us...>]

Revision: 11046
          http://plplot.svn.sourceforge.net/plplot/?rev=11046&view=rev
Author:   airwin
Date:     2010-05-31 19:49:08 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Temporarily revert Hazen's recent improvement to xwin so that -dev tk
will work again.  The issue here is that -dev tk uses code from xwin.c
so that additional changes have to be made to -dev tk to be consistent
with Hazen's changes to -dev xwin.

Modified Paths:
--------------
    trunk/drivers/xwin.c
    trunk/include/plxwd.h

Modified: trunk/drivers/xwin.c
===================================================================
--- trunk/drivers/xwin.c	2010-05-31 19:46:51 UTC (rev 11045)
+++ trunk/drivers/xwin.c	2010-05-31 19:49:08 UTC (rev 11046)
@@ -284,7 +284,6 @@
 
 /* Get ready for plotting */
 
-    dev->closed = FALSE;
     dev->xlen = xmax - xmin;
     dev->ylen = ymax - ymin;
 
@@ -364,9 +363,6 @@
 
     dbug_enter( "plD_line_xw" );
 
-    if ( dev->closed )
-        return;
-
 #ifdef HAVE_PTHREAD
     if ( usepthreads )
         pthread_mutex_lock( &events_mutex );
@@ -432,9 +428,6 @@
 
     dbug_enter( "plD_polyline_xw" );
 
-    if ( dev->closed )
-        return;
-
 #ifdef HAVE_PTHREAD
     if ( usepthreads )
         pthread_mutex_lock( &events_mutex );
@@ -476,9 +469,6 @@
 
     dbug_enter( "plD_eop_xw" );
 
-    if ( dev->closed )
-        return;
-
 #ifdef HAVE_PTHREAD
     if ( usepthreads )
         pthread_mutex_lock( &events_mutex );
@@ -511,9 +501,6 @@
 
     dbug_enter( "plD_bop_xw" );
 
-    if ( dev->closed )
-        return;
-
 #ifdef HAVE_PTHREAD
     if ( usepthreads )
         pthread_mutex_lock( &events_mutex );
@@ -604,9 +591,6 @@
 
     dbug_enter( "plD_state_xw" );
 
-    if ( dev->closed )
-        return;
-
 #ifdef HAVE_PTHREAD
     if ( usepthreads )
         pthread_mutex_lock( &events_mutex );
@@ -719,13 +703,8 @@
 void
 plD_esc_xw( PLStream *pls, PLINT op, void *ptr )
 {
-    XwDev     *dev = (XwDev *) pls->dev;
-
     dbug_enter( "plD_esc_xw" );
 
-    if ( dev->closed )
-        return;
-
 #ifdef HAVE_PTHREAD
     if ( usepthreads )
         pthread_mutex_lock( &events_mutex );
@@ -1505,9 +1484,8 @@
 
     if ( event->xclient.data.l[0] == XInternAtom( xwd->display, "WM_DELETE_WINDOW", False ) )
     {
-        dev->exit_eventloop = TRUE;
-        dev->closed = TRUE;
-        return;
+        pls->nopause = TRUE;
+        plexit( "" );
     }
 }
 

Modified: trunk/include/plxwd.h
===================================================================
--- trunk/include/plxwd.h	2010-05-31 19:46:51 UTC (rev 11045)
+++ trunk/include/plxwd.h	2010-05-31 19:49:08 UTC (rev 11046)
@@ -103,8 +103,6 @@
     int          drawing_xhairs;                   /* Set during xhair draws */
     XPoint       xhair_x[2], xhair_y[2];           /* Crosshair lines */
 
-    int          closed;                            /* Set if the stream is closed */
-
     void ( *MasterEH )( PLStream *, XEvent * );    /* Master X event handler */
 #ifdef HAVE_PTHREAD
     pthread_t updater;                             /* The X events updater thread id */


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