[Git][freetype/freetype-demos][ftmulti-misc] 3 commits: * src/ftmulti.c

Alexei Podtelezhnikov pushed to branch ftmulti-misc at FreeType / FreeType Demo Programs

Commits:

5f4959bd

by Alexei Podtelezhnikov at 2023-02-11T09:33:05-05:00

* src/ftmulti.c (main): Synchronize options with the others.

195908f4

by Alexei Podtelezhnikov at 2023-02-11T09:48:09-05:00

* src/ftmulti.c (Init_Display): Use automatic color depth.

e65fa83d

by Alexei Podtelezhnikov at 2023-02-11T11:04:21-05:00

* src/ftmulti.c (Process_Event): Miscellaneous tweaks.

Set default step at 1/40 which covers most preferable coordinates.
Adjust the step by doubling of halving it. Round all large-range
coordinates, not just MM. Wrap the coordinates around.

1 changed file:

src/ftmulti.c

Changes:

src/ftmulti.c

@@ -99,7 +99,7 @@
    static int  res       = 72;
 -  static grColor  fore_color = { 255 };
 +  static grColor  fore_color;
    static int  Fail;
@@ -112,7 +112,7 @@
    static FT_Fixed      requested_pos[MAX_MM_AXES];
    static unsigned int  requested_cnt =  0;
    static unsigned int  used_num_axis =  0;
 -  static int           increment     = 20;  /* for axes */
 +  static double        increment     = 0.025;  /* for axes */
    /*
     * We use the following arrays to support both the display of all axes and
@@ -293,7 +293,7 @@
    static void
    Init_Display( void )
+   {
 -    grBitmap  bitmap = { height, width, 0, gr_pixel_mode_gray, 256, NULL };
 +    grBitmap  bitmap = { height, width, 0, gr_pixel_mode_none, 256, NULL };
      grInitDevices();
@@ -304,6 +304,8 @@
      bit = (grBitmap*)surface;
 +    fore_color = grFindColor( bit, 255, 255, 255, 255 );  /* white */
++
      graph_init = 1;
+   }
@@ -606,7 +608,7 @@
    Process_Event( void )
+   {
      grEvent       event;
 -    int           i;
 +    double        i;
      unsigned int  axis;
@@ -685,14 +687,13 @@
      /* MM-related keys */
      case grKEY( '+' ):
 -      /* value 100 is arbitrary */
 -      if ( increment < 100 )
 -        increment += 1;
 +      if ( increment < 0.1 )
 +        increment *= 2.0;
        break;
      case grKEY( '-' ):
 -      if ( increment > 1 )
 -        increment -= 1;
 +      if ( increment > 0.01 )
 +        increment *= 0.5;
        break;
      case grKEY( 'a' ):
@@ -796,7 +797,7 @@
      if ( axis < num_shown_axes )
+     {
        FT_Var_Axis*  a;
 -      FT_Fixed      pos;
 +      FT_Fixed      pos, rng;
        unsigned int  n;
@@ -804,6 +805,7 @@
        axis = (unsigned int)shown_axes[axis];
        a   = multimaster->axis + axis;
 +      rng = a->maximum - a->minimum;
        pos = design_pos[axis];
        /*
@@ -812,15 +814,15 @@
         * for mac fonts, which have a range of ~3.  And it's rather extreme
         * for optical size even in PS.
         */
 -      pos += FT_MulDiv( i, a->maximum - a->minimum, 1000 );
 +      pos += (FT_Fixed)( i * rng );
        if ( pos < a->minimum )
 -        pos = a->minimum;
 -      if ( pos > a->maximum )
          pos = a->maximum;
 +      if ( pos > a->maximum )
 +        pos = a->minimum;
 -      /* for MM fonts, round the design coordinates to integers,         */
 +      /* for MM fonts or large ranges, round the design coordinates      */
        /* otherwise round to two decimal digits to make the PS name short */
 -      if ( !FT_IS_SFNT( face ) )
 +      if ( !FT_IS_SFNT( face ) || rng > 0x200000 )
          pos = FT_RoundFix( pos );
        else
+       {
@@ -889,9 +891,7 @@
        "  font         The font file(s) to display.\n"
        "\n" );
      fprintf( stderr,
 -      "  -w W         Set window width to W pixels (default: %dpx).\n"
 -      "  -h H         Set window height to H pixels (default: %dpx).\n"
 -      "\n",
 +      "  -d WxH       Set window dimentions (default: %ux%u).\n",
               DIM_X, DIM_Y );
      fprintf( stderr,
        "  -e encoding  Specify encoding tag (default: no encoding).\n"
@@ -899,7 +899,7 @@
        "               `ADOB' (Adobe standard), `ADBC' (Adobe custom).\n"
        "  -r R         Use resolution R dpi (default: 72dpi).\n"
        "  -f index     Specify first glyph index to display.\n"
 -      "  -d \"axis1 axis2 ...\"\n"
 +      "  -a \"axis1 axis2 ...\"\n"
        "               Specify the design coordinates for each\n"
        "               variation axis at start-up.\n"
        "\n"
@@ -973,10 +973,15 @@
        switch ( option )
+       {
 -      case 'd':
 +      case 'a':
          parse_design_coords( optarg );
          break;
 +      case 'd':
 +        if ( sscanf( optarg, "%ux%u", &width, &height ) != 2 )
 +          usage( execname );
 +        break;
++
        case 'e':
          encoding = make_tag( optarg );
          break;
@@ -985,12 +990,6 @@
          sscanf( optarg, "%i", &first_glyph );
          break;
 -      case 'h':
 -        height = atoi( optarg );
 -        if ( height < 1 )
 -          usage( execname );
 -        break;
+-
        case 'r':
          res = atoi( optarg );
          if ( res < 1 )
@@ -1012,12 +1011,6 @@
+         }
          /* break; */
 -      case 'w':
 -        width = atoi( optarg );
 -        if ( width < 1 )
 -          usage( execname );
 -        break;
+-
        default:
          usage( execname );
          break;
@@ -1193,11 +1186,14 @@
            strbuf_reset( header );
 -          strbuf_format( header, "%c %.50s%s: %.02f",
 +          strbuf_format( header, "%c %.50s%s:",
                           n + 'A',
                           multimaster->axis[axis].name,
 -                         hidden[axis] ? "*" : "",
 -                         design_pos[axis] / 65536.0 );
 +                         hidden[axis] ? "*" : "" );
 +          if ( design_pos[axis] & 0xFFFF )
 +            strbuf_format( header, "% .2f", design_pos[axis] / 65536.0 );
 +          else
 +            strbuf_format( header,   "% d", design_pos[axis] / 65536 );
            grWriteCellString( bit, 0, (int)( n + 4 ) * HEADER_HEIGHT,
                               Header, fore_color );
+         }
@@ -1235,7 +1231,7 @@
              ptsize,
              Num,
              format_str,
 -            increment / 10.0 );
 +            100. * increment );
+         }
+       }
        else

From:	Alexei Podtelezhnikov (@apodtele)
Subject:	[Git][freetype/freetype-demos][ftmulti-misc] 3 commits: * src/ftmulti.c (main): Synchronize options with the others.
Date:	Sat, 11 Feb 2023 16:05:29 +0000