freetype-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Git][freetype/freetype-demos][master] 3 commits: * graph/grevents.h (gr

From: Werner Lemberg (@wl)
Subject: [Git][freetype/freetype-demos][master] 3 commits: * graph/grevents.h (grKey): Add `grKeyHash` and `grKeyAmpersand`.
Date: Sun, 05 Feb 2023 15:23:30 +0000

Werner Lemberg pushed to branch master at FreeType / FreeType Demo Programs

Commits:

  • f6cd0be0
    by Werner Lemberg at 2023-02-05T09:21:00+01:00 
    * graph/grevents.h (grKey): Add `grKeyHash` and `grKeyAmpersand`.
  • 0b396f09
    by Werner Lemberg at 2023-02-05T15:56:00+01:00 
    [ftmulti] Change layout to list axes vertically.

* src/ftmulti.c (Render_All, Render_Text): Shift 'upper left corner' for
glyph display up and to the right.
(main): Emit one axis per line at the left side of the screen.
  • 56dcc2c3
    by Werner Lemberg at 2023-02-05T16:22:45+01:00 
    [ftmulti] Display up to 15 axes.

Due to the support of the 'avar' version 2 OpenType extension it is expected
that the number of axes in many fonts will increase because adding 'virtual
axes' is cheap now.

* src/ftmulti.c (MAX_MM_AXES): Set to 15.
(Help): Updated.
(Process_Event): Handle keys '7890-=' for axes 6-8, '!@#$%^' for axes 9-11,
and '&*()_+' for axes 12-14.

2 changed files:

Changes:

  • graph/grevents.h
    ... ... @@ -58,6 +58,8 @@
    58 58 
         grKeyDiv        = '/',
    59 59 
         grKeyExclam     = '!',
    60 60 
         grKeyPercent    = '%',
    61 
    +    grKeyHash       = '#',
    62 
    +    grKeyAmpersand  = '&',
    61 63 
         grKeyLeftParen  = '(',
    62 64 
         grKeyRightParen = ')',
    63 65 
         grKeyAt         = '@',

  • src/ftmulti.c
    ... ... @@ -38,7 +38,7 @@
    38 38 
     #define  HEADER_HEIGHT  12
    39 39
    40 40 
     #define  MAXPTSIZE    500               /* dtp */
    41 
    -#define  MAX_MM_AXES    6
    41 
    +#define  MAX_MM_AXES   15
    42 42
    43 43 
       /* definitions in ftcommon.c */
    44 44 
       unsigned int
    ... ... @@ -390,9 +390,8 @@
    390 390 
         unsigned int  i;
    391 391
    392 392
    393 
    -    start_x = 4;
    394 
    -    start_y = pt_size + HEADER_HEIGHT *
    395 
    -                        ( num_shown_axes > MAX_MM_AXES / 2 ? 6 : 5 );
    393 
    +    start_x = 20 * 8;
    394 
    +    start_y = pt_size + HEADER_HEIGHT * 3;
    396 395
    397 396 
         step_y = size->metrics.y_ppem + 10;
    398 397
    ... ... @@ -455,8 +454,8 @@
    455 454 
         const unsigned char*  p;
    456 455
    457 456
    458 
    -    start_x = 4;
    459 
    -    start_y = pt_size + ( num_shown_axes > MAX_MM_AXES / 2 ? 52 : 44 );
    457 
    +    start_x = 20 * 8;
    458 
    +    start_y = pt_size + HEADER_HEIGHT * 3;
    460 459
    461 460 
         step_y = size->metrics.y_ppem + 10;
    462 461
    ... ... @@ -571,12 +570,12 @@
    571 570 
         grWriteln( "F9, F10     adjust index by 100" );
    572 571 
         grWriteln( "F11, F12    adjust index by 1000" );
    573 572 
         grLn();
    574 
    -    grWriteln( "F1, F2      adjust first axis" );
    575 
    -    grWriteln( "F3, F4      adjust second axis" );
    576 
    -    grWriteln( "F5, F6      adjust third axis" );
    577 
    -    grWriteln( "1, 2        adjust fourth axis" );
    578 
    -    grWriteln( "3, 4        adjust fifth axis" );
    579 
    -    grWriteln( "5, 6        adjust sixth axis" );
    573 
    +    grWriteln( "F1, F2  adjust axis 0    7, 8  adjust axis  6    &, *  adjust axis 12" );
    574 
    +    grWriteln( "F3, F4  adjust axis 1    9, 0  adjust axis  7    (, )  adjust axis 13" );
    575 
    +    grWriteln( "F5, F6  adjust axis 2    -, =  adjust axis  8    _, +  adjust axis 14" );
    576 
    +    grWriteln( "1, 2    adjust axis 3    !, @  adjust axis  9" );
    577 
    +    grWriteln( "3, 4    adjust axis 4    #, $  adjust axis 10" );
    578 
    +    grWriteln( "5, 6    adjust axis 5    %, ^  adjust axis 11" );
    580 579 
         grLn();
    581 580 
         grWriteln( "i, I        adjust axis range increment" );
    582 581 
         grLn();
    ... ... @@ -755,6 +754,96 @@
    755 754 
           axis = 5;
    756 755 
           goto Do_Axis;
    757 756
    757 
    +    case grKEY( '7' ):
    758 
    +      i = -increment;
    759 
    +      axis = 6;
    760 
    +      goto Do_Axis;
    761 
    +
    762 
    +    case grKEY( '8' ):
    763 
    +      i = increment;
    764 
    +      axis = 6;
    765 
    +      goto Do_Axis;
    766 
    +
    767 
    +    case grKEY( '9' ):
    768 
    +      i = -increment;
    769 
    +      axis = 7;
    770 
    +      goto Do_Axis;
    771 
    +
    772 
    +    case grKEY( '0' ):
    773 
    +      i = increment;
    774 
    +      axis = 7;
    775 
    +      goto Do_Axis;
    776 
    +
    777 
    +    case grKEY( '-' ):
    778 
    +      i = -increment;
    779 
    +      axis = 8;
    780 
    +      goto Do_Axis;
    781 
    +
    782 
    +    case grKEY( '=' ):
    783 
    +      i = increment;
    784 
    +      axis = 8;
    785 
    +      goto Do_Axis;
    786 
    +
    787 
    +    case grKEY( '!' ):
    788 
    +      i = -increment;
    789 
    +      axis = 9;
    790 
    +      goto Do_Axis;
    791 
    +
    792 
    +    case grKEY( '@' ):
    793 
    +      i = increment;
    794 
    +      axis = 9;
    795 
    +      goto Do_Axis;
    796 
    +
    797 
    +    case grKEY( '#' ):
    798 
    +      i = -increment;
    799 
    +      axis = 10;
    800 
    +      goto Do_Axis;
    801 
    +
    802 
    +    case grKEY( '$' ):
    803 
    +      i = increment;
    804 
    +      axis = 10;
    805 
    +      goto Do_Axis;
    806 
    +
    807 
    +    case grKEY( '%' ):
    808 
    +      i = -increment;
    809 
    +      axis = 11;
    810 
    +      goto Do_Axis;
    811 
    +
    812 
    +    case grKEY( '^' ):
    813 
    +      i = increment;
    814 
    +      axis = 11;
    815 
    +      goto Do_Axis;
    816 
    +
    817 
    +    case grKEY( '&' ):
    818 
    +      i = -increment;
    819 
    +      axis = 12;
    820 
    +      goto Do_Axis;
    821 
    +
    822 
    +    case grKEY( '*' ):
    823 
    +      i = increment;
    824 
    +      axis = 12;
    825 
    +      goto Do_Axis;
    826 
    +
    827 
    +    case grKEY( '(' ):
    828 
    +      i = -increment;
    829 
    +      axis = 13;
    830 
    +      goto Do_Axis;
    831 
    +
    832 
    +    case grKEY( ')' ):
    833 
    +      i = increment;
    834 
    +      axis = 13;
    835 
    +      goto Do_Axis;
    836 
    +
    837 
    +    case grKEY( '_' ):
    838 
    +      i = -increment;
    839 
    +      axis = 14;
    840 
    +      goto Do_Axis;
    841 
    +
    842 
    +    case grKEY( '+' ):
    843 
    +      i = increment;
    844 
    +      axis = 14;
    845 
    +      goto Do_Axis;
    846 
    +
    758 847 
         /* scaling related keys */
    759 848
    760 849 
         case grKeyPageUp:
    ... ... @@ -1206,46 +1295,20 @@
    1206 1295
    1207 1296 
             strbuf_reset( header );
    1208 1297 
             strbuf_add( header, "axes:" );
    1209 
    -
    1210 
    -        {
    1211 
    -          unsigned int  limit = num_shown_axes > MAX_MM_AXES / 2
    1212 
    -                                  ? MAX_MM_AXES / 2
    1213 
    -                                  : num_shown_axes;
    1214 
    -
    1215 
    -
    1216 
    -          for ( n = 0; n < limit; n++ )
    1217 
    -          {
    1218 
    -            int  axis = shown_axes[n];
    1219 
    -
    1220 
    -
    1221 
    -            strbuf_format( header, "  %.50s%s: %.02f",
    1222 
    -                           multimaster->axis[axis].name,
    1223 
    -                           hidden[axis] ? "*" : "",
    1224 
    -                           design_pos[axis] / 65536.0 );
    1225 
    -          }
    1226 
    -        }
    1227 1298 
             grWriteCellString( bit, 0, 3 * HEADER_HEIGHT, Header, fore_color );
    1228 
    -
    1229 
    -        if ( num_shown_axes > MAX_MM_AXES / 2 )
    1299 
    +        for ( n = 0; n < num_shown_axes; n++ )
    1230 1300 
             {
    1231 
    -          unsigned int  limit = num_shown_axes;
    1301 
    +          int  axis = shown_axes[n];
    1232 1302
    1233 1303
    1234 1304 
               strbuf_reset( header );
    1235 
    -          strbuf_add( header, "     " );
    1236 
    -
    1237 
    -          for ( n = MAX_MM_AXES / 2; n < limit; n++ )
    1238 
    -          {
    1239 
    -            int  axis = shown_axes[n];
    1240 
    -
    1241 
    -
    1242 
    -            strbuf_format( header, "  %.50s%s: %.02f",
    1243 
    -                           multimaster->axis[axis].name,
    1244 
    -                           hidden[axis] ? "*" : "",
    1245 
    -                           design_pos[axis] / 65536.0 );
    1246 
    -          }
    1247 
    -
    1248 
    -          grWriteCellString( bit, 0, 4 * HEADER_HEIGHT, Header, fore_color );
    1305 
    +          strbuf_format( header, "%2i %.50s%s: %.02f",
    1306 
    +                         n,
    1307 
    +                         multimaster->axis[axis].name,
    1308 
    +                         hidden[axis] ? "*" : "",
    1309 
    +                         design_pos[axis] / 65536.0 );
    1310 
    +          grWriteCellString( bit, 0, ( n + 4 ) * HEADER_HEIGHT,
    1311 
    +                             Header, fore_color );
    1249 1312 
             }
    1250 1313
    1251 1314 
             {

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help

    reply via email to
    [Prev in Thread] Current Thread [Next in Thread]