Add xgeometry support and remove old non-standard. - thingmenu - A simple graphical menu launcher for X11.
(HTM) git clone git://bitreich.org/thingmenu
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Tags
(DIR) LICENSE
---
(DIR) commit ce149fb5b5c4223f0a724911be59bfe55f2ddb7b
(DIR) parent 6fe4ccf5c1b27d5babe573dfa794ac86610ae28d
(HTM) Author: Christoph Lohmann <20h@r-36.net>
Date: Sun, 9 Oct 2011 18:14:48 +0200
Add xgeometry support and remove old non-standard.
Diffstat:
M thingmenu.1 | 18 +++---------------
M thingmenu.c | 52 +++++++++++++++++--------------
2 files changed, 32 insertions(+), 38 deletions(-)
---
(DIR) diff --git a/thingmenu.1 b/thingmenu.1
@@ -12,10 +12,7 @@
.Op Fl x
.Op Fl s
.Op Fl o
-.Op Fl wh Ar height
-.Op Fl ww Ar width
-.Op Fl wx Ar x position
-.Op Fl wy Ar y position
+.Op Fl g Ar geometry
.Op Fl ws Ar widthscaling
.Op Fl hs Ar heightscaling
.Op Fl -
@@ -66,17 +63,8 @@ button is clicked.
.It Fl o
Use the horizontal layout.
.
-.It Fl wh
-Define the overall window height.
-.
-.It Fl ww
-Define the overall window width.
-.
-.It Fl wx
-Define the absolute x position.
-.
-.It Fl wy
-Define the absolute y position.
+.It Fl g
+Define the X11 geometry string, which is to be used.
.
.It Fl ws
Define the width scaling.
(DIR) diff --git a/thingmenu.c b/thingmenu.c
@@ -380,24 +380,28 @@ setup(void)
}
www *= widthscaling;
- if (ww == 0) {
+ if (!ww) {
if (horizontal) {
ww = www * nentries;
} else {
ww = www;
}
}
- if (wh == 0) {
+ if (!wh) {
if (horizontal) {
wh = dc.font.height * heightscaling;
} else {
wh = nentries * dc.font.height * heightscaling;
}
}
- if (wy == 0)
+ if (!wy)
wy = (sh - wh) / 2;
- if (wx == 0)
+ if (wy < 0)
+ wy = sh + wy - wh;
+ if (!wx)
wx = (sw - ww) / 2;
+ if (wx < 0)
+ wx = sw + wx - ww;
dc.norm[ColBG] = getcolor(normbgcolor);
dc.norm[ColFG] = getcolor(normfgcolor);
@@ -537,8 +541,7 @@ updateentries(void)
void
usage(char *argv0)
{
- fprintf(stderr, "usage: %s [-hxso] [-wh height] [-ww width] "
- "[-wx x position] [-wy y position] [-ws widthscaling] "
+ fprintf(stderr, "usage: %s [-hxso] [-g geometry] [-ws widthscaling] "
"[-hs heightscaling] [--] "
"label0 cmd0 [label1 cmd1 ...]\n", argv0);
exit(1);
@@ -549,7 +552,8 @@ main(int argc, char *argv[])
{
Bool addexit;
char *label, *cmd;
- int i;
+ int i, xr, yr, bitm;
+ unsigned int wr, hr;
addexit = True;
@@ -566,6 +570,24 @@ main(int argc, char *argv[])
}
switch (argv[i][1]) {
+ case 'g':
+ if (i >= argc - 1)
+ break;
+ bitm = XParseGeometry(argv[i+1], &xr, &yr, &wr, &hr);
+ if(bitm & XValue)
+ wx = xr;
+ if(bitm & YValue)
+ wy = yr;
+ if(bitm & WidthValue)
+ ww = (int)wr;
+ if(bitm & HeightValue)
+ wh = (int)hr;
+ if(bitm & XNegative && wx == 0)
+ wx = -1;
+ if(bitm & YNegative && wy == 0)
+ wy = -1;
+ i++;
+ break;
case 'h':
switch ((i >= argc - 1)? 0 : argv[i][2]) {
case 's':
@@ -584,26 +606,10 @@ main(int argc, char *argv[])
break;
case 'w':
switch ((i >= argc - 1)? 0 : argv[i][2]) {
- case 'h':
- wh = atoi(argv[i+1]);
- i++;
- break;
case 's':
widthscaling = atof(argv[i+1]);
i++;
break;
- case 'w':
- ww = atoi(argv[i+1]);
- i++;
- break;
- case 'x':
- wx = atoi(argv[i+1]);
- i++;
- break;
- case 'y':
- wy = atoi(argv[i+1]);
- i++;
- break;
default:
usage(argv[0]);
}