Add option to use primary monitor intead of root…

screen dimensions, with Xresources support

Modified from dudik#21 such that it
applies on top of dudik#11 and
use_primary_montior can be taken from xrdb

Author: Owen McGrath

Makefile

@@ -1,4 +1,4 @@
-CFLAGS = -Wall -Wextra -pedantic -lX11 -lXft -I/usr/include/freetype2 -pthread
+CFLAGS = -Wall -Wextra -pedantic -lX11 -lXft -lXrandr -I/usr/include/freetype2 -pthread
 
 PREFIX ?= /usr/local
 CC ?= cc

config.def.h

@@ -4,6 +4,7 @@ static const char *font_color = "#ececec";
 static const char *font_pattern = "monospace:size=10";
 static unsigned line_spacing = 5;
 static unsigned int padding = 15;
+static int use_primary_monitor = 0;
 
 static unsigned int width = 450;
 static unsigned int border_size = 2;

herbe.c

@@ -1,6 +1,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 #include <X11/Xresource.h>
+#include <X11/extensions/Xrandr.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -136,13 +137,28 @@ int main(int argc, char *argv[])
 	XRES_INT(pos_y);
 	XRES_INT(corner);
 	XRES_INT(duration);
+	XRES_INT(use_primary_monitor);
 
 	int screen = DefaultScreen(display);
 	Visual *visual = DefaultVisual(display, screen);
 	Colormap colormap = DefaultColormap(display, screen);
 
+	int screen_x = 0;
+	int screen_y = 0;
 	int screen_width = DisplayWidth(display, screen);
 	int screen_height = DisplayHeight(display, screen);
+	if (use_primary_monitor) {
+		int nMonitors;
+		XRRMonitorInfo *info = XRRGetMonitors(display, RootWindow(display, screen), 1, &nMonitors);
+		for (int i = 0; i < nMonitors; i++) {
+			if (info[i].primary) {
+				screen_x = info[i].x;
+				screen_y = info[i].y;
+				screen_width = info[i].width;
+				screen_height = info[i].height;
+			}
+		}
+	}
 
 	XSetWindowAttributes attributes;
 	attributes.override_redirect = True;
@@ -181,16 +197,16 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	unsigned int x = pos_x;
-	unsigned int y = pos_y;
+	unsigned int x = screen_x + pos_x;
+	unsigned int y = screen_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;
+		x = screen_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;
+		y = screen_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);