removed useless newlines
This commit is contained in:
parent
02238725f6
commit
5fd7af18c6
3
dmenu.h
3
dmenu.h
@ -1,5 +1,4 @@
|
|||||||
/*
|
/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
||||||
* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
|
||||||
* See LICENSE file for license details.
|
* See LICENSE file for license details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
10
draw.c
10
draw.c
@ -1,5 +1,4 @@
|
|||||||
/*
|
/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
||||||
* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
|
||||||
* See LICENSE file for license details.
|
* See LICENSE file for license details.
|
||||||
*/
|
*/
|
||||||
#include "dmenu.h"
|
#include "dmenu.h"
|
||||||
@ -32,21 +31,17 @@ drawtext(const char *text, unsigned long col[ColLast]) {
|
|||||||
|
|
||||||
XSetForeground(dpy, dc.gc, col[ColBG]);
|
XSetForeground(dpy, dc.gc, col[ColBG]);
|
||||||
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
|
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
|
||||||
|
|
||||||
if(!text)
|
if(!text)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
w = 0;
|
w = 0;
|
||||||
olen = len = strlen(text);
|
olen = len = strlen(text);
|
||||||
if(len >= sizeof(buf))
|
if(len >= sizeof(buf))
|
||||||
len = sizeof(buf) - 1;
|
len = sizeof(buf) - 1;
|
||||||
memcpy(buf, text, len);
|
memcpy(buf, text, len);
|
||||||
buf[len] = 0;
|
buf[len] = 0;
|
||||||
|
|
||||||
h = dc.font.ascent + dc.font.descent;
|
h = dc.font.ascent + dc.font.descent;
|
||||||
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
|
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
|
||||||
x = dc.x + (h / 2);
|
x = dc.x + (h / 2);
|
||||||
|
|
||||||
/* shorten text if necessary */
|
/* shorten text if necessary */
|
||||||
while(len && (w = textnw(buf, len)) > dc.w - h)
|
while(len && (w = textnw(buf, len)) > dc.w - h)
|
||||||
buf[--len] = 0;
|
buf[--len] = 0;
|
||||||
@ -58,10 +53,8 @@ drawtext(const char *text, unsigned long col[ColLast]) {
|
|||||||
if(len > 3)
|
if(len > 3)
|
||||||
buf[len - 3] = '.';
|
buf[len - 3] = '.';
|
||||||
}
|
}
|
||||||
|
|
||||||
if(w > dc.w)
|
if(w > dc.w)
|
||||||
return; /* too long */
|
return; /* too long */
|
||||||
|
|
||||||
gcv.foreground = col[ColFG];
|
gcv.foreground = col[ColFG];
|
||||||
if(dc.font.set) {
|
if(dc.font.set) {
|
||||||
XChangeGC(dpy, dc.gc, GCForeground, &gcv);
|
XChangeGC(dpy, dc.gc, GCForeground, &gcv);
|
||||||
@ -106,7 +99,6 @@ setfont(const char *fontstr) {
|
|||||||
XFontSetExtents *font_extents;
|
XFontSetExtents *font_extents;
|
||||||
XFontStruct **xfonts;
|
XFontStruct **xfonts;
|
||||||
char **font_names;
|
char **font_names;
|
||||||
|
|
||||||
dc.font.ascent = dc.font.descent = 0;
|
dc.font.ascent = dc.font.descent = 0;
|
||||||
font_extents = XExtentsOfFontSet(dc.font.set);
|
font_extents = XExtentsOfFontSet(dc.font.set);
|
||||||
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
|
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
|
||||||
|
27
main.c
27
main.c
@ -1,5 +1,4 @@
|
|||||||
/*
|
/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
||||||
* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
|
||||||
* (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
|
* (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
|
||||||
* See LICENSE file for license details.
|
* See LICENSE file for license details.
|
||||||
*/
|
*/
|
||||||
@ -47,7 +46,6 @@ calcoffsets(void) {
|
|||||||
|
|
||||||
if(!curr)
|
if(!curr)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
w = cmdw + 2 * SPACE;
|
w = cmdw + 2 * SPACE;
|
||||||
for(next = curr; next; next=next->right) {
|
for(next = curr; next; next=next->right) {
|
||||||
tw = textw(next->text);
|
tw = textw(next->text);
|
||||||
@ -57,7 +55,6 @@ calcoffsets(void) {
|
|||||||
if(w > mw)
|
if(w > mw)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
w = cmdw + 2 * SPACE;
|
w = cmdw + 2 * SPACE;
|
||||||
for(prev = curr; prev && prev->left; prev=prev->left) {
|
for(prev = curr; prev && prev->left; prev=prev->left) {
|
||||||
tw = textw(prev->left->text);
|
tw = textw(prev->left->text);
|
||||||
@ -78,18 +75,15 @@ drawmenu(void) {
|
|||||||
dc.w = mw;
|
dc.w = mw;
|
||||||
dc.h = mh;
|
dc.h = mh;
|
||||||
drawtext(NULL, dc.norm);
|
drawtext(NULL, dc.norm);
|
||||||
|
|
||||||
/* print command */
|
/* print command */
|
||||||
if(cmdw && item)
|
if(cmdw && item)
|
||||||
dc.w = cmdw;
|
dc.w = cmdw;
|
||||||
drawtext(text[0] ? text : NULL, dc.norm);
|
drawtext(text[0] ? text : NULL, dc.norm);
|
||||||
dc.x += cmdw;
|
dc.x += cmdw;
|
||||||
|
|
||||||
if(curr) {
|
if(curr) {
|
||||||
dc.w = SPACE;
|
dc.w = SPACE;
|
||||||
drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
|
drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
|
||||||
dc.x += dc.w;
|
dc.x += dc.w;
|
||||||
|
|
||||||
/* determine maximum items */
|
/* determine maximum items */
|
||||||
for(i = curr; i != next; i=i->right) {
|
for(i = curr; i != next; i=i->right) {
|
||||||
dc.w = textw(i->text);
|
dc.w = textw(i->text);
|
||||||
@ -98,7 +92,6 @@ drawmenu(void) {
|
|||||||
drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
|
drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
|
||||||
dc.x += dc.w;
|
dc.x += dc.w;
|
||||||
}
|
}
|
||||||
|
|
||||||
dc.x = mw - SPACE;
|
dc.x = mw - SPACE;
|
||||||
dc.w = SPACE;
|
dc.w = SPACE;
|
||||||
drawtext(next ? ">" : NULL, dc.norm);
|
drawtext(next ? ">" : NULL, dc.norm);
|
||||||
@ -114,11 +107,9 @@ match(char *pattern) {
|
|||||||
|
|
||||||
if(!pattern)
|
if(!pattern)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
plen = strlen(pattern);
|
plen = strlen(pattern);
|
||||||
item = j = NULL;
|
item = j = NULL;
|
||||||
nitem = 0;
|
nitem = 0;
|
||||||
|
|
||||||
for(i = allitems; i; i=i->next)
|
for(i = allitems; i; i=i->next)
|
||||||
if(!plen || !strncmp(pattern, i->text, plen)) {
|
if(!plen || !strncmp(pattern, i->text, plen)) {
|
||||||
if(!j)
|
if(!j)
|
||||||
@ -142,7 +133,6 @@ match(char *pattern) {
|
|||||||
j = i;
|
j = i;
|
||||||
nitem++;
|
nitem++;
|
||||||
}
|
}
|
||||||
|
|
||||||
curr = prev = next = sel = item;
|
curr = prev = next = sel = item;
|
||||||
calcoffsets();
|
calcoffsets();
|
||||||
}
|
}
|
||||||
@ -157,12 +147,10 @@ kpress(XKeyEvent * e) {
|
|||||||
len = strlen(text);
|
len = strlen(text);
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
|
num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
|
||||||
|
|
||||||
if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
|
if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
|
||||||
|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
|
|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
|
||||||
|| IsPrivateKeypadKey(ksym))
|
|| IsPrivateKeypadKey(ksym))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* first check if a control mask is omitted */
|
/* first check if a control mask is omitted */
|
||||||
if(e->state & ControlMask) {
|
if(e->state & ControlMask) {
|
||||||
switch (ksym) {
|
switch (ksym) {
|
||||||
@ -261,7 +249,6 @@ readstdin(void) {
|
|||||||
maxname = p;
|
maxname = p;
|
||||||
max = len;
|
max = len;
|
||||||
}
|
}
|
||||||
|
|
||||||
new = emalloc(sizeof(Item));
|
new = emalloc(sizeof(Item));
|
||||||
new->next = new->left = new->right = NULL;
|
new->next = new->left = new->right = NULL;
|
||||||
new->text = p;
|
new->text = p;
|
||||||
@ -318,7 +305,6 @@ main(int argc, char *argv[]) {
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);
|
eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);
|
||||||
|
|
||||||
dpy = XOpenDisplay(0);
|
dpy = XOpenDisplay(0);
|
||||||
if(!dpy)
|
if(!dpy)
|
||||||
eprint("dmenu: cannot open display\n");
|
eprint("dmenu: cannot open display\n");
|
||||||
@ -333,44 +319,37 @@ main(int argc, char *argv[]) {
|
|||||||
while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
|
while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
|
||||||
GrabModeAsync, CurrentTime) != GrabSuccess)
|
GrabModeAsync, CurrentTime) != GrabSuccess)
|
||||||
usleep(1000);
|
usleep(1000);
|
||||||
|
|
||||||
FD_ZERO(&rd);
|
FD_ZERO(&rd);
|
||||||
FD_SET(STDIN_FILENO, &rd);
|
FD_SET(STDIN_FILENO, &rd);
|
||||||
if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
|
if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
|
||||||
goto UninitializedEnd;
|
goto UninitializedEnd;
|
||||||
maxname = readstdin();
|
maxname = readstdin();
|
||||||
|
|
||||||
/* style */
|
/* style */
|
||||||
dc.norm[ColBG] = getcolor(normbg);
|
dc.norm[ColBG] = getcolor(normbg);
|
||||||
dc.norm[ColFG] = getcolor(normfg);
|
dc.norm[ColFG] = getcolor(normfg);
|
||||||
dc.sel[ColBG] = getcolor(selbg);
|
dc.sel[ColBG] = getcolor(selbg);
|
||||||
dc.sel[ColFG] = getcolor(selfg);
|
dc.sel[ColFG] = getcolor(selfg);
|
||||||
setfont(font);
|
setfont(font);
|
||||||
|
/* menu window */
|
||||||
wa.override_redirect = 1;
|
wa.override_redirect = 1;
|
||||||
wa.background_pixmap = ParentRelative;
|
wa.background_pixmap = ParentRelative;
|
||||||
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
|
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
|
||||||
|
|
||||||
mx = my = 0;
|
mx = my = 0;
|
||||||
mw = DisplayWidth(dpy, screen);
|
mw = DisplayWidth(dpy, screen);
|
||||||
mh = dc.font.height + 2;
|
mh = dc.font.height + 2;
|
||||||
|
|
||||||
win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
|
win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
|
||||||
DefaultDepth(dpy, screen), CopyFromParent,
|
DefaultDepth(dpy, screen), CopyFromParent,
|
||||||
DefaultVisual(dpy, screen),
|
DefaultVisual(dpy, screen),
|
||||||
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
|
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
|
||||||
XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));
|
XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));
|
||||||
|
|
||||||
/* pixmap */
|
/* pixmap */
|
||||||
dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
|
dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
|
||||||
dc.gc = XCreateGC(dpy, root, 0, 0);
|
dc.gc = XCreateGC(dpy, root, 0, 0);
|
||||||
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
|
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
|
||||||
|
|
||||||
if(maxname)
|
if(maxname)
|
||||||
cmdw = textw(maxname);
|
cmdw = textw(maxname);
|
||||||
if(cmdw > mw / 3)
|
if(cmdw > mw / 3)
|
||||||
cmdw = mw / 3;
|
cmdw = mw / 3;
|
||||||
|
|
||||||
text[0] = 0;
|
text[0] = 0;
|
||||||
match(text);
|
match(text);
|
||||||
XMapRaised(dpy, win);
|
XMapRaised(dpy, win);
|
||||||
@ -392,6 +371,7 @@ main(int argc, char *argv[]) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* cleanup */
|
||||||
while(allitems) {
|
while(allitems) {
|
||||||
itm = allitems->next;
|
itm = allitems->next;
|
||||||
free(allitems->text);
|
free(allitems->text);
|
||||||
@ -408,6 +388,5 @@ main(int argc, char *argv[]) {
|
|||||||
UninitializedEnd:
|
UninitializedEnd:
|
||||||
XUngrabKeyboard(dpy, CurrentTime);
|
XUngrabKeyboard(dpy, CurrentTime);
|
||||||
XCloseDisplay(dpy);
|
XCloseDisplay(dpy);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
5
util.c
5
util.c
@ -1,5 +1,4 @@
|
|||||||
/*
|
/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
||||||
* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
|
||||||
* See LICENSE file for license details.
|
* See LICENSE file for license details.
|
||||||
*/
|
*/
|
||||||
#include "dmenu.h"
|
#include "dmenu.h"
|
||||||
@ -22,6 +21,7 @@ badmalloc(unsigned int size) {
|
|||||||
void *
|
void *
|
||||||
emalloc(unsigned int size) {
|
emalloc(unsigned int size) {
|
||||||
void *res = malloc(size);
|
void *res = malloc(size);
|
||||||
|
|
||||||
if(!res)
|
if(!res)
|
||||||
badmalloc(size);
|
badmalloc(size);
|
||||||
return res;
|
return res;
|
||||||
@ -40,6 +40,7 @@ eprint(const char *errstr, ...) {
|
|||||||
char *
|
char *
|
||||||
estrdup(const char *str) {
|
estrdup(const char *str) {
|
||||||
void *res = strdup(str);
|
void *res = strdup(str);
|
||||||
|
|
||||||
if(!res)
|
if(!res)
|
||||||
badmalloc(strlen(str));
|
badmalloc(strlen(str));
|
||||||
return res;
|
return res;
|
||||||
|
Loading…
Reference in New Issue
Block a user