Changeset 7258c6a in buchla-68k for ram/vtyper.c


Ignore:
Timestamp:
07/09/2017 04:45:34 PM (7 years ago)
Author:
Thomas Lopatic <thomas@…>
Branches:
master
Children:
8618599
Parents:
0292fbb
Message:

Use standard integer types.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • ram/vtyper.c

    r0292fbb r7258c6a  
    1414#include "midas.h"
    1515
    16 extern  unsigned        exp_c(unsigned c);
    17 
    18 extern  short   cxrate;         /* data entry cursor x (col) update increment */
    19 extern  short   cyrate;         /* data entry cursor y (row) update increment */
    20 extern  short   stccol;         /* data entry text cursor column */
    21 extern  short   stcrow;         /* data entry text cursor row */
    22 extern  short   vtccol;         /* vtyper cursor column */
    23 extern  short   vtcrow;         /* vtyper cursor row */
    24 extern  short   vtdecol;        /* vtyper data entry column */
    25 extern  short   vtxval;         /* vtyper cursor x value */
    26 extern  short   vtyval;         /* vtyper cursor y value */
    27 
    28 extern  char    *vtdeptr;       /* vtyper data entry pointer */
    29 
    30 extern  char    vtdechr;        /* vtyper data entry character */
    31 
    32 extern  char    bfs[];          /* display string buffer */
    33 
    34 extern  short   vtwrow;         /* vtyper window top row */
    35 extern  short   vtwcol;         /* vtyper window left column */
     16extern  uint16_t        exp_c(uint16_t c);
     17
     18extern  int16_t cxrate;         /* data entry cursor x (col) update increment */
     19extern  int16_t cyrate;         /* data entry cursor y (row) update increment */
     20extern  int16_t stccol;         /* data entry text cursor column */
     21extern  int16_t stcrow;         /* data entry text cursor row */
     22extern  int16_t vtccol;         /* vtyper cursor column */
     23extern  int16_t vtcrow;         /* vtyper cursor row */
     24extern  int16_t vtdecol;        /* vtyper data entry column */
     25extern  int16_t vtxval;         /* vtyper cursor x value */
     26extern  int16_t vtyval;         /* vtyper cursor y value */
     27
     28extern  int8_t  *vtdeptr;       /* vtyper data entry pointer */
     29
     30extern  int8_t  vtdechr;        /* vtyper data entry character */
     31
     32extern  int8_t  bfs[];          /* display string buffer */
     33
     34extern  int16_t vtwrow;         /* vtyper window top row */
     35extern  int16_t vtwcol;         /* vtyper window left column */
    3636
    3737extern  void    (*vt_adv)(void);
    … …  
    4545extern  void    (*vt_stop)(void);
    4646                                /* vtyper exit function */
    47 extern  void    (*vt_dsp)(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf);
     47extern  void    (*vt_dsp)(uint16_t *obj, uint16_t fg, uint16_t bg, int16_t row, int16_t col, int8_t *buf);
    4848                                /* vtyper display function */
    4949
    50 extern  unsigned *vtobj;        /* vtyper display object pointer */
    51 extern  unsigned vtfgval;       /* vtyper data foreground color */
    52 extern  unsigned vtbgval;       /* vtyper data background color */
     50extern  uint16_t *vtobj;        /* vtyper display object pointer */
     51extern  uint16_t vtfgval;       /* vtyper data foreground color */
     52extern  uint16_t vtbgval;       /* vtyper data background color */
    5353
    5454/* virtual typewriter display line constants */
    5555
    5656/*                      "123456789012345678901234567890"  */
    57 char    vtlin1[] =      "ABCDEFGHIJKLMNOPQRSTUVWXYZ  | ";       /* top */
    58 char    vtlin2[] =      "abcdefghijklmnopqrstuvwxyz -*-";       /* center */
    59 char    vtlin3[] =      " 0123456789+-/#().,:;!?&<>  | ";       /* bottom */
     57int8_t  vtlin1[] =      "ABCDEFGHIJKLMNOPQRSTUVWXYZ  | ";       /* top */
     58int8_t  vtlin2[] =      "abcdefghijklmnopqrstuvwxyz -*-";       /* center */
     59int8_t  vtlin3[] =      " 0123456789+-/#().,:;!?&<>  | ";       /* bottom */
    6060
    6161/*
    … …  
    8585*/
    8686
    87 void vtsetup(unsigned *obj, short (*dsp)(), short col, char *ptr, short tr, short tc, short (*adv)(), short (*bsp)(), short (*cup)(), short (*cdn)(), short (*stop)(), unsigned fg, unsigned bg)
     87void vtsetup(uint16_t *obj, int16_t (*dsp)(), int16_t col, int8_t *ptr, int16_t tr, int16_t tc, int16_t (*adv)(), int16_t (*bsp)(), int16_t (*cup)(), int16_t (*cdn)(), int16_t (*stop)(), uint16_t fg, uint16_t bg)
    8888{
    8989        vtobj   = obj;          /* setup object pointer */
    … …  
    165165*/
    166166
    167 void vtdisp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf)
     167void vtdisp(uint16_t *obj, uint16_t fg, uint16_t bg, int16_t row, int16_t col, int8_t *buf)
    168168{
    169169
    … …  
    187187*/
    188188
    189 int vtyper(void)
     189int16_t vtyper(void)
    190190{
    191191        /* check for data entry */
Note: See TracChangeset for help on using the changeset viewer.