swytch/dmenu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libdraw now has own repo

Browse Source
This commit is contained in:
Connor Lane Smith 2010-06-30 01:36:15 +01:00
parent 7afd296c40
commit 26b9f3de0f
16 changed files with 8 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -18,7 +18,7 @@ options:
@echo CC $<
@${CC} -c ${CFLAGS} $<
${OBJ}: config.h config.mk draw/libdraw.a
${OBJ}: config.h config.mk
config.h:
@echo creating $@ from config.def.h
@ -28,18 +28,14 @@ config.h:
@echo CC -o $@
@${CC} -o $@ $< ${LDFLAGS}
draw/libdraw.a:
@cd draw && make
clean:
@echo cleaning
@rm -f dinput dmenu ${OBJ} dmenu-${VERSION}.tar.gz
@cd draw && make clean
dist: clean
@echo creating dist tarball
@mkdir -p dmenu-${VERSION}
@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run draw ${SRC} dmenu-${VERSION}
@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
@gzip dmenu-${VERSION}.tar
@rm -rf dmenu-${VERSION}

2
README
View File

@ -6,6 +6,8 @@ dmenu is a generic and efficient menu for X.
Requirements
------------
In order to build dmenu you need the Xlib header files.
You also need libdraw, available from http://hg.suckless.org/libdraw
Pasting the X selection to dmenu requires the sselp utility at runtime.

4
config.mk
View File

@ -15,8 +15,8 @@ XINERAMALIBS = -L${X11LIB} -lXinerama
XINERAMAFLAGS = -DXINERAMA
# includes and libs
INCS = -I. -Idraw -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -Ldraw -ldraw ${XINERAMALIBS}
INCS = -I. -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -ldraw ${XINERAMALIBS}
# flags
CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}

2
dinput.c
View File

@ -12,6 +12,7 @@
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
#include <draw.h>
/* macros */
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
@ -30,7 +31,6 @@ static void run(void);
static void setup(Bool topbar);
#include "config.h"
#include "draw.h"
/* variables */
static char *prompt = NULL;

2
dmenu.c
View File

@ -13,6 +13,7 @@
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
#include <draw.h>
/* macros */
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
@ -46,7 +47,6 @@ static void run(void);
static void setup(void);
#include "config.h"
#include "draw.h"
/* variables */
static char **argp = NULL;

26
draw/Makefile
View File

@ -1,26 +0,0 @@
# libdraw - dynamic drawing library
# See LICENSE file for copyright and license details.
include ../config.mk
SRC = cleanupdraw.c drawsquare.c drawtext.c eprint.c getcolor.c initfont.c \
setupdraw.c textnw.c textw.c
OBJ = ${SRC:.c=.o}
all: libdraw.a
.c.o:
@echo CC $<
@${CC} -c ${CFLAGS} $<
${OBJ}: ../config.mk draw.h
libdraw.a: ${OBJ}
@echo AR $@
@ar cr $@ $+
clean:
@echo cleaning libdraw
@rm -f libdraw.a ${OBJ}
.PHONY: all options clean

13
draw/cleanupdraw.c
View File

@ -1,13 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"
void
cleanupdraw(DC *dc) {
if(dc->font.set)
XFreeFontSet(dc->dpy, dc->font.set);
else
XFreeFont(dc->dpy, dc->font.xfont);
XFreePixmap(dc->dpy, dc->drawable);
XFreeGC(dc->dpy, dc->gc);
}

34
draw/draw.h
View File

@ -1,34 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
/* enums */
enum { ColBorder, ColFG, ColBG, ColLast };
/* typedefs */
typedef struct {
int x, y, w, h;
Drawable drawable;
Display *dpy;
GC gc;
struct {
XFontStruct *xfont;
XFontSet set;
int ascent;
int descent;
int height;
} font;
} DC; /* draw context */
/* forward declarations */
void cleanupdraw(DC *dc);
void drawsquare(DC *dc, Bool filled, unsigned long col[ColLast], Bool invert);
void drawtext(DC *dc, const char *text, unsigned long col[ColLast], Bool invert);
void eprint(const char *fmt, ...);
unsigned long getcolor(DC *dc, const char *colstr);
void initfont(DC *dc, const char *fontstr);
void setupdraw(DC *dc, Window w);
int textnw(DC *dc, const char *text, unsigned int len);
int textw(DC *dc, const char *text);
/* variables */
extern const char *progname;

19
draw/drawsquare.c
View File

@ -1,19 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"
void
drawsquare(DC *dc, Bool filled, unsigned long col[ColLast], Bool invert) {
int n;
XRectangle r = { dc->x, dc->y, dc->w, dc->h };
XSetForeground(dc->dpy, dc->gc, col[invert ? ColBG : ColFG]);
n = ((dc->font.ascent + dc->font.descent + 2) / 4) + (filled ? 1 : 0);
r.width = r.height = n;
r.x = dc->x + 1;
r.y = dc->y + 1;
if(filled)
XFillRectangles(dc->dpy, dc->drawable, dc->gc, &r, 1);
else
XDrawRectangles(dc->dpy, dc->drawable, dc->gc, &r, 1);
}

34
draw/drawtext.c
View File

@ -1,34 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <string.h>
#include <X11/Xlib.h>
#include "draw.h"
#define MIN(a, b) ((a) < (b) ? (a) : (b))
void
drawtext(DC *dc, const char *text, unsigned long col[ColLast], Bool invert) {
char buf[256];
int i, x, y, h, len, olen;
XRectangle r = { dc->x, dc->y, dc->w, dc->h };
XSetForeground(dc->dpy, dc->gc, col[invert ? ColFG : ColBG]);
XFillRectangles(dc->dpy, dc->drawable, dc->gc, &r, 1);
if(!text)
return;
olen = strlen(text);
h = dc->font.height;
y = dc->y + ((h+2) / 2) - (h / 2) + dc->font.ascent;
x = dc->x + (h / 2);
/* shorten text if necessary */
for(len = MIN(olen, sizeof buf); len && textnw(dc, text, len) > dc->w - h; len--);
if(!len)
return;
memcpy(buf, text, len);
if(len < olen)
for(i = len; i && i > len - 3; buf[--i] = '.');
XSetForeground(dc->dpy, dc->gc, col[invert ? ColBG : ColFG]);
if(dc->font.set)
XmbDrawString(dc->dpy, dc->drawable, dc->font.set, dc->gc, x, y, buf, len);
else
XDrawString(dc->dpy, dc->drawable, dc->gc, x, y, buf, len);
}

18
draw/eprint.c
View File

@ -1,18 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "draw.h"
const char *progname;
void
eprint(const char *fmt, ...) {
va_list ap;
fprintf(stderr, "%s: ", progname);
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
va_end(ap);
exit(EXIT_FAILURE);
}

13
draw/getcolor.c
View File

@ -1,13 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"
unsigned long
getcolor(DC *dc, const char *colstr) {
Colormap cmap = DefaultColormap(dc->dpy, DefaultScreen(dc->dpy));
XColor color;
if(!XAllocNamedColor(dc->dpy, cmap, colstr, &color, &color))
eprint("cannot allocate color '%s'\n", colstr);
return color.pixel;
}

36
draw/initfont.c
View File

@ -1,36 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"
#define MAX(a, b) ((a) > (b) ? (a) : (b))
void
initfont(DC *dc, const char *fontstr) {
char *def, **missing = NULL;
int i, n;
if(!fontstr || !*fontstr)
eprint("cannot load null font\n");
dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def);
if(missing)
XFreeStringList(missing);
if(dc->font.set) {
XFontStruct **xfonts;
char **font_names;
dc->font.ascent = dc->font.descent = 0;
n = XFontsOfFontSet(dc->font.set, &xfonts, &font_names);
for(i = 0; i < n; i++) {
dc->font.ascent = MAX(dc->font.ascent, (*xfonts)->ascent);
dc->font.descent = MAX(dc->font.descent, (*xfonts)->descent);
xfonts++;
}
}
else {
if(!(dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))
&& !(dc->font.xfont = XLoadQueryFont(dc->dpy, "fixed")))
eprint("cannot load font '%s'\n", fontstr);
dc->font.ascent = dc->font.xfont->ascent;
dc->font.descent = dc->font.xfont->descent;
}
dc->font.height = dc->font.ascent + dc->font.descent;
}

16
draw/setupdraw.c
View File

@ -1,16 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"
void
setupdraw(DC *dc, Window w) {
XWindowAttributes wa;
XGetWindowAttributes(dc->dpy, w, &wa);
dc->drawable = XCreatePixmap(dc->dpy, w, wa.width, wa.height,
DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
dc->gc = XCreateGC(dc->dpy, w, 0, NULL);
XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter);
if(!dc->font.set)
XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
}

14
draw/textnw.c
View File

@ -1,14 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"
int
textnw(DC *dc, const char *text, unsigned int len) {
XRectangle r;
if(dc->font.set) {
XmbTextExtents(dc->font.set, text, len, NULL, &r);
return r.width;
}
return XTextWidth(dc->font.xfont, text, len);
}

9
draw/textw.c
View File

@ -1,9 +0,0 @@
/* See LICENSE file for copyright and license details. */
#include <string.h>
#include <X11/Xlib.h>
#include "draw.h"
int
textw(DC *dc, const char *text) {
return textnw(dc, text, strlen(text)) + dc->font.height;
}