norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

console: add UCS4 to UTF8 conversion

Browse Source 
Allow to create new kmscon_char objects with UCS4 input.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2011-12-31 17:38:17 +01:00
parent 22a16b0cd5
commit af9ab4197c
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/console.h
View File

@ -47,12 +47,16 @@ struct kmscon_console;
int kmscon_char_new(struct kmscon_char **out);
int kmscon_char_new_u8(struct kmscon_char **out, const char *str, size_t len);
int kmscon_char_new_ucs4(struct kmscon_char **out, const uint32_t *str,
size_t len);
int kmscon_char_dup(struct kmscon_char **out, const struct kmscon_char *orig);
void kmscon_char_free(struct kmscon_char *ch);
void kmscon_char_reset(struct kmscon_char *ch);
int kmscon_char_set(struct kmscon_char *ch, const struct kmscon_char *orig);
int kmscon_char_set_u8(struct kmscon_char *ch, const char *str, size_t len);
int kmscon_char_set_ucs4(struct kmscon_char *ch, const uint32_t *str,
size_t len);
const char *kmscon_char_get_u8(const struct kmscon_char *ch);
size_t kmscon_char_get_len(const struct kmscon_char *ch);
int kmscon_char_append_u8(struct kmscon_char *ch, const char *str, size_t len);

60
src/console_char.c
View File

@ -157,6 +157,44 @@ int kmscon_char_new_u8(struct kmscon_char **out, const char *str, size_t len)
return 0;
}
int kmscon_char_new_ucs4(struct kmscon_char **out, const uint32_t *str,
size_t len)
{
int ret;
struct kmscon_char *ch;
char *str8;
glong siz;
if (!len)
return kmscon_char_new(out);
if (!out || !str)
return -EINVAL;
str8 = g_ucs4_to_utf8(str, len, NULL, &siz, NULL);
if (!str8 || siz < 0)
return -EFAULT;
ret = new_char(&ch, siz);
if (ret)
goto err_free;
ret = kmscon_char_set_u8(ch, str8, siz);
if (ret)
goto err_char;
g_free(str8);
*out = ch;
return 0;
err_char:
kmscon_char_free(ch);
err_free:
g_free(str8);
return ret;
}
int kmscon_char_dup(struct kmscon_char **out, const struct kmscon_char *orig)
{
struct kmscon_char *ch;
@ -222,6 +260,28 @@ int kmscon_char_set_u8(struct kmscon_char *ch, const char *str, size_t len)
return 0;
}
int kmscon_char_set_ucs4(struct kmscon_char *ch, const uint32_t *str,
size_t len)
{
char *str8;
glong siz;
int ret;
if (!ch)
return -EINVAL;
str8 = g_ucs4_to_utf8(str, len, NULL, &siz, NULL);
if (!str8 || siz < 0) {
g_free(str8);
return -EFAULT;
}
ret = kmscon_char_set_u8(ch, str8, siz);
g_free(str8);
return ret;
}
const char *kmscon_char_get_u8(const struct kmscon_char *ch)
{
if (!ch)