using TOP_RIGHT

Add projects integrating herbe to readme

.gitignore

@@ -1,3 +1,4 @@
 herbe
 config.h
 .ccls-cache
+*.~undo-tree~

Makefile

@@ -1,24 +1,18 @@
-CFLAGS = -Wall -Wextra -pedantic -lX11 -lXft -I/usr/include/freetype2 -pthread
+CFLAGS = -Wall -Wextra -pedantic -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 -lXft -I/usr/X11R6/include/freetype2 -pthread
 
 PREFIX ?= /usr/local
 CC ?= cc
 
-all: herbe
-
-config.h: config.def.h
+compile:
 	cp config.def.h config.h
-
-herbe: herbe.c config.h
 	$(CC) herbe.c $(CFLAGS) -o herbe
 
-install: herbe
-	mkdir -p ${DESTDIR}${PREFIX}/bin
-	cp -f herbe ${DESTDIR}${PREFIX}/bin
+install: compile
+	mkdir -p ~/bin
+	cp -f herbe ~/bin
+	chmod +x ~/bin/herbe
 
 uninstall:
-	rm -f ${DESTDIR}${PREFIX}/bin/herbe
+	rm -f ~/bin/herbe
 
-clean:
-	rm -f herbe
-
-.PHONY: all install uninstall clean
+.PHONY: compile install uninstall

README.md

@@ -5,13 +5,38 @@
   <img src="https://user-images.githubusercontent.com/24730635/90975811-cd62fd00-e537-11ea-9169-92e68a71d0a0.gif" />
 </p>
 
+## Features
+* Under 200 lines of code
+* Doesn't run in the background, just displays the notification and exits
+* No external dependencies except Xlib and Xft
+* Configurable through `config.h` or Xresources ([using this patch](https://github.com/dudik/herbe/pull/11))
+* [Actions support](#actions)
+* Extensible through [patches](https://github.com/dudik/herbe/pulls?q=is%3Aopen+is%3Apr+label%3Apatch)
+
+## Table of contents
+
+* [Usage](#usage)
+  * [Patches](#patches)
+  * [Dismiss a notification](#dismiss-a-notification)
+  * [Actions](#actions)
+  * [Newlines](#newlines)
+  * [Multiple notifications](#multiple-notifications)
+  * [Notifications don't show up](#notifications-dont-show-up)
+* [Installation](#installation)
+  * [Packages](#packages)
+  * [Dependencies](#dependencies)
+  * [Build](#build)
+* [Configuration](#configuration)
+* [Contribute](#contribute)
+
 ## Usage
 
-* [Dismiss a notification](#dismiss-a-notification)
-* [Actions](#actions)
-* [Newlines](#newlines)
-* [Multiple notifications](#multiple-notifications)
-* [Notifications don't show up](#notifications-dont-show-up)
+### Patches
+[List of available patches](https://github.com/dudik/herbe/pulls?q=is%3Aopen+is%3Apr+label%3Apatch)
+
+To create a new patch you'll have to open a pull request with your changes. Append `.diff` to the pull request URL to get a downloadable diff file. Don't forget to prefix the title with `patch:` and to apply the `patch` label to it. For inspiration, look at [my Xresources patch](https://github.com/dudik/herbe/pull/11). Thank you.
+
+_Note: This patching method was heavily inspired by [dylan's sowm](https://github.com/dylanaraps/sowm)._
 
 ### Dismiss a notification
 A notification can be dismissed either by clicking on it with `DISMISS_BUTTON` (set in config.h, defaults to left mouse button) or sending a `SIGUSR1` signal to it:
@@ -71,10 +96,20 @@ $ pkill -SIGUSR2 herbe
 And you should be fine. That's all you really need to interact with `herbe`.
 
 ## Installation
+### Packages
+[![Packaging status](https://repology.org/badge/vertical-allrepos/herbe.svg)](https://repology.org/project/herbe/versions)
+
+[OpenBSD patch](https://github.com/dudik/herbe/pull/4)
+
+[FreeBSD patch](https://github.com/dudik/herbe/pull/16)
+
+[Wayland port](https://github.com/muevoid/Wayherb) by [muevoid](https://github.com/muevoid)
+
+**Only the [herbe-git AUR package](https://aur.archlinux.org/packages/herbe-git/) is maintained by me.**
+
 ### Dependencies
 * X11 (Xlib)
 * Xft
-* freetype2
 
 The names of packages are different depending on which distribution you use.
 For example, if you use [Void Linux](https://voidlinux.org/) you will have to install these dependencies:
@@ -95,5 +130,10 @@ You can also use `make clean` to remove the binary from the build folder, `sudo
 ## Configuration
 herbe is configured at compile-time by editing `config.h`. Every option should be self-explanatory. There is no `height` option because height is determined by font size and text padding.
 
+[Xresources patch](https://github.com/dudik/herbe/pull/11)
+
 ## Contribute
 If you want to report a bug or you have a feature request, feel free to [open an issue](https://github.com/dudik/herbe/issues).
+
+## Projects with herbe integration
+- [qutebrowser](https://qutebrowser.org/) supports showing web notifications via herbe, via the `content.notifications.presenter` setting.

config.def.h

@@ -1,14 +1,14 @@
-static const char *background_color = "#3e3e3e";
-static const char *border_color = "#ececec";
-static const char *font_color = "#ececec";
-static const char *font_pattern = "monospace:size=10";
+static const char *background_color = "#282828";
+static const char *border_color = "#d65d0e";
+static const char *font_color = "#d65d0e";
+static const char *font_pattern = "Hack:pixelsize=12:antialias=true:autohint=true";
 static const unsigned line_spacing = 5;
 static const unsigned int padding = 15;
 
 static const unsigned int width = 450;
-static const unsigned int border_size = 2;
-static const unsigned int pos_x = 30;
-static const unsigned int pos_y = 60;
+static const unsigned int border_size = 1;
+static const unsigned int pos_x = 20;
+static const unsigned int pos_y = 20;
 
 enum corners { TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT };
 enum corners corner = TOP_RIGHT;

herbe.c

@@ -21,200 +21,200 @@ int exit_code = EXIT_DISMISS;
 
 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_FAIL);
+  va_list ap;
+  va_start(ap, format);
+  vfprintf(stderr, format, ap);
+  fprintf(stderr, "\n");
+  va_end(ap);
+  exit(EXIT_FAIL);
 }
 
 int get_max_len(char *string, XftFont *font, int max_text_width)
 {
-	int eol = strlen(string);
-	XGlyphInfo info;
-	XftTextExtentsUtf8(display, font, (FcChar8 *)string, eol, &info);
+  int eol = strlen(string);
+  XGlyphInfo info;
+  XftTextExtentsUtf8(display, font, (FcChar8 *)string, eol, &info);
 
-	if (info.width > max_text_width)
-	{
-		eol = max_text_width / font->max_advance_width;
-		info.width = 0;
+  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 *)string, eol, &info);
-		}
+      while (info.width < max_text_width)
+        {
+          eol++;
+          XftTextExtentsUtf8(display, font, (FcChar8 *)string, eol, &info);
+        }
 
-		eol--;
-	}
+      eol--;
+    }
 
-	for (int i = 0; i < eol; i++)
-		if (string[i] == '\n')
-		{
-			string[i] = ' ';
-			return ++i;
-		}
+  for (int i = 0; i < eol; i++)
+    if (string[i] == '\n')
+      {
+        string[i] = ' ';
+        return ++i;
+      }
 
-	if (info.width <= max_text_width)
-		return eol;
+  if (info.width <= max_text_width)
+    return eol;
 
-	int temp = eol;
+  int temp = eol;
 
-	while (string[eol] != ' ' && eol)
-		--eol;
+  while (string[eol] != ' ' && eol)
+    --eol;
 
-	if (eol == 0)
-		return temp;
-	else
-		return ++eol;
+  if (eol == 0)
+    return temp;
+  else
+    return ++eol;
 }
 
 void expire(int sig)
 {
-	XEvent event;
-	event.type = ButtonPress;
-	event.xbutton.button = (sig == SIGUSR2) ? (ACTION_BUTTON) : (DISMISS_BUTTON);
-	XSendEvent(display, window, 0, 0, &event);
-	XFlush(display);
+  XEvent event;
+  event.type = ButtonPress;
+  event.xbutton.button = (sig == SIGUSR2) ? (ACTION_BUTTON) : (DISMISS_BUTTON);
+  XSendEvent(display, window, 0, 0, &event);
+  XFlush(display);
 }
 
 int main(int argc, char *argv[])
 {
-	if (argc == 1)
-	{
-		sem_unlink("/herbe");
-		die("Usage: %s body", argv[0]);
-	}
+  if (argc == 1)
+    {
+      sem_unlink("/herbe");
+      die("Usage: %s body", argv[0]);
+    }
 
-	struct sigaction act_expire, act_ignore;
+  struct sigaction act_expire, act_ignore;
 
-	act_expire.sa_handler = expire;
-	act_expire.sa_flags = SA_RESTART;
-	sigemptyset(&act_expire.sa_mask);
+  act_expire.sa_handler = expire;
+  act_expire.sa_flags = SA_RESTART;
+  sigemptyset(&act_expire.sa_mask);
 
-	act_ignore.sa_handler = SIG_IGN;
-	act_ignore.sa_flags = 0;
-	sigemptyset(&act_ignore.sa_mask);
+  act_ignore.sa_handler = SIG_IGN;
+  act_ignore.sa_flags = 0;
+  sigemptyset(&act_ignore.sa_mask);
 
-	sigaction(SIGALRM, &act_expire, 0);
-	sigaction(SIGTERM, &act_expire, 0);
-	sigaction(SIGINT, &act_expire, 0);
+  sigaction(SIGALRM, &act_expire, 0);
+  sigaction(SIGTERM, &act_expire, 0);
+  sigaction(SIGINT, &act_expire, 0);
 
-	sigaction(SIGUSR1, &act_ignore, 0);
-	sigaction(SIGUSR2, &act_ignore, 0);
+  sigaction(SIGUSR1, &act_ignore, 0);
+  sigaction(SIGUSR2, &act_ignore, 0);
 
-	if (!(display = XOpenDisplay(0)))
-		die("Cannot open display");
+  if (!(display = XOpenDisplay(0)))
+    die("Cannot open display");
 
-	int screen = DefaultScreen(display);
-	Visual *visual = DefaultVisual(display, screen);
-	Colormap colormap = DefaultColormap(display, screen);
+  int screen = DefaultScreen(display);
+  Visual *visual = DefaultVisual(display, screen);
+  Colormap colormap = DefaultColormap(display, screen);
 
-	int screen_width = DisplayWidth(display, screen);
-	int screen_height = DisplayHeight(display, screen);
+  int screen_width = DisplayWidth(display, screen);
+  int screen_height = DisplayHeight(display, screen);
 
-	XSetWindowAttributes attributes;
-	attributes.override_redirect = True;
-	XftColor color;
-	XftColorAllocName(display, visual, colormap, background_color, &color);
-	attributes.background_pixel = color.pixel;
-	XftColorAllocName(display, visual, colormap, border_color, &color);
-	attributes.border_pixel = color.pixel;
+  XSetWindowAttributes attributes;
+  attributes.override_redirect = True;
+  XftColor color;
+  XftColorAllocName(display, visual, colormap, background_color, &color);
+  attributes.background_pixel = color.pixel;
+  XftColorAllocName(display, visual, colormap, border_color, &color);
+  attributes.border_pixel = color.pixel;
 
-	int num_of_lines = 0;
-	int max_text_width = width - 2 * padding;
-	int lines_size = 5;
-	char **lines = malloc(lines_size * sizeof(char *));
-	if (!lines)
-		die("malloc failed");
+  int num_of_lines = 0;
+  int max_text_width = width - 2 * padding;
+  int lines_size = 5;
+  char **lines = malloc(lines_size * sizeof(char *));
+  if (!lines)
+    die("malloc failed");
 
-	XftFont *font = XftFontOpenName(display, screen, font_pattern);
+  XftFont *font = XftFontOpenName(display, screen, font_pattern);
 
-	for (int i = 1; i < argc; i++)
-	{
-		for (unsigned int eol = get_max_len(argv[i], font, max_text_width); eol; argv[i] += eol, num_of_lines++, eol = get_max_len(argv[i], font, max_text_width))
-		{
-			if (lines_size <= num_of_lines)
-			{
-				lines = realloc(lines, (lines_size += 5) * sizeof(char *));
-				if (!lines)
-					die("realloc failed");
-			}
+  for (int i = 1; i < argc; i++)
+    {
+      for (unsigned int eol = get_max_len(argv[i], font, max_text_width); eol; argv[i] += eol, num_of_lines++, eol = get_max_len(argv[i], font, max_text_width))
+        {
+          if (lines_size <= num_of_lines)
+            {
+              lines = realloc(lines, (lines_size += 5) * sizeof(char *));
+              if (!lines)
+                die("realloc failed");
+            }
 
-			lines[num_of_lines] = malloc((eol + 1) * sizeof(char));
-			if (!lines[num_of_lines])
-				die("malloc failed");
+          lines[num_of_lines] = malloc((eol + 1) * sizeof(char));
+          if (!lines[num_of_lines])
+            die("malloc failed");
 
-			strncpy(lines[num_of_lines], argv[i], eol);
-			lines[num_of_lines][eol] = '\0';
-		}
-	}
+          strncpy(lines[num_of_lines], argv[i], eol);
+          lines[num_of_lines][eol] = '\0';
+        }
+    }
 
-	unsigned int x = pos_x;
-	unsigned int y = pos_y;
-	unsigned int text_height = font->ascent - font->descent;
-	unsigned int height = (num_of_lines - 1) * line_spacing + num_of_lines * text_height + 2 * padding;
+  unsigned int x = pos_x;
+  unsigned int y = pos_y;
+  unsigned int text_height = font->ascent - font->descent;
+  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;
+  if (corner == TOP_RIGHT || corner == BOTTOM_RIGHT)
+    x = screen_width - width - border_size * 2 - pos_x;
 
-	if (corner == BOTTOM_LEFT || corner == BOTTOM_RIGHT)
-		y = screen_height - height - border_size * 2 - pos_y;
+  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);
+  window = XCreateWindow(display, RootWindow(display, screen), x, y, width, height, border_size, DefaultDepth(display, screen),
+                         CopyFromParent, visual, CWOverrideRedirect | CWBackPixel | CWBorderPixel, &attributes);
 
-	XftDraw *draw = XftDrawCreate(display, window, visual, colormap);
-	XftColorAllocName(display, visual, colormap, font_color, &color);
+  XftDraw *draw = XftDrawCreate(display, window, visual, colormap);
+  XftColorAllocName(display, visual, colormap, font_color, &color);
 
-	XSelectInput(display, window, ExposureMask | ButtonPress);
-	XMapWindow(display, window);
+  XSelectInput(display, window, ExposureMask | ButtonPress);
+  XMapWindow(display, window);
 
-	sem_t *mutex = sem_open("/herbe", O_CREAT, 0644, 1);
-	sem_wait(mutex);
+  sem_t *mutex = sem_open("/herbe", O_CREAT, 0644, 1);
+  sem_wait(mutex);
 
-	sigaction(SIGUSR1, &act_expire, 0);
-	sigaction(SIGUSR2, &act_expire, 0);
+  sigaction(SIGUSR1, &act_expire, 0);
+  sigaction(SIGUSR2, &act_expire, 0);
 
-	if (duration != 0)
-		alarm(duration);
+  if (duration != 0)
+    alarm(duration);
 
-	for (;;)
-	{
-		XEvent event;
-		XNextEvent(display, &event);
+  for (;;)
+    {
+      XEvent event;
+      XNextEvent(display, &event);
 
-		if (event.type == Expose)
-		{
-			XClearWindow(display, window);
-			for (int i = 0; i < num_of_lines; i++)
-				XftDrawStringUtf8(draw, &color, font, padding, line_spacing * i + text_height * (i + 1) + padding,
-								  (FcChar8 *)lines[i], strlen(lines[i]));
-		}
-		else if (event.type == ButtonPress)
-		{
-			if (event.xbutton.button == DISMISS_BUTTON)
-				break;
-			else if (event.xbutton.button == ACTION_BUTTON)
-			{
-				exit_code = EXIT_ACTION;
-				break;
-			}
-		}
-	}
+      if (event.type == Expose)
+        {
+          XClearWindow(display, window);
+          for (int i = 0; i < num_of_lines; i++)
+            XftDrawStringUtf8(draw, &color, font, padding, line_spacing * i + text_height * (i + 1) + padding,
+                              (FcChar8 *)lines[i], strlen(lines[i]));
+        }
+      else if (event.type == ButtonPress)
+        {
+          if (event.xbutton.button == DISMISS_BUTTON)
+            break;
+          else if (event.xbutton.button == ACTION_BUTTON)
+            {
+              exit_code = EXIT_ACTION;
+              break;
+            }
+        }
+    }
 
-	sem_post(mutex);
-	sem_close(mutex);
+  sem_post(mutex);
+  sem_close(mutex);
 
-	for (int i = 0; i < num_of_lines; i++)
-		free(lines[i]);
+  for (int i = 0; i < num_of_lines; i++)
+    free(lines[i]);
 
-	free(lines);
-	XftDrawDestroy(draw);
-	XftColorFree(display, visual, colormap, &color);
-	XftFontClose(display, font);
-	XCloseDisplay(display);
+  free(lines);
+  XftDrawDestroy(draw);
+  XftColorFree(display, visual, colormap, &color);
+  XftFontClose(display, font);
+  XCloseDisplay(display);
 
-	return exit_code;
-}
+  return exit_code;
+}