nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity
caa16deb1c
putty-source/terminal/bidi.h

66 lines
2.2 KiB
C
Raw Normal View History

Move bidi gettype main() into its own file. That's what I've usually been doing with any main()s I find under ifdef; there's no reason this should be an exception. If we're keeping it in the code at all, we should ensure it carries on compiling. I've also created a new header file bidi.h, containing pieces of the bidi definitions shared between bidi.c and the new source file.
2021-10-10 13:31:04 +00:00
/*
* Header file shared between bidi.c and its tests. Not used by
* anything outside the bidi subsystem.
*/
#ifndef PUTTY_BIDI_H
#define PUTTY_BIDI_H
#define LMASK 0x3F /* Embedding Level mask */
#define OMASK 0xC0 /* Override mask */
#define OISL 0x80 /* Override is L */
#define OISR 0x40 /* Override is R */
/* Shaping Helpers */
#define STYPE(xh) ((((xh) >= SHAPE_FIRST) && ((xh) <= SHAPE_LAST)) ? \
shapetypes[(xh)-SHAPE_FIRST].type : SU) /*))*/
#define SISOLATED(xh) (shapetypes[(xh)-SHAPE_FIRST].form_b)
#define SFINAL(xh) ((xh)+1)
#define SINITIAL(xh) ((xh)+2)
#define SMEDIAL(ch) ((ch)+3)
#define leastGreaterOdd(x) ( ((x)+1) | 1 )
#define leastGreaterEven(x) ( ((x)+2) &~ 1 )
/* Function declarations used outside bidi.c */
unsigned char bidi_getType(int ch);
Make bidi type enums into list macros. This makes it easier to create the matching array of type names in bidi_gettype.c, and eliminates the need for an assertion to check the array matched the enum. And I'm about to need to add more types, so let's start by making that trivially easy.
2021-10-10 13:32:03 +00:00
/* Bidi character types */
#define BIDI_CHAR_TYPE_LIST(X) \
X(L) \
X(LRE) \
X(LRO) \
X(R) \
X(AL) \
X(RLE) \
X(RLO) \
X(PDF) \
X(EN) \
X(ES) \
X(ET) \
X(AN) \
X(CS) \
X(NSM) \
X(BN) \
X(B) \
X(S) \
X(WS) \
X(ON) \
/* end of list */
Move bidi gettype main() into its own file. That's what I've usually been doing with any main()s I find under ifdef; there's no reason this should be an exception. If we're keeping it in the code at all, we should ensure it carries on compiling. I've also created a new header file bidi.h, containing pieces of the bidi definitions shared between bidi.c and the new source file.
2021-10-10 13:31:04 +00:00
/* Shaping Types */
Make bidi type enums into list macros. This makes it easier to create the matching array of type names in bidi_gettype.c, and eliminates the need for an assertion to check the array matched the enum. And I'm about to need to add more types, so let's start by making that trivially easy.
2021-10-10 13:32:03 +00:00
#define SHAPING_CHAR_TYPE_LIST(X) \
X(SL) /* Left-Joining, doesn't exist in U+0600 - U+06FF */ \
X(SR) /* Right-Joining, ie has Isolated, Final */ \
X(SD) /* Dual-Joining, ie has Isolated, Final, Initial, Medial */ \
X(SU) /* Non-Joining */ \
X(SC) /* Join-Causing, like U+0640 (TATWEEL) */ \
/* end of list */
#define ENUM_DECL(name) name,
typedef enum { BIDI_CHAR_TYPE_LIST(ENUM_DECL) N_BIDI_TYPES } BidiType;
typedef enum { SHAPING_CHAR_TYPE_LIST(ENUM_DECL) N_SHAPING_TYPES } ShapingType;
#undef ENUM_DECL
Move bidi gettype main() into its own file. That's what I've usually been doing with any main()s I find under ifdef; there's no reason this should be an exception. If we're keeping it in the code at all, we should ensure it carries on compiling. I've also created a new header file bidi.h, containing pieces of the bidi definitions shared between bidi.c and the new source file.
2021-10-10 13:31:04 +00:00
#endif /* PUTTY_BIDI_H */
Reference in New Issue Copy Permalink