removed -t title crap from dmenu
This commit is contained in:
parent
62a7d40746
commit
ee03052e73
7
dmenu.1
7
dmenu.1
|
@ -4,8 +4,6 @@ dmenu \- dynamic menu
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
.B dmenu
|
.B dmenu
|
||||||
.RB [ \-v ]
|
.RB [ \-v ]
|
||||||
.RB [ \-t
|
|
||||||
.IR title ]
|
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
.SS Overview
|
.SS Overview
|
||||||
.B dmenu
|
.B dmenu
|
||||||
|
@ -17,11 +15,6 @@ It supports arbitrary, user defined menu contents.
|
||||||
.TP
|
.TP
|
||||||
.B \-v
|
.B \-v
|
||||||
prints version information to stdout, then exits.
|
prints version information to stdout, then exits.
|
||||||
.TP
|
|
||||||
.BI \-t " title"
|
|
||||||
displays
|
|
||||||
.I title
|
|
||||||
above the menu.
|
|
||||||
.SS Usage
|
.SS Usage
|
||||||
.B dmenu
|
.B dmenu
|
||||||
reads a list of newline-separated items from stdin and creates a menu.
|
reads a list of newline-separated items from stdin and creates a menu.
|
||||||
|
|
62
main.c
62
main.c
|
@ -24,13 +24,11 @@ struct Item {
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
|
|
||||||
static char *title, text[4096];
|
static char text[4096];
|
||||||
static int mx, my, mw, mh;
|
static int mx, my, mw, mh;
|
||||||
static int ret = 0;
|
static int ret = 0;
|
||||||
static int nitem = 0;
|
static int nitem = 0;
|
||||||
static unsigned int cmdw = 0;
|
static unsigned int cmdw = 0;
|
||||||
static unsigned int tw = 0;
|
|
||||||
static unsigned int cw = 0;
|
|
||||||
static Bool done = False;
|
static Bool done = False;
|
||||||
static Item *allitems = NULL; /* first of all items */
|
static Item *allitems = NULL; /* first of all items */
|
||||||
static Item *item = NULL; /* first of pattern matching items */
|
static Item *item = NULL; /* first of pattern matching items */
|
||||||
|
@ -82,18 +80,10 @@ drawmenu()
|
||||||
drawtext(NULL, False, False);
|
drawtext(NULL, False, False);
|
||||||
|
|
||||||
/* print command */
|
/* print command */
|
||||||
if(!title || text[0]) {
|
if(cmdw && item)
|
||||||
cmdw = cw;
|
|
||||||
if(cmdw && item)
|
|
||||||
dc.w = cmdw;
|
|
||||||
drawtext(text, False, False);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
cmdw = tw;
|
|
||||||
dc.w = cmdw;
|
dc.w = cmdw;
|
||||||
drawtext(title, False, False);
|
drawtext(text[0] ? text : NULL, False, False);
|
||||||
}
|
dc.x += cmdw;
|
||||||
dc.x += dc.w;
|
|
||||||
|
|
||||||
if(curr) {
|
if(curr) {
|
||||||
dc.w = SPACE;
|
dc.w = SPACE;
|
||||||
|
@ -127,11 +117,6 @@ input(char *pattern)
|
||||||
if(!pattern)
|
if(!pattern)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(!title || *pattern)
|
|
||||||
cmdw = cw;
|
|
||||||
else
|
|
||||||
cmdw = tw;
|
|
||||||
|
|
||||||
plen = strlen(pattern);
|
plen = strlen(pattern);
|
||||||
item = j = NULL;
|
item = j = NULL;
|
||||||
nitem = 0;
|
nitem = 0;
|
||||||
|
@ -308,30 +293,15 @@ int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
char *maxname;
|
char *maxname;
|
||||||
int i;
|
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
XSetWindowAttributes wa;
|
XSetWindowAttributes wa;
|
||||||
|
|
||||||
/* command line args */
|
if(argc == 2 && !strncmp("-v", argv[1], 3)) {
|
||||||
for(i = 1; i < argc; i++) {
|
fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
|
||||||
if (argv[i][0] == '-')
|
exit(EXIT_SUCCESS);
|
||||||
switch (argv[i][1]) {
|
|
||||||
case 'v':
|
|
||||||
fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
|
|
||||||
exit(EXIT_SUCCESS);
|
|
||||||
break;
|
|
||||||
case 't':
|
|
||||||
if(++i < argc) {
|
|
||||||
title = argv[i];
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
eprint("usage: dmenu [-v] [-t <title>]\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
eprint("usage: dmenu [-v] [-t <title>]\n");
|
|
||||||
}
|
}
|
||||||
|
else if(argc != 1)
|
||||||
|
eprint("usage: dmenu [-v]\n");
|
||||||
|
|
||||||
dpy = XOpenDisplay(0);
|
dpy = XOpenDisplay(0);
|
||||||
if(!dpy)
|
if(!dpy)
|
||||||
|
@ -371,17 +341,9 @@ main(int argc, char *argv[])
|
||||||
dc.gc = XCreateGC(dpy, root, 0, 0);
|
dc.gc = XCreateGC(dpy, root, 0, 0);
|
||||||
|
|
||||||
if(maxname)
|
if(maxname)
|
||||||
cw = textw(maxname);
|
cmdw = textw(maxname);
|
||||||
if(cw > mw / 3)
|
if(cmdw > mw / 3)
|
||||||
cw = mw / 3;
|
cmdw = mw / 3;
|
||||||
|
|
||||||
if(title) {
|
|
||||||
tw = textw(title);
|
|
||||||
if(tw > mw / 3)
|
|
||||||
tw = mw / 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
cmdw = title ? tw : cw;
|
|
||||||
|
|
||||||
text[0] = 0;
|
text[0] = 0;
|
||||||
input(text);
|
input(text);
|
||||||
|
|
Loading…
Reference in a new issue