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

[<hba...@us...>]

Revision: 10759
          http://plplot.svn.sourceforge.net/plplot/?rev=10759&view=rev
Author:   hbabcock
Date:     2010-01-20 03:33:06 +0000 (Wed, 20 Jan 2010)

Log Message:
-----------
Style cairo.c. Update README.release.

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

Modified: trunk/README.release
===================================================================
--- trunk/README.release	2010-01-20 02:21:19 UTC (rev 10758)
+++ trunk/README.release	2010-01-20 03:33:06 UTC (rev 10759)
@@ -141,6 +141,7 @@
 
 1.1 Make PLplot aware of LC_NUMERIC locale
 1.2 Linear gradients have been implemented
+1.3 Cairo Windows driver implemented
 
 2. Changes relative to PLplot 5.8.0 (the previous stable release)
 
@@ -183,6 +184,7 @@
 detected
 2.36 Make PLplot aware of LC_NUMERIC locale
 2.37 Linear gradients have been implemented
+2.38 Cairo Windows driver implemented
 
 1. Changes relative to PLplot 5.9.5 (the previous development release)
 
@@ -264,6 +266,12 @@
 and cairo devices.  The result is nice-looking smooth transparency
 gradients for those devices, for, e.g., example 30, page 2.
 
+1.3 Cairo Windows driver implemented
+
+A cairo Windows driver has been implemented. This provides an
+interactive cairo driver for Windows similar to xcairo on Linux.
+Work to improve its functionality is ongoing.
+
 2. Changes relative to PLplot 5.8.0 (the previous stable release)
 
 2.1 All autotools-related files have now been removed
@@ -825,3 +833,9 @@
 and cairo devices.  The result is nice-looking smooth transparency
 gradients for those devices, for, e.g., example 30, page 2.
 
+2.38 Cairo Windows driver implemented
+
+A cairo Windows driver has been implemented. This provides an
+interactive cairo driver for Windows similar to xcairo on Linux.
+Work to improve its functionality is ongoing.
+

Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c	2010-01-20 02:21:19 UTC (rev 10758)
+++ trunk/drivers/cairo.c	2010-01-20 03:33:06 UTC (rev 10759)
@@ -116,11 +116,11 @@
     char            bigendian;
 #endif
 #if defined ( PLD_wincairo )
-  WNDCLASSEX      wndclass;
-  HWND            hwnd;
-  MSG             msg;
-  HDC             hdc;
-  HDC             SCRN_hdc;
+    WNDCLASSEX      wndclass;
+    HWND            hwnd;
+    MSG             msg;
+    HDC             hdc;
+    HDC             SCRN_hdc;
 #endif
 } PLCairo;
 
@@ -2636,8 +2636,8 @@
     switch ( nMsg )
     {
     case WM_DESTROY:
-      //        if ( dev )
-      //            Debug( "WM_DESTROY\t" );
+        //        if ( dev )
+        //            Debug( "WM_DESTROY\t" );
         PostQuitMessage( 0 );
         return ( 0 );
         break;
@@ -2757,9 +2757,9 @@
         WS_OVERLAPPEDWINDOW,                                /* Style */
         pls->xoffset,                                       /* Initial x (use default) */
         pls->yoffset,                                       /* Initial y (use default) */
-        /* This is a little lame since the window border size might change. */
-        pls->xlength+5,                                     /* Initial x size (use default) */
-        pls->ylength+30,                                    /* Initial y size (use default) */
+                                                            /* This is a little lame since the window border size might change. */
+        pls->xlength + 5,                                   /* Initial x size (use default) */
+        pls->ylength + 30,                                  /* Initial y size (use default) */
         NULL,                                               /* No parent window */
         NULL,                                               /* No menu */
         aStream->wndclass.hInstance,                        /* This program instance */
@@ -2781,11 +2781,11 @@
  */
 
 /*
-    dev->PopupMenu = CreatePopupMenu();
-    AppendMenu( dev->PopupMenu, MF_STRING, PopupPrint, "Print" );
-    AppendMenu( dev->PopupMenu, MF_STRING, PopupNextPage, "Next Page" );
-    AppendMenu( dev->PopupMenu, MF_STRING, PopupQuit, "Quit" );
-*/
+ *  dev->PopupMenu = CreatePopupMenu();
+ *  AppendMenu( dev->PopupMenu, MF_STRING, PopupPrint, "Print" );
+ *  AppendMenu( dev->PopupMenu, MF_STRING, PopupNextPage, "Next Page" );
+ *  AppendMenu( dev->PopupMenu, MF_STRING, PopupQuit, "Quit" );
+ */
 
     //    plD_state_wingcc( pls, PLSTATE_COLOR0 );
     /*
@@ -2804,17 +2804,17 @@
  */
 
 /*
-    GetClientRect( dev->hwnd, &dev->rect );
-    dev->width  = dev->rect.right;
-    dev->height = dev->rect.bottom;
-*/
+ *  GetClientRect( dev->hwnd, &dev->rect );
+ *  dev->width  = dev->rect.right;
+ *  dev->height = dev->rect.bottom;
+ */
 
 /*
  * Initialize Cairo Surface using the windows hdc.
  */
 
-    aStream->cairoSurface = (cairo_surface_t *)cairo_win32_surface_create(aStream->hdc);
-    aStream->cairoContext = cairo_create(aStream->cairoSurface);
+    aStream->cairoSurface = (cairo_surface_t *) cairo_win32_surface_create( aStream->hdc );
+    aStream->cairoContext = cairo_create( aStream->cairoSurface );
 
     /* Invert the surface so that the graphs are drawn right side up. */
     rotate_cairo_surface( pls, 1.0, 0.0, 0.0, -1.0, 0.0, pls->ylength );
@@ -2842,9 +2842,9 @@
             switch ((int) aStream->msg.message )
             {
             case WM_CHAR:
-	      if (((TCHAR) ( aStream->msg.wParam ) == 13 ) ||
-		  ((TCHAR) ( aStream->msg.wParam ) == 'q' ) ||
-		  ((TCHAR) ( aStream->msg.wParam ) == 'Q' ))
+                if (((TCHAR) ( aStream->msg.wParam ) == 13 ) ||
+                    ((TCHAR) ( aStream->msg.wParam ) == 'q' ) ||
+                    ((TCHAR) ( aStream->msg.wParam ) == 'Q' ))
                 {
                     PostQuitMessage( 0 );
                 }


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