Changeset 4873 for toilet


Ignore:
Timestamp:
Sep 18, 2013, 9:03:51 AM (6 years ago)
Author:
Sam Hocevar
Message:

fix: use the upcoming libcaca's canvas width and smushing mode features.

Location:
toilet/trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • toilet/trunk/src/figlet.c

    r4350 r4873  
    5050    }
    5151
     52    caca_set_figfont_smush(cx->cv, cx->hmode);
     53    caca_set_figfont_width(cx->cv, cx->term_width);
     54
    5255    cx->feed = feed_figlet;
    5356    cx->flush = flush_figlet;
  • toilet/trunk/src/main.c

    r4681 r4873  
    4949    cx->term_width = 80;
    5050
    51     cx->hmode = H_DEFAULT;
     51    cx->hmode = "default";
    5252
    5353    cx->filters = NULL;
     
    127127        }
    128128        case 's':
    129             cx->hmode = H_DEFAULT;
     129            cx->hmode = "default";
    130130            break;
    131131        case 'S':
    132             cx->hmode = H_SMUSH;
     132            cx->hmode = "smush";
    133133            break;
    134134        case 'k':
    135             cx->hmode = H_KERN;
     135            cx->hmode = "kern";
    136136            break;
    137137        case 'W':
    138             cx->hmode = H_NONE;
     138            cx->hmode = "none";
    139139            break;
    140140        case 'o':
    141             cx->hmode = H_OVERLAP;
     141            cx->hmode = "overlap";
    142142            break;
    143143        case 'E': /* --export */
  • toilet/trunk/src/toilet.h

    r4350 r4873  
    3333
    3434    /* Used by the FIGlet driver */
    35     enum { H_DEFAULT, H_KERN, H_SMUSH, H_NONE, H_OVERLAP } hmode;
    36     unsigned int hsmushrule;
    37     unsigned long int hardblank;
    38     unsigned int height, baseline, max_length;
    39     int old_layout;
    40     unsigned int print_direction, full_layout, codetag_count;
    41     unsigned int glyphs;
    42     caca_canvas_t *fontcv, *charcv;
    43     int *left, *right; /* Unused yet */
     35    char const *hmode;
    4436    unsigned int *lookup;
    4537
Note: See TracChangeset for help on using the changeset viewer.