[freetype2-demos] master fa89886: * graph/x11/grx11.c (gr_x11_device_init): Organize logging.

[Alexei Podtelezhnikov]

branch: master
commit fa898861fbc05fde2b5d97ba3ec6362ecaca269e
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    * graph/x11/grx11.c (gr_x11_device_init): Organize logging.
---
 ChangeLog         |  4 ++++
 graph/x11/grx11.c | 69 +++++++++++++++++--------------------------------------
 2 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c3ae4bd..a027b9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-31  Alexei Podtelezhnikov  <address@hidden>
+
+       * graph/x11/grx11.c (gr_x11_device_init): Organize logging.
+
 2018-05-27  Werner Lemberg  <address@hidden>
 
        Separate color support from sbit handling.
diff --git a/graph/x11/grx11.c b/graph/x11/grx11.c
index 70f60da..87e08c8 100644
--- a/graph/x11/grx11.c
+++ b/graph/x11/grx11.c
@@ -27,6 +27,16 @@
 
 #ifdef TEST
 #include "grfont.h"
+#define LOG(x)  printf x
+#define visualClass(x)  ( x == StaticGray  ? "StaticGray"  : \
+                          x == GrayScale   ? "GrayScale"   : \
+                          x == StaticColor ? "StaticColor" : \
+                          x == PseudoColor ? "PseudoColor" : \
+                          x == TrueColor   ? "TrueColor"   : \
+                          x == DirectColor ? "DirectColor" : "unknown" )
+#define grAlloc  malloc
+#else
+#define LOG(x)  /* nothing */
 #endif
 
 #include <stdio.h>
@@ -124,11 +134,6 @@ typedef  unsigned long   uint32;
   typedef XPixmapFormatValues  XDepth;
 
 
-#ifdef TEST
-#define grAlloc  malloc
-#endif
-
-
   /************************************************************************/
   /************************************************************************/
   /*****                                                              *****/
@@ -941,19 +946,15 @@ typedef  unsigned long   uint32;
       templ.screen = DefaultScreen( x11dev.display );
       formats      = XListPixmapFormats( x11dev.display, &count );
 
-#ifdef TEST
-      printf( "available pixmap formats\n" );
-      printf( "depth  pixbits  scanpad\n" );
-#endif /* TEST */
+      LOG(( "available pixmap formats\n" ));
+      LOG(( "depth  pixbits  scanpad\n" ));
 
       for ( format = formats; count > 0; count--, format++ )
       {
-#ifdef TEST
-        printf( " %3d     %3d      %3d\n",
+        LOG(( " %3d      %3d      %3d\n",
                 format->depth,
                 format->bits_per_pixel,
-                format->scanline_pad );
-#endif /* TEST */
+                format->scanline_pad ));
 
         /* note, the 32-bit modes return a depth of 24, */
         /* and 32 bits per pixel                        */
@@ -975,41 +976,13 @@ typedef  unsigned long   uint32;
 
             for ( visual = visuals; count2 > 0; count2--, visual++ )
             {
-#ifdef TEST
-              const char*  visualClass;
-
-              switch ( visual->Class )
-              {
-              case TrueColor:
-                visualClass = "TrueColor";
-                break;
-              case DirectColor:
-                visualClass = "DirectColor";
-                break;
-              case PseudoColor:
-                visualClass = "PseudoColor";
-                break;
-              case StaticGray:
-                visualClass = "StaticGray";
-                break;
-              case StaticColor:
-                visualClass = "StaticColor";
-                break;
-              case GrayScale:
-                visualClass = "GrayScale";
-                break;
-              default:
-                visualClass = "unknown";
-              }
-
-              printf( ">   RGB %04lx:%04lx:%04lx, colors %3d, bits %2d  %s\n",
-                      visual->red_mask,
-                      visual->green_mask,
-                      visual->blue_mask,
-                      visual->colormap_size,
-                      visual->bits_per_rgb,
-                      visualClass );
-#endif /* TEST */
+              LOG(( "> R:G:B %0*lx:%0*lx:%0*lx, colors %3d, bits %2d, %s\n",
+                     format->bits_per_pixel/4, visual->red_mask,
+                     format->bits_per_pixel/4, visual->green_mask,
+                     format->bits_per_pixel/4, visual->blue_mask,
+                                               visual->colormap_size,
+                                               visual->bits_per_rgb,
+                                  visualClass( visual->Class ) ));
 
               /* compare to the list of supported formats */
               {