[hackers] [dmenu] libdraw now has own repo || Connor Lane Smith

changeset: 332:313ede111c1d
tag: tip
user: Connor Lane Smith <cls_AT_lubutu.com>
date: Wed Jun 30 01:36:15 2010 +0100
files: Makefile README config.mk dinput.c dmenu.c draw/Makefile draw/cleanupdraw.c draw/draw.h draw/drawsquare.c draw/drawtext.c draw/eprint.c draw/getcolor.c draw/initfont.c draw/setupdraw.c draw/textnw.c draw/textw.c
description:
libdraw now has own repo

diff -r cd913f078e60 -r 313ede111c1d Makefile
--- a/Makefile Wed Jun 30 00:52:14 2010 +0100
+++ b/Makefile Wed Jun 30 01:36:15 2010 +0100
@@ -18,7 +18,7 @@
         @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 @@
         @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}
diff -r cd913f078e60 -r 313ede111c1d README
--- a/README Wed Jun 30 00:52:14 2010 +0100
+++ b/README Wed Jun 30 01:36:15 2010 +0100
@@ -6,6 +6,8 @@
 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.
 
 
diff -r cd913f078e60 -r 313ede111c1d config.mk
--- a/config.mk Wed Jun 30 00:52:14 2010 +0100
+++ b/config.mk Wed Jun 30 01:36:15 2010 +0100
@@ -15,8 +15,8 @@
 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}
diff -r cd913f078e60 -r 313ede111c1d dinput.c
--- a/dinput.c Wed Jun 30 00:52:14 2010 +0100
+++ b/dinput.c Wed Jun 30 01:36:15 2010 +0100
@@ -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 setup(Bool topbar);
 
 #include "config.h"
-#include "draw.h"
 
 /* variables */
 static char *prompt = NULL;
diff -r cd913f078e60 -r 313ede111c1d dmenu.c
--- a/dmenu.c Wed Jun 30 00:52:14 2010 +0100
+++ b/dmenu.c Wed Jun 30 01:36:15 2010 +0100
@@ -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 setup(void);
 
 #include "config.h"
-#include "draw.h"
 
 /* variables */
 static char **argp = NULL;
diff -r cd913f078e60 -r 313ede111c1d draw/Makefile
--- a/draw/Makefile Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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
diff -r cd913f078e60 -r 313ede111c1d draw/cleanupdraw.c
--- a/draw/cleanupdraw.c Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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);
-}
diff -r cd913f078e60 -r 313ede111c1d draw/draw.h
--- a/draw/draw.h Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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;
diff -r cd913f078e60 -r 313ede111c1d draw/drawsquare.c
--- a/draw/drawsquare.c Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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);
-}
diff -r cd913f078e60 -r 313ede111c1d draw/drawtext.c
--- a/draw/drawtext.c Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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);
-}
diff -r cd913f078e60 -r 313ede111c1d draw/eprint.c
--- a/draw/eprint.c Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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);
-}
diff -r cd913f078e60 -r 313ede111c1d draw/getcolor.c
--- a/draw/getcolor.c Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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;
-}
diff -r cd913f078e60 -r 313ede111c1d draw/initfont.c
--- a/draw/initfont.c Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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;
-}
diff -r cd913f078e60 -r 313ede111c1d draw/setupdraw.c
--- a/draw/setupdraw.c Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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);
-}
diff -r cd913f078e60 -r 313ede111c1d draw/textnw.c
--- a/draw/textnw.c Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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);
-}
diff -r cd913f078e60 -r 313ede111c1d draw/textw.c
--- a/draw/textw.c Wed Jun 30 00:52:14 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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;
-}
Received on Wed Jun 30 2010 - 00:36:28 UTC