mlow/mpd_control
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

utf8 char handling via glib's utf8 aware string functions

Browse Source
This commit is contained in:
Matt Low 2019-10-16 18:47:59 +04:00
parent efa0e1cb70
commit 06a70df2c5
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,10 +1,10 @@
CC = gcc CC = gcc
CFLAGS = -g -Wall CFLAGS = -g -Wall $(shell pkg-config --cflags --libs glib-2.0)
LDLIBS=-lpthread -lmpdclient LDLIBS=-lpthread -lmpdclient
OBJECTS = mpd_control.o OBJECTS = mpd_control.o
mpd_control: $(OBJECTS) mpd_control: $(OBJECTS)
$(CC) $(CFLAGS) $^ $(LDLIBS) -o $@ $(CC) $(CFLAGS) $^ $(LDLIBS) -o $@
clean: clean:
rm $(OBJECTS) rm $(OBJECTS)

40
mpd_control.c
View File

@ -7,6 +7,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include <glib.h>
struct worker_meta { struct worker_meta {
long long update_interval; long long update_interval;
@ -24,20 +25,19 @@ current_timestamp() {
} }
static void static void
scroll_text(char *text_to_scroll, int text_len, char *buffer, int *index, scroll_text(const char *text_to_scroll, const int text_len, char *buffer,
const int max_length) { int *index, const int max_length) {
if (*index - text_len > 0) if (*index - text_len > 0) *index %= text_len;
*index %= text_len;
const int overflow = text_len - *index - max_length; char* first_char = g_utf8_offset_to_pointer(text_to_scroll, *index);
if (overflow <= 0) { const int overflow = text_len - *index - max_length;
memcpy(buffer, &text_to_scroll[*index], text_len-*index); if (overflow <= 0) {
memcpy(&buffer[text_len-*index], text_to_scroll, max_length-(text_len-*index)); g_utf8_strncpy(buffer, first_char, text_len-*index);
} else { g_utf8_strncpy(g_utf8_offset_to_pointer(buffer, text_len-*index),
memcpy(buffer, &text_to_scroll[*index], max_length); text_to_scroll, max_length-(text_len-*index));
} } else {
g_utf8_strncpy(buffer, first_char, max_length);
buffer[max_length] = '\0'; }
} }
static int static int
@ -144,15 +144,21 @@ print_status(struct mpd_connection *conn, struct worker_meta *meta)
} }
// The label we'll actually print // The label we'll actually print
char label[meta->scroll_length+1]; // Allocate scroll_length * 4 chars(bytes) since each UTF-8 character may
if (strlen(full_label) > meta->scroll_length) { // consume up to 4 bytes.
char label[(meta->scroll_length*4)+1];
strncpy(label, "", sizeof(label));
if (g_utf8_strlen(full_label, -1) > meta->scroll_length) {
// If length of full label > meta->scroll_length, we'll scroll it // If length of full label > meta->scroll_length, we'll scroll it
// Pad the text with a separator // Pad the text with a separator
char padded_text[strlen(full_label) + 3]; char padded_text[strlen(full_label) + 3 + 1];
padded_text[sizeof(padded_text)-1] = '\0';
sprintf(padded_text, "%s | ", full_label); sprintf(padded_text, "%s | ", full_label);
scroll_text(padded_text, strlen(padded_text), label, scroll_text(padded_text, g_utf8_strlen(padded_text, -1), label,
&meta->scroll_index, meta->scroll_length); &meta->scroll_index, meta->scroll_length);
} else { } else {
// Else we'll just print it out normally and reset the scroll index // Else we'll just print it out normally and reset the scroll index