add -o and free(item) on delitem

Author: phillbush

xnotify.1

@@ -3,6 +3,7 @@
 xnotify \- popup a notification on the screen
 .SH SYNOPSIS
 .B xnotify
+.RB [ \-o ]
 .RB [ \-G
 .IR gravity ]
 .RB [ \-g
@@ -65,6 +66,11 @@ Monitor numbers start from 0.
 Without this option,
 xnotify is displayed on the first monitor (that is, the monitor 0).
 .TP
+.B \-o
+With this option,
+only one notification should exist at a time.
+So, when a new notification appears, the other ones are removed.
+.TP
 .BI "\-s " seconds
 Specify the time, in seconds,
 for a notification to be displayed before it is removed from screen.

xnotify.c

@@ -38,14 +38,17 @@ static Atom netatom[NetLast];
 static struct DC dc;
 static struct Fonts titlefnt, bodyfnt;
 
+/* flags */
+static int oflag = 0;   /* whether only one notification must exist at a time */
+
 /* include configuration structure */
 #include "config.h"
 
 /* show usage */
 void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: xnotify [-G gravity] [-g geometry] [-m monitor] [-s seconds]\n");
+	(void)fprintf(stderr, "usage: xnotify [-o] [-G gravity] [-g geometry] [-m monitor] [-s seconds]\n");
 	exit(1);
 }
 
@@ -108,7 +111,7 @@ getoptions(int argc, char *argv[])
 	unsigned long n;
 	int ch;
 
-	while ((ch = getopt(argc, argv, "G:g:m:s:")) != -1) {
+	while ((ch = getopt(argc, argv, "G:g:m:os:")) != -1) {
 		switch (ch) {
 		case 'G':
 			config.gravityspec = optarg;
@@ -119,6 +122,9 @@ getoptions(int argc, char *argv[])
 		case 'm':
 			mon.num = atoi(optarg);
 			break;
+		case 'o':
+			oflag = 1;
+			break;
 		case 's':
 			if ((n = strtoul(optarg, NULL, 10)) < INT_MAX)
 				config.sec = n;
@@ -794,7 +800,6 @@ delitem(struct Queue *queue, struct Item *item)
 		free(item->body);
 	XFreePixmap(dpy, item->pixmap);
 	XDestroyWindow(dpy, item->win);
-
 	if (item->prev)
 		item->prev->next = item->next;
 	else
@@ -803,7 +808,7 @@ delitem(struct Queue *queue, struct Item *item)
 		item->next->prev = item->prev;
 	else
 		queue->tail = item->prev;
-
+	free(item);
 	queue->change = 1;
 }
 
@@ -822,6 +827,21 @@ optiontype(const char *s)
 	return UNKNOWN;
 }
 
+/* destroy all notification items */
+static void
+cleanitems(struct Queue *queue)
+{
+	struct Item *item;
+	struct Item *tmp;
+
+	item = queue->head;
+	while (item) {
+		tmp = item;
+		item = item->next;
+		delitem(queue, tmp);
+	}
+}
+
 /* read stdin */
 static void
 parseinput(struct Queue *queue, char *s)
@@ -856,7 +876,6 @@ parseinput(struct Queue *queue, char *s)
 		default:
 			break;
 		}
-
 	}
 
 	/* get the body */
@@ -868,6 +887,9 @@ parseinput(struct Queue *queue, char *s)
 	if (!title)
 		return;
 
+	if (oflag)
+		cleanitems(queue);
+
 	additem(queue, title, body, file, bg, fg, brd);
 }
 
@@ -976,21 +998,6 @@ moveitems(struct Queue *queue)
 	queue->change = 0;
 }
 
-/* destroy all notification items */
-static void
-cleanitems(struct Queue *queue)
-{
-	struct Item *item;
-	struct Item *tmp;
-
-	item = queue->head;
-	while (item) {
-		tmp = item;
-		item = item->next;
-		delitem(queue, tmp);
-	}
-}
-
 /* clean up dc elements */
 static void
 cleandc(void)