X-Git-Url: https://git.datadissipation.net/herbe/blobdiff_plain/89dbfdbfb8ddf8519278212d227aba939f6f1ee5..e1df67a0febf281a6d4d11d54078ea69c27014d1:/herbe.c

diff --git a/herbe.c b/herbe.c
index 5bcb0a1..f1b1ca9 100644
--- a/herbe.c
+++ b/herbe.c
@@ -4,12 +4,65 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <unistd.h>
+#include <string.h>
+#include <stdarg.h>
+#include <fcntl.h>
+#include <semaphore.h>
 
 #include "config.h"
 
 Display *display;
 Window window;
 
+static void die(const char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	vfprintf(stderr, format, ap);
+	fprintf(stderr, "\n");
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+int get_max_len(char *body, XftFont *font, int max_text_width)
+{
+	int eol = strlen(body);
+	XGlyphInfo info;
+	XftTextExtentsUtf8(display, font, (FcChar8 *)body, eol, &info);
+
+	if (info.width > max_text_width)
+	{
+
+		eol = max_text_width / font->max_advance_width;
+		info.width = 0;
+
+		while (info.width < max_text_width)
+		{
+			eol++;
+			XftTextExtentsUtf8(display, font, (FcChar8 *)body, eol, &info);
+		}
+
+		eol--;
+	}
+
+	for (int i = 0; i < eol; i++)
+		if (body[i] == '\n')
+			return ++i;
+
+	if (info.width < max_text_width)
+		return eol;
+
+	int temp = eol;
+
+	while (body[eol] != ' ' && eol)
+		--eol;
+
+	if (eol == 0)
+		return temp;
+	else
+		return ++eol;
+}
+
 void expire()
 {
 	XEvent event;
@@ -20,24 +73,17 @@ void expire()
 
 int main(int argc, char *argv[])
 {
-	if (argc != 2)
-	{
-		fprintf(stderr, "Usage: herbe message\n");
-		exit(EXIT_FAILURE);
-	}
-
-	char *body = argv[1];
+	if (argc == 1)
+		die("Usage: %s body", argv[0]);
 
 	signal(SIGALRM, expire);
-	alarm(duration);
+	signal(SIGTERM, expire);
+	signal(SIGINT, expire);
 
-	display = XOpenDisplay(NULL);
+	display = XOpenDisplay(0);
 
-	if (display == NULL)
-	{
-		fprintf(stderr, "Cannot open display\n");
-		exit(EXIT_FAILURE);
-	}
+	if (display == 0)
+		die("Cannot open display");
 
 	int screen = DefaultScreen(display);
 	Visual *visual = DefaultVisual(display, screen);
@@ -57,68 +103,43 @@ int main(int argc, char *argv[])
 
 	XftFont *font = XftFontOpenName(display, screen, font_pattern);
 
+	int num_of_lines = 0;
 	int max_text_width = width - 2 * padding;
-	int eols_size = 5;
-	int *eols = malloc(eols_size * sizeof(int));
-	eols[0] = 0;
-	int remainder = strlen(body);
-	int num_of_lines = 1;
+	int words_size = 5;
+	char **words = malloc(words_size * sizeof(char *));
+	if (!words)
+		die("malloc failed");
 
-	while (1)
+	for (int i = 1; i < argc; i++)
 	{
-		XGlyphInfo info;
-		info.width = 0;
-		int eol = max_text_width / font->max_advance_width;
-		while (info.width < max_text_width)
-		{
-			eol++;
-			XftTextExtentsUtf8(display, font, body + eols[num_of_lines - 1], eol, &info);
-		}
-
-		--eol;
+		char *body = argv[i];
 
-		if (eol >= remainder)
+		for (unsigned int eol = get_max_len(body, font, max_text_width); eol <= strlen(body) && eol; body += eol, num_of_lines++, eol = get_max_len(body, font, max_text_width))
 		{
-			if (eols_size < num_of_lines + 1)
+			if (words_size <= num_of_lines)
 			{
-				eols_size += 5;
-				eols = realloc(eols, eols_size * sizeof(int));
+				words = realloc(words, (words_size += 5) * sizeof(char *));
+				if (!words)
+					die("malloc failed");
 			}
-			eols[num_of_lines] = eols[num_of_lines - 1] + remainder;
-			num_of_lines++;
-			break;
-		}
-
-		while (body[eols[num_of_lines - 1] + eol] != ' ')
-			--eol;
-
-		eol++;
-
-		remainder -= eol;
-		if (eols_size < num_of_lines + 1)
-		{
-			eols_size += 5;
-			eols = realloc(eols, eols_size * sizeof(int));
+			words[num_of_lines] = malloc((eol + 1) * sizeof(char));
+			if (!words[num_of_lines])
+				die("malloc failed");
+			strncpy(words[num_of_lines], body, eol);
+			words[num_of_lines][eol] = '\0';
 		}
-		eols[num_of_lines] = eols[num_of_lines - 1] + eol;
-		num_of_lines++;
 	}
 
 	unsigned int x = pos_x;
 	unsigned int y = pos_y;
 	unsigned int text_height = font->ascent - font->descent;
-	unsigned int height = (num_of_lines - 2) * line_spacing + (num_of_lines - 1) * text_height + 2 * padding;
+	unsigned int height = (num_of_lines - 1) * line_spacing + num_of_lines * text_height + 2 * padding;
 
-	switch (corner)
-	{
-	case BOTTOM_RIGHT:
-		y = screen_height - height - border_size * 2 - pos_y;
-	case TOP_RIGHT:
+	if (corner == TOP_RIGHT || corner == BOTTOM_RIGHT)
 		x = screen_width - width - border_size * 2 - pos_x;
-		break;
-	case BOTTOM_LEFT:
+
+	if (corner == BOTTOM_LEFT || corner == BOTTOM_RIGHT)
 		y = screen_height - height - border_size * 2 - pos_y;
-	}
 
 	window = XCreateWindow(display, RootWindow(display, screen), x, y, width, height, border_size, DefaultDepth(display, screen), CopyFromParent, visual,
 						   CWOverrideRedirect | CWBackPixel | CWBorderPixel, &attributes);
@@ -130,27 +151,39 @@ int main(int argc, char *argv[])
 
 	XMapWindow(display, window);
 
-	XEvent event;
+	sem_t *mutex = sem_open("/herbe", O_CREAT, 0644, 1);
+	sem_wait(mutex);
+
+	if (duration != 0)
+		alarm(duration);
 
 	while (1)
 	{
+		XEvent event;
 		XNextEvent(display, &event);
 
 		if (event.type == Expose)
 		{
 			XClearWindow(display, window);
-			for (int i = 1; i < num_of_lines; i++)
-				XftDrawStringUtf8(draw, &color, font, padding, line_spacing * (i - 1) + text_height * i + padding, body + eols[i - 1], eols[i] - eols[i - 1]);
+			for (int i = 0; i < num_of_lines; i++)
+				XftDrawStringUtf8(draw, &color, font, padding, line_spacing * i + text_height * (i + 1) + padding, (FcChar8 *)words[i], strlen(words[i]));
 		}
 		if (event.type == ButtonPress)
 			break;
 	}
 
-	free(eols);
+	sem_post(mutex);
+	sem_close(mutex);
+	sem_unlink("/herbe");
+
+	for (int i = 0; i < num_of_lines; i++)
+		free(words[i]);
+
+	free(words);
 	XftDrawDestroy(draw);
 	XftColorFree(display, visual, colormap, &color);
 	XftFontClose(display, font);
-
 	XCloseDisplay(display);
-	return EXIT_SUCCESS;
+
+	exit(EXIT_SUCCESS);
 }
\ No newline at end of file