Fix minor bug causing 'dismiss' not to work
[herbe.git] / herbe.c
diff --git a/herbe.c b/herbe.c
index 907401200440a0d41983f873fdaf7de218f2474c..270b9e973133a43cf06c4ef6d049c55a410f9ff2 100644 (file)
--- a/herbe.c
+++ b/herbe.c
 #include <stdlib.h>
 #include <signal.h>
 #include <unistd.h>
+#include <string.h>
+#include <stdarg.h>
+#include <fcntl.h>
+#include <semaphore.h>
 
 #include "config.h"
 
+#define EXIT_ACTION 3
+
 Display *display;
 Window window;
+int exit_code = EXIT_SUCCESS;
+
+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')
+               {
+                       body[i] = ' ';
+                       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;
        event.type = ButtonPress;
+       event.xbutton.button = DISMISS_BUTTON;
        XSendEvent(display, window, 0, 0, &event);
        XFlush(display);
 }
 
-int main(int argc, char *argv[])
+void action()
 {
-       if (argc != 2)
-       {
-               fprintf(stderr, "Usage: herbe message\n");
-               exit(EXIT_FAILURE);
-       }
+       exit_code = EXIT_ACTION;
+       expire();
+}
 
-       char *body = argv[1];
+int main(int argc, char *argv[])
+{
+       if (argc == 1)
+               die("Usage: %s body", argv[0]);
 
        signal(SIGALRM, expire);
-       alarm(duration);
+       signal(SIGTERM, expire);
+       signal(SIGINT, expire);
+       signal(SIGUSR1, SIG_IGN);
+       signal(SIGUSR2, SIG_IGN);
 
-       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,62 +117,37 @@ 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, (FcChar8 *)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;
+                       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';
                }
-
-               int temp = eol;
-
-               while (body[eols[num_of_lines - 1] + eol] != ' ' && eol)
-                       --eol;
-
-               if (eol == 0)
-                       eol = temp;
-               else
-                       eol++;
-
-               remainder -= eol;
-               if (eols_size < num_of_lines + 1)
-               {
-                       eols_size += 5;
-                       eols = realloc(eols, eols_size * sizeof(int));
-               }
-               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;
 
        if (corner == TOP_RIGHT || corner == BOTTOM_RIGHT)
                x = screen_width - width - border_size * 2 - pos_x;
@@ -130,27 +165,49 @@ int main(int argc, char *argv[])
 
        XMapWindow(display, window);
 
-       XEvent event;
+       sem_t *mutex = sem_open("/herbe", O_CREAT, 0644, 1);
+       sem_wait(mutex);
+
+       signal(SIGUSR1, expire);
+       signal(SIGUSR2, action);
+
+       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, (FcChar8 *)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;
+               {
+                       if (event.xbutton.button == DISMISS_BUTTON)
+                               break;
+                       else if (event.xbutton.button == ACTION_BUTTON)
+                       {
+                               exit_code = EXIT_ACTION;
+                               break;
+                       }
+               }
        }
 
-       free(eols);
+       sem_post(mutex);
+       sem_close(mutex);
+
+       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_code);
 }