[freetype2-demos] master 7de3334 2/2: [ftview] Merge gray and color sbits controls.

[Alexei Podtelezhnikov]

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

    [ftview] Merge gray and color sbits controls.
    
    * src/ftcommon.h (FTDemo_Handle): Merge `color' into `use_sbits'.
    * src/ftcommon.c (FTDemo_New, FTDemo_Update_Current_Flags): Updated.
    * src/ftview.c (Process_Event, event_help, write_header): Updated.
---
 ChangeLog      |  8 ++++++++
 src/ftcommon.c | 10 ++++------
 src/ftcommon.h |  1 -
 src/ftview.c   | 21 ++++++---------------
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 466a302..00f8e89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2017-06-03  Alexei Podtelezhnikov  <address@hidden>
 
+       [ftview] Merge gray and color sbits controls.
+
+       * src/ftcommon.h (FTDemo_Handle): Merge `color' into `use_sbits'.
+       * src/ftcommon.c (FTDemo_New, FTDemo_Update_Current_Flags): Updated.
+       * src/ftview.c (Process_Event, event_help, write_header): Updated.
+
+2017-06-03  Alexei Podtelezhnikov  <address@hidden>
+
        [ftgrid] Teach encodings.
 
        * src/ftgrid.c (grid_status_draw_outline): Use encoding.
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 20072a5..0e438bc 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -299,10 +299,9 @@
     handle->encoding = FT_ENCODING_ORDER;
 
     handle->hinted    = 1;
-    handle->use_sbits = 1;
+    handle->use_sbits = 2;  /* including color bitmaps */
     handle->autohint  = 0;
     handle->lcd_mode  = LCD_MODE_AA;
-    handle->color     = 1;
 
     handle->use_sbits_cache = 1;
 
@@ -657,8 +656,10 @@
     if ( handle->autohint )
       flags |= FT_LOAD_FORCE_AUTOHINT;
 
-    if ( !handle->use_sbits )
+    if ( handle->use_sbits == 0 )
       flags |= FT_LOAD_NO_BITMAP;
+    else if ( handle->use_sbits == 2 )
+      flags |= FT_LOAD_COLOR;
 
     if ( handle->hinted )
     {
@@ -699,9 +700,6 @@
         flags |= FT_LOAD_MONOCHROME;
     }
 
-    if ( handle->color )
-      flags |= FT_LOAD_COLOR;
-
     handle->load_flags    = flags;
     handle->string_reload = 1;
   }
diff --git a/src/ftcommon.h b/src/ftcommon.h
index 72008aa..312a5b0 100644
--- a/src/ftcommon.h
+++ b/src/ftcommon.h
@@ -199,7 +199,6 @@
     int             autohint;          /* force auto-hinting          */
     int             lcd_mode;          /* mono, aa, light, vrgb, ...  */
     int             preload;           /* force font file preloading  */
-    int             color;             /* load color bitmaps          */
 
     /* don't touch the following fields! */
 
diff --git a/src/ftview.c b/src/ftview.c
index 28b148d..29a345f 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -732,7 +732,7 @@
     grWriteln( "  backspace cycle backwards             k, l        cycle back 
and forth    " );
     grWriteln( "                                                               
             " );
     grWriteln( "b           toggle embedded bitmaps     x, X        adjust 
horizontal       " );
-    grWriteln( "c           toggle color glyphs                      
emboldening (in mode 2)" );
+    grWriteln( "                                                     
emboldening (in mode 2)" );
     grWriteln( "K           toggle cache modes          y, Y        adjust 
vertical         " );
     grWriteln( "                                                     
emboldening (in mode 2)" );
     grWriteln( "p, n        previous/next font          s, S        adjust 
slanting         " );
@@ -1096,13 +1096,9 @@
       break;
 
     case grKEY( 'b' ):
-      handle->use_sbits = !handle->use_sbits;
-      FTDemo_Update_Current_Flags( handle );
-      status.update = 1;
-      break;
-
-    case grKEY( 'c' ):
-      handle->color = !handle->color;
+      handle->use_sbits++;
+      if ( handle->use_sbits > 2)
+        handle->use_sbits = 0;
       FTDemo_Update_Current_Flags( handle );
       status.update = 1;
       break;
@@ -1549,13 +1545,8 @@
 
     /* embedded bitmaps */
     sprintf( buf, "bitmaps: %s",
-                  handle->use_sbits ? "on" : "off" );
-    grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
-                       buf, display->fore_color );
-
-    /* embedded color bitmaps */
-    sprintf( buf, "color bitmaps: %s",
-                  handle->color ? "on" : "off" );
+                  handle->use_sbits == 2 ? "color" :
+                  handle->use_sbits == 1 ? "gray" : "off" );
     grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
                        buf, display->fore_color );