interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

struct graphemes -> uiprivGraphemes. Also deleted OLD_uipriv.h now that that one is settled.

This commit is contained in:
Pietro Gagliardi 2018-04-15 22:43:14 -04:00
parent 01d6422664
commit 8e2004cf67
6 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/OLD_uipriv.h
View File

@ -1,3 +0,0 @@
// OS-specific text.* files
extern int uiprivStricmp(const char *a, const char *b);

2
common/attrstr.c
View File

@ -18,7 +18,7 @@ struct uiAttributedString {
size_t *u16tou8; size_t *u16tou8;
// this is lazily created to keep things from getting *too* slow // this is lazily created to keep things from getting *too* slow
struct graphemes *graphemes; uiprivGraphemes *graphemes;
}; };
static void resize(uiAttributedString *s, size_t u8, size_t u16) static void resize(uiAttributedString *s, size_t u8, size_t u16)

5
common/attrstr.h
View File

@ -28,10 +28,11 @@ extern size_t *uiprivAttributedStringCopyUTF8ToUTF16Table(const uiAttributedStri
extern size_t *uiprivAttributedStringCopyUTF16ToUTF8Table(const uiAttributedString *s, size_t *n); extern size_t *uiprivAttributedStringCopyUTF16ToUTF8Table(const uiAttributedString *s, size_t *n);
// per-OS graphemes.c/graphemes.cpp/graphemes.m/etc. // per-OS graphemes.c/graphemes.cpp/graphemes.m/etc.
struct graphemes { typedef struct uiprivGraphemes uiprivGraphemes;
struct uiprivGraphemes {
size_t len; size_t len;
size_t *pointsToGraphemes; size_t *pointsToGraphemes;
size_t *graphemesToPoints; size_t *graphemesToPoints;
}; };
extern int uiprivGraphemesTakesUTF16(void); extern int uiprivGraphemesTakesUTF16(void);
extern struct graphemes *uiprivNewGraphemes(void *s, size_t len); extern uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len);

6
darwin/graphemes.m
View File

@ -10,16 +10,16 @@ int uiprivGraphemesTakesUTF16(void)
return 1; return 1;
} }
struct graphemes *uiprivNewGraphemes(void *s, size_t len) uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len)
{ {
struct graphemes *g; uiprivGraphemes *g;
UniChar *str = (UniChar *) s; UniChar *str = (UniChar *) s;
CFStringRef cfstr; CFStringRef cfstr;
size_t ppos, gpos; size_t ppos, gpos;
CFRange range; CFRange range;
size_t i; size_t i;
g = uiprivNew(struct graphemes); g = uiprivNew(uiprivGraphemes);
cfstr = CFStringCreateWithCharactersNoCopy(NULL, str, len, kCFAllocatorNull); cfstr = CFStringCreateWithCharactersNoCopy(NULL, str, len, kCFAllocatorNull);
if (cfstr == NULL) { if (cfstr == NULL) {

6
unix/graphemes.c
View File

@ -7,16 +7,16 @@ int uiprivGraphemesTakesUTF16(void)
return 0; return 0;
} }
struct graphemes *uiprivNewGraphemes(void *s, size_t len) uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len)
{ {
struct graphemes *g; uiprivGraphemes *g;
char *text = (char *) s; char *text = (char *) s;
size_t lenchars; size_t lenchars;
PangoLogAttr *logattrs; PangoLogAttr *logattrs;
size_t i; size_t i;
size_t *op; size_t *op;
g = uiprivNew(struct graphemes); g = uiprivNew(uiprivGraphemes);
// TODO see if we can use the utf routines // TODO see if we can use the utf routines
lenchars = g_utf8_strlen(text, -1); lenchars = g_utf8_strlen(text, -1);

6
windows/graphemes.cpp
View File

@ -11,13 +11,13 @@ int uiprivGraphemesTakesUTF16(void)
return 1; return 1;
} }
struct graphemes *uiprivNewGraphemes(void *s, size_t len) uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len)
{ {
struct graphemes *g; uiprivGraphemes *g;
WCHAR *str; WCHAR *str;
size_t *pPTG, *pGTP; size_t *pPTG, *pGTP;
g = uiprivNew(struct graphemes); g = uiprivNew(uiprivGraphemes);
g->len = 0; g->len = 0;
str = (WCHAR *) s; str = (WCHAR *) s;