Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 89fc26e7f0 |
49
.hgtags
Normal file
49
.hgtags
Normal file
@ -0,0 +1,49 @@
|
||||
fcc8a282cb52c6a9343b461026b386825590cd31 0.1
|
||||
656be0f47df545dfdd2e1e0663663b8b1b26f031 0.2
|
||||
d352e9dc112ee96aa5cad961a0ed880ae9ce7276 0.3
|
||||
7acf0dde1120542917bae12e0e42293f9d2cc899 0.4
|
||||
4a0ecd881c4fc15de4a0bebd79308b064be020ef 0.5
|
||||
25f679fb19686140a907684ffcb423b9e9d44b53 0.6
|
||||
5fc20d7158bd16b4d5f8d1c25e177680b6d54252 0.7
|
||||
409667a57221f7e50ba8b5248f638915cd61b366 0.8
|
||||
d046c818ea467555cc338751c9bf3024609f1f12 0.9
|
||||
9e11140d4cc3eecac3b0ab752f91528fd5e04be8 1.0
|
||||
e8c1e9733752db12f2dbd1fa93c46f5806242ba9 1.1
|
||||
bee7fe6d1189174d0204ca3195b83cdc1bb4f82e 1.2
|
||||
2eb9997be51cb1b11a8900728ccc0904f9371157 1.3
|
||||
df3fbb050004c544d14e43c36f6a94cca6ed4a69 1.4
|
||||
e071fb045bd9e8574947acff7196360bc0270e68 1.5
|
||||
dcc5427f99f51a978386a0dd770467cd911ac84b 1.6
|
||||
58dbef4aef3d45c7a3da6945e53c9667c0f02d5b 1.7
|
||||
3696d77aaf02f5d15728dde3b9e35abcaf291496 1.7.1
|
||||
d3e6fa22ae45b38b1bdb0d813390365e5930360b 1.8
|
||||
c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9
|
||||
1fce5c464fcd870b9f024aa1853d5cf3a3eb371b 2.0
|
||||
7656557298c954469a6a9564e6649b1fb5db663e 2.1
|
||||
90f0e34e7f118c9ad3227a1606211ee825942b1c 2.2
|
||||
b6e09682c8adcb6569656bee73c311f9ab457715 2.3
|
||||
9e9036cbfb4b7306c6fb366249e81dc0e65bdfde 2.4
|
||||
03e83e2788c83ddd63b45a667939d7ec783c98cb 2.4.1
|
||||
1ca5d430524e838c52ede912533cb90108c5cd66 2.4.2
|
||||
041143e9fc544c62edc58af52cae9ac5237e5945 2.5
|
||||
775f761a5647a05038e091d1c99fc35d3034cd68 2.6
|
||||
fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7
|
||||
dd3d02b07cac44fbafc074a361c1002cebe7aae4 2.8
|
||||
59b3024854db49739c6d237fa9077f04a2da847a 3.0
|
||||
8f0f917ac988164e1b4446236e3a6ab6cfcb8c67 3.1
|
||||
e4c81a78ffbad6ba4d1ad119cc654da6eca63a4c 3.2
|
||||
709df5a4bad7015a346b2b44b1b3b573ea3088ff 3.3
|
||||
9ab649b3b3e5bfccf1c8f352c59e5361e070a25f 3.4
|
||||
05e5bd706b3b3e61399d57c4bb43df296a20112d 3.5
|
||||
0bc2751d06e8b95e0138854c7815e154c5c3d990 3.6
|
||||
0508a3a6ee106f36d9b8ff07bb5b28584edfa89c 3.7
|
||||
644b0798fcccd570fd519899e1601c6857496b91 3.8
|
||||
21a1ed9a69b9541a355758a57103e294fb722c33 3.9
|
||||
78f9f72cc9c6bdb022ff8908486b61ef5e242aad 4.0
|
||||
844587572673cf6326c3f61737264a46b728fc0a 4.1
|
||||
72749a826cab0baa805620e44a22e54486c97a4e 4.1.1
|
||||
379813a051f03a1b20bdbfdc2d2d1d2d794ace48 4.2
|
||||
abb6579a324fffdf6a23c2fa4c32911277da594a 4.2.1
|
||||
14c79f054bdf43ff3213af8e60a783192e92a018 4.3
|
||||
34a2d77049a95b02f3332a0b88f9370965ebcfad 4.3.1
|
||||
2b105eaae8315b076da93056da9ecd60de5a7ac9 4.4
|
||||
3
LICENSE
3
LICENSE
@ -1,13 +1,12 @@
|
||||
MIT/X Consortium License
|
||||
|
||||
© 2006-2014 Anselm R Garbe <anselm@garbe.us>
|
||||
© 2010-2012 Connor Lane Smith <cls@lubutu.com>
|
||||
© 2006-2012 Anselm R Garbe <anselm@garbe.us>
|
||||
© 2009 Gottox <gottox@s01.de>
|
||||
© 2009 Markus Schnalke <meillo@marmaro.de>
|
||||
© 2009 Evan Gates <evan.gates@gmail.com>
|
||||
© 2006-2008 Sander van Dijk <a dot h dot vandijk at gmail dot com>
|
||||
© 2006-2007 Michał Janeczek <janeczek at gmail dot com>
|
||||
© 2014-2015 Hiltjo Posthuma <hiltjo@codemadness.org>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
|
||||
24
Makefile
24
Makefile
@ -3,7 +3,7 @@
|
||||
|
||||
include config.mk
|
||||
|
||||
SRC = drw.c dmenu.c stest.c util.c
|
||||
SRC = dmenu.c draw.c stest.c
|
||||
OBJ = ${SRC:.c=.o}
|
||||
|
||||
all: options dmenu stest
|
||||
@ -15,18 +15,14 @@ options:
|
||||
@echo "CC = ${CC}"
|
||||
|
||||
.c.o:
|
||||
@echo CC $<
|
||||
@${CC} -c ${CFLAGS} $<
|
||||
@echo CC -c $<
|
||||
@${CC} -c $< ${CFLAGS}
|
||||
|
||||
config.h:
|
||||
@echo creating $@ from config.def.h
|
||||
@cp config.def.h $@
|
||||
${OBJ}: config.mk draw.h
|
||||
|
||||
${OBJ}: arg.h config.h config.mk drw.h
|
||||
|
||||
dmenu: dmenu.o drw.o util.o
|
||||
dmenu: dmenu.o draw.o
|
||||
@echo CC -o $@
|
||||
@${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
|
||||
@${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
|
||||
|
||||
stest: stest.o
|
||||
@echo CC -o $@
|
||||
@ -39,9 +35,7 @@ clean:
|
||||
dist: clean
|
||||
@echo creating dist tarball
|
||||
@mkdir -p dmenu-${VERSION}
|
||||
@cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1 \
|
||||
drw.h util.h dmenu_path dmenu_run stest.1 ${SRC} \
|
||||
dmenu-${VERSION}
|
||||
@cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_run stest.1 ${SRC} dmenu-${VERSION}
|
||||
@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
|
||||
@gzip dmenu-${VERSION}.tar
|
||||
@rm -rf dmenu-${VERSION}
|
||||
@ -49,9 +43,8 @@ dist: clean
|
||||
install: all
|
||||
@echo installing executables to ${DESTDIR}${PREFIX}/bin
|
||||
@mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||
@cp -f dmenu dmenu_path dmenu_run stest ${DESTDIR}${PREFIX}/bin
|
||||
@cp -f dmenu dmenu_run stest ${DESTDIR}${PREFIX}/bin
|
||||
@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
|
||||
@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
|
||||
@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
|
||||
@chmod 755 ${DESTDIR}${PREFIX}/bin/stest
|
||||
@echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
|
||||
@ -64,7 +57,6 @@ install: all
|
||||
uninstall:
|
||||
@echo removing executables from ${DESTDIR}${PREFIX}/bin
|
||||
@rm -f ${DESTDIR}${PREFIX}/bin/dmenu
|
||||
@rm -f ${DESTDIR}${PREFIX}/bin/dmenu_path
|
||||
@rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
|
||||
@rm -f ${DESTDIR}${PREFIX}/bin/stest
|
||||
@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
|
||||
|
||||
49
arg.h
49
arg.h
@ -1,49 +0,0 @@
|
||||
/*
|
||||
* Copy me if you can.
|
||||
* by 20h
|
||||
*/
|
||||
|
||||
#ifndef ARG_H__
|
||||
#define ARG_H__
|
||||
|
||||
extern char *argv0;
|
||||
|
||||
/* use main(int argc, char *argv[]) */
|
||||
#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
|
||||
argv[0] && argv[0][1]\
|
||||
&& argv[0][0] == '-';\
|
||||
argc--, argv++) {\
|
||||
char argc_;\
|
||||
char **argv_;\
|
||||
int brk_;\
|
||||
if (argv[0][1] == '-' && argv[0][2] == '\0') {\
|
||||
argv++;\
|
||||
argc--;\
|
||||
break;\
|
||||
}\
|
||||
for (brk_ = 0, argv[0]++, argv_ = argv;\
|
||||
argv[0][0] && !brk_;\
|
||||
argv[0]++) {\
|
||||
if (argv_ != argv)\
|
||||
break;\
|
||||
argc_ = argv[0][0];\
|
||||
switch (argc_)
|
||||
|
||||
#define ARGEND }\
|
||||
}
|
||||
|
||||
#define ARGC() argc_
|
||||
|
||||
#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\
|
||||
((x), abort(), (char *)0) :\
|
||||
(brk_ = 1, (argv[0][1] != '\0')?\
|
||||
(&argv[0][1]) :\
|
||||
(argc--, argv++, argv[0])))
|
||||
|
||||
#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\
|
||||
(char *)0 :\
|
||||
(brk_ = 1, (argv[0][1] != '\0')?\
|
||||
(&argv[0][1]) :\
|
||||
(argc--, argv++, argv[0])))
|
||||
|
||||
#endif
|
||||
17
config.def.h
17
config.def.h
@ -1,17 +0,0 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
/* Default settings; can be overriden by command line. */
|
||||
|
||||
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
||||
static const char *fonts[] = {
|
||||
"monospace:size=10"
|
||||
};
|
||||
static const char *prompt = NULL; /* -p option; prompt to the elft of input field */
|
||||
static const char *normbgcolor = "#222222"; /* -nb option; normal background */
|
||||
static const char *normfgcolor = "#bbbbbb"; /* -nf option; normal foreground */
|
||||
static const char *selbgcolor = "#005577"; /* -sb option; selected background */
|
||||
static const char *selfgcolor = "#eeeeee"; /* -sf option; selected foreground */
|
||||
static const char *outbgcolor = "#00ffff";
|
||||
static const char *outfgcolor = "#000000";
|
||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
||||
static unsigned int lines = 0;
|
||||
15
config.mk
15
config.mk
@ -1,5 +1,5 @@
|
||||
# dmenu version
|
||||
VERSION = 4.6
|
||||
VERSION = 4.5
|
||||
|
||||
# paths
|
||||
PREFIX = /usr/local
|
||||
@ -12,18 +12,13 @@ X11LIB = /usr/X11R6/lib
|
||||
XINERAMALIBS = -lXinerama
|
||||
XINERAMAFLAGS = -DXINERAMA
|
||||
|
||||
# freetype
|
||||
FREETYPELIBS = -lfontconfig -lXft
|
||||
FREETYPEINC = /usr/include/freetype2
|
||||
# OpenBSD (uncomment)
|
||||
#FREETYPEINC = ${X11INC}/freetype2
|
||||
|
||||
# includes and libs
|
||||
INCS = -I${X11INC} -I${FREETYPEINC}
|
||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
|
||||
INCS = -I${X11INC}
|
||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
|
||||
|
||||
# flags
|
||||
CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||
CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
|
||||
CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
|
||||
LDFLAGS = -s ${LIBS}
|
||||
|
||||
|
||||
15
dmenu.1
15
dmenu.1
@ -7,8 +7,6 @@ dmenu \- dynamic menu
|
||||
.RB [ \-f ]
|
||||
.RB [ \-i ]
|
||||
.RB [ \-l
|
||||
.RB [ \-m
|
||||
.IR monitor ]
|
||||
.IR lines ]
|
||||
.RB [ \-p
|
||||
.IR prompt ]
|
||||
@ -51,10 +49,6 @@ dmenu matches menu items case insensitively.
|
||||
.BI \-l " lines"
|
||||
dmenu lists items vertically, with the given number of lines.
|
||||
.TP
|
||||
.BI \-m " monitor"
|
||||
dmenu is displayed on the monitor number supplied. Monitor numbers are starting
|
||||
from 0.
|
||||
.TP
|
||||
.BI \-p " prompt"
|
||||
defines the prompt to be displayed to the left of the input field.
|
||||
.TP
|
||||
@ -89,9 +83,6 @@ Copy the selected item to the input field.
|
||||
Confirm selection. Prints the selected item to stdout and exits, returning
|
||||
success.
|
||||
.TP
|
||||
.B Ctrl-Return
|
||||
Confirm selection. Prints the selected item to stdout and continues.
|
||||
.TP
|
||||
.B Shift\-Return
|
||||
Confirm input. Prints the input text to stdout and exits, returning success.
|
||||
.TP
|
||||
@ -116,9 +107,6 @@ End
|
||||
C\-f
|
||||
Right
|
||||
.TP
|
||||
C\-g
|
||||
Escape
|
||||
.TP
|
||||
C\-h
|
||||
Backspace
|
||||
.TP
|
||||
@ -137,9 +125,6 @@ Delete line right
|
||||
C\-m
|
||||
Return
|
||||
.TP
|
||||
C\-M
|
||||
Shift-Return
|
||||
.TP
|
||||
C\-n
|
||||
Down
|
||||
.TP
|
||||
|
||||
707
dmenu.c
707
dmenu.c
@ -1,66 +1,128 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <ctype.h>
|
||||
#include <locale.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <time.h>
|
||||
|
||||
#include <unistd.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include <X11/Xutil.h>
|
||||
#ifdef XINERAMA
|
||||
#include <X11/extensions/Xinerama.h>
|
||||
#endif
|
||||
#include <X11/Xft/Xft.h>
|
||||
#include "draw.h"
|
||||
|
||||
#include "drw.h"
|
||||
#include "util.h"
|
||||
|
||||
/* macros */
|
||||
#define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \
|
||||
* MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
|
||||
#define LENGTH(X) (sizeof X / sizeof X[0])
|
||||
#define TEXTNW(X,N) (drw_font_getexts_width(drw->fonts[0], (X), (N)))
|
||||
#define TEXTW(X) (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
|
||||
#define MIN(a,b) ((a) < (b) ? (a) : (b))
|
||||
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
||||
|
||||
/* enums */
|
||||
enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
|
||||
|
||||
struct item {
|
||||
typedef struct Item Item;
|
||||
struct Item {
|
||||
char *text;
|
||||
struct item *left, *right;
|
||||
int out;
|
||||
Item *left, *right;
|
||||
};
|
||||
|
||||
static void appenditem(Item *item, Item **list, Item **last);
|
||||
static void calcoffsets(void);
|
||||
static char *cistrstr(const char *s, const char *sub);
|
||||
static void drawmenu(void);
|
||||
static void grabkeyboard(void);
|
||||
static void insert(const char *str, ssize_t n);
|
||||
static void keypress(XKeyEvent *ev);
|
||||
static void match(void);
|
||||
static size_t nextrune(int inc);
|
||||
static void paste(void);
|
||||
static void readstdin(void);
|
||||
static void run(void);
|
||||
static void setup(void);
|
||||
static void usage(void);
|
||||
|
||||
static char text[BUFSIZ] = "";
|
||||
static int bh, mw, mh;
|
||||
static int sw, sh; /* X display screen geometry width, height */
|
||||
static int inputw, promptw;
|
||||
static size_t cursor;
|
||||
static struct item *items = NULL;
|
||||
static struct item *matches, *matchend;
|
||||
static struct item *prev, *curr, *next, *sel;
|
||||
static int mon = -1, screen;
|
||||
|
||||
static size_t cursor = 0;
|
||||
static const char *font = NULL;
|
||||
static const char *prompt = NULL;
|
||||
static const char *normbgcolor = "#222222";
|
||||
static const char *normfgcolor = "#bbbbbb";
|
||||
static const char *selbgcolor = "#005577";
|
||||
static const char *selfgcolor = "#eeeeee";
|
||||
static unsigned int lines = 0;
|
||||
static unsigned long normcol[ColLast];
|
||||
static unsigned long selcol[ColLast];
|
||||
static Atom clip, utf8;
|
||||
static Display *dpy;
|
||||
static Window root, win;
|
||||
static Bool topbar = True;
|
||||
static DC *dc;
|
||||
static Item *items = NULL;
|
||||
static Item *matches, *matchend;
|
||||
static Item *prev, *curr, *next, *sel;
|
||||
static Window win;
|
||||
static XIC xic;
|
||||
|
||||
static ClrScheme scheme[SchemeLast];
|
||||
static Drw *drw;
|
||||
|
||||
#include "config.h"
|
||||
|
||||
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
|
||||
static char *(*fstrstr)(const char *, const char *) = strstr;
|
||||
|
||||
static void
|
||||
appenditem(struct item *item, struct item **list, struct item **last)
|
||||
{
|
||||
if (*last)
|
||||
int
|
||||
main(int argc, char *argv[]) {
|
||||
Bool fast = False;
|
||||
int i;
|
||||
|
||||
for(i = 1; i < argc; i++)
|
||||
/* these options take no arguments */
|
||||
if(!strcmp(argv[i], "-v")) { /* prints version information */
|
||||
puts("dmenu-"VERSION", © 2006-2012 dmenu engineers, see LICENSE for details");
|
||||
exit(EXIT_SUCCESS);
|
||||
}
|
||||
else if(!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
|
||||
topbar = False;
|
||||
else if(!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
||||
fast = True;
|
||||
else if(!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
||||
fstrncmp = strncasecmp;
|
||||
fstrstr = cistrstr;
|
||||
}
|
||||
else if(i+1 == argc)
|
||||
usage();
|
||||
/* these options take one argument */
|
||||
else if(!strcmp(argv[i], "-l")) /* number of lines in vertical list */
|
||||
lines = atoi(argv[++i]);
|
||||
else if(!strcmp(argv[i], "-p")) /* adds prompt to left of input field */
|
||||
prompt = argv[++i];
|
||||
else if(!strcmp(argv[i], "-fn")) /* font or font set */
|
||||
font = argv[++i];
|
||||
else if(!strcmp(argv[i], "-nb")) /* normal background color */
|
||||
normbgcolor = argv[++i];
|
||||
else if(!strcmp(argv[i], "-nf")) /* normal foreground color */
|
||||
normfgcolor = argv[++i];
|
||||
else if(!strcmp(argv[i], "-sb")) /* selected background color */
|
||||
selbgcolor = argv[++i];
|
||||
else if(!strcmp(argv[i], "-sf")) /* selected foreground color */
|
||||
selfgcolor = argv[++i];
|
||||
else
|
||||
usage();
|
||||
|
||||
dc = initdc();
|
||||
initfont(dc, font);
|
||||
|
||||
if(fast) {
|
||||
grabkeyboard();
|
||||
readstdin();
|
||||
}
|
||||
else {
|
||||
readstdin();
|
||||
grabkeyboard();
|
||||
}
|
||||
setup();
|
||||
run();
|
||||
|
||||
return 1; /* unreachable */
|
||||
}
|
||||
|
||||
void
|
||||
appenditem(Item *item, Item **list, Item **last) {
|
||||
if(*last)
|
||||
(*last)->right = item;
|
||||
else
|
||||
*list = item;
|
||||
@ -70,225 +132,118 @@ appenditem(struct item *item, struct item **list, struct item **last)
|
||||
*last = item;
|
||||
}
|
||||
|
||||
static void
|
||||
calcoffsets(void)
|
||||
{
|
||||
void
|
||||
calcoffsets(void) {
|
||||
int i, n;
|
||||
|
||||
if (lines > 0)
|
||||
if(lines > 0)
|
||||
n = lines * bh;
|
||||
else
|
||||
n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
|
||||
n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
|
||||
/* calculate which items will begin the next page and previous page */
|
||||
for (i = 0, next = curr; next; next = next->right)
|
||||
if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
|
||||
for(i = 0, next = curr; next; next = next->right)
|
||||
if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)
|
||||
break;
|
||||
for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
|
||||
if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
|
||||
for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
|
||||
if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), n)) > n)
|
||||
break;
|
||||
}
|
||||
|
||||
static void
|
||||
cleanup(void)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
||||
for (i = 0; i < SchemeLast; i++) {
|
||||
drw_clr_free(scheme[i].bg);
|
||||
drw_clr_free(scheme[i].fg);
|
||||
}
|
||||
drw_free(drw);
|
||||
XSync(dpy, False);
|
||||
XCloseDisplay(dpy);
|
||||
}
|
||||
|
||||
static char *
|
||||
cistrstr(const char *s, const char *sub)
|
||||
{
|
||||
char *
|
||||
cistrstr(const char *s, const char *sub) {
|
||||
size_t len;
|
||||
|
||||
for (len = strlen(sub); *s; s++)
|
||||
if (!strncasecmp(s, sub, len))
|
||||
for(len = strlen(sub); *s; s++)
|
||||
if(!strncasecmp(s, sub, len))
|
||||
return (char *)s;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
drawmenu(void)
|
||||
{
|
||||
void
|
||||
drawmenu(void) {
|
||||
int curpos;
|
||||
struct item *item;
|
||||
int x = 0, y = 0, h = bh, w;
|
||||
Item *item;
|
||||
|
||||
drw_setscheme(drw, &scheme[SchemeNorm]);
|
||||
drw_rect(drw, 0, 0, mw, mh, 1, 1, 1);
|
||||
dc->x = 0;
|
||||
dc->y = 0;
|
||||
dc->h = bh;
|
||||
drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
|
||||
|
||||
if (prompt && *prompt) {
|
||||
drw_setscheme(drw, &scheme[SchemeSel]);
|
||||
drw_text(drw, x, 0, promptw, bh, prompt, 0);
|
||||
x += promptw;
|
||||
if(prompt) {
|
||||
dc->w = promptw;
|
||||
drawtext(dc, prompt, selcol);
|
||||
dc->x = dc->w;
|
||||
}
|
||||
/* draw input field */
|
||||
w = (lines > 0 || !matches) ? mw - x : inputw;
|
||||
drw_setscheme(drw, &scheme[SchemeNorm]);
|
||||
drw_text(drw, x, 0, w, bh, text, 0);
|
||||
dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
|
||||
drawtext(dc, text, normcol);
|
||||
if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
|
||||
drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
|
||||
|
||||
if ((curpos = TEXTNW(text, cursor) + bh / 2 - 2) < w) {
|
||||
drw_setscheme(drw, &scheme[SchemeNorm]);
|
||||
drw_rect(drw, x + curpos + 2, 2, 1, bh - 4, 1, 1, 0);
|
||||
}
|
||||
|
||||
if (lines > 0) {
|
||||
if(lines > 0) {
|
||||
/* draw vertical list */
|
||||
w = mw - x;
|
||||
for (item = curr; item != next; item = item->right) {
|
||||
y += h;
|
||||
if (item == sel)
|
||||
drw_setscheme(drw, &scheme[SchemeSel]);
|
||||
else if (item->out)
|
||||
drw_setscheme(drw, &scheme[SchemeOut]);
|
||||
else
|
||||
drw_setscheme(drw, &scheme[SchemeNorm]);
|
||||
|
||||
drw_text(drw, x, y, w, bh, item->text, 0);
|
||||
}
|
||||
} else if (matches) {
|
||||
/* draw horizontal list */
|
||||
x += inputw;
|
||||
w = TEXTW("<");
|
||||
if (curr->left) {
|
||||
drw_setscheme(drw, &scheme[SchemeNorm]);
|
||||
drw_text(drw, x, 0, w, bh, "<", 0);
|
||||
}
|
||||
for (item = curr; item != next; item = item->right) {
|
||||
x += w;
|
||||
w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
|
||||
|
||||
if (item == sel)
|
||||
drw_setscheme(drw, &scheme[SchemeSel]);
|
||||
else if (item->out)
|
||||
drw_setscheme(drw, &scheme[SchemeOut]);
|
||||
else
|
||||
drw_setscheme(drw, &scheme[SchemeNorm]);
|
||||
drw_text(drw, x, 0, w, bh, item->text, 0);
|
||||
}
|
||||
w = TEXTW(">");
|
||||
x = mw - w;
|
||||
if (next) {
|
||||
drw_setscheme(drw, &scheme[SchemeNorm]);
|
||||
drw_text(drw, x, 0, w, bh, ">", 0);
|
||||
dc->w = mw - dc->x;
|
||||
for(item = curr; item != next; item = item->right) {
|
||||
dc->y += dc->h;
|
||||
drawtext(dc, item->text, (item == sel) ? selcol : normcol);
|
||||
}
|
||||
}
|
||||
drw_map(drw, win, 0, 0, mw, mh);
|
||||
else if(matches) {
|
||||
/* draw horizontal list */
|
||||
dc->x += inputw;
|
||||
dc->w = textw(dc, "<");
|
||||
if(curr->left)
|
||||
drawtext(dc, "<", normcol);
|
||||
for(item = curr; item != next; item = item->right) {
|
||||
dc->x += dc->w;
|
||||
dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">"));
|
||||
drawtext(dc, item->text, (item == sel) ? selcol : normcol);
|
||||
}
|
||||
dc->w = textw(dc, ">");
|
||||
dc->x = mw - dc->w;
|
||||
if(next)
|
||||
drawtext(dc, ">", normcol);
|
||||
}
|
||||
mapdc(dc, win, mw, mh);
|
||||
}
|
||||
|
||||
static void
|
||||
grabkeyboard(void)
|
||||
{
|
||||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 };
|
||||
void
|
||||
grabkeyboard(void) {
|
||||
int i;
|
||||
|
||||
/* try to grab keyboard, we may have to wait for another process to ungrab */
|
||||
for (i = 0; i < 1000; i++) {
|
||||
if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True,
|
||||
for(i = 0; i < 1000; i++) {
|
||||
if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
|
||||
GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
|
||||
return;
|
||||
nanosleep(&ts, NULL);
|
||||
usleep(1000);
|
||||
}
|
||||
die("cannot grab keyboard\n");
|
||||
eprintf("cannot grab keyboard\n");
|
||||
}
|
||||
|
||||
static void
|
||||
match(void)
|
||||
{
|
||||
static char **tokv = NULL;
|
||||
static int tokn = 0;
|
||||
|
||||
char buf[sizeof text], *s;
|
||||
int i, tokc = 0;
|
||||
size_t len, textsize;
|
||||
struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
|
||||
|
||||
strcpy(buf, text);
|
||||
/* separate input text into tokens to be matched individually */
|
||||
for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
|
||||
if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
|
||||
die("cannot realloc %u bytes\n", tokn * sizeof *tokv);
|
||||
len = tokc ? strlen(tokv[0]) : 0;
|
||||
|
||||
matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
|
||||
textsize = strlen(text);
|
||||
for (item = items; item && item->text; item++) {
|
||||
for (i = 0; i < tokc; i++)
|
||||
if (!fstrstr(item->text, tokv[i]))
|
||||
break;
|
||||
if (i != tokc) /* not all tokens match */
|
||||
continue;
|
||||
/* exact matches go first, then prefixes, then substrings */
|
||||
if (!tokc || !fstrncmp(text, item->text, textsize))
|
||||
appenditem(item, &matches, &matchend);
|
||||
else if (!fstrncmp(tokv[0], item->text, len))
|
||||
appenditem(item, &lprefix, &prefixend);
|
||||
else
|
||||
appenditem(item, &lsubstr, &substrend);
|
||||
}
|
||||
if (lprefix) {
|
||||
if (matches) {
|
||||
matchend->right = lprefix;
|
||||
lprefix->left = matchend;
|
||||
} else
|
||||
matches = lprefix;
|
||||
matchend = prefixend;
|
||||
}
|
||||
if (lsubstr) {
|
||||
if (matches) {
|
||||
matchend->right = lsubstr;
|
||||
lsubstr->left = matchend;
|
||||
} else
|
||||
matches = lsubstr;
|
||||
matchend = substrend;
|
||||
}
|
||||
curr = sel = matches;
|
||||
calcoffsets();
|
||||
}
|
||||
|
||||
static void
|
||||
insert(const char *str, ssize_t n)
|
||||
{
|
||||
if (strlen(text) + n > sizeof text - 1)
|
||||
void
|
||||
insert(const char *str, ssize_t n) {
|
||||
if(strlen(text) + n > sizeof text - 1)
|
||||
return;
|
||||
/* move existing text out of the way, insert new text, and update cursor */
|
||||
memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
|
||||
if (n > 0)
|
||||
if(n > 0)
|
||||
memcpy(&text[cursor], str, n);
|
||||
cursor += n;
|
||||
match();
|
||||
}
|
||||
|
||||
static size_t
|
||||
nextrune(int inc)
|
||||
{
|
||||
ssize_t n;
|
||||
|
||||
/* return location of next utf8 rune in the given direction (+1 or -1) */
|
||||
for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
|
||||
;
|
||||
return n;
|
||||
}
|
||||
|
||||
static void
|
||||
keypress(XKeyEvent *ev)
|
||||
{
|
||||
void
|
||||
keypress(XKeyEvent *ev) {
|
||||
char buf[32];
|
||||
int len;
|
||||
KeySym ksym = NoSymbol;
|
||||
Status status;
|
||||
|
||||
len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
|
||||
if (status == XBufferOverflow)
|
||||
if(status == XBufferOverflow)
|
||||
return;
|
||||
if (ev->state & ControlMask)
|
||||
if(ev->state & ControlMask)
|
||||
switch(ksym) {
|
||||
case XK_a: ksym = XK_Home; break;
|
||||
case XK_b: ksym = XK_Left; break;
|
||||
@ -296,13 +251,10 @@ keypress(XKeyEvent *ev)
|
||||
case XK_d: ksym = XK_Delete; break;
|
||||
case XK_e: ksym = XK_End; break;
|
||||
case XK_f: ksym = XK_Right; break;
|
||||
case XK_g: ksym = XK_Escape; break;
|
||||
case XK_h: ksym = XK_BackSpace; break;
|
||||
case XK_i: ksym = XK_Tab; break;
|
||||
case XK_j: /* fallthrough */
|
||||
case XK_J: /* fallthrough */
|
||||
case XK_m: /* fallthrough */
|
||||
case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break;
|
||||
case XK_j: ksym = XK_Return; break;
|
||||
case XK_m: ksym = XK_Return; break;
|
||||
case XK_n: ksym = XK_Down; break;
|
||||
case XK_p: ksym = XK_Up; break;
|
||||
|
||||
@ -314,26 +266,19 @@ keypress(XKeyEvent *ev)
|
||||
insert(NULL, 0 - cursor);
|
||||
break;
|
||||
case XK_w: /* delete word */
|
||||
while (cursor > 0 && text[nextrune(-1)] == ' ')
|
||||
while(cursor > 0 && text[nextrune(-1)] == ' ')
|
||||
insert(NULL, nextrune(-1) - cursor);
|
||||
while (cursor > 0 && text[nextrune(-1)] != ' ')
|
||||
while(cursor > 0 && text[nextrune(-1)] != ' ')
|
||||
insert(NULL, nextrune(-1) - cursor);
|
||||
break;
|
||||
case XK_y: /* paste selection */
|
||||
case XK_Y:
|
||||
XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
|
||||
XConvertSelection(dc->dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
|
||||
utf8, utf8, win, CurrentTime);
|
||||
return;
|
||||
case XK_Return:
|
||||
case XK_KP_Enter:
|
||||
break;
|
||||
case XK_bracketleft:
|
||||
cleanup();
|
||||
exit(1);
|
||||
default:
|
||||
return;
|
||||
}
|
||||
else if (ev->state & Mod1Mask)
|
||||
else if(ev->state & Mod1Mask)
|
||||
switch(ksym) {
|
||||
case XK_g: ksym = XK_Home; break;
|
||||
case XK_G: ksym = XK_End; break;
|
||||
@ -346,40 +291,39 @@ keypress(XKeyEvent *ev)
|
||||
}
|
||||
switch(ksym) {
|
||||
default:
|
||||
if (!iscntrl(*buf))
|
||||
if(!iscntrl(*buf))
|
||||
insert(buf, len);
|
||||
break;
|
||||
case XK_Delete:
|
||||
if (text[cursor] == '\0')
|
||||
if(text[cursor] == '\0')
|
||||
return;
|
||||
cursor = nextrune(+1);
|
||||
/* fallthrough */
|
||||
case XK_BackSpace:
|
||||
if (cursor == 0)
|
||||
if(cursor == 0)
|
||||
return;
|
||||
insert(NULL, nextrune(-1) - cursor);
|
||||
break;
|
||||
case XK_End:
|
||||
if (text[cursor] != '\0') {
|
||||
if(text[cursor] != '\0') {
|
||||
cursor = strlen(text);
|
||||
break;
|
||||
}
|
||||
if (next) {
|
||||
if(next) {
|
||||
/* jump to end of list and position items in reverse */
|
||||
curr = matchend;
|
||||
calcoffsets();
|
||||
curr = prev;
|
||||
calcoffsets();
|
||||
while (next && (curr = curr->right))
|
||||
while(next && (curr = curr->right))
|
||||
calcoffsets();
|
||||
}
|
||||
sel = matchend;
|
||||
break;
|
||||
case XK_Escape:
|
||||
cleanup();
|
||||
exit(1);
|
||||
exit(EXIT_FAILURE);
|
||||
case XK_Home:
|
||||
if (sel == matches) {
|
||||
if(sel == matches) {
|
||||
cursor = 0;
|
||||
break;
|
||||
}
|
||||
@ -387,27 +331,27 @@ keypress(XKeyEvent *ev)
|
||||
calcoffsets();
|
||||
break;
|
||||
case XK_Left:
|
||||
if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
|
||||
if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
|
||||
cursor = nextrune(-1);
|
||||
break;
|
||||
}
|
||||
if (lines > 0)
|
||||
if(lines > 0)
|
||||
return;
|
||||
/* fallthrough */
|
||||
case XK_Up:
|
||||
if (sel && sel->left && (sel = sel->left)->right == curr) {
|
||||
if(sel && sel->left && (sel = sel->left)->right == curr) {
|
||||
curr = prev;
|
||||
calcoffsets();
|
||||
}
|
||||
break;
|
||||
case XK_Next:
|
||||
if (!next)
|
||||
if(!next)
|
||||
return;
|
||||
sel = curr = next;
|
||||
calcoffsets();
|
||||
break;
|
||||
case XK_Prior:
|
||||
if (!prev)
|
||||
if(!prev)
|
||||
return;
|
||||
sel = curr = prev;
|
||||
calcoffsets();
|
||||
@ -415,32 +359,25 @@ keypress(XKeyEvent *ev)
|
||||
case XK_Return:
|
||||
case XK_KP_Enter:
|
||||
puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
|
||||
if (!(ev->state & ControlMask)) {
|
||||
cleanup();
|
||||
exit(0);
|
||||
}
|
||||
if (sel)
|
||||
sel->out = 1;
|
||||
break;
|
||||
exit(EXIT_SUCCESS);
|
||||
case XK_Right:
|
||||
if (text[cursor] != '\0') {
|
||||
if(text[cursor] != '\0') {
|
||||
cursor = nextrune(+1);
|
||||
break;
|
||||
}
|
||||
if (lines > 0)
|
||||
if(lines > 0)
|
||||
return;
|
||||
/* fallthrough */
|
||||
case XK_Down:
|
||||
if (sel && sel->right && (sel = sel->right) == next) {
|
||||
if(sel && sel->right && (sel = sel->right) == next) {
|
||||
curr = next;
|
||||
calcoffsets();
|
||||
}
|
||||
break;
|
||||
case XK_Tab:
|
||||
if (!sel)
|
||||
if(!sel)
|
||||
return;
|
||||
strncpy(text, sel->text, sizeof text - 1);
|
||||
text[sizeof text - 1] = '\0';
|
||||
strncpy(text, sel->text, sizeof text);
|
||||
cursor = strlen(text);
|
||||
match();
|
||||
break;
|
||||
@ -448,233 +385,223 @@ keypress(XKeyEvent *ev)
|
||||
drawmenu();
|
||||
}
|
||||
|
||||
static void
|
||||
paste(void)
|
||||
{
|
||||
void
|
||||
match(void) {
|
||||
static char **tokv = NULL;
|
||||
static int tokn = 0;
|
||||
|
||||
char buf[sizeof text], *s;
|
||||
int i, tokc = 0;
|
||||
size_t len;
|
||||
Item *item, *lprefix, *lsubstr, *prefixend, *substrend;
|
||||
|
||||
strcpy(buf, text);
|
||||
/* separate input text into tokens to be matched individually */
|
||||
for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " "))
|
||||
if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
|
||||
eprintf("cannot realloc %u bytes\n", tokn * sizeof *tokv);
|
||||
len = tokc ? strlen(tokv[0]) : 0;
|
||||
|
||||
matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
|
||||
for(item = items; item && item->text; item++) {
|
||||
for(i = 0; i < tokc; i++)
|
||||
if(!fstrstr(item->text, tokv[i]))
|
||||
break;
|
||||
if(i != tokc) /* not all tokens match */
|
||||
continue;
|
||||
/* exact matches go first, then prefixes, then substrings */
|
||||
if(!tokc || !fstrncmp(tokv[0], item->text, len+1))
|
||||
appenditem(item, &matches, &matchend);
|
||||
else if(!fstrncmp(tokv[0], item->text, len))
|
||||
appenditem(item, &lprefix, &prefixend);
|
||||
else
|
||||
appenditem(item, &lsubstr, &substrend);
|
||||
}
|
||||
if(lprefix) {
|
||||
if(matches) {
|
||||
matchend->right = lprefix;
|
||||
lprefix->left = matchend;
|
||||
}
|
||||
else
|
||||
matches = lprefix;
|
||||
matchend = prefixend;
|
||||
}
|
||||
if(lsubstr) {
|
||||
if(matches) {
|
||||
matchend->right = lsubstr;
|
||||
lsubstr->left = matchend;
|
||||
}
|
||||
else
|
||||
matches = lsubstr;
|
||||
matchend = substrend;
|
||||
}
|
||||
curr = sel = matches;
|
||||
calcoffsets();
|
||||
}
|
||||
|
||||
size_t
|
||||
nextrune(int inc) {
|
||||
ssize_t n;
|
||||
|
||||
/* return location of next utf8 rune in the given direction (+1 or -1) */
|
||||
for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);
|
||||
return n;
|
||||
}
|
||||
|
||||
void
|
||||
paste(void) {
|
||||
char *p, *q;
|
||||
int di;
|
||||
unsigned long dl;
|
||||
Atom da;
|
||||
|
||||
/* we have been given the current selection, now insert it into input */
|
||||
XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
|
||||
XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
|
||||
utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
|
||||
insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
|
||||
insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p));
|
||||
XFree(p);
|
||||
drawmenu();
|
||||
}
|
||||
|
||||
static void
|
||||
readstdin(void)
|
||||
{
|
||||
void
|
||||
readstdin(void) {
|
||||
char buf[sizeof text], *p, *maxstr = NULL;
|
||||
size_t i, max = 0, size = 0;
|
||||
|
||||
/* read each line from stdin and add it to the item list */
|
||||
for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
|
||||
if (i + 1 >= size / sizeof *items)
|
||||
if (!(items = realloc(items, (size += BUFSIZ))))
|
||||
die("cannot realloc %u bytes:", size);
|
||||
if ((p = strchr(buf, '\n')))
|
||||
for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
|
||||
if(i+1 >= size / sizeof *items)
|
||||
if(!(items = realloc(items, (size += BUFSIZ))))
|
||||
eprintf("cannot realloc %u bytes:", size);
|
||||
if((p = strchr(buf, '\n')))
|
||||
*p = '\0';
|
||||
if (!(items[i].text = strdup(buf)))
|
||||
die("cannot strdup %u bytes:", strlen(buf) + 1);
|
||||
items[i].out = 0;
|
||||
if (strlen(items[i].text) > max)
|
||||
if(!(items[i].text = strdup(buf)))
|
||||
eprintf("cannot strdup %u bytes:", strlen(buf)+1);
|
||||
if(strlen(items[i].text) > max)
|
||||
max = strlen(maxstr = items[i].text);
|
||||
}
|
||||
if (items)
|
||||
if(items)
|
||||
items[i].text = NULL;
|
||||
inputw = maxstr ? TEXTW(maxstr) : 0;
|
||||
inputw = maxstr ? textw(dc, maxstr) : 0;
|
||||
lines = MIN(lines, i);
|
||||
}
|
||||
|
||||
static void
|
||||
run(void)
|
||||
{
|
||||
void
|
||||
run(void) {
|
||||
XEvent ev;
|
||||
|
||||
while (!XNextEvent(dpy, &ev)) {
|
||||
if (XFilterEvent(&ev, win))
|
||||
while(!XNextEvent(dc->dpy, &ev)) {
|
||||
if(XFilterEvent(&ev, win))
|
||||
continue;
|
||||
switch(ev.type) {
|
||||
case Expose:
|
||||
if (ev.xexpose.count == 0)
|
||||
drw_map(drw, win, 0, 0, mw, mh);
|
||||
if(ev.xexpose.count == 0)
|
||||
mapdc(dc, win, mw, mh);
|
||||
break;
|
||||
case KeyPress:
|
||||
keypress(&ev.xkey);
|
||||
break;
|
||||
case SelectionNotify:
|
||||
if (ev.xselection.property == utf8)
|
||||
if(ev.xselection.property == utf8)
|
||||
paste();
|
||||
break;
|
||||
case VisibilityNotify:
|
||||
if (ev.xvisibility.state != VisibilityUnobscured)
|
||||
XRaiseWindow(dpy, win);
|
||||
if(ev.xvisibility.state != VisibilityUnobscured)
|
||||
XRaiseWindow(dc->dpy, win);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
setup(void)
|
||||
{
|
||||
int x, y;
|
||||
void
|
||||
setup(void) {
|
||||
int x, y, screen = DefaultScreen(dc->dpy);
|
||||
Window root = RootWindow(dc->dpy, screen);
|
||||
XSetWindowAttributes swa;
|
||||
XIM xim;
|
||||
#ifdef XINERAMA
|
||||
int n;
|
||||
XineramaScreenInfo *info;
|
||||
Window w, pw, dw, *dws;
|
||||
XWindowAttributes wa;
|
||||
int a, j, di, n, i = 0, area = 0;
|
||||
unsigned int du;
|
||||
#endif
|
||||
|
||||
/* init appearance */
|
||||
scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor);
|
||||
scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor);
|
||||
scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
|
||||
scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
|
||||
scheme[SchemeOut].bg = drw_clr_create(drw, outbgcolor);
|
||||
scheme[SchemeOut].fg = drw_clr_create(drw, outfgcolor);
|
||||
normcol[ColBG] = getcolor(dc, normbgcolor);
|
||||
normcol[ColFG] = getcolor(dc, normfgcolor);
|
||||
selcol[ColBG] = getcolor(dc, selbgcolor);
|
||||
selcol[ColFG] = getcolor(dc, selfgcolor);
|
||||
|
||||
clip = XInternAtom(dpy, "CLIPBOARD", False);
|
||||
utf8 = XInternAtom(dpy, "UTF8_STRING", False);
|
||||
clip = XInternAtom(dc->dpy, "CLIPBOARD", False);
|
||||
utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
|
||||
|
||||
/* calculate menu geometry */
|
||||
bh = drw->fonts[0]->h + 2;
|
||||
bh = dc->font.height + 2;
|
||||
lines = MAX(lines, 0);
|
||||
mh = (lines + 1) * bh;
|
||||
#ifdef XINERAMA
|
||||
if ((info = XineramaQueryScreens(dpy, &n))) {
|
||||
XGetInputFocus(dpy, &w, &di);
|
||||
if (mon != -1 && mon < n)
|
||||
i = mon;
|
||||
else if (w != root && w != PointerRoot && w != None) {
|
||||
if((info = XineramaQueryScreens(dc->dpy, &n))) {
|
||||
int a, j, di, i = 0, area = 0;
|
||||
unsigned int du;
|
||||
Window w, pw, dw, *dws;
|
||||
XWindowAttributes wa;
|
||||
|
||||
XGetInputFocus(dc->dpy, &w, &di);
|
||||
if(w != root && w != PointerRoot && w != None) {
|
||||
/* find top-level window containing current input focus */
|
||||
do {
|
||||
if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
|
||||
if(XQueryTree(dc->dpy, (pw = w), &dw, &w, &dws, &du) && dws)
|
||||
XFree(dws);
|
||||
} while (w != root && w != pw);
|
||||
} while(w != root && w != pw);
|
||||
/* find xinerama screen with which the window intersects most */
|
||||
if (XGetWindowAttributes(dpy, pw, &wa))
|
||||
for (j = 0; j < n; j++)
|
||||
if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
|
||||
if(XGetWindowAttributes(dc->dpy, pw, &wa))
|
||||
for(j = 0; j < n; j++)
|
||||
if((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
|
||||
area = a;
|
||||
i = j;
|
||||
}
|
||||
}
|
||||
/* no focused window is on screen, so use pointer location instead */
|
||||
if (mon == -1 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
|
||||
for (i = 0; i < n; i++)
|
||||
if (INTERSECT(x, y, 1, 1, info[i]))
|
||||
if(!area && XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
|
||||
for(i = 0; i < n; i++)
|
||||
if(INTERSECT(x, y, 1, 1, info[i]))
|
||||
break;
|
||||
|
||||
x = info[i].x_org;
|
||||
y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
||||
mw = info[i].width;
|
||||
XFree(info);
|
||||
} else
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
x = 0;
|
||||
y = topbar ? 0 : sh - mh;
|
||||
mw = sw;
|
||||
y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
|
||||
mw = DisplayWidth(dc->dpy, screen);
|
||||
}
|
||||
promptw = (prompt && *prompt) ? TEXTW(prompt) : 0;
|
||||
promptw = prompt ? textw(dc, prompt) : 0;
|
||||
inputw = MIN(inputw, mw/3);
|
||||
match();
|
||||
|
||||
/* create menu window */
|
||||
swa.override_redirect = True;
|
||||
swa.background_pixel = scheme[SchemeNorm].bg->pix;
|
||||
swa.background_pixel = normcol[ColBG];
|
||||
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
||||
win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
|
||||
DefaultDepth(dpy, screen), CopyFromParent,
|
||||
DefaultVisual(dpy, screen),
|
||||
win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
|
||||
DefaultDepth(dc->dpy, screen), CopyFromParent,
|
||||
DefaultVisual(dc->dpy, screen),
|
||||
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
||||
|
||||
/* open input methods */
|
||||
xim = XOpenIM(dpy, NULL, NULL, NULL);
|
||||
xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
|
||||
xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
|
||||
XNClientWindow, win, XNFocusWindow, win, NULL);
|
||||
|
||||
XMapRaised(dpy, win);
|
||||
drw_resize(drw, mw, mh);
|
||||
XMapRaised(dc->dpy, win);
|
||||
resizedc(dc, mw, mh);
|
||||
drawmenu();
|
||||
}
|
||||
|
||||
static void
|
||||
usage(void)
|
||||
{
|
||||
fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
|
||||
void
|
||||
usage(void) {
|
||||
fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n"
|
||||
" [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
int i, fast = 0;
|
||||
|
||||
for (i = 1; i < argc; i++)
|
||||
/* these options take no arguments */
|
||||
if (!strcmp(argv[i], "-v")) { /* prints version information */
|
||||
puts("dmenu-"VERSION);
|
||||
exit(0);
|
||||
} else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
|
||||
topbar = 0;
|
||||
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
||||
fast = 1;
|
||||
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
||||
fstrncmp = strncasecmp;
|
||||
fstrstr = cistrstr;
|
||||
} else if (i + 1 == argc)
|
||||
usage();
|
||||
/* these options take one argument */
|
||||
else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */
|
||||
lines = atoi(argv[++i]);
|
||||
else if (!strcmp(argv[i], "-m"))
|
||||
mon = atoi(argv[++i]);
|
||||
else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */
|
||||
prompt = argv[++i];
|
||||
else if (!strcmp(argv[i], "-fn")) /* font or font set */
|
||||
fonts[0] = argv[++i];
|
||||
else if (!strcmp(argv[i], "-nb")) /* normal background color */
|
||||
normbgcolor = argv[++i];
|
||||
else if (!strcmp(argv[i], "-nf")) /* normal foreground color */
|
||||
normfgcolor = argv[++i];
|
||||
else if (!strcmp(argv[i], "-sb")) /* selected background color */
|
||||
selbgcolor = argv[++i];
|
||||
else if (!strcmp(argv[i], "-sf")) /* selected foreground color */
|
||||
selfgcolor = argv[++i];
|
||||
else
|
||||
usage();
|
||||
|
||||
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
|
||||
fputs("warning: no locale support\n", stderr);
|
||||
if (!(dpy = XOpenDisplay(NULL)))
|
||||
die("cannot open display\n");
|
||||
screen = DefaultScreen(dpy);
|
||||
root = RootWindow(dpy, screen);
|
||||
sw = DisplayWidth(dpy, screen);
|
||||
sh = DisplayHeight(dpy, screen);
|
||||
drw = drw_create(dpy, screen, root, sw, sh);
|
||||
drw_load_fonts(drw, fonts, LENGTH(fonts));
|
||||
if (!drw->fontcount)
|
||||
die("no fonts could be loaded.\n");
|
||||
drw_setscheme(drw, &scheme[SchemeNorm]);
|
||||
|
||||
if (fast) {
|
||||
grabkeyboard();
|
||||
readstdin();
|
||||
} else {
|
||||
readstdin();
|
||||
grabkeyboard();
|
||||
}
|
||||
setup();
|
||||
run();
|
||||
|
||||
return 1; /* unreachable */
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
13
dmenu_path
13
dmenu_path
@ -1,13 +0,0 @@
|
||||
#!/bin/sh
|
||||
cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"}
|
||||
if [ -d "$cachedir" ]; then
|
||||
cache=$cachedir/dmenu_run
|
||||
else
|
||||
cache=$HOME/.dmenu_cache # if no xdg dir, fall back to dotfile in ~
|
||||
fi
|
||||
IFS=:
|
||||
if stest -dqr -n "$cache" $PATH; then
|
||||
stest -flx $PATH | sort -u | tee "$cache"
|
||||
else
|
||||
cat "$cache"
|
||||
fi
|
||||
15
dmenu_run
15
dmenu_run
@ -1,2 +1,15 @@
|
||||
#!/bin/sh
|
||||
dmenu_path | dmenu "$@" | ${SHELL:-"/bin/sh"} &
|
||||
cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"}
|
||||
if [ -d "$cachedir" ]; then
|
||||
cache=$cachedir/dmenu_run
|
||||
else
|
||||
cache=$HOME/.dmenu_cache # if no xdg dir, fall back to dotfile in ~
|
||||
fi
|
||||
(
|
||||
IFS=:
|
||||
if stest -dqr -n "$cache" $PATH; then
|
||||
stest -flx $PATH | sort -u | tee "$cache" | dmenu "$@"
|
||||
else
|
||||
dmenu "$@" < "$cache"
|
||||
fi
|
||||
) | ${SHELL:-"/bin/sh"} &
|
||||
|
||||
177
draw.c
Normal file
177
draw.c
Normal file
@ -0,0 +1,177 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <locale.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include "draw.h"
|
||||
|
||||
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
||||
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||
#define DEFAULTFN "fixed"
|
||||
|
||||
static Bool loadfont(DC *dc, const char *fontstr);
|
||||
|
||||
void
|
||||
drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
|
||||
XSetForeground(dc->dpy, dc->gc, color);
|
||||
if(fill)
|
||||
XFillRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w, h);
|
||||
else
|
||||
XDrawRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w-1, h-1);
|
||||
}
|
||||
|
||||
void
|
||||
drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
|
||||
char buf[BUFSIZ];
|
||||
size_t mn, n = strlen(text);
|
||||
|
||||
/* shorten text if necessary */
|
||||
for(mn = MIN(n, sizeof buf); textnw(dc, text, mn) + dc->font.height/2 > dc->w; mn--)
|
||||
if(mn == 0)
|
||||
return;
|
||||
memcpy(buf, text, mn);
|
||||
if(mn < n)
|
||||
for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.');
|
||||
|
||||
drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col));
|
||||
drawtextn(dc, buf, mn, col);
|
||||
}
|
||||
|
||||
void
|
||||
drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
|
||||
int x = dc->x + dc->font.height/2;
|
||||
int y = dc->y + dc->font.ascent+1;
|
||||
|
||||
XSetForeground(dc->dpy, dc->gc, FG(dc, col));
|
||||
if(dc->font.set)
|
||||
XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n);
|
||||
else {
|
||||
XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
|
||||
XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
eprintf(const char *fmt, ...) {
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
vfprintf(stderr, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') {
|
||||
fputc(' ', stderr);
|
||||
perror(NULL);
|
||||
}
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
void
|
||||
freedc(DC *dc) {
|
||||
if(dc->font.set)
|
||||
XFreeFontSet(dc->dpy, dc->font.set);
|
||||
if(dc->font.xfont)
|
||||
XFreeFont(dc->dpy, dc->font.xfont);
|
||||
if(dc->canvas)
|
||||
XFreePixmap(dc->dpy, dc->canvas);
|
||||
XFreeGC(dc->dpy, dc->gc);
|
||||
XCloseDisplay(dc->dpy);
|
||||
free(dc);
|
||||
}
|
||||
|
||||
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))
|
||||
eprintf("cannot allocate color '%s'\n", colstr);
|
||||
return color.pixel;
|
||||
}
|
||||
|
||||
DC *
|
||||
initdc(void) {
|
||||
DC *dc;
|
||||
|
||||
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
|
||||
fputs("no locale support\n", stderr);
|
||||
if(!(dc = calloc(1, sizeof *dc)))
|
||||
eprintf("cannot malloc %u bytes:", sizeof *dc);
|
||||
if(!(dc->dpy = XOpenDisplay(NULL)))
|
||||
eprintf("cannot open display\n");
|
||||
|
||||
dc->gc = XCreateGC(dc->dpy, DefaultRootWindow(dc->dpy), 0, NULL);
|
||||
XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter);
|
||||
return dc;
|
||||
}
|
||||
|
||||
void
|
||||
initfont(DC *dc, const char *fontstr) {
|
||||
if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
|
||||
if(fontstr != NULL)
|
||||
fprintf(stderr, "cannot load font '%s'\n", fontstr);
|
||||
if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
|
||||
eprintf("cannot load font '%s'\n", DEFAULTFN);
|
||||
}
|
||||
dc->font.height = dc->font.ascent + dc->font.descent;
|
||||
}
|
||||
|
||||
Bool
|
||||
loadfont(DC *dc, const char *fontstr) {
|
||||
char *def, **missing, **names;
|
||||
int i, n;
|
||||
XFontStruct **xfonts;
|
||||
|
||||
if(!*fontstr)
|
||||
return False;
|
||||
if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
|
||||
n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
|
||||
for(i = 0; i < n; i++) {
|
||||
dc->font.ascent = MAX(dc->font.ascent, xfonts[i]->ascent);
|
||||
dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
|
||||
dc->font.width = MAX(dc->font.width, xfonts[i]->max_bounds.width);
|
||||
}
|
||||
}
|
||||
else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
|
||||
dc->font.ascent = dc->font.xfont->ascent;
|
||||
dc->font.descent = dc->font.xfont->descent;
|
||||
dc->font.width = dc->font.xfont->max_bounds.width;
|
||||
}
|
||||
if(missing)
|
||||
XFreeStringList(missing);
|
||||
return dc->font.set || dc->font.xfont;
|
||||
}
|
||||
|
||||
void
|
||||
mapdc(DC *dc, Window win, unsigned int w, unsigned int h) {
|
||||
XCopyArea(dc->dpy, dc->canvas, win, dc->gc, 0, 0, w, h, 0, 0);
|
||||
}
|
||||
|
||||
void
|
||||
resizedc(DC *dc, unsigned int w, unsigned int h) {
|
||||
if(dc->canvas)
|
||||
XFreePixmap(dc->dpy, dc->canvas);
|
||||
|
||||
dc->w = w;
|
||||
dc->h = h;
|
||||
dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
|
||||
DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
|
||||
}
|
||||
|
||||
int
|
||||
textnw(DC *dc, const char *text, size_t len) {
|
||||
if(dc->font.set) {
|
||||
XRectangle r;
|
||||
|
||||
XmbTextExtents(dc->font.set, text, len, NULL, &r);
|
||||
return r.width;
|
||||
}
|
||||
return XTextWidth(dc->font.xfont, text, len);
|
||||
}
|
||||
|
||||
int
|
||||
textw(DC *dc, const char *text) {
|
||||
return textnw(dc, text, strlen(text)) + dc->font.height;
|
||||
}
|
||||
35
draw.h
Normal file
35
draw.h
Normal file
@ -0,0 +1,35 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
|
||||
#define FG(dc, col) ((col)[(dc)->invert ? ColBG : ColFG])
|
||||
#define BG(dc, col) ((col)[(dc)->invert ? ColFG : ColBG])
|
||||
|
||||
enum { ColBG, ColFG, ColBorder, ColLast };
|
||||
|
||||
typedef struct {
|
||||
int x, y, w, h;
|
||||
Bool invert;
|
||||
Display *dpy;
|
||||
GC gc;
|
||||
Pixmap canvas;
|
||||
struct {
|
||||
int ascent;
|
||||
int descent;
|
||||
int height;
|
||||
int width;
|
||||
XFontSet set;
|
||||
XFontStruct *xfont;
|
||||
} font;
|
||||
} DC; /* draw context */
|
||||
|
||||
void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color);
|
||||
void drawtext(DC *dc, const char *text, unsigned long col[ColLast]);
|
||||
void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]);
|
||||
void eprintf(const char *fmt, ...);
|
||||
void freedc(DC *dc);
|
||||
unsigned long getcolor(DC *dc, const char *colstr);
|
||||
DC *initdc(void);
|
||||
void initfont(DC *dc, const char *fontstr);
|
||||
void mapdc(DC *dc, Window win, unsigned int w, unsigned int h);
|
||||
void resizedc(DC *dc, unsigned int w, unsigned int h);
|
||||
int textnw(DC *dc, const char *text, size_t len);
|
||||
int textw(DC *dc, const char *text);
|
||||
398
drw.c
398
drw.c
@ -1,398 +0,0 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xft/Xft.h>
|
||||
|
||||
#include "drw.h"
|
||||
#include "util.h"
|
||||
|
||||
#define UTF_INVALID 0xFFFD
|
||||
#define UTF_SIZ 4
|
||||
|
||||
static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
|
||||
static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
|
||||
static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
|
||||
static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
|
||||
|
||||
static long
|
||||
utf8decodebyte(const char c, size_t *i)
|
||||
{
|
||||
for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
|
||||
if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
|
||||
return (unsigned char)c & ~utfmask[*i];
|
||||
return 0;
|
||||
}
|
||||
|
||||
static size_t
|
||||
utf8validate(long *u, size_t i)
|
||||
{
|
||||
if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
|
||||
*u = UTF_INVALID;
|
||||
for (i = 1; *u > utfmax[i]; ++i)
|
||||
;
|
||||
return i;
|
||||
}
|
||||
|
||||
static size_t
|
||||
utf8decode(const char *c, long *u, size_t clen)
|
||||
{
|
||||
size_t i, j, len, type;
|
||||
long udecoded;
|
||||
|
||||
*u = UTF_INVALID;
|
||||
if (!clen)
|
||||
return 0;
|
||||
udecoded = utf8decodebyte(c[0], &len);
|
||||
if (!BETWEEN(len, 1, UTF_SIZ))
|
||||
return 1;
|
||||
for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
|
||||
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
|
||||
if (type)
|
||||
return j;
|
||||
}
|
||||
if (j < len)
|
||||
return 0;
|
||||
*u = udecoded;
|
||||
utf8validate(u, len);
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
Drw *
|
||||
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
|
||||
{
|
||||
Drw *drw;
|
||||
|
||||
drw = ecalloc(1, sizeof(Drw));
|
||||
drw->dpy = dpy;
|
||||
drw->screen = screen;
|
||||
drw->root = root;
|
||||
drw->w = w;
|
||||
drw->h = h;
|
||||
drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
|
||||
drw->gc = XCreateGC(dpy, root, 0, NULL);
|
||||
drw->fontcount = 0;
|
||||
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
|
||||
|
||||
return drw;
|
||||
}
|
||||
|
||||
void
|
||||
drw_resize(Drw *drw, unsigned int w, unsigned int h)
|
||||
{
|
||||
drw->w = w;
|
||||
drw->h = h;
|
||||
if (drw->drawable)
|
||||
XFreePixmap(drw->dpy, drw->drawable);
|
||||
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
|
||||
}
|
||||
|
||||
void
|
||||
drw_free(Drw *drw)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < drw->fontcount; i++)
|
||||
drw_font_free(drw->fonts[i]);
|
||||
XFreePixmap(drw->dpy, drw->drawable);
|
||||
XFreeGC(drw->dpy, drw->gc);
|
||||
free(drw);
|
||||
}
|
||||
|
||||
/* This function is an implementation detail. Library users should use
|
||||
* drw_font_create instead.
|
||||
*/
|
||||
static Fnt *
|
||||
drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
|
||||
{
|
||||
Fnt *font;
|
||||
XftFont *xfont = NULL;
|
||||
FcPattern *pattern = NULL;
|
||||
|
||||
if (fontname) {
|
||||
/* Using the pattern found at font->xfont->pattern does not yield same
|
||||
* the same substitution results as using the pattern returned by
|
||||
* FcNameParse; using the latter results in the desired fallback
|
||||
* behaviour whereas the former just results in
|
||||
* missing-character-rectangles being drawn, at least with some fonts.
|
||||
*/
|
||||
if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
|
||||
fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
|
||||
return NULL;
|
||||
}
|
||||
if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
|
||||
fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
|
||||
XftFontClose(drw->dpy, xfont);
|
||||
return NULL;
|
||||
}
|
||||
} else if (fontpattern) {
|
||||
if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
|
||||
fprintf(stderr, "error, cannot load font pattern.\n");
|
||||
return NULL;
|
||||
}
|
||||
} else {
|
||||
die("no font specified.\n");
|
||||
}
|
||||
|
||||
font = ecalloc(1, sizeof(Fnt));
|
||||
font->xfont = xfont;
|
||||
font->pattern = pattern;
|
||||
font->ascent = xfont->ascent;
|
||||
font->descent = xfont->descent;
|
||||
font->h = font->ascent + font->descent;
|
||||
font->dpy = drw->dpy;
|
||||
|
||||
return font;
|
||||
}
|
||||
|
||||
Fnt*
|
||||
drw_font_create(Drw *drw, const char *fontname)
|
||||
{
|
||||
return drw_font_xcreate(drw, fontname, NULL);
|
||||
}
|
||||
|
||||
void
|
||||
drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount)
|
||||
{
|
||||
size_t i;
|
||||
Fnt *font;
|
||||
|
||||
for (i = 0; i < fontcount; i++) {
|
||||
if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
|
||||
die("Font cache exhausted.\n");
|
||||
} else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) {
|
||||
drw->fonts[drw->fontcount++] = font;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
drw_font_free(Fnt *font)
|
||||
{
|
||||
if (!font)
|
||||
return;
|
||||
if (font->pattern)
|
||||
FcPatternDestroy(font->pattern);
|
||||
XftFontClose(font->dpy, font->xfont);
|
||||
free(font);
|
||||
}
|
||||
|
||||
Clr *
|
||||
drw_clr_create(Drw *drw, const char *clrname)
|
||||
{
|
||||
Clr *clr;
|
||||
|
||||
clr = ecalloc(1, sizeof(Clr));
|
||||
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
|
||||
DefaultColormap(drw->dpy, drw->screen),
|
||||
clrname, &clr->rgb))
|
||||
die("error, cannot allocate color '%s'\n", clrname);
|
||||
clr->pix = clr->rgb.pixel;
|
||||
|
||||
return clr;
|
||||
}
|
||||
|
||||
void
|
||||
drw_clr_free(Clr *clr)
|
||||
{
|
||||
free(clr);
|
||||
}
|
||||
|
||||
void
|
||||
drw_setscheme(Drw *drw, ClrScheme *scheme)
|
||||
{
|
||||
drw->scheme = scheme;
|
||||
}
|
||||
|
||||
void
|
||||
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert)
|
||||
{
|
||||
if (!drw->scheme)
|
||||
return;
|
||||
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
|
||||
if (filled)
|
||||
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1);
|
||||
else if (empty)
|
||||
XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
||||
}
|
||||
|
||||
int
|
||||
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert)
|
||||
{
|
||||
char buf[1024];
|
||||
int tx, ty, th;
|
||||
Extnts tex;
|
||||
XftDraw *d = NULL;
|
||||
Fnt *curfont, *nextfont;
|
||||
size_t i, len;
|
||||
int utf8strlen, utf8charlen, render;
|
||||
long utf8codepoint = 0;
|
||||
const char *utf8str;
|
||||
FcCharSet *fccharset;
|
||||
FcPattern *fcpattern;
|
||||
FcPattern *match;
|
||||
XftResult result;
|
||||
int charexists = 0;
|
||||
|
||||
if (!drw->scheme || !drw->fontcount)
|
||||
return 0;
|
||||
|
||||
if (!(render = x || y || w || h)) {
|
||||
w = ~w;
|
||||
} else {
|
||||
XSetForeground(drw->dpy, drw->gc, invert ?
|
||||
drw->scheme->fg->pix : drw->scheme->bg->pix);
|
||||
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
||||
d = XftDrawCreate(drw->dpy, drw->drawable,
|
||||
DefaultVisual(drw->dpy, drw->screen),
|
||||
DefaultColormap(drw->dpy, drw->screen));
|
||||
}
|
||||
|
||||
curfont = drw->fonts[0];
|
||||
while (1) {
|
||||
utf8strlen = 0;
|
||||
utf8str = text;
|
||||
nextfont = NULL;
|
||||
while (*text) {
|
||||
utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
|
||||
for (i = 0; i < drw->fontcount; i++) {
|
||||
charexists = charexists || XftCharExists(drw->dpy, drw->fonts[i]->xfont, utf8codepoint);
|
||||
if (charexists) {
|
||||
if (drw->fonts[i] == curfont) {
|
||||
utf8strlen += utf8charlen;
|
||||
text += utf8charlen;
|
||||
} else {
|
||||
nextfont = drw->fonts[i];
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!charexists || (nextfont && nextfont != curfont))
|
||||
break;
|
||||
else
|
||||
charexists = 0;
|
||||
}
|
||||
|
||||
if (utf8strlen) {
|
||||
drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
|
||||
/* shorten text if necessary */
|
||||
for (len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--)
|
||||
drw_font_getexts(curfont, utf8str, len, &tex);
|
||||
|
||||
if (len) {
|
||||
memcpy(buf, utf8str, len);
|
||||
buf[len] = '\0';
|
||||
if (len < utf8strlen)
|
||||
for (i = len; i && i > len - 3; buf[--i] = '.');
|
||||
|
||||
if (render) {
|
||||
th = curfont->ascent + curfont->descent;
|
||||
ty = y + (h / 2) - (th / 2) + curfont->ascent;
|
||||
tx = x + (h / 2);
|
||||
XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
|
||||
}
|
||||
x += tex.w;
|
||||
w -= tex.w;
|
||||
}
|
||||
}
|
||||
|
||||
if (!*text) {
|
||||
break;
|
||||
} else if (nextfont) {
|
||||
charexists = 0;
|
||||
curfont = nextfont;
|
||||
} else {
|
||||
/* Regardless of whether or not a fallback font is found, the
|
||||
* character must be drawn.
|
||||
*/
|
||||
charexists = 1;
|
||||
|
||||
if (drw->fontcount >= DRW_FONT_CACHE_SIZE)
|
||||
continue;
|
||||
|
||||
fccharset = FcCharSetCreate();
|
||||
FcCharSetAddChar(fccharset, utf8codepoint);
|
||||
|
||||
if (!drw->fonts[0]->pattern) {
|
||||
/* Refer to the comment in drw_font_xcreate for more
|
||||
* information. */
|
||||
die("the first font in the cache must be loaded from a font string.\n");
|
||||
}
|
||||
|
||||
fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);
|
||||
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
|
||||
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
|
||||
|
||||
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
|
||||
FcDefaultSubstitute(fcpattern);
|
||||
match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
|
||||
|
||||
FcCharSetDestroy(fccharset);
|
||||
FcPatternDestroy(fcpattern);
|
||||
|
||||
if (match) {
|
||||
curfont = drw_font_xcreate(drw, NULL, match);
|
||||
if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
|
||||
drw->fonts[drw->fontcount++] = curfont;
|
||||
} else {
|
||||
drw_font_free(curfont);
|
||||
curfont = drw->fonts[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (d)
|
||||
XftDrawDestroy(d);
|
||||
|
||||
return x;
|
||||
}
|
||||
|
||||
void
|
||||
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
|
||||
{
|
||||
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
|
||||
XSync(drw->dpy, False);
|
||||
}
|
||||
|
||||
void
|
||||
drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex)
|
||||
{
|
||||
XGlyphInfo ext;
|
||||
|
||||
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
|
||||
tex->h = font->h;
|
||||
tex->w = ext.xOff;
|
||||
}
|
||||
|
||||
unsigned int
|
||||
drw_font_getexts_width(Fnt *font, const char *text, unsigned int len)
|
||||
{
|
||||
Extnts tex;
|
||||
|
||||
drw_font_getexts(font, text, len, &tex);
|
||||
|
||||
return tex.w;
|
||||
}
|
||||
|
||||
Cur *
|
||||
drw_cur_create(Drw *drw, int shape)
|
||||
{
|
||||
Cur *cur;
|
||||
|
||||
cur = ecalloc(1, sizeof(Cur));
|
||||
cur->cursor = XCreateFontCursor(drw->dpy, shape);
|
||||
|
||||
return cur;
|
||||
}
|
||||
|
||||
void
|
||||
drw_cur_free(Drw *drw, Cur *cursor)
|
||||
{
|
||||
if (!cursor)
|
||||
return;
|
||||
XFreeCursor(drw->dpy, cursor->cursor);
|
||||
free(cursor);
|
||||
}
|
||||
74
drw.h
74
drw.h
@ -1,74 +0,0 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#define DRW_FONT_CACHE_SIZE 32
|
||||
|
||||
typedef struct {
|
||||
unsigned long pix;
|
||||
XftColor rgb;
|
||||
} Clr;
|
||||
|
||||
typedef struct {
|
||||
Cursor cursor;
|
||||
} Cur;
|
||||
|
||||
typedef struct {
|
||||
Display *dpy;
|
||||
int ascent;
|
||||
int descent;
|
||||
unsigned int h;
|
||||
XftFont *xfont;
|
||||
FcPattern *pattern;
|
||||
} Fnt;
|
||||
|
||||
typedef struct {
|
||||
Clr *fg;
|
||||
Clr *bg;
|
||||
Clr *border;
|
||||
} ClrScheme;
|
||||
|
||||
typedef struct {
|
||||
unsigned int w, h;
|
||||
Display *dpy;
|
||||
int screen;
|
||||
Window root;
|
||||
Drawable drawable;
|
||||
GC gc;
|
||||
ClrScheme *scheme;
|
||||
size_t fontcount;
|
||||
Fnt *fonts[DRW_FONT_CACHE_SIZE];
|
||||
} Drw;
|
||||
|
||||
typedef struct {
|
||||
unsigned int w;
|
||||
unsigned int h;
|
||||
} Extnts;
|
||||
|
||||
/* Drawable abstraction */
|
||||
Drw *drw_create(Display *, int, Window, unsigned int, unsigned int);
|
||||
void drw_resize(Drw *, unsigned int, unsigned int);
|
||||
void drw_free(Drw *);
|
||||
|
||||
/* Fnt abstraction */
|
||||
Fnt *drw_font_create(Drw *, const char *);
|
||||
void drw_load_fonts(Drw *, const char *[], size_t);
|
||||
void drw_font_free(Fnt *);
|
||||
void drw_font_getexts(Fnt *, const char *, unsigned int, Extnts *);
|
||||
unsigned int drw_font_getexts_width(Fnt *, const char *, unsigned int);
|
||||
|
||||
/* Colour abstraction */
|
||||
Clr *drw_clr_create(Drw *, const char *);
|
||||
void drw_clr_free(Clr *);
|
||||
|
||||
/* Cursor abstraction */
|
||||
Cur *drw_cur_create(Drw *, int);
|
||||
void drw_cur_free(Drw *, Cur *);
|
||||
|
||||
/* Drawing context manipulation */
|
||||
void drw_setfont(Drw *, Fnt *);
|
||||
void drw_setscheme(Drw *, ClrScheme *);
|
||||
|
||||
/* Drawing functions */
|
||||
void drw_rect(Drw *, int, int, unsigned int, unsigned int, int, int, int);
|
||||
int drw_text(Drw *, int, int, unsigned int, unsigned int, const char *, int);
|
||||
|
||||
/* Map functions */
|
||||
void drw_map(Drw *, Window, int, int, unsigned int, unsigned int);
|
||||
3
stest.1
3
stest.1
@ -67,9 +67,6 @@ Test that files are not empty.
|
||||
.B \-u
|
||||
Test that files have their set-user-ID flag set.
|
||||
.TP
|
||||
.B \-v
|
||||
Invert the sense of tests, only failing files pass.
|
||||
.TP
|
||||
.B \-w
|
||||
Test that files are writable.
|
||||
.TP
|
||||
|
||||
127
stest.c
127
stest.c
@ -1,31 +1,66 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <dirent.h>
|
||||
#include <limits.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "arg.h"
|
||||
char *argv0;
|
||||
#include <sys/stat.h>
|
||||
|
||||
#define FLAG(x) (flag[(x)-'a'])
|
||||
|
||||
static void test(const char *, const char *);
|
||||
static void usage(void);
|
||||
|
||||
static int match = 0;
|
||||
static int flag[26];
|
||||
static bool match = false;
|
||||
static bool flag[26];
|
||||
static struct stat old, new;
|
||||
|
||||
static void
|
||||
test(const char *path, const char *name)
|
||||
{
|
||||
int
|
||||
main(int argc, char *argv[]) {
|
||||
struct dirent *d;
|
||||
char buf[BUFSIZ], *p;
|
||||
DIR *dir;
|
||||
int opt;
|
||||
|
||||
while((opt = getopt(argc, argv, "abcdefghln:o:pqrsuwx")) != -1)
|
||||
switch(opt) {
|
||||
case 'n': /* newer than file */
|
||||
case 'o': /* older than file */
|
||||
if(!(FLAG(opt) = !stat(optarg, (opt == 'n' ? &new : &old))))
|
||||
perror(optarg);
|
||||
break;
|
||||
default: /* miscellaneous operators */
|
||||
FLAG(opt) = true;
|
||||
break;
|
||||
case '?': /* error: unknown flag */
|
||||
fprintf(stderr, "usage: %s [-abcdefghlpqrsuwx] [-n file] [-o file] [file...]\n", argv[0]);
|
||||
exit(2);
|
||||
}
|
||||
if(optind == argc)
|
||||
while(fgets(buf, sizeof buf, stdin)) {
|
||||
if((p = strchr(buf, '\n')))
|
||||
*p = '\0';
|
||||
test(buf, buf);
|
||||
}
|
||||
for(; optind < argc; optind++)
|
||||
if(FLAG('l') && (dir = opendir(argv[optind]))) {
|
||||
/* test directory contents */
|
||||
while((d = readdir(dir)))
|
||||
if(snprintf(buf, sizeof buf, "%s/%s", argv[optind], d->d_name) < sizeof buf)
|
||||
test(buf, d->d_name);
|
||||
closedir(dir);
|
||||
}
|
||||
else
|
||||
test(argv[optind], argv[optind]);
|
||||
|
||||
return match ? 0 : 1;
|
||||
}
|
||||
|
||||
void
|
||||
test(const char *path, const char *name) {
|
||||
struct stat st, ln;
|
||||
|
||||
if ((!stat(path, &st) && (FLAG('a') || name[0] != '.') /* hidden files */
|
||||
if(!stat(path, &st) && (FLAG('a') || name[0] != '.') /* hidden files */
|
||||
&& (!FLAG('b') || S_ISBLK(st.st_mode)) /* block special */
|
||||
&& (!FLAG('c') || S_ISCHR(st.st_mode)) /* character special */
|
||||
&& (!FLAG('d') || S_ISDIR(st.st_mode)) /* directory */
|
||||
@ -40,70 +75,10 @@ test(const char *path, const char *name)
|
||||
&& (!FLAG('s') || st.st_size > 0) /* not empty */
|
||||
&& (!FLAG('u') || st.st_mode & S_ISUID) /* set-user-id flag */
|
||||
&& (!FLAG('w') || access(path, W_OK) == 0) /* writable */
|
||||
&& (!FLAG('x') || access(path, X_OK) == 0)) != FLAG('v')) { /* executable */
|
||||
if (FLAG('q'))
|
||||
&& (!FLAG('x') || access(path, X_OK) == 0)) { /* executable */
|
||||
if(FLAG('q'))
|
||||
exit(0);
|
||||
match = 1;
|
||||
match = true;
|
||||
puts(name);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
usage(void)
|
||||
{
|
||||
fprintf(stderr, "usage: %s [-abcdefghlpqrsuvwx] "
|
||||
"[-n file] [-o file] [file...]\n", argv0);
|
||||
exit(2); /* like test(1) return > 1 on error */
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
struct dirent *d;
|
||||
char path[PATH_MAX], *line = NULL, *file;
|
||||
size_t linesiz = 0;
|
||||
ssize_t n;
|
||||
DIR *dir;
|
||||
int r;
|
||||
|
||||
ARGBEGIN {
|
||||
case 'n': /* newer than file */
|
||||
case 'o': /* older than file */
|
||||
file = EARGF(usage());
|
||||
if (!(FLAG(ARGC()) = !stat(file, (ARGC() == 'n' ? &new : &old))))
|
||||
perror(file);
|
||||
break;
|
||||
default:
|
||||
/* miscellaneous operators */
|
||||
if (strchr("abcdefghlpqrsuvwx", ARGC()))
|
||||
FLAG(ARGC()) = 1;
|
||||
else
|
||||
usage(); /* unknown flag */
|
||||
} ARGEND;
|
||||
|
||||
if (!argc) {
|
||||
/* read list from stdin */
|
||||
while ((n = getline(&line, &linesiz, stdin)) > 0) {
|
||||
if (n && line[n - 1] == '\n')
|
||||
line[n - 1] = '\0';
|
||||
test(line, line);
|
||||
}
|
||||
free(line);
|
||||
} else {
|
||||
for (; argc; argc--, argv++) {
|
||||
if (FLAG('l') && (dir = opendir(*argv))) {
|
||||
/* test directory contents */
|
||||
while ((d = readdir(dir))) {
|
||||
r = snprintf(path, sizeof path, "%s/%s",
|
||||
*argv, d->d_name);
|
||||
if (r >= 0 && (size_t)r < sizeof path)
|
||||
test(path, d->d_name);
|
||||
}
|
||||
closedir(dir);
|
||||
} else {
|
||||
test(*argv, *argv);
|
||||
}
|
||||
}
|
||||
}
|
||||
return match ? 0 : 1;
|
||||
}
|
||||
|
||||
33
util.c
33
util.c
@ -1,33 +0,0 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util.h"
|
||||
|
||||
void *
|
||||
ecalloc(size_t nmemb, size_t size)
|
||||
{
|
||||
void *p;
|
||||
|
||||
if (!(p = calloc(nmemb, size)))
|
||||
perror(NULL);
|
||||
return p;
|
||||
}
|
||||
|
||||
void
|
||||
die(const char *fmt, ...) {
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
vfprintf(stderr, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
|
||||
fputc(' ', stderr);
|
||||
perror(NULL);
|
||||
}
|
||||
|
||||
exit(1);
|
||||
}
|
||||
Reference in New Issue
Block a user