X-Git-Url: http://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/006c94ce9c745acfb07758c0d71a008d6dd2abe6..6abae763c6cce70c9b753778b5e3742a7719715a:/xmenu.h

diff --git a/xmenu.h b/xmenu.h
index e29df02..051bc4a 100644
--- a/xmenu.h
+++ b/xmenu.h
@@ -3,11 +3,19 @@
 /* enum for keyboard menu navigation */
 enum { ITEMPREV, ITEMNEXT, ITEMFIRST, ITEMLAST };
 
+/* enum for text alignment */
+enum {LeftAlignment, CenterAlignment, RightAlignment};
+
 /* macros */
 #define LEN(x)              (sizeof (x) / sizeof (x[0]))
 #define MAX(x,y)            ((x)>(y)?(x):(y))
 #define MIN(x,y)            ((x)<(y)?(x):(y))
 #define BETWEEN(x, a, b)    ((a) <= (x) && (x) <= (b))
+#define GETNUM(n, s) { \
+	unsigned long __TMP__; \
+	if ((__TMP__ = strtoul((s), NULL, 10)) < INT_MAX) \
+		(n) = __TMP__; \
+	}
 
 /* color enum */
 enum {ColorFG, ColorBG, ColorLast};
@@ -34,6 +42,7 @@ struct Config {
 	int triangle_height;
 	int iconpadding;
 	int horzpadding;
+	int alignment;
 
 	/* the values below are set by options */
 	int monitor;
@@ -64,6 +73,7 @@ struct Item {
 	char *file;             /* filename of the icon */
 	int y;                  /* item y position relative to menu */
 	int h;                  /* item height */
+	int textw;              /* text width */
 	struct Item *prev;      /* previous item */
 	struct Item *next;      /* next item */
 	struct Menu *submenu;   /* submenu spawned by clicking on item */
@@ -85,6 +95,7 @@ struct Menu {
 	int x, y, w, h;         /* menu geometry */
 	int hasicon;            /* whether the menu has item with icons */
 	int drawn;              /* whether the menu was already drawn */
+	int maxtextw;           /* maximum text width */
 	unsigned level;         /* menu level relative to root */
 	Window win;             /* menu window to map on the screen */
 };