[Plplot-cvs] SF.net SVN: plplot:[12504] trunk/drivers/cairo.c

[<and...@us...>]

Revision: 12504
          http://sourceforge.net/p/plplot/code/12504
Author:   andrewross
Date:     2013-09-09 22:32:36 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------

Modify xcairo driver to honour the -display option to set the display. 

Also exit if opening the display fails since continuing will lead to a crash anyway.

Modified Paths:
--------------
    trunk/drivers/cairo.c

Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c	2013-09-09 14:41:12 UTC (rev 12503)
+++ trunk/drivers/cairo.c	2013-09-09 22:32:36 UTC (rev 12504)
@@ -1922,10 +1922,13 @@
     {
         // X Windows setup
         aStream->XDisplay = NULL;
-        aStream->XDisplay = XOpenDisplay( NULL );
+	if (pls->FileName != NULL) 
+	  aStream->XDisplay = XOpenDisplay( pls->FileName );
+	else
+	  aStream->XDisplay = XOpenDisplay( NULL );
         if ( aStream->XDisplay == NULL )
         {
-            printf( "Failed to open X Windows display\n" );
+            plexit( "Failed to open X Windows display\n" );
             // some sort of error here
         }
         XScreen    = DefaultScreen( aStream->XDisplay );

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