umgeher/herbe
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Add dynamic space allocation for notification body

Browse source
This commit is contained in:
Samuel Dudik 2020-08-08 17:57:24 +02:00
parent 2c2741a9cc
commit 36c03fec66
2 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
herbe.c
View file

@ -5,12 +5,23 @@
#include <signal.h>
#include <unistd.h>
#include <string.h>
#include <stdarg.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 body_len = strlen(body);
@ -53,10 +64,7 @@ void expire()
int main(int argc, char *argv[])
{
if (argc == 1)
{
fprintf(stderr, "Usage: herbe body\n");
exit(EXIT_FAILURE);
}
die("Usage: %s body", argv[0]);
signal(SIGALRM, expire);
alarm(duration);
@ -64,10 +72,7 @@ int main(int argc, char *argv[])
display = XOpenDisplay(0);
if (display == 0)
{
fprintf(stderr, "Cannot open display\n");
exit(EXIT_FAILURE);
}
die("Cannot open display");
int screen = DefaultScreen(display);
Visual *visual = DefaultVisual(display, screen);
@ -89,8 +94,10 @@ int main(int argc, char *argv[])
int num_of_lines = 0;
int max_text_width = width - 2 * padding;
// TODO replace hard-coded size 100
char words[100][max_text_width / font->max_advance_width + 2];
int words_size = 5;
char **words = malloc(words_size * sizeof(char *));
if (!words)
die("malloc failed");
for (int i = 1; i < argc; i++)
{
@ -98,6 +105,15 @@ int main(int argc, char *argv[])
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 (words_size <= num_of_lines)
{
words = realloc(words, (words_size += 5) * sizeof(char *));
if (!words)
die("malloc failed");
}
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';
}
@ -139,10 +155,14 @@ int main(int argc, char *argv[])
break;
}
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);
}