[freetype2-demos] master e27540c: [ftview] Hide LCD filter from grayscale modes.

[Alexei Podtelezhnikov]

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

    [ftview] Hide LCD filter from grayscale modes.
    
    * src/ftview.c (Process_Event, write_header): Check the LCD mode
    before adjusting or reporting the LCD filter.
---
 ChangeLog    |  7 +++++++
 src/ftview.c | 56 ++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c577b23..826820a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2017-03-26  Alexei Podtelezhnikov  <address@hidden>
 
+       [ftview] Hide LCD filter from grayscale modes.
+
+       * src/ftview.c (Process_Event, write_header): Check the LCD mode
+       before adjusting or reporting the LCD filter.
+
+2017-03-26  Alexei Podtelezhnikov  <address@hidden>
+
        [ftview, ftstring, ftgrid] Remove anti-aliasing toggle.
 
        * src/ftcommon.h (FTDemo_Handle): Replace `antialias' field with
diff --git a/src/ftview.c b/src/ftview.c
index 7148c25..2d6e921 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1268,6 +1268,15 @@
       status.update = event_index_change( 0x1000 );
       break;
 
+    default:
+      break;
+    }
+
+    if ( handle->lcd_mode < LCD_MODE_RGB )
+      return ret;
+
+    switch ( event->key )
+    {
     case grKEY( 'L' ):
       FTC_Manager_RemoveFaceID( handle->cache_manager,
                                 handle->scaler.face_id );
@@ -1710,31 +1719,34 @@
     line++;
 
     /* LCD filtering */
-    sprintf( buf, "LCD filter: %s",
-                  status.lcd_filter == 0 ? "none" :
-                  status.lcd_filter == 1 ? "default" :
-                  status.lcd_filter == 2 ? "light" :
-                  status.lcd_filter == 3 ? "legacy" : "custom" );
-    grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
-                       buf, display->fore_color );
-
-    /* custom LCD filter settings */
-    if ( status.lcd_filter < 0 )
+    if ( handle->lcd_mode >= LCD_MODE_RGB )
     {
-      int             fwi = status.fw_idx;
-      unsigned char*  fw  = status.filter_weights;
-      int             i;
-
+      sprintf( buf, "filter: %s",
+                    status.lcd_filter == 0 ? "none" :
+                    status.lcd_filter == 1 ? "default" :
+                    status.lcd_filter == 2 ? "light" :
+                    status.lcd_filter == 3 ? "legacy" : "custom" );
+      grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
+                         buf, display->fore_color );
 
-      for ( i = 0; i < 5; i++ )
+      /* custom LCD filter settings */
+      if ( status.lcd_filter < 0 )
       {
-        sprintf( buf,
-                 " %s0x%02X%s",
-                 fwi == i ? "[" : " ",
-                 fw[i],
-                 fwi == i ? "]" : " " );
-        grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
-                           buf, display->fore_color );
+        int             fwi = status.fw_idx;
+        unsigned char*  fw  = status.filter_weights;
+        int             i;
+
+
+        for ( i = 0; i < 5; i++ )
+        {
+          sprintf( buf,
+                   " %s0x%02X%s",
+                   fwi == i ? "[" : " ",
+                   fw[i],
+                   fwi == i ? "]" : " " );
+          grWriteCellString( display->bitmap, 0, (line++) * HEADER_HEIGHT,
+                             buf, display->fore_color );
+        }
       }
     }