From 4b508c555706af67b1842d3e0293b00e91e4fa21 Mon Sep 17 00:00:00 2001 From: Till Dieminger Date: Sun, 31 Aug 2025 20:58:55 +0200 Subject: [PATCH] Ipdate --- LICENSE | 30 ++ Makefile | 61 ++++ arg.h | 49 +++ config.h | 30 ++ config.mk | 31 ++ dmenu | Bin 0 -> 48064 bytes dmenu.1 | 205 +++++++++++ dmenu.1.orig | 202 ++++++++++ dmenu.1.rej | 21 ++ dmenu.1backup | 202 ++++++++++ dmenu.c | 831 ++++++++++++++++++++++++++++++++++++++++++ dmenu.c.rej | 65 ++++ dmenu.o | Bin 0 -> 34536 bytes dmenu.old | 831 ++++++++++++++++++++++++++++++++++++++++++ dmenu_path | 13 + dmenu_run | 58 +++ dmenuc.backup | 819 +++++++++++++++++++++++++++++++++++++++++ drw.c | 436 ++++++++++++++++++++++ drw.h | 57 +++ drw.o | Bin 0 -> 10504 bytes patches/password.diff | 88 +++++ stest | Bin 0 -> 21536 bytes stest.1 | 90 +++++ stest.c | 109 ++++++ stest.o | Bin 0 -> 5232 bytes util.c | 35 ++ util.h | 8 + util.o | Bin 0 -> 2216 bytes 28 files changed, 4271 insertions(+) create mode 100755 LICENSE create mode 100755 Makefile create mode 100755 arg.h create mode 100755 config.h create mode 100755 config.mk create mode 100755 dmenu create mode 100755 dmenu.1 create mode 100755 dmenu.1.orig create mode 100755 dmenu.1.rej create mode 100755 dmenu.1backup create mode 100755 dmenu.c create mode 100755 dmenu.c.rej create mode 100644 dmenu.o create mode 100755 dmenu.old create mode 100755 dmenu_path create mode 100755 dmenu_run create mode 100755 dmenuc.backup create mode 100755 drw.c create mode 100755 drw.h create mode 100644 drw.o create mode 100755 patches/password.diff create mode 100755 stest create mode 100755 stest.1 create mode 100755 stest.c create mode 100644 stest.o create mode 100755 util.c create mode 100755 util.h create mode 100644 util.o diff --git a/LICENSE b/LICENSE new file mode 100755 index 0000000..3afd28e --- /dev/null +++ b/LICENSE @@ -0,0 +1,30 @@ +MIT/X Consortium License + +© 2006-2019 Anselm R Garbe +© 2006-2008 Sander van Dijk +© 2006-2007 Michał Janeczek +© 2007 Kris Maglione +© 2009 Gottox +© 2009 Markus Schnalke +© 2009 Evan Gates +© 2010-2012 Connor Lane Smith +© 2014-2020 Hiltjo Posthuma +© 2015-2019 Quentin Rameau + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/Makefile b/Makefile new file mode 100755 index 0000000..b42c96e --- /dev/null +++ b/Makefile @@ -0,0 +1,61 @@ +# dmenu - dynamic menu +# See LICENSE file for copyright and license details. + +include config.mk + +SRC = drw.c dmenu.c stest.c util.c +OBJ = $(SRC:.c=.o) + +all: options dmenu stest + +options: + @echo dmenu build options: + @echo "CFLAGS = $(CFLAGS)" + @echo "LDFLAGS = $(LDFLAGS)" + @echo "CC = $(CC)" + +.c.o: + $(CC) -c $(CFLAGS) $< + +$(OBJ): arg.h config.h config.mk drw.h + +dmenu: dmenu.o drw.o util.o + $(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS) + +stest: stest.o + $(CC) -o $@ stest.o $(LDFLAGS) + +clean: + rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz + +dist: clean + mkdir -p dmenu-$(VERSION) + cp LICENSE Makefile README arg.h config.h config.mk dmenu.1\ + drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\ + dmenu-$(VERSION) + tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION) + gzip dmenu-$(VERSION).tar + rm -rf dmenu-$(VERSION) + +install: all + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp -f dmenu dmenu_path 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 + mkdir -p $(DESTDIR)$(MANPREFIX)/man1 + sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1 + sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1 + chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1 + chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1 + +uninstall: + rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\ + $(DESTDIR)$(PREFIX)/bin/dmenu_path\ + $(DESTDIR)$(PREFIX)/bin/dmenu_run\ + $(DESTDIR)$(PREFIX)/bin/stest\ + $(DESTDIR)$(MANPREFIX)/man1/dmenu.1\ + $(DESTDIR)$(MANPREFIX)/man1/stest.1 + +.PHONY: all options clean dist install uninstall diff --git a/arg.h b/arg.h new file mode 100755 index 0000000..e94e02b --- /dev/null +++ b/arg.h @@ -0,0 +1,49 @@ +/* + * 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][0] == '-'\ + && argv[0][1];\ + 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 diff --git a/config.h b/config.h new file mode 100755 index 0000000..62e0294 --- /dev/null +++ b/config.h @@ -0,0 +1,30 @@ +/* See LICENSE file for copyright and license details. */ +/* Default settings; can be overriden by command line. */ + +static int instant = 0; +static int topbar = 0; /* -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", + "JoyPixels:pixelsize=25:antialias=true:autohint=true", + "IPAGothic:size=10", + "symbola:size=10"}; + + +static const char *prompt = NULL; /* -p option; prompt to the left of input field */ + +static const char *colors[SchemeLast][2] = { + /* fg bg */ + [SchemeNorm] = { "#BFBDB6","#0D1017" }, + [SchemeSel] = { "#BFBDB6", "#1B3A5B" }, + [SchemeOut] = { "#000000", "#00ffff" }, +}; +/* -l option; if nonzero, dmenu uses vertical list with given number of lines */ +static unsigned int lines = 0; + +static int sidepad = 0; +static int vertpad = 0; +/* * Characters not considered part of a word while deleting words + * for example: " /?\"&[]" + */ +static const char worddelimiters[] = " "; diff --git a/config.mk b/config.mk new file mode 100755 index 0000000..05d5a3e --- /dev/null +++ b/config.mk @@ -0,0 +1,31 @@ +# dmenu version +VERSION = 5.0 + +# paths +PREFIX = /usr/local +MANPREFIX = $(PREFIX)/share/man + +X11INC = /usr/X11R6/include +X11LIB = /usr/X11R6/lib + +# Xinerama, comment if you don't want it +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) + +# flags +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) +CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) +LDFLAGS = $(LIBS) + +# compiler and linker +CC = cc diff --git a/dmenu b/dmenu new file mode 100755 index 0000000000000000000000000000000000000000..91853ff85f9c10e18bbf0f2b31a781b8ade427a0 GIT binary patch literal 48064 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�ND|Upj#KTp&KEY5LLt%x41eK~2(^3Sj=PJO+jg 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 JTEP^$egGeCIrjhn literal 0 HcmV?d00001 diff --git a/dmenu.1 b/dmenu.1 new file mode 100755 index 0000000..f2247d9 --- /dev/null +++ b/dmenu.1 @@ -0,0 +1,205 @@ +.TH DMENU 1 dmenu\-VERSION +.SH NAME +dmenu \- dynamic menu +.SH SYNOPSIS +.B dmenu +.RB [ \-bfinvP ] +.RB [ \-l +.IR lines ] +.RB [ \-m +.IR monitor ] +.RB [ \-p +.IR prompt ] +.RB [ \-fn +.IR font ] +.RB [ \-nb +.IR color ] +.RB [ \-nf +.IR color ] +.RB [ \-sb +.IR color ] +.RB [ \-sf +.IR color ] +.RB [ \-w +.IR windowid ] +.RB [ \-it +.IR text ] +.P +.BR dmenu_run " ..." +.SH DESCRIPTION +.B dmenu +is a dynamic menu for X, which reads a list of newline\-separated items from +stdin. When the user selects an item and presses Return, their choice is printed +to stdout and dmenu terminates. Entering text will narrow the items to those +matching the tokens in the input. +.P +.B dmenu_run +is a script used by +.IR dwm (1) +which lists programs in the user's $PATH and runs the result in their $SHELL. +.SH OPTIONS +.TP +.B \-b +dmenu appears at the bottom of the screen. +.TP +.B \-f +dmenu grabs the keyboard before reading stdin if not reading from a tty. This +is faster, but will lock up X until stdin reaches end\-of\-file. +.TP +.B \-i +dmenu matches menu items case insensitively. +.TP +.B \-P +dmenu displays input as dots +.TP +.B \-n +dmenu instantly selects if only one match. +.TP +.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 +.BI \-fn " font" +defines the font or font set used. +.TP +.BI \-nb " color" +defines the normal background color. +.IR #RGB , +.IR #RRGGBB , +and X color names are supported. +.TP +.BI \-nf " color" +defines the normal foreground color. +.TP +.BI \-sb " color" +defines the selected background color. +.TP +.BI \-sf " color" +defines the selected foreground color. +.TP +.B \-v +prints version information to stdout, then exits. +.TP +.BI \-w " windowid" +embed into windowid. +.TP +.BI \-it " text". +start with initial text input. +.SH USAGE +dmenu is completely controlled by the keyboard. Items are selected using the +arrow keys, page up, page down, home, and end. +.TP +.B Tab +Copy the selected item to the input field. +.TP +.B Return +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 +.B Escape +Exit without selecting an item, returning failure. +.TP +.B Ctrl-Left +Move cursor to the start of the current word +.TP +.B Ctrl-Right +Move cursor to the end of the current word +.TP +.B C\-a +Home +.TP +.B C\-b +Left +.TP +.B C\-c +Escape +.TP +.B C\-d +Delete +.TP +.B C\-e +End +.TP +.B C\-f +Right +.TP +.B C\-g +Escape +.TP +.B C\-h +Backspace +.TP +.B C\-i +Tab +.TP +.B C\-j +Return +.TP +.B C\-J +Shift-Return +.TP +.B C\-k +Delete line right +.TP +.B C\-m +Return +.TP +.B C\-M +Shift-Return +.TP +.B C\-n +Down +.TP +.B C\-p +Up +.TP +.B C\-u +Delete line left +.TP +.B C\-w +Delete word left +.TP +.B C\-y +Paste from primary X selection +.TP +.B C\-Y +Paste from X clipboard +.TP +.B M\-b +Move cursor to the start of the current word +.TP +.B M\-f +Move cursor to the end of the current word +.TP +.B M\-g +Home +.TP +.B M\-G +End +.TP +.B M\-h +Up +.TP +.B M\-j +Page down +.TP +.B M\-k +Page up +.TP +.B M\-l +Down +.SH SEE ALSO +.IR dwm (1), +.IR stest (1) diff --git a/dmenu.1.orig b/dmenu.1.orig new file mode 100755 index 0000000..461cc20 --- /dev/null +++ b/dmenu.1.orig @@ -0,0 +1,202 @@ +.TH DMENU 1 dmenu\-VERSION +.SH NAME +dmenu \- dynamic menu +.SH SYNOPSIS +.B dmenu +.RB [ \-bfinv ] +.RB [ \-l +.IR lines ] +.RB [ \-m +.IR monitor ] +.RB [ \-p +.IR prompt ] +.RB [ \-fn +.IR font ] +.RB [ \-nb +.IR color ] +.RB [ \-nf +.IR color ] +.RB [ \-sb +.IR color ] +.RB [ \-sf +.IR color ] +.RB [ \-w +.IR windowid ] +.RB [ \-it +.IR text ] +.P +.BR dmenu_run " ..." +.SH DESCRIPTION +.B dmenu +is a dynamic menu for X, which reads a list of newline\-separated items from +stdin. When the user selects an item and presses Return, their choice is printed +to stdout and dmenu terminates. Entering text will narrow the items to those +matching the tokens in the input. +.P +.B dmenu_run +is a script used by +.IR dwm (1) +which lists programs in the user's $PATH and runs the result in their $SHELL. +.SH OPTIONS +.TP +.B \-b +dmenu appears at the bottom of the screen. +.TP +.B \-f +dmenu grabs the keyboard before reading stdin if not reading from a tty. This +is faster, but will lock up X until stdin reaches end\-of\-file. +.TP +.B \-i +dmenu matches menu items case insensitively. +.TP +.B \-n +dmenu instantly selects if only one match. +.TP +.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 +.BI \-fn " font" +defines the font or font set used. +.TP +.BI \-nb " color" +defines the normal background color. +.IR #RGB , +.IR #RRGGBB , +and X color names are supported. +.TP +.BI \-nf " color" +defines the normal foreground color. +.TP +.BI \-sb " color" +defines the selected background color. +.TP +.BI \-sf " color" +defines the selected foreground color. +.TP +.B \-v +prints version information to stdout, then exits. +.TP +.BI \-w " windowid" +embed into windowid. +.TP +.BI \-it " text". +start with initial text input. +.SH USAGE +dmenu is completely controlled by the keyboard. Items are selected using the +arrow keys, page up, page down, home, and end. +.TP +.B Tab +Copy the selected item to the input field. +.TP +.B Return +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 +.B Escape +Exit without selecting an item, returning failure. +.TP +.B Ctrl-Left +Move cursor to the start of the current word +.TP +.B Ctrl-Right +Move cursor to the end of the current word +.TP +.B C\-a +Home +.TP +.B C\-b +Left +.TP +.B C\-c +Escape +.TP +.B C\-d +Delete +.TP +.B C\-e +End +.TP +.B C\-f +Right +.TP +.B C\-g +Escape +.TP +.B C\-h +Backspace +.TP +.B C\-i +Tab +.TP +.B C\-j +Return +.TP +.B C\-J +Shift-Return +.TP +.B C\-k +Delete line right +.TP +.B C\-m +Return +.TP +.B C\-M +Shift-Return +.TP +.B C\-n +Down +.TP +.B C\-p +Up +.TP +.B C\-u +Delete line left +.TP +.B C\-w +Delete word left +.TP +.B C\-y +Paste from primary X selection +.TP +.B C\-Y +Paste from X clipboard +.TP +.B M\-b +Move cursor to the start of the current word +.TP +.B M\-f +Move cursor to the end of the current word +.TP +.B M\-g +Home +.TP +.B M\-G +End +.TP +.B M\-h +Up +.TP +.B M\-j +Page down +.TP +.B M\-k +Page up +.TP +.B M\-l +Down +.SH SEE ALSO +.IR dwm (1), +.IR stest (1) diff --git a/dmenu.1.rej b/dmenu.1.rej new file mode 100755 index 0000000..de8f614 --- /dev/null +++ b/dmenu.1.rej @@ -0,0 +1,21 @@ +--- dmenu.1 2019-09-25 12:55:42.666319316 -0600 ++++ dmenu.1 2019-09-25 12:48:38.848249931 -0600 +@@ -3,7 +3,7 @@ + dmenu \- dynamic menu + .SH SYNOPSIS + .B dmenu +-.RB [ \-bfivP ] ++.RB [ \-bfiv ] + .RB [ \-l + .IR lines ] + .RB [ \-m +@@ -47,9 +47,6 @@ is faster, but will lock up X until stdi + .B \-i + dmenu matches menu items case insensitively. + .TP +-.B \-P +-dmenu will not directly display the keyboard input, but instead replace it with dots. All data from stdin will be ignored. +-.TP + .BI \-l " lines" + dmenu lists items vertically, with the given number of lines. + .TP diff --git a/dmenu.1backup b/dmenu.1backup new file mode 100755 index 0000000..461cc20 --- /dev/null +++ b/dmenu.1backup @@ -0,0 +1,202 @@ +.TH DMENU 1 dmenu\-VERSION +.SH NAME +dmenu \- dynamic menu +.SH SYNOPSIS +.B dmenu +.RB [ \-bfinv ] +.RB [ \-l +.IR lines ] +.RB [ \-m +.IR monitor ] +.RB [ \-p +.IR prompt ] +.RB [ \-fn +.IR font ] +.RB [ \-nb +.IR color ] +.RB [ \-nf +.IR color ] +.RB [ \-sb +.IR color ] +.RB [ \-sf +.IR color ] +.RB [ \-w +.IR windowid ] +.RB [ \-it +.IR text ] +.P +.BR dmenu_run " ..." +.SH DESCRIPTION +.B dmenu +is a dynamic menu for X, which reads a list of newline\-separated items from +stdin. When the user selects an item and presses Return, their choice is printed +to stdout and dmenu terminates. Entering text will narrow the items to those +matching the tokens in the input. +.P +.B dmenu_run +is a script used by +.IR dwm (1) +which lists programs in the user's $PATH and runs the result in their $SHELL. +.SH OPTIONS +.TP +.B \-b +dmenu appears at the bottom of the screen. +.TP +.B \-f +dmenu grabs the keyboard before reading stdin if not reading from a tty. This +is faster, but will lock up X until stdin reaches end\-of\-file. +.TP +.B \-i +dmenu matches menu items case insensitively. +.TP +.B \-n +dmenu instantly selects if only one match. +.TP +.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 +.BI \-fn " font" +defines the font or font set used. +.TP +.BI \-nb " color" +defines the normal background color. +.IR #RGB , +.IR #RRGGBB , +and X color names are supported. +.TP +.BI \-nf " color" +defines the normal foreground color. +.TP +.BI \-sb " color" +defines the selected background color. +.TP +.BI \-sf " color" +defines the selected foreground color. +.TP +.B \-v +prints version information to stdout, then exits. +.TP +.BI \-w " windowid" +embed into windowid. +.TP +.BI \-it " text". +start with initial text input. +.SH USAGE +dmenu is completely controlled by the keyboard. Items are selected using the +arrow keys, page up, page down, home, and end. +.TP +.B Tab +Copy the selected item to the input field. +.TP +.B Return +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 +.B Escape +Exit without selecting an item, returning failure. +.TP +.B Ctrl-Left +Move cursor to the start of the current word +.TP +.B Ctrl-Right +Move cursor to the end of the current word +.TP +.B C\-a +Home +.TP +.B C\-b +Left +.TP +.B C\-c +Escape +.TP +.B C\-d +Delete +.TP +.B C\-e +End +.TP +.B C\-f +Right +.TP +.B C\-g +Escape +.TP +.B C\-h +Backspace +.TP +.B C\-i +Tab +.TP +.B C\-j +Return +.TP +.B C\-J +Shift-Return +.TP +.B C\-k +Delete line right +.TP +.B C\-m +Return +.TP +.B C\-M +Shift-Return +.TP +.B C\-n +Down +.TP +.B C\-p +Up +.TP +.B C\-u +Delete line left +.TP +.B C\-w +Delete word left +.TP +.B C\-y +Paste from primary X selection +.TP +.B C\-Y +Paste from X clipboard +.TP +.B M\-b +Move cursor to the start of the current word +.TP +.B M\-f +Move cursor to the end of the current word +.TP +.B M\-g +Home +.TP +.B M\-G +End +.TP +.B M\-h +Up +.TP +.B M\-j +Page down +.TP +.B M\-k +Page up +.TP +.B M\-l +Down +.SH SEE ALSO +.IR dwm (1), +.IR stest (1) diff --git a/dmenu.c b/dmenu.c new file mode 100755 index 0000000..2f07f59 --- /dev/null +++ b/dmenu.c @@ -0,0 +1,831 @@ +/* See LICENSE file for copyright and license details. */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#ifdef XINERAMA +#include +#endif +#include + +#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 TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) + +/* enums */ +enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */ + +struct item { + char *text; + struct item *left, *right; + + int id; /* for multiselect */ +}; + +static char text[BUFSIZ] = ""; +static char *embed; +static int bh, mw, mh; +static int inputw = 0, promptw, passwd = 0; +static int lrpad; /* sum of left and right padding */ +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 int *selid = NULL; +static unsigned int selidsize = 0; + +static Atom clip, utf8; +static Display *dpy; +static Window root, parentwin, win; +static XIC xic; + +static Drw *drw; +static Clr *scheme[SchemeLast]; + +#include "config.h" + +static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; +static char *(*fstrstr)(const char *, const char *) = strstr; + +static int +issel(size_t id) +{ + for (int i = 0;i < selidsize;i++) + if (selid[i] == id) + return 1; + return 0; +} + +static void +appenditem(struct item *item, struct item **list, struct item **last) +{ + if (*last) + (*last)->right = item; + else + *list = item; + + item->left = *last; + item->right = NULL; + *last = item; +} + +static void +calcoffsets(void) +{ + int i, n; + + if (lines > 0) + n = lines * bh; + else + n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">")); + /* 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) + break; + for (i = 0, prev = curr; prev && prev->left; prev = prev->left) + if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n) + break; +} + +static void +cleanup(void) +{ + size_t i; + + XUngrabKey(dpy, AnyKey, AnyModifier, root); + for (i = 0; i < SchemeLast; i++) + free(scheme[i]); + drw_free(drw); + XSync(dpy, False); + XCloseDisplay(dpy); + free(selid); +} + +static char * +cistrstr(const char *s, const char *sub) +{ + size_t len; + + for (len = strlen(sub); *s; s++) + if (!strncasecmp(s, sub, len)) + return (char *)s; + return NULL; +} + +static int +drawitem(struct item *item, int x, int y, int w) +{ + if (item == sel) + drw_setscheme(drw, scheme[SchemeSel]); + else if (issel(item->id)) + drw_setscheme(drw, scheme[SchemeOut]); + else + drw_setscheme(drw, scheme[SchemeNorm]); + + return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0); +} + +static void +drawmenu(void) +{ + unsigned int curpos; + struct item *item; + int x = 0, y = 0, w; + char *censort; + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, 0, 0, mw, mh, 1, 1); + + if (prompt && *prompt) { + drw_setscheme(drw, scheme[SchemeSel]); + x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0); + } + /* draw input field */ + w = (lines > 0 || !matches) ? mw - x : inputw; + drw_setscheme(drw, scheme[SchemeNorm]); + if (passwd) { + censort = ecalloc(1,sizeof(text)); + memset(censort, '-', strlen(text)); + drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0); + free(censort); + } + else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + + curpos = TEXTW(text) - TEXTW(&text[cursor]); + if ((curpos += lrpad / 2 - 1) < w) { + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0); + } + + if (lines > 0) { + /* draw vertical list */ + for (item = curr; item != next; item = item->right) + drawitem(item, x, y += bh, mw - x); + } 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, lrpad / 2, "<", 0); + } + x += w; + for (item = curr; item != next; item = item->right) + x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">"))); + if (next) { + w = TEXTW(">"); + drw_setscheme(drw, scheme[SchemeNorm]); + drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0); + } + } + drw_map(drw, win, 0, 0, mw, mh); +} + +static void +grabfocus(void) +{ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 }; + Window focuswin; + int i, revertwin; + + for (i = 0; i < 100; ++i) { + XGetInputFocus(dpy, &focuswin, &revertwin); + if (focuswin == win) + return; + XSetInputFocus(dpy, win, RevertToParent, CurrentTime); + nanosleep(&ts, NULL); + } + die("cannot grab focus"); +} + +static void +grabkeyboard(void) +{ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 }; + int i; + + if (embed) + return; + /* 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, GrabModeAsync, + GrabModeAsync, CurrentTime) == GrabSuccess) + return; + nanosleep(&ts, NULL); + } + die("cannot grab keyboard"); +} + +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:", tokn * sizeof *tokv); + len = tokc ? strlen(tokv[0]) : 0; + + matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; + textsize = strlen(text) + 1; + 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; + + if(instant && matches && matches==matchend && !lsubstr) { + puts(matches->text); + cleanup(); + exit(0); + } + + calcoffsets(); +} + +static 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) + 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 +movewordedge(int dir) +{ + if (dir < 0) { /* move cursor to the start of the word*/ + while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) + cursor = nextrune(-1); + while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) + cursor = nextrune(-1); + } else { /* move cursor to the end of the word */ + while (text[cursor] && strchr(worddelimiters, text[cursor])) + cursor = nextrune(+1); + while (text[cursor] && !strchr(worddelimiters, text[cursor])) + cursor = nextrune(+1); + } +} + +static void +keypress(XKeyEvent *ev) +{ + char buf[32]; + int len; + KeySym ksym; + Status status; + + len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); + switch (status) { + default: /* XLookupNone, XBufferOverflow */ + return; + case XLookupChars: + goto insert; + case XLookupKeySym: + case XLookupBoth: + break; + } + + if (ev->state & ControlMask) { + switch(ksym) { + case XK_a: ksym = XK_Home; break; + case XK_b: ksym = XK_Left; break; + case XK_c: ksym = XK_Escape; break; + 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_n: ksym = XK_Down; break; + case XK_p: ksym = XK_Up; break; + + case XK_k: /* delete right */ + text[cursor] = '\0'; + match(); + break; + case XK_u: /* delete left */ + insert(NULL, 0 - cursor); + break; + case XK_w: /* delete word */ + while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) + insert(NULL, nextrune(-1) - cursor); + while (cursor > 0 && !strchr(worddelimiters, 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, + utf8, utf8, win, CurrentTime); + return; + case XK_Left: + movewordedge(-1); + goto draw; + case XK_Right: + movewordedge(+1); + goto draw; + case XK_Return: + case XK_KP_Enter: + if (sel && issel(sel->id)) { + for (int i = 0;i < selidsize;i++) + if (selid[i] == sel->id) + selid[i] = -1; + } else { + for (int i = 0;i < selidsize;i++) + if (selid[i] == -1) { + selid[i] = sel->id; + return; + } + selidsize++; + selid = realloc(selid, (selidsize + 1) * sizeof(int)); + selid[selidsize - 1] = sel->id; + } + break; + case XK_bracketleft: + cleanup(); + exit(1); + default: + return; + } + } else if (ev->state & Mod1Mask) { + switch(ksym) { + case XK_b: + movewordedge(-1); + goto draw; + case XK_f: + movewordedge(+1); + goto draw; + case XK_g: ksym = XK_Home; break; + case XK_G: ksym = XK_End; break; + case XK_h: ksym = XK_Up; break; + case XK_j: ksym = XK_Next; break; + case XK_k: ksym = XK_Prior; break; + case XK_l: ksym = XK_Down; break; + default: + return; + } + } + + switch(ksym) { + default: +insert: + if (!iscntrl(*buf)) + insert(buf, len); + break; + case XK_Delete: + if (text[cursor] == '\0') + return; + cursor = nextrune(+1); + /* fallthrough */ + case XK_BackSpace: + if (cursor == 0) + return; + insert(NULL, nextrune(-1) - cursor); + break; + case XK_End: + if (text[cursor] != '\0') { + cursor = strlen(text); + break; + } + if (next) { + /* jump to end of list and position items in reverse */ + curr = matchend; + calcoffsets(); + curr = prev; + calcoffsets(); + while (next && (curr = curr->right)) + calcoffsets(); + } + sel = matchend; + break; + case XK_Escape: + cleanup(); + exit(1); + case XK_Home: + if (sel == matches) { + cursor = 0; + break; + } + sel = curr = matches; + calcoffsets(); + break; + case XK_Left: + if (cursor > 0 && (!sel || !sel->left || lines > 0)) { + cursor = nextrune(-1); + break; + } + if (lines > 0) + return; + /* fallthrough */ + case XK_Up: + if (sel && sel->left && (sel = sel->left)->right == curr) { + curr = prev; + calcoffsets(); + } + break; + case XK_Next: + if (!next) + return; + sel = curr = next; + calcoffsets(); + break; + case XK_Prior: + if (!prev) + return; + sel = curr = prev; + calcoffsets(); + break; + case XK_Return: + case XK_KP_Enter: + if (!(ev->state & ControlMask)) { + for (int i = 0;i < selidsize;i++) + if (selid[i] != -1 && (!sel || sel->id != selid[i])) + puts(items[selid[i]].text); + if ( sel ) + puts(sel->text); + else + puts(text); + cleanup(); + exit(0); + } + if (sel && sel->right && (sel = sel->right) == next) { + curr = next; + calcoffsets(); + } + break; + case XK_Right: + if (text[cursor] != '\0') { + cursor = nextrune(+1); + break; + } + if (lines > 0) + return; + /* fallthrough */ + case XK_Down: + if (sel && sel->right && (sel = sel->right) == next) { + curr = next; + calcoffsets(); + } + break; + case XK_Tab: + if (!sel) + return; + strncpy(text, sel->text, sizeof text - 1); + text[sizeof text - 1] = '\0'; + cursor = strlen(text); + match(); + break; + } + +draw: + drawmenu(); +} + +static 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 */ + if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, + utf8, &da, &di, &dl, &dl, (unsigned char **)&p) + == Success && p) { + insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p)); + XFree(p); + } + drawmenu(); +} + +static void +readstdin(void) +{ + char buf[sizeof text], *p; + size_t i, imax = 0, size = 0; + unsigned int tmpmax = 0; + if(passwd){ + inputw = lines = 0; + return; + } + /* 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'))) + *p = '\0'; + if (!(items[i].text = strdup(buf))) + die("cannot strdup %u bytes:", strlen(buf) + 1); + items[i].id = i; /* for multiselect */ + drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL); + if (tmpmax > inputw) { + inputw = tmpmax; + imax = i; + } + } + if (items) + items[i].text = NULL; + inputw = items ? TEXTW(items[imax].text) : 0; + lines = MIN(lines, i); +} + +static void +run(void) +{ + XEvent ev; + + while (!XNextEvent(dpy, &ev)) { + if (XFilterEvent(&ev, win)) + continue; + switch(ev.type) { + case DestroyNotify: + if (ev.xdestroywindow.window != win) + break; + cleanup(); + exit(1); + case Expose: + if (ev.xexpose.count == 0) + drw_map(drw, win, 0, 0, mw, mh); + break; + case FocusIn: + /* regrab focus from parent window */ + if (ev.xfocus.window != win) + grabfocus(); + break; + case KeyPress: + keypress(&ev.xkey); + break; + case SelectionNotify: + if (ev.xselection.property == utf8) + paste(); + break; + case VisibilityNotify: + if (ev.xvisibility.state != VisibilityUnobscured) + XRaiseWindow(dpy, win); + break; + } + } +} + +static void +setup(void) +{ + int x, y, i, j; + unsigned int du; + XSetWindowAttributes swa; + XIM xim; + Window w, dw, *dws; + XWindowAttributes wa; + XClassHint ch = {"dmenu", "dmenu"}; +#ifdef XINERAMA + XineramaScreenInfo *info; + Window pw; + int a, di, n, area = 0; +#endif + /* init appearance */ + for (j = 0; j < SchemeLast; j++) + scheme[j] = drw_scm_create(drw, colors[j], 2); + + clip = XInternAtom(dpy, "CLIPBOARD", False); + utf8 = XInternAtom(dpy, "UTF8_STRING", False); + + /* calculate menu geometry */ + bh = drw->fonts->h + 2; + lines = MAX(lines, 0); + mh = (lines + 1) * bh; +#ifdef XINERAMA + i = 0; + if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { + XGetInputFocus(dpy, &w, &di); + if (mon >= 0 && mon < n) + i = mon; + else 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) + XFree(dws); + } 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) { + area = a; + i = j; + } + } + /* no focused window is on screen, so use pointer location instead */ + if (mon < 0 && !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])) + break; + + x = info[i].x_org + sidepad; + y = info[i].y_org + (topbar ? 0 : info[i].height - mh) + vertpad; + mw = info[i].width - 2*sidepad; + XFree(info); + } else +#endif + { + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + x = 0; + y = topbar ? 0 : wa.height - mh; + mw = wa.width; + } + promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; + inputw = MIN(inputw, mw/3); + match(); + + /* create menu window */ + swa.override_redirect = True; + swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; + swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; + win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0, + CopyFromParent, CopyFromParent, CopyFromParent, + CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); + XSetClassHint(dpy, win, &ch); + + + /* input methods */ + if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) + die("XOpenIM failed: could not open input device"); + + xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, + XNClientWindow, win, XNFocusWindow, win, NULL); + + XMapRaised(dpy, win); + if (embed) { + XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask); + if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { + for (i = 0; i < du && dws[i] != win; ++i) + XSelectInput(dpy, dws[i], FocusChangeMask); + XFree(dws); + } + grabfocus(); + } + drw_resize(drw, mw, mh); + drawmenu(); +} + +static void +usage(void) +{ + fputs("usage: dmenu [-bfinPv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid] [-it text]\n", stderr); + exit(1); +} + +int +main(int argc, char *argv[]) +{ + XWindowAttributes wa; + 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 (!strcmp(argv[i], "-P")){ /* pass input */ + passwd =1;} + else if (!strcmp(argv[i], "-n")) /* instant select only match */ + instant = 1; + 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 */ + colors[SchemeNorm][ColBg] = argv[++i]; + else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ + colors[SchemeNorm][ColFg] = argv[++i]; + else if (!strcmp(argv[i], "-sb")) /* selected background color */ + colors[SchemeSel][ColBg] = argv[++i]; + else if (!strcmp(argv[i], "-sf")) /* selected foreground color */ + colors[SchemeSel][ColFg] = argv[++i]; + else if (!strcmp(argv[i], "-w")) /* embedding window id */ + embed = argv[++i]; + else if (!strcmp(argv[i], "-it")) { /* embedding window id */ + const char * text = argv[++i]; + insert(text, strlen(text)); + } else + usage(); + + if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fputs("warning: no locale support\n", stderr); + if (!(dpy = XOpenDisplay(NULL))) + die("cannot open display"); + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + if (!embed || !(parentwin = strtol(embed, NULL, 0))) + parentwin = root; + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + drw = drw_create(dpy, screen, root, wa.width, wa.height); + if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) + die("no fonts could be loaded."); + lrpad = drw->fonts->h; + +#ifdef __OpenBSD__ + if (pledge("stdio rpath", NULL) == -1) + die("pledge"); +#endif + + if (fast && !isatty(0)) { + grabkeyboard(); + readstdin(); + } else { + readstdin(); + grabkeyboard(); + } + setup(); + run(); + + return 1; /* unreachable */ +} diff --git a/dmenu.c.rej b/dmenu.c.rej new file mode 100755 index 0000000..df4ef60 --- /dev/null +++ b/dmenu.c.rej @@ -0,0 +1,65 @@ +--- dmenu.c 2019-09-25 12:48:55.756173240 -0600 ++++ dmenu.c 2019-09-25 12:48:38.848249931 -0600 +@@ -37,7 +37,7 @@ struct item { + static char text[BUFSIZ] = ""; + static char *embed; + static int bh, mw, mh; +-static int inputw = 0, promptw, passwd = 0; ++static int inputw = 0, promptw; + static int lrpad; /* sum of left and right padding */ + static size_t cursor; + static struct item *items = NULL; +@@ -132,7 +132,6 @@ drawmenu(void) + unsigned int curpos; + struct item *item; + int x = 0, y = 0, w; +- char *censort; + + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, 0, 0, mw, mh, 1, 1); +@@ -144,12 +143,7 @@ drawmenu(void) + /* draw input field */ + w = (lines > 0 || !matches) ? mw - x : inputw; + drw_setscheme(drw, scheme[SchemeNorm]); +- if (passwd) { +- censort = ecalloc(1, sizeof(text)); +- memset(censort, '.', strlen(text)); +- drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0); +- free(censort); +- } else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); ++ drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + + curpos = TEXTW(text) - TEXTW(&text[cursor]); + if ((curpos += lrpad / 2 - 1) < w) { +@@ -531,11 +525,6 @@ readstdin(void) + size_t i, imax = 0, size = 0; + unsigned int tmpmax = 0; + +- if(passwd){ +- inputw = lines = 0; +- return; +- } +- + /* 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) +@@ -693,7 +682,7 @@ setup(void) + static void + usage(void) + { +- fputs("usage: dmenu [-bfiPv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" ++ fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); + exit(1); + } +@@ -716,9 +705,7 @@ main(int argc, char *argv[]) + else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ + fstrncmp = strncasecmp; + fstrstr = cistrstr; +- } else if (!strcmp(argv[i], "-P")) /* is the input a password */ +- passwd = 1; +- else if (i + 1 == argc) ++ } else if (i + 1 == argc) + usage(); + /* these options take one argument */ + else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ diff --git a/dmenu.o b/dmenu.o new file mode 100644 index 0000000000000000000000000000000000000000..9fca96c5872aae11d4172c6e78b241599627b3cc GIT binary patch literal 34536 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 n+8G3_z!U=)bR7eP2Rh>z#)8lwH(}Gi0@|R5t +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#ifdef XINERAMA +#include +#endif +#include + +#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 TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) + +/* enums */ +enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */ + +struct item { + char *text; + struct item *left, *right; + + int id; /* for multiselect */ +}; + +static char text[BUFSIZ] = ""; +static char *embed; +static int bh, mw, mh; +static int inputw = 0, promptw, passwd = 0; +static int lrpad; /* sum of left and right padding */ +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 int *selid = NULL; +static unsigned int selidsize = 0; + +static Atom clip, utf8; +static Display *dpy; +static Window root, parentwin, win; +static XIC xic; + +static Drw *drw; +static Clr *scheme[SchemeLast]; + +#include "config.h" + +static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; +static char *(*fstrstr)(const char *, const char *) = strstr; + +static int +issel(size_t id) +{ + for (int i = 0;i < selidsize;i++) + if (selid[i] == id) + return 1; + return 0; +} + +static void +appenditem(struct item *item, struct item **list, struct item **last) +{ + if (*last) + (*last)->right = item; + else + *list = item; + + item->left = *last; + item->right = NULL; + *last = item; +} + +static void +calcoffsets(void) +{ + int i, n; + + if (lines > 0) + n = lines * bh; + else + n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">")); + /* 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) + break; + for (i = 0, prev = curr; prev && prev->left; prev = prev->left) + if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n) + break; +} + +static void +cleanup(void) +{ + size_t i; + + XUngrabKey(dpy, AnyKey, AnyModifier, root); + for (i = 0; i < SchemeLast; i++) + free(scheme[i]); + drw_free(drw); + XSync(dpy, False); + XCloseDisplay(dpy); + free(selid); +} + +static char * +cistrstr(const char *s, const char *sub) +{ + size_t len; + + for (len = strlen(sub); *s; s++) + if (!strncasecmp(s, sub, len)) + return (char *)s; + return NULL; +} + +static int +drawitem(struct item *item, int x, int y, int w) +{ + if (item == sel) + drw_setscheme(drw, scheme[SchemeSel]); + else if (issel(item->id)) + drw_setscheme(drw, scheme[SchemeOut]); + else + drw_setscheme(drw, scheme[SchemeNorm]); + + return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0); +} + +static void +drawmenu(void) +{ + unsigned int curpos; + struct item *item; + int x = 0, y = 0, w; + char *censort; + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, 0, 0, mw, mh, 1, 1); + + if (prompt && *prompt) { + drw_setscheme(drw, scheme[SchemeSel]); + x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0); + } + /* draw input field */ + w = (lines > 0 || !matches) ? mw - x : inputw; + drw_setscheme(drw, scheme[SchemeNorm]); + if (passwd) { + censort = ecalloc(1,sizeof(text)); + memset(censort, '.', strlen(text)); + drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0); + free(censort); + } + else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + + curpos = TEXTW(text) - TEXTW(&text[cursor]); + if ((curpos += lrpad / 2 - 1) < w) { + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0); + } + + if (lines > 0) { + /* draw vertical list */ + for (item = curr; item != next; item = item->right) + drawitem(item, x, y += bh, mw - x); + } 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, lrpad / 2, "<", 0); + } + x += w; + for (item = curr; item != next; item = item->right) + x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">"))); + if (next) { + w = TEXTW(">"); + drw_setscheme(drw, scheme[SchemeNorm]); + drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0); + } + } + drw_map(drw, win, 0, 0, mw, mh); +} + +static void +grabfocus(void) +{ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 }; + Window focuswin; + int i, revertwin; + + for (i = 0; i < 100; ++i) { + XGetInputFocus(dpy, &focuswin, &revertwin); + if (focuswin == win) + return; + XSetInputFocus(dpy, win, RevertToParent, CurrentTime); + nanosleep(&ts, NULL); + } + die("cannot grab focus"); +} + +static void +grabkeyboard(void) +{ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 }; + int i; + + if (embed) + return; + /* 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, GrabModeAsync, + GrabModeAsync, CurrentTime) == GrabSuccess) + return; + nanosleep(&ts, NULL); + } + die("cannot grab keyboard"); +} + +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:", tokn * sizeof *tokv); + len = tokc ? strlen(tokv[0]) : 0; + + matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; + textsize = strlen(text) + 1; + 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; + + if(instant && matches && matches==matchend && !lsubstr) { + puts(matches->text); + cleanup(); + exit(0); + } + + calcoffsets(); +} + +static 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) + 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 +movewordedge(int dir) +{ + if (dir < 0) { /* move cursor to the start of the word*/ + while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) + cursor = nextrune(-1); + while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) + cursor = nextrune(-1); + } else { /* move cursor to the end of the word */ + while (text[cursor] && strchr(worddelimiters, text[cursor])) + cursor = nextrune(+1); + while (text[cursor] && !strchr(worddelimiters, text[cursor])) + cursor = nextrune(+1); + } +} + +static void +keypress(XKeyEvent *ev) +{ + char buf[32]; + int len; + KeySym ksym; + Status status; + + len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); + switch (status) { + default: /* XLookupNone, XBufferOverflow */ + return; + case XLookupChars: + goto insert; + case XLookupKeySym: + case XLookupBoth: + break; + } + + if (ev->state & ControlMask) { + switch(ksym) { + case XK_a: ksym = XK_Home; break; + case XK_b: ksym = XK_Left; break; + case XK_c: ksym = XK_Escape; break; + 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_n: ksym = XK_Down; break; + case XK_p: ksym = XK_Up; break; + + case XK_k: /* delete right */ + text[cursor] = '\0'; + match(); + break; + case XK_u: /* delete left */ + insert(NULL, 0 - cursor); + break; + case XK_w: /* delete word */ + while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) + insert(NULL, nextrune(-1) - cursor); + while (cursor > 0 && !strchr(worddelimiters, 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, + utf8, utf8, win, CurrentTime); + return; + case XK_Left: + movewordedge(-1); + goto draw; + case XK_Right: + movewordedge(+1); + goto draw; + case XK_Return: + case XK_KP_Enter: + if (sel && issel(sel->id)) { + for (int i = 0;i < selidsize;i++) + if (selid[i] == sel->id) + selid[i] = -1; + } else { + for (int i = 0;i < selidsize;i++) + if (selid[i] == -1) { + selid[i] = sel->id; + return; + } + selidsize++; + selid = realloc(selid, (selidsize + 1) * sizeof(int)); + selid[selidsize - 1] = sel->id; + } + break; + case XK_bracketleft: + cleanup(); + exit(1); + default: + return; + } + } else if (ev->state & Mod1Mask) { + switch(ksym) { + case XK_b: + movewordedge(-1); + goto draw; + case XK_f: + movewordedge(+1); + goto draw; + case XK_g: ksym = XK_Home; break; + case XK_G: ksym = XK_End; break; + case XK_h: ksym = XK_Up; break; + case XK_j: ksym = XK_Next; break; + case XK_k: ksym = XK_Prior; break; + case XK_l: ksym = XK_Down; break; + default: + return; + } + } + + switch(ksym) { + default: +insert: + if (!iscntrl(*buf)) + insert(buf, len); + break; + case XK_Delete: + if (text[cursor] == '\0') + return; + cursor = nextrune(+1); + /* fallthrough */ + case XK_BackSpace: + if (cursor == 0) + return; + insert(NULL, nextrune(-1) - cursor); + break; + case XK_End: + if (text[cursor] != '\0') { + cursor = strlen(text); + break; + } + if (next) { + /* jump to end of list and position items in reverse */ + curr = matchend; + calcoffsets(); + curr = prev; + calcoffsets(); + while (next && (curr = curr->right)) + calcoffsets(); + } + sel = matchend; + break; + case XK_Escape: + cleanup(); + exit(1); + case XK_Home: + if (sel == matches) { + cursor = 0; + break; + } + sel = curr = matches; + calcoffsets(); + break; + case XK_Left: + if (cursor > 0 && (!sel || !sel->left || lines > 0)) { + cursor = nextrune(-1); + break; + } + if (lines > 0) + return; + /* fallthrough */ + case XK_Up: + if (sel && sel->left && (sel = sel->left)->right == curr) { + curr = prev; + calcoffsets(); + } + break; + case XK_Next: + if (!next) + return; + sel = curr = next; + calcoffsets(); + break; + case XK_Prior: + if (!prev) + return; + sel = curr = prev; + calcoffsets(); + break; + case XK_Return: + case XK_KP_Enter: + if (!(ev->state & ControlMask)) { + for (int i = 0;i < selidsize;i++) + if (selid[i] != -1 && (!sel || sel->id != selid[i])) + puts(items[selid[i]].text); + if (sel && !(ev->state & ShiftMask)) + puts(sel->text); + else + puts(text); + cleanup(); + exit(0); + } + if (sel && sel->right && (sel = sel->right) == next) { + curr = next; + calcoffsets(); + } + break; + case XK_Right: + if (text[cursor] != '\0') { + cursor = nextrune(+1); + break; + } + if (lines > 0) + return; + /* fallthrough */ + case XK_Down: + if (sel && sel->right && (sel = sel->right) == next) { + curr = next; + calcoffsets(); + } + break; + case XK_Tab: + if (!sel) + return; + strncpy(text, sel->text, sizeof text - 1); + text[sizeof text - 1] = '\0'; + cursor = strlen(text); + match(); + break; + } + +draw: + drawmenu(); +} + +static 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 */ + if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, + utf8, &da, &di, &dl, &dl, (unsigned char **)&p) + == Success && p) { + insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p)); + XFree(p); + } + drawmenu(); +} + +static void +readstdin(void) +{ + char buf[sizeof text], *p; + size_t i, imax = 0, size = 0; + unsigned int tmpmax = 0; + if(passwd){ + inputw = lines = 0; + return; + } + /* 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'))) + *p = '\0'; + if (!(items[i].text = strdup(buf))) + die("cannot strdup %u bytes:", strlen(buf) + 1); + items[i].id = i; /* for multiselect */ + drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL); + if (tmpmax > inputw) { + inputw = tmpmax; + imax = i; + } + } + if (items) + items[i].text = NULL; + inputw = items ? TEXTW(items[imax].text) : 0; + lines = MIN(lines, i); +} + +static void +run(void) +{ + XEvent ev; + + while (!XNextEvent(dpy, &ev)) { + if (XFilterEvent(&ev, win)) + continue; + switch(ev.type) { + case DestroyNotify: + if (ev.xdestroywindow.window != win) + break; + cleanup(); + exit(1); + case Expose: + if (ev.xexpose.count == 0) + drw_map(drw, win, 0, 0, mw, mh); + break; + case FocusIn: + /* regrab focus from parent window */ + if (ev.xfocus.window != win) + grabfocus(); + break; + case KeyPress: + keypress(&ev.xkey); + break; + case SelectionNotify: + if (ev.xselection.property == utf8) + paste(); + break; + case VisibilityNotify: + if (ev.xvisibility.state != VisibilityUnobscured) + XRaiseWindow(dpy, win); + break; + } + } +} + +static void +setup(void) +{ + int x, y, i, j; + unsigned int du; + XSetWindowAttributes swa; + XIM xim; + Window w, dw, *dws; + XWindowAttributes wa; + XClassHint ch = {"dmenu", "dmenu"}; +#ifdef XINERAMA + XineramaScreenInfo *info; + Window pw; + int a, di, n, area = 0; +#endif + /* init appearance */ + for (j = 0; j < SchemeLast; j++) + scheme[j] = drw_scm_create(drw, colors[j], 2); + + clip = XInternAtom(dpy, "CLIPBOARD", False); + utf8 = XInternAtom(dpy, "UTF8_STRING", False); + + /* calculate menu geometry */ + bh = drw->fonts->h + 2; + lines = MAX(lines, 0); + mh = (lines + 1) * bh; +#ifdef XINERAMA + i = 0; + if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { + XGetInputFocus(dpy, &w, &di); + if (mon >= 0 && mon < n) + i = mon; + else 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) + XFree(dws); + } 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) { + area = a; + i = j; + } + } + /* no focused window is on screen, so use pointer location instead */ + if (mon < 0 && !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])) + break; + + x = info[i].x_org + sidepad; + y = info[i].y_org + (topbar ? 0 : info[i].height - mh) + vertpad; + mw = info[i].width - 2*sidepad; + XFree(info); + } else +#endif + { + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + x = 0; + y = topbar ? 0 : wa.height - mh; + mw = wa.width; + } + promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; + inputw = MIN(inputw, mw/3); + match(); + + /* create menu window */ + swa.override_redirect = True; + swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; + swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; + win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0, + CopyFromParent, CopyFromParent, CopyFromParent, + CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); + XSetClassHint(dpy, win, &ch); + + + /* input methods */ + if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) + die("XOpenIM failed: could not open input device"); + + xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, + XNClientWindow, win, XNFocusWindow, win, NULL); + + XMapRaised(dpy, win); + if (embed) { + XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask); + if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { + for (i = 0; i < du && dws[i] != win; ++i) + XSelectInput(dpy, dws[i], FocusChangeMask); + XFree(dws); + } + grabfocus(); + } + drw_resize(drw, mw, mh); + drawmenu(); +} + +static void +usage(void) +{ + fputs("usage: dmenu [-bfinPv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid] [-it text]\n", stderr); + exit(1); +} + +int +main(int argc, char *argv[]) +{ + XWindowAttributes wa; + 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 (!strcmp(argv[i], "-P")){ /* pass input */ + passwd =1;} + else if (!strcmp(argv[i], "-n")) /* instant select only match */ + instant = 1; + 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 */ + colors[SchemeNorm][ColBg] = argv[++i]; + else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ + colors[SchemeNorm][ColFg] = argv[++i]; + else if (!strcmp(argv[i], "-sb")) /* selected background color */ + colors[SchemeSel][ColBg] = argv[++i]; + else if (!strcmp(argv[i], "-sf")) /* selected foreground color */ + colors[SchemeSel][ColFg] = argv[++i]; + else if (!strcmp(argv[i], "-w")) /* embedding window id */ + embed = argv[++i]; + else if (!strcmp(argv[i], "-it")) { /* embedding window id */ + const char * text = argv[++i]; + insert(text, strlen(text)); + } else + usage(); + + if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fputs("warning: no locale support\n", stderr); + if (!(dpy = XOpenDisplay(NULL))) + die("cannot open display"); + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + if (!embed || !(parentwin = strtol(embed, NULL, 0))) + parentwin = root; + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + drw = drw_create(dpy, screen, root, wa.width, wa.height); + if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) + die("no fonts could be loaded."); + lrpad = drw->fonts->h; + +#ifdef __OpenBSD__ + if (pledge("stdio rpath", NULL) == -1) + die("pledge"); +#endif + + if (fast && !isatty(0)) { + grabkeyboard(); + readstdin(); + } else { + readstdin(); + grabkeyboard(); + } + setup(); + run(); + + return 1; /* unreachable */ +} diff --git a/dmenu_path b/dmenu_path new file mode 100755 index 0000000..3a7cda7 --- /dev/null +++ b/dmenu_path @@ -0,0 +1,13 @@ +#!/bin/sh + +cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}" +cache="$cachedir/dmenu_run" + +[ ! -e "$cachedir" ] && mkdir -p "$cachedir" + +IFS=: +if stest -dqr -n "$cache" $PATH; then + stest -flx $PATH | sort -u | tee "$cache" +else + cat "$cache" +fi diff --git a/dmenu_run b/dmenu_run new file mode 100755 index 0000000..02f68da --- /dev/null +++ b/dmenu_run @@ -0,0 +1,58 @@ +#!/bin/sh +aliases=$HOME/.config/aliasrc + +#. $HOME/.config/aliasrc +termcmd="st -e" +cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"} +if [ -d "$cachedir" ]; then + cache=$cachedir/dmenu_run + historyfile=$cachedir/dmenu_history +else # if no xdg dir, fall back to dotfiles in ~ + cache=$HOME/.dmenu_cache + historyfile=$HOME/.dmenu_history +fi + +IFS=: +if stest -dqr -n "$cache" $PATH; then + stest -flx $PATH | sort -u > "$cache" +fi +unset IFS + +cmd=$(awk -v histfile=$historyfile ' + BEGIN { + while( (getline < histfile) > 0 ) { + sub("^[0-9]+\t","") + print + x[$0]=1 + } + } !x[$0]++ ' "$cache" \ + | dmenu "$@" \ + | awk -v histfile=$historyfile ' + BEGIN { + FS=OFS="\t" + while ( (getline < histfile) > 0 ) { + count=$1 + sub("^[0-9]+\t","") + fname=$0 + history[fname]=count + } + close(histfile) + } + + { + history[$0]++ + print + } + + END { + if(!NR) exit + for (f in history) + print history[f],f | "sort -t '\t' -k1rn >" histfile + } + ' ) + +case $cmd in + *\! ) ${termcmd} "$(printf "%s" "${cmd}" | cut -d'!' -f1)";; + * ) ${cmd} ;; +esac +exit diff --git a/dmenuc.backup b/dmenuc.backup new file mode 100755 index 0000000..777b41c --- /dev/null +++ b/dmenuc.backup @@ -0,0 +1,819 @@ +/* See LICENSE file for copyright and license details. */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#ifdef XINERAMA +#include +#endif +#include + +#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 TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) + +/* enums */ +enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */ + +struct item { + char *text; + struct item *left, *right; + + int id; /* for multiselect */ +}; + +static char text[BUFSIZ] = ""; +static char *embed; +static int bh, mw, mh; +static int inputw = 0, promptw; +static int lrpad; /* sum of left and right padding */ +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 int *selid = NULL; +static unsigned int selidsize = 0; + +static Atom clip, utf8; +static Display *dpy; +static Window root, parentwin, win; +static XIC xic; + +static Drw *drw; +static Clr *scheme[SchemeLast]; + +#include "config.h" + +static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; +static char *(*fstrstr)(const char *, const char *) = strstr; + +static int +issel(size_t id) +{ + for (int i = 0;i < selidsize;i++) + if (selid[i] == id) + return 1; + return 0; +} + +static void +appenditem(struct item *item, struct item **list, struct item **last) +{ + if (*last) + (*last)->right = item; + else + *list = item; + + item->left = *last; + item->right = NULL; + *last = item; +} + +static void +calcoffsets(void) +{ + int i, n; + + if (lines > 0) + n = lines * bh; + else + n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">")); + /* 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) + break; + for (i = 0, prev = curr; prev && prev->left; prev = prev->left) + if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n) + break; +} + +static void +cleanup(void) +{ + size_t i; + + XUngrabKey(dpy, AnyKey, AnyModifier, root); + for (i = 0; i < SchemeLast; i++) + free(scheme[i]); + drw_free(drw); + XSync(dpy, False); + XCloseDisplay(dpy); + free(selid); +} + +static char * +cistrstr(const char *s, const char *sub) +{ + size_t len; + + for (len = strlen(sub); *s; s++) + if (!strncasecmp(s, sub, len)) + return (char *)s; + return NULL; +} + +static int +drawitem(struct item *item, int x, int y, int w) +{ + if (item == sel) + drw_setscheme(drw, scheme[SchemeSel]); + else if (issel(item->id)) + drw_setscheme(drw, scheme[SchemeOut]); + else + drw_setscheme(drw, scheme[SchemeNorm]); + + return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0); +} + +static void +drawmenu(void) +{ + unsigned int curpos; + struct item *item; + int x = 0, y = 0, w; + + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, 0, 0, mw, mh, 1, 1); + + if (prompt && *prompt) { + drw_setscheme(drw, scheme[SchemeSel]); + x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0); + } + /* draw input field */ + w = (lines > 0 || !matches) ? mw - x : inputw; + drw_setscheme(drw, scheme[SchemeNorm]); + drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + + curpos = TEXTW(text) - TEXTW(&text[cursor]); + if ((curpos += lrpad / 2 - 1) < w) { + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0); + } + + if (lines > 0) { + /* draw vertical list */ + for (item = curr; item != next; item = item->right) + drawitem(item, x, y += bh, mw - x); + } 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, lrpad / 2, "<", 0); + } + x += w; + for (item = curr; item != next; item = item->right) + x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">"))); + if (next) { + w = TEXTW(">"); + drw_setscheme(drw, scheme[SchemeNorm]); + drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0); + } + } + drw_map(drw, win, 0, 0, mw, mh); +} + +static void +grabfocus(void) +{ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 }; + Window focuswin; + int i, revertwin; + + for (i = 0; i < 100; ++i) { + XGetInputFocus(dpy, &focuswin, &revertwin); + if (focuswin == win) + return; + XSetInputFocus(dpy, win, RevertToParent, CurrentTime); + nanosleep(&ts, NULL); + } + die("cannot grab focus"); +} + +static void +grabkeyboard(void) +{ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000 }; + int i; + + if (embed) + return; + /* 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, GrabModeAsync, + GrabModeAsync, CurrentTime) == GrabSuccess) + return; + nanosleep(&ts, NULL); + } + die("cannot grab keyboard"); +} + +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:", tokn * sizeof *tokv); + len = tokc ? strlen(tokv[0]) : 0; + + matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; + textsize = strlen(text) + 1; + 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; + + if(instant && matches && matches==matchend && !lsubstr) { + puts(matches->text); + cleanup(); + exit(0); + } + + calcoffsets(); +} + +static 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) + 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 +movewordedge(int dir) +{ + if (dir < 0) { /* move cursor to the start of the word*/ + while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) + cursor = nextrune(-1); + while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)])) + cursor = nextrune(-1); + } else { /* move cursor to the end of the word */ + while (text[cursor] && strchr(worddelimiters, text[cursor])) + cursor = nextrune(+1); + while (text[cursor] && !strchr(worddelimiters, text[cursor])) + cursor = nextrune(+1); + } +} + +static void +keypress(XKeyEvent *ev) +{ + char buf[32]; + int len; + KeySym ksym; + Status status; + + len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); + switch (status) { + default: /* XLookupNone, XBufferOverflow */ + return; + case XLookupChars: + goto insert; + case XLookupKeySym: + case XLookupBoth: + break; + } + + if (ev->state & ControlMask) { + switch(ksym) { + case XK_a: ksym = XK_Home; break; + case XK_b: ksym = XK_Left; break; + case XK_c: ksym = XK_Escape; break; + 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_n: ksym = XK_Down; break; + case XK_p: ksym = XK_Up; break; + + case XK_k: /* delete right */ + text[cursor] = '\0'; + match(); + break; + case XK_u: /* delete left */ + insert(NULL, 0 - cursor); + break; + case XK_w: /* delete word */ + while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)])) + insert(NULL, nextrune(-1) - cursor); + while (cursor > 0 && !strchr(worddelimiters, 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, + utf8, utf8, win, CurrentTime); + return; + case XK_Left: + movewordedge(-1); + goto draw; + case XK_Right: + movewordedge(+1); + goto draw; + case XK_Return: + case XK_KP_Enter: + if (sel && issel(sel->id)) { + for (int i = 0;i < selidsize;i++) + if (selid[i] == sel->id) + selid[i] = -1; + } else { + for (int i = 0;i < selidsize;i++) + if (selid[i] == -1) { + selid[i] = sel->id; + return; + } + selidsize++; + selid = realloc(selid, (selidsize + 1) * sizeof(int)); + selid[selidsize - 1] = sel->id; + } + break; + case XK_bracketleft: + cleanup(); + exit(1); + default: + return; + } + } else if (ev->state & Mod1Mask) { + switch(ksym) { + case XK_b: + movewordedge(-1); + goto draw; + case XK_f: + movewordedge(+1); + goto draw; + case XK_g: ksym = XK_Home; break; + case XK_G: ksym = XK_End; break; + case XK_h: ksym = XK_Up; break; + case XK_j: ksym = XK_Next; break; + case XK_k: ksym = XK_Prior; break; + case XK_l: ksym = XK_Down; break; + default: + return; + } + } + + switch(ksym) { + default: +insert: + if (!iscntrl(*buf)) + insert(buf, len); + break; + case XK_Delete: + if (text[cursor] == '\0') + return; + cursor = nextrune(+1); + /* fallthrough */ + case XK_BackSpace: + if (cursor == 0) + return; + insert(NULL, nextrune(-1) - cursor); + break; + case XK_End: + if (text[cursor] != '\0') { + cursor = strlen(text); + break; + } + if (next) { + /* jump to end of list and position items in reverse */ + curr = matchend; + calcoffsets(); + curr = prev; + calcoffsets(); + while (next && (curr = curr->right)) + calcoffsets(); + } + sel = matchend; + break; + case XK_Escape: + cleanup(); + exit(1); + case XK_Home: + if (sel == matches) { + cursor = 0; + break; + } + sel = curr = matches; + calcoffsets(); + break; + case XK_Left: + if (cursor > 0 && (!sel || !sel->left || lines > 0)) { + cursor = nextrune(-1); + break; + } + if (lines > 0) + return; + /* fallthrough */ + case XK_Up: + if (sel && sel->left && (sel = sel->left)->right == curr) { + curr = prev; + calcoffsets(); + } + break; + case XK_Next: + if (!next) + return; + sel = curr = next; + calcoffsets(); + break; + case XK_Prior: + if (!prev) + return; + sel = curr = prev; + calcoffsets(); + break; + case XK_Return: + case XK_KP_Enter: + if (!(ev->state & ControlMask)) { + for (int i = 0;i < selidsize;i++) + if (selid[i] != -1 && (!sel || sel->id != selid[i])) + puts(items[selid[i]].text); + if (sel && !(ev->state & ShiftMask)) + puts(sel->text); + else + puts(text); + cleanup(); + exit(0); + } + if (sel && sel->right && (sel = sel->right) == next) { + curr = next; + calcoffsets(); + } + break; + case XK_Right: + if (text[cursor] != '\0') { + cursor = nextrune(+1); + break; + } + if (lines > 0) + return; + /* fallthrough */ + case XK_Down: + if (sel && sel->right && (sel = sel->right) == next) { + curr = next; + calcoffsets(); + } + break; + case XK_Tab: + if (!sel) + return; + strncpy(text, sel->text, sizeof text - 1); + text[sizeof text - 1] = '\0'; + cursor = strlen(text); + match(); + break; + } + +draw: + drawmenu(); +} + +static 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 */ + if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, + utf8, &da, &di, &dl, &dl, (unsigned char **)&p) + == Success && p) { + insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p)); + XFree(p); + } + drawmenu(); +} + +static void +readstdin(void) +{ + char buf[sizeof text], *p; + size_t i, imax = 0, size = 0; + unsigned int tmpmax = 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'))) + *p = '\0'; + if (!(items[i].text = strdup(buf))) + die("cannot strdup %u bytes:", strlen(buf) + 1); + items[i].id = i; /* for multiselect */ + drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL); + if (tmpmax > inputw) { + inputw = tmpmax; + imax = i; + } + } + if (items) + items[i].text = NULL; + inputw = items ? TEXTW(items[imax].text) : 0; + lines = MIN(lines, i); +} + +static void +run(void) +{ + XEvent ev; + + while (!XNextEvent(dpy, &ev)) { + if (XFilterEvent(&ev, win)) + continue; + switch(ev.type) { + case DestroyNotify: + if (ev.xdestroywindow.window != win) + break; + cleanup(); + exit(1); + case Expose: + if (ev.xexpose.count == 0) + drw_map(drw, win, 0, 0, mw, mh); + break; + case FocusIn: + /* regrab focus from parent window */ + if (ev.xfocus.window != win) + grabfocus(); + break; + case KeyPress: + keypress(&ev.xkey); + break; + case SelectionNotify: + if (ev.xselection.property == utf8) + paste(); + break; + case VisibilityNotify: + if (ev.xvisibility.state != VisibilityUnobscured) + XRaiseWindow(dpy, win); + break; + } + } +} + +static void +setup(void) +{ + int x, y, i, j; + unsigned int du; + XSetWindowAttributes swa; + XIM xim; + Window w, dw, *dws; + XWindowAttributes wa; + XClassHint ch = {"dmenu", "dmenu"}; +#ifdef XINERAMA + XineramaScreenInfo *info; + Window pw; + int a, di, n, area = 0; +#endif + /* init appearance */ + for (j = 0; j < SchemeLast; j++) + scheme[j] = drw_scm_create(drw, colors[j], 2); + + clip = XInternAtom(dpy, "CLIPBOARD", False); + utf8 = XInternAtom(dpy, "UTF8_STRING", False); + + /* calculate menu geometry */ + bh = drw->fonts->h + 2; + lines = MAX(lines, 0); + mh = (lines + 1) * bh; +#ifdef XINERAMA + i = 0; + if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { + XGetInputFocus(dpy, &w, &di); + if (mon >= 0 && mon < n) + i = mon; + else 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) + XFree(dws); + } 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) { + area = a; + i = j; + } + } + /* no focused window is on screen, so use pointer location instead */ + if (mon < 0 && !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])) + break; + + x = info[i].x_org + sidepad; + y = info[i].y_org + (topbar ? 0 : info[i].height - mh) + vertpad; + mw = info[i].width - 2*sidepad; + XFree(info); + } else +#endif + { + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + x = 0; + y = topbar ? 0 : wa.height - mh; + mw = wa.width; + } + promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0; + inputw = MIN(inputw, mw/3); + match(); + + /* create menu window */ + swa.override_redirect = True; + swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; + swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; + win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0, + CopyFromParent, CopyFromParent, CopyFromParent, + CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); + XSetClassHint(dpy, win, &ch); + + + /* input methods */ + if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) + die("XOpenIM failed: could not open input device"); + + xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, + XNClientWindow, win, XNFocusWindow, win, NULL); + + XMapRaised(dpy, win); + if (embed) { + XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask); + if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { + for (i = 0; i < du && dws[i] != win; ++i) + XSelectInput(dpy, dws[i], FocusChangeMask); + XFree(dws); + } + grabfocus(); + } + drw_resize(drw, mw, mh); + drawmenu(); +} + +static void +usage(void) +{ + fputs("usage: dmenu [-bfinv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid] [-it text]\n", stderr); + exit(1); +} + +int +main(int argc, char *argv[]) +{ + XWindowAttributes wa; + 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 (!strcmp(argv[i], "-n")) /* instant select only match */ + instant = 1; + 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 */ + colors[SchemeNorm][ColBg] = argv[++i]; + else if (!strcmp(argv[i], "-nf")) /* normal foreground color */ + colors[SchemeNorm][ColFg] = argv[++i]; + else if (!strcmp(argv[i], "-sb")) /* selected background color */ + colors[SchemeSel][ColBg] = argv[++i]; + else if (!strcmp(argv[i], "-sf")) /* selected foreground color */ + colors[SchemeSel][ColFg] = argv[++i]; + else if (!strcmp(argv[i], "-w")) /* embedding window id */ + embed = argv[++i]; + else if (!strcmp(argv[i], "-it")) { /* embedding window id */ + const char * text = argv[++i]; + insert(text, strlen(text)); + } else + usage(); + + if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fputs("warning: no locale support\n", stderr); + if (!(dpy = XOpenDisplay(NULL))) + die("cannot open display"); + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + if (!embed || !(parentwin = strtol(embed, NULL, 0))) + parentwin = root; + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + drw = drw_create(dpy, screen, root, wa.width, wa.height); + if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) + die("no fonts could be loaded."); + lrpad = drw->fonts->h; + +#ifdef __OpenBSD__ + if (pledge("stdio rpath", NULL) == -1) + die("pledge"); +#endif + + if (fast && !isatty(0)) { + grabkeyboard(); + readstdin(); + } else { + readstdin(); + grabkeyboard(); + } + setup(); + run(); + + return 1; /* unreachable */ +} diff --git a/drw.c b/drw.c new file mode 100755 index 0000000..4cdbcbe --- /dev/null +++ b/drw.c @@ -0,0 +1,436 @@ +/* See LICENSE file for copyright and license details. */ +#include +#include +#include +#include +#include + +#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 = 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); + XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); + + return drw; +} + +void +drw_resize(Drw *drw, unsigned int w, unsigned int h) +{ + if (!drw) + return; + + 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) +{ + XFreePixmap(drw->dpy, drw->drawable); + XFreeGC(drw->dpy, drw->gc); + drw_fontset_free(drw->fonts); + free(drw); +} + +/* This function is an implementation detail. Library users should use + * drw_fontset_create instead. + */ +static Fnt * +xfont_create(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 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 from name: '%s'\n", fontname); + return NULL; + } + if (!(pattern = FcNameParse((FcChar8 *) fontname))) { + fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname); + XftFontClose(drw->dpy, xfont); + return NULL; + } + } else if (fontpattern) { + if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { + fprintf(stderr, "error, cannot load font from pattern.\n"); + return NULL; + } + } else { + die("no font specified."); + } + + /* Do not allow using color fonts. This is a workaround for a BadLength + * error from Xft with color glyphs. Modelled on the Xterm workaround. See + * https://bugzilla.redhat.com/show_bug.cgi?id=1498269 + * https://lists.suckless.org/dev/1701/30932.html + * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349 + * and lots more all over the internet. + */ + FcBool iscol; + if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) { + XftFontClose(drw->dpy, xfont); + return NULL; + } + + font = ecalloc(1, sizeof(Fnt)); + font->xfont = xfont; + font->pattern = pattern; + font->h = xfont->ascent + xfont->descent; + font->dpy = drw->dpy; + + return font; +} + +static void +xfont_free(Fnt *font) +{ + if (!font) + return; + if (font->pattern) + FcPatternDestroy(font->pattern); + XftFontClose(font->dpy, font->xfont); + free(font); +} + +Fnt* +drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount) +{ + Fnt *cur, *ret = NULL; + size_t i; + + if (!drw || !fonts) + return NULL; + + for (i = 1; i <= fontcount; i++) { + if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) { + cur->next = ret; + ret = cur; + } + } + return (drw->fonts = ret); +} + +void +drw_fontset_free(Fnt *font) +{ + if (font) { + drw_fontset_free(font->next); + xfont_free(font); + } +} + +void +drw_clr_create(Drw *drw, Clr *dest, const char *clrname) +{ + if (!drw || !dest || !clrname) + return; + + if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), + DefaultColormap(drw->dpy, drw->screen), + clrname, dest)) + die("error, cannot allocate color '%s'", clrname); +} + +/* Wrapper to create color schemes. The caller has to call free(3) on the + * returned color scheme when done using it. */ +Clr * +drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) +{ + size_t i; + Clr *ret; + + /* need at least two colors for a scheme */ + if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) + return NULL; + + for (i = 0; i < clrcount; i++) + drw_clr_create(drw, &ret[i], clrnames[i]); + return ret; +} + +void +drw_setfontset(Drw *drw, Fnt *set) +{ + if (drw) + drw->fonts = set; +} + +void +drw_setscheme(Drw *drw, Clr *scm) +{ + if (drw) + drw->scheme = scm; +} + +void +drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) +{ + if (!drw || !drw->scheme) + return; + XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); + if (filled) + XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); + else + XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); +} + +int +drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) +{ + char buf[1024]; + int ty; + unsigned int ew; + XftDraw *d = NULL; + Fnt *usedfont, *curfont, *nextfont; + size_t i, len; + int utf8strlen, utf8charlen, render = x || y || w || h; + long utf8codepoint = 0; + const char *utf8str; + FcCharSet *fccharset; + FcPattern *fcpattern; + FcPattern *match; + XftResult result; + int charexists = 0; + + if (!drw || (render && !drw->scheme) || !text || !drw->fonts) + return 0; + + if (!render) { + w = ~w; + } else { + XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); + 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)); + x += lpad; + w -= lpad; + } + + usedfont = drw->fonts; + while (1) { + utf8strlen = 0; + utf8str = text; + nextfont = NULL; + while (*text) { + utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); + for (curfont = drw->fonts; curfont; curfont = curfont->next) { + charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); + if (charexists) { + if (curfont == usedfont) { + utf8strlen += utf8charlen; + text += utf8charlen; + } else { + nextfont = curfont; + } + break; + } + } + + if (!charexists || nextfont) + break; + else + charexists = 0; + } + + if (utf8strlen) { + drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL); + /* shorten text if necessary */ + for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--) + drw_font_getexts(usedfont, utf8str, len, &ew, NULL); + + if (len) { + memcpy(buf, utf8str, len); + buf[len] = '\0'; + if (len < utf8strlen) + for (i = len; i && i > len - 3; buf[--i] = '.') + ; /* NOP */ + + if (render) { + ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; + XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], + usedfont->xfont, x, ty, (XftChar8 *)buf, len); + } + x += ew; + w -= ew; + } + } + + if (!*text) { + break; + } else if (nextfont) { + charexists = 0; + usedfont = nextfont; + } else { + /* Regardless of whether or not a fallback font is found, the + * character must be drawn. */ + charexists = 1; + + fccharset = FcCharSetCreate(); + FcCharSetAddChar(fccharset, utf8codepoint); + + if (!drw->fonts->pattern) { + /* Refer to the comment in xfont_create for more information. */ + die("the first font in the cache must be loaded from a font string."); + } + + fcpattern = FcPatternDuplicate(drw->fonts->pattern); + FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); + FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); + FcPatternAddBool(fcpattern, FC_COLOR, FcFalse); + + FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); + FcDefaultSubstitute(fcpattern); + match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result); + + FcCharSetDestroy(fccharset); + FcPatternDestroy(fcpattern); + + if (match) { + usedfont = xfont_create(drw, NULL, match); + if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { + for (curfont = drw->fonts; curfont->next; curfont = curfont->next) + ; /* NOP */ + curfont->next = usedfont; + } else { + xfont_free(usedfont); + usedfont = drw->fonts; + } + } + } + } + if (d) + XftDrawDestroy(d); + + return x + (render ? w : 0); +} + +void +drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) +{ + if (!drw) + return; + + XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); + XSync(drw->dpy, False); +} + +unsigned int +drw_fontset_getwidth(Drw *drw, const char *text) +{ + if (!drw || !drw->fonts || !text) + return 0; + return drw_text(drw, 0, 0, 0, 0, 0, text, 0); +} + +void +drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) +{ + XGlyphInfo ext; + + if (!font || !text) + return; + + XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); + if (w) + *w = ext.xOff; + if (h) + *h = font->h; +} + +Cur * +drw_cur_create(Drw *drw, int shape) +{ + Cur *cur; + + if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) + return NULL; + + 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); +} diff --git a/drw.h b/drw.h new file mode 100755 index 0000000..4c67419 --- /dev/null +++ b/drw.h @@ -0,0 +1,57 @@ +/* See LICENSE file for copyright and license details. */ + +typedef struct { + Cursor cursor; +} Cur; + +typedef struct Fnt { + Display *dpy; + unsigned int h; + XftFont *xfont; + FcPattern *pattern; + struct Fnt *next; +} Fnt; + +enum { ColFg, ColBg }; /* Clr scheme index */ +typedef XftColor Clr; + +typedef struct { + unsigned int w, h; + Display *dpy; + int screen; + Window root; + Drawable drawable; + GC gc; + Clr *scheme; + Fnt *fonts; +} Drw; + +/* Drawable abstraction */ +Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); +void drw_resize(Drw *drw, unsigned int w, unsigned int h); +void drw_free(Drw *drw); + +/* Fnt abstraction */ +Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount); +void drw_fontset_free(Fnt* set); +unsigned int drw_fontset_getwidth(Drw *drw, const char *text); +void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); + +/* Colorscheme abstraction */ +void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); +Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); + +/* Cursor abstraction */ +Cur *drw_cur_create(Drw *drw, int shape); +void drw_cur_free(Drw *drw, Cur *cursor); + +/* Drawing context manipulation */ +void drw_setfontset(Drw *drw, Fnt *set); +void drw_setscheme(Drw *drw, Clr *scm); + +/* Drawing functions */ +void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert); +int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert); + +/* Map functions */ +void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); diff --git a/drw.o b/drw.o new file mode 100644 index 0000000000000000000000000000000000000000..7e11c14b0358c2dfacffc1650a72a254d991d481 GIT binary patch literal 10504 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 KFb_eX>jwbVk5Z%n literal 0 HcmV?d00001 diff --git a/patches/password.diff b/patches/password.diff new file mode 100755 index 0000000..16d8a1e --- /dev/null +++ b/patches/password.diff @@ -0,0 +1,88 @@ +diff -up dmenu-4.9/dmenu.1 dmenu-4.9-orig/dmenu.1 +--- dmenu-4.9/dmenu.1 2019-09-25 12:55:42.666319316 -0600 ++++ dmenu-4.9-orig/dmenu.1 2019-09-25 12:48:38.848249931 -0600 +@@ -3,7 +3,7 @@ + dmenu \- dynamic menu + .SH SYNOPSIS + .B dmenu +-.RB [ \-bfivP ] ++.RB [ \-bfiv ] + .RB [ \-l + .IR lines ] + .RB [ \-m +@@ -47,9 +47,6 @@ is faster, but will lock up X until stdi + .B \-i + dmenu matches menu items case insensitively. + .TP +-.B \-P +-dmenu will not directly display the keyboard input, but instead replace it with dots. All data from stdin will be ignored. +-.TP + .BI \-l " lines" + dmenu lists items vertically, with the given number of lines. + .TP +diff -up dmenu-4.9/dmenu.c dmenu-4.9-orig/dmenu.c +--- dmenu-4.9/dmenu.c 2019-09-25 12:48:55.756173240 -0600 ++++ dmenu-4.9-orig/dmenu.c 2019-09-25 12:48:38.848249931 -0600 +@@ -37,7 +37,7 @@ struct item { + static char text[BUFSIZ] = ""; + static char *embed; + static int bh, mw, mh; +-static int inputw = 0, promptw, passwd = 0; ++static int inputw = 0, promptw; + static int lrpad; /* sum of left and right padding */ + static size_t cursor; + static struct item *items = NULL; +@@ -132,7 +132,6 @@ drawmenu(void) + unsigned int curpos; + struct item *item; + int x = 0, y = 0, w; +- char *censort; + + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, 0, 0, mw, mh, 1, 1); +@@ -144,12 +143,7 @@ drawmenu(void) + /* draw input field */ + w = (lines > 0 || !matches) ? mw - x : inputw; + drw_setscheme(drw, scheme[SchemeNorm]); +- if (passwd) { +- censort = ecalloc(1, sizeof(text)); +- memset(censort, '.', strlen(text)); +- drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0); +- free(censort); +- } else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); ++ drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); + + curpos = TEXTW(text) - TEXTW(&text[cursor]); + if ((curpos += lrpad / 2 - 1) < w) { +@@ -531,11 +525,6 @@ readstdin(void) + size_t i, imax = 0, size = 0; + unsigned int tmpmax = 0; + +- if(passwd){ +- inputw = lines = 0; +- return; +- } +- + /* 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) +@@ -693,7 +682,7 @@ setup(void) + static void + usage(void) + { +- fputs("usage: dmenu [-bfiPv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" ++ fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); + exit(1); + } +@@ -716,9 +705,7 @@ main(int argc, char *argv[]) + else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ + fstrncmp = strncasecmp; + fstrstr = cistrstr; +- } else if (!strcmp(argv[i], "-P")) /* is the input a password */ +- passwd = 1; +- else if (i + 1 == argc) ++ } else if (i + 1 == argc) + usage(); + /* these options take one argument */ + else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ diff --git a/stest b/stest new file mode 100755 index 0000000000000000000000000000000000000000..bb439efebab9a82f5dbbd70708d080e34d90c7f7 GIT binary patch literal 21536 zcmb<-^>JfjWMqH=W(GS35U)TOBH{p{7#?^*84L^z4h$9yybKNusthU&YzzzxEMPH+ zJWM@|zQF_$htV7mE(0@Ep9F}(z`%e`%Rtq^XpoygLLeGsABc?&J8(fnVKjpPgb&ik z3SvU}FmV|D666sE1_l@n69?%7+ou51%)r2aMpu9oFfcH{Xk>jLBUk7`^sTT(rGG%f zg#+v;1_qcukT6K!4ye8zP<=330i*!r3@8l?Pmmiy*a8}!=rk-oU^KeE3aCDG+6Cfl z1{e*p10)puv?K+@Mz;sXhuH(8VfF<;^~FHL5uG*x8P34K0HZ;6fP?~{mZX5f1;i!> z!=gC|Y9Fq6h=7J8jD|)hgMLnCl9`EqPKs_$W?pH9ZiR)Ju9=BmalW1r*m{t=3>X*~ zK+)&!7s|lYz;FO02Gh^Tz=*TtkU^4R0W>4R^5HV5_yII= zhIr2q-}sc&qSW-v;*!*&5MSq<{JhkV#H5^5hWPmO-2A-w;*!LolK6OtQmhKoQ%iC( z^FSJsD-z?=GV>C1GOJP0~U zF%*=R6f>k1rKU3E6qh8HFcg=hWacpx=RwsKm!zZ?6*1%&q~?KDrxq3E7crz(WR@@# zr6#6;#Nt8bCuheeXJp5xC1&O@Bqk@P78f(*WF|!z8iF#i8JL}!ms*sVn+Osx1PP?& z=anSq=cQ$)!-XQ!NITzU;)#tP#UBjl%H7`WEtVr0>hSx)7U_zjXG3pGnmi9Uxd6I2YigEAlk0|Tu7fyI9UsPJK6VAueyUtr<_Q1KaP=>o>TVGnU1sH_1OG7v7q z10-=!nFtkTc!4C&4ijWxVEBL}&WR-c14$g(1Ody!(l5wtP`L&cWME)`rC*S^7)%h< zo`AX^WG6HTz_JQR;?OD&EUtkhj$FPPAc=$g3|7p*z+izS4huVwoCA_Lv?&4-X7E4~ z=LU;FhyWyU9*7W_j6f3S1&ct41SD}jh!B{}KoaK%i$I71Bymt(0ug0ks6Y}Igb6Y* zFf<^EBi9QZNaD~Wf~0GdIT`|^Aut*OqaiTVLf|vM+%J#jHyj?_tS9vu7(7}Jlra6j z;L&`9<1pAO|4kq1Gcf#DeWK66z%TE>@Lv_g&j882eDMGO|NpAD^cfg3KvnF^3t;{w z5FgYuczFQKKLz50s@j(u!2ClXKB$U)xd6=H1>%FM@0Sz6{7oP}sH%P00Oqd(@j=!2 z%K|We5r_|}a$hEZ`LjTLP!r;10GK}s#0OQqFCD=AE)XA7<-Rlk^P50?P*wX<0nD!g z@j+GWO93#y2*d|ftuGn=|Nrk8?$c{4Zpgsk80Hx27!ul>|3BEHH;%)j@r{N614D{O zH;bwU0|SFcXN!u200V>J0mB0xoh~XIAVR>So6Vz>wE`5d-OL`X2l!ilfa+KaUH;bh z3=9li0gNq|_*pfA-}$kg5L&;XJGK@eD9n5&7;@!y&eOD2fyow z7vKK<|KECmf64*=Z3mn?S+G_{U<)tSmJkNUe#;9<-`~x!aZ7I7)Z;Xn-Yh|Ba(`&p846idi zdR^H6H&}3$G9P1L@aV1q1>CvEG@nZ4c|NmcC zy;$@2|9{WUqaYU~fE)+nd$b-Xl>>3^|NZ|T5}G9e&9*iApb+i0E-`<7!lySu*r&Hf zMZ%+-+wg#I=L4V4Py0Y)Fg~6CUr7A@|KIjMKLbPgTA$8mAdxgi28P!QJi4ttI{&?h z1aVdv9%!~r1DVJ_<$y=`6maCHcxa1&Q$q>s3ulnsjYmLl*7#J914Wp{h;#V#ev`d|A%^Xehv2M{O!^B#)1(oe`zp+_4SshaJ&fl z14^MK?1l$k9%E!+Xtpf^4Vaa(HPkZbmAq=UO$TvH1iD>R6jT{LFfiCMBrq_PUTn4v z!jMp4U?|9m(Ru&H#NS{iJbzj7|Nnm^ ziy9ah_*+x{|Nq}?`xO+9CEVX!R1{hGTR`Pgv+Yxm7|6IUAV!JnYeSFTEh;m>p?v>^ z57p+qq=Tw3iB`UAQ_JIm#kOw#X0(kMM-02Kozy8A#B$gpIvVUQx_wb(vTgoA{A zz``Y`UK;=V|KF08QHOz{M5)>K2`JT-up9n=vHIu#|HoN>YJo$082FfX;cr*k?Ltr!nMnhmU1V%$( zGz3O=2!LiIN{bWIQ>_$Kixr}E6O)otQq$5iataEIic8DND`FL*b@LR`GILTvtb7;? zB%r6K7t6(fp@TuSSYNdmG$$#|Yz>pJ8BN5c&N7zYhZg1Mipr z|3PzsCSU&lUjPz^Mh9b65Cda{0HZVyJI4e@1_scWGiVa?z^DKJ)j(=o*ulfuD$u#& zi1+{hgC{}x1l;%}y!g4xIT{%3rL47#Rlw7OAjL5Z3=EZ@|NmD9>38H40QK7o7#J9O zKL7vk32Kl!@(Hvtx$sFeGkft}U}83B;*)UX6L93?U|{fIU|^U7nzwlW|Gz&-trMR> zKa(e)L?5#gpF%H-6Q4#8t0SL58=DKCMKilM-vb3^RVF?QM?M2bJ`E>61t&fUCq4lu zkXaz>NAYL~jE2By2#kinXb6mkz-S1JhQMeDjE2By2;d3<*m^D4`Yh0}I!Nt95CQ6I zLFu!u!Q{XG`=1Zu9{|k+L)XoM_yVArUIqs6I&u*I1ymk1feYdXLmdj5zyyGAO+bN*{yL*P!$>DE$pevq2Z1i9uxoX zWncsw4^CSs9tPz?Q&4HpaES%9T9lCkG;YG@$iToL3ljHdU|;~PfM#aoILgGpz|6$1 zz|6qF%);&q;&HHhfG9?`<4g<;tZ7UP42){xa-c=(OsuOI85mgSGcqtRYRIU9^6vs> z1_nk=ksQ#<0~XfIyb=c1Dv-367${1ZIasYAW}O3>wTPL4fk{d@0i-blBrYKgaue%9 zMg|6ENs$nccnydxB?1~aV!g%4z`&v?v=Ou~f`{cE3n!=;Nq?KsY{u zcn={w7LFKZ1_qW#5FQ7EASVk01IuF;=93`TbFe!zF)(npftHFhGB9u%g9I6vIap0W zPGMpB1G1TeWfO=ez`6uXv8)BTdnbsH0ehHRgoS}YfNdLSqX*j-W(Eef9jvaP7+?c! zU18hFRm%uU87zT}P^)@jR`D`0f&`gB0_^)h?wk$^C=kH}3IKLlkYiVa#6SeoRz?N} zc4Lsb{U9+A!E_QN<_{9P3=#toOm`U>7`Xp3GcX9Sf7M`OU|>5BQuH0_s_D!O4D3Jn zcY{KnZ5k5;1N%>rg&+giE`vCKgl)iSoaH&lJP^U8%f!GS^puH#L57`$k)wx+fq{bw zWC$B0#7K@;AoJN7A!c&4f_NN^e4t2T;ot+Q@Y|SL@=ENsnZ0-`gM>Ph+ujM5}OQC z_ZlPyBAC8{#JWIU{SOiY5loz*)C!6^CSee34k)fN9&j_UFfj0(VrF1?$Snk#vFDr#Dw6@Q{6Qmy`15WSk44j~d0!0s)&&8-hhRHfl-{>nt_3VlNq*Ciy2Znv4D3J$%9H721bq&kO82!5UAZ_&%(ffC^=zD z+CWM`Nd~m)BLYPUqacHTxFDktKQo^+pDLd)sIX?_XW&-k@DyfXU@~U_QOqg~+}w8D z%zO+CENWm8Rxt)E0ybVGt_3#(1G_K-GoOtl0|N(Ch83g`B*V$b=qb!7 z%)r2<$lxig&&|NVEzHQw$IT5kO_2j6#RJx)$PP1}SA&6>PllU;flrW8l~0(PSzcOR zK%9YrAL=d+1_l9PMz9gAmfRo{1flK&Tg$*81h)bzFDwpG&J9s6!otYRXUEOW?I{d) z2G|TysF6@LVkSs_>|o?(0=1tQQ60pDtj1mvqy!dr9PqGX0Ec;~IC6-CVgW@Y5*)i6 z40@m{kdg5>A1?zVBY1NoC@vWpI0n~J5Vw7j%X9C46BbZ>|WP(+s%odFP%mR8& z%67gg%C?5gJS7=Sj0}v7RZzo=a2d`CN{678k>v~w46O_d44_0kg@J)#3j+hg5e5c^ z)1Wj8vX~3Bn~w1wi2Dpw7kvQ{%%DX87g~TAfWiq(FmN)#x&qAhj6Oc4w)#v=42+BnoJ_DL4)Y}j zMsFq-21dp>60I=@Spy~*IGJEAAZB$&Z*V{}a5BMKLCo4vF+Dx~;>zNb)PiFD3JbG% zGZTIACM3OJ2K}Vc%$yYcbkLR}{oFERKYP=!AQ^80?c+cG=w%H6?AhG zi;^>JA-nn%baP8e^HOcoQ}a@bGLsc_(-n06jTCf?OHypp^GXd36?D_m^GYo&bu;ro z+nN+~)AI6l3vx;nbkkBRl2Z#xGV}9_6?D^zOA?c_b(3=vi!*c!it)M0*3hb(#*UPW25*IhT_aTv-q@}{PN7aG$eJUc~C`$ zW*|iw`9&oPp!Oib)Pf3#-s0r^g4FoT6c8^yEipGUr;@=nC(X116k-J=@F8IaW`o?!P@EW_l30?+Pz(-rxCJ2p!h=60haui6 zKR<^7>RM1F!6H00KaU|VzNE4s6<+}Rdb$TWhPXof4AWX+WD1HbL|j1j;k}f?^dK-o{1@Ma8Lw@yW&UX*r4M#qmj*NU|0T@$rdCneiow=?LwadC=tI2Tmza zmmuU5L2d#C8$-OOe>`~4V0>wDY6=5p@sV6qlBpMrT_O*Ev4UY31FS4UmC;X3%GAxv zFGt#T;RhH;x=9T0jc%b|a z;-==LfdrwU3}vR4=w&cuf}}x_2WDrM=p{2i!!x<41QdFp-NT^T3e-_!ht(ru?68`H zg8@YWtOj6Zhn4%F1{FvzCI zK#d9pK86cu;-HoQNIh))5M(w8S3=!$0=mBs6uuyFQ2T|EK?J@(6eI@1YoO-C#v?&u zAiM)?jxc2ak>9GSiKNKi6Tf9D#jKsPr*tA8DQrHfVm6|450lKj11!NaX*+i zAE=4JAj*I~zO|bXbcBNh!vv^*Vd}*hvG0Qi^}dA|_%Ozmbin4obR%eM9On4o5RV0k zGx5X6jbJ7v<1oLT5wxFM0OSdCK#S>-_kF_j zfJS7%3u#~iQ2HwldpVgv?!?@8E)5cAl7R0=hZ@764i$%u`@zIbK;jIN3=g331s?cf zU|;}^E@5*gXdp`fl)s?rVdg}F1~*_FB)SBLcn1?`@3kbu255eSY3aqGei782u>Hs| zcW%X@9yDTr&HXoVsDA@?4`#T1#-W~_8GCv@i9@{#SUn$u0(2Y}yvB)vfk6`_&cp)> z3|J6AXr#&wQB#9jm3qkx#U-i5ph^L}u#5r3VE|R}40);L4EZ@J47rIV$r+$3qqw9r zEln?(0dd|yd`WJ6GU&vCVutwml>GSgocyH3ocNTI{G#Ic#L^0em% zDnQ2#WX2~J6(v^2r{gNJF z;2_@JFErlO11jj@62uVi?&I&|=o9bn<`(Q45+CB|im4BW~>5s8lv@pXoWU`la*d`4nkN=_<6Vo`dT0rU_EG#yFB z#ZV`qpW6UeXu<$JRRS&o4%^hc6!@_bC^C>UB2a`NM?jzmfsdDfix?X-6oAi?fQvxv z0JpKBhg6_Sp&w-dmo+wF$ORp30ZwBK40^?txh08740^>SMG!gz#>&hqNi8a1&;vIW z)ALI83X1XzQj1C|k%YjVT;0qRsF0(Rr!J^vtOrt_kyxC;pqEmaS6rD3p-YMwz%pg2 zMa7xVFI81&LI^D-Iqit@qU)=SNR<{40< z8_t91fMgzs4j4P7GA}VVGnqjzJ--A@=z%SO7?xCA%%BJAx2EQmFzA6>!|{nliFxU% z#V{_ocL|e9N-9b%gUNt8-!OJD$deHLAmMlejJ!?*wc^I`6X&ELXk&`cW0F6cBahWis4 z7#Kivw=n&nVQi3k7!4X>2k}8+1PVJ?y$Kp81c_&YhQ`2cP7n_?1A|J#=7%AokWFGR zHi#}{U;u67g}Wa%{|ci)BV!R-47B2VbB;L zC`@7cVe`u{`U6N2()>5N|3T;Xfb_$fA+Y&s7!8}>2Du+Jr;V&3efpV7!6)?4U&Ljs5H!YhUIAX!`c@xdM8>}52hb# z90TawCuI9!T}T)WTc-e1kM91>Q2Sxw51SQ$(NQpsP#RtTZZ!R{{s)W(&niImf+%$T zpb1Ej`(gG^fMz%t{Q{&33B%$KCUlvBfdRA`9a`+b`&Y2@%+S@t_%QlDXnq!&hd^e+ z&imN_8uo@QUI0lzF-#wfehp2VF#BQsDcJdRu=D6Z=^tbSOdl*BK||Xh|HJgd&JVf) z+B(g^0G^2l>4RaIei;1|8vZc-46p(d)bU2@SL4#p1nvidPDX;Lfc5((K=s4i36X`* z>chAU9H7B>r0|2CL$m;<9~QAt9nk27@)#I+q4q96#8ql~5;F&szQWWy61%wOg zS3+125?#MH)PAUUA&M9n7?xW>n4sB62n#~O^uy>d9Qq}o=SE`WwVsGR^>V+Bk1u=)?Q?g*at!8##? l1?XTp1_lOwG)a(s5ET#-)SW|90+vYk1XB!UXd2MC3;;6c6QTeB literal 0 HcmV?d00001 diff --git a/stest.1 b/stest.1 new file mode 100755 index 0000000..2667d8a --- /dev/null +++ b/stest.1 @@ -0,0 +1,90 @@ +.TH STEST 1 dmenu\-VERSION +.SH NAME +stest \- filter a list of files by properties +.SH SYNOPSIS +.B stest +.RB [ -abcdefghlpqrsuwx ] +.RB [ -n +.IR file ] +.RB [ -o +.IR file ] +.RI [ file ...] +.SH DESCRIPTION +.B stest +takes a list of files and filters by the files' properties, analogous to +.IR test (1). +Files which pass all tests are printed to stdout. If no files are given, stest +reads files from stdin. +.SH OPTIONS +.TP +.B \-a +Test hidden files. +.TP +.B \-b +Test that files are block specials. +.TP +.B \-c +Test that files are character specials. +.TP +.B \-d +Test that files are directories. +.TP +.B \-e +Test that files exist. +.TP +.B \-f +Test that files are regular files. +.TP +.B \-g +Test that files have their set-group-ID flag set. +.TP +.B \-h +Test that files are symbolic links. +.TP +.B \-l +Test the contents of a directory given as an argument. +.TP +.BI \-n " file" +Test that files are newer than +.IR file . +.TP +.BI \-o " file" +Test that files are older than +.IR file . +.TP +.B \-p +Test that files are named pipes. +.TP +.B \-q +No files are printed, only the exit status is returned. +.TP +.B \-r +Test that files are readable. +.TP +.B \-s +Test that files are not empty. +.TP +.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 +.B \-x +Test that files are executable. +.SH EXIT STATUS +.TP +.B 0 +At least one file passed all tests. +.TP +.B 1 +No files passed all tests. +.TP +.B 2 +An error occurred. +.SH SEE ALSO +.IR dmenu (1), +.IR test (1) diff --git a/stest.c b/stest.c new file mode 100755 index 0000000..7a7b0bc --- /dev/null +++ b/stest.c @@ -0,0 +1,109 @@ +/* See LICENSE file for copyright and license details. */ +#include + +#include +#include +#include +#include +#include +#include + +#include "arg.h" +char *argv0; + +#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 struct stat old, new; + +static void +test(const char *path, const char *name) +{ + struct stat st, ln; + + 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 */ + && (!FLAG('e') || access(path, F_OK) == 0) /* exists */ + && (!FLAG('f') || S_ISREG(st.st_mode)) /* regular file */ + && (!FLAG('g') || st.st_mode & S_ISGID) /* set-group-id flag */ + && (!FLAG('h') || (!lstat(path, &ln) && S_ISLNK(ln.st_mode))) /* symbolic link */ + && (!FLAG('n') || st.st_mtime > new.st_mtime) /* newer than file */ + && (!FLAG('o') || st.st_mtime < old.st_mtime) /* older than file */ + && (!FLAG('p') || S_ISFIFO(st.st_mode)) /* named pipe */ + && (!FLAG('r') || access(path, R_OK) == 0) /* readable */ + && (!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')) + exit(0); + match = 1; + 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; +} diff --git a/stest.o b/stest.o new file mode 100644 index 0000000000000000000000000000000000000000..7a645c2434fd42ff301b53fde21c29997197b31a GIT binary patch literal 5232 zcmb<-^>JfjWMqH=Mg}_u1P><4z)&E7U^{@B4h#Ye{0spe-L@dEN3SV}GCbhXEec}1 z01^9{7#JA9tWb~6ufZOjzdah?STHg$q2=q*v<0IO|1 zP{M9_;N>w!28L#^*$ky@4Ydq4-5>p3<(Sjr5CYDC@?UT?!YGD zz`#&CA1YDG4P}&Qz7{t8=Fxc{=7i@jEB^ogk7Q8;0|S3+%K!iWVLG_Kxu__z@V5jY z#1O{0zBcse-J&uB>_?cP{H-b=Gh0+PFfcGc-M;{2EbssS|6d>R=w=0lnun!}N&nqDs+EFju|l+N zVp4KSYFc_mPC;Q&acNn3MXW-!Zk|F~W=<-Il@DWq1oZUuV!0SFbTFtE>#G(sIEMT5 zf|H(Om}978NN8{V|6q^aI1Z1-HyQ$H$yY)Elza^jcyzj`aDWH_k8U=PPO#rRx|uy% z5Ae7AU|?Wqu+Zgieb2za&=tVga*4m?2}tahZmD2H1rtLlw@33~j{j$0o&!bF{{x<# zcRV_o4G;Ks>!>t;V07#XWoWs?KlNbC3I3M(3=9mOmUsADr!g=v@bCN7>o&=yw`_j% z561EY$A(%)hEjgt?i>{k-`2OKT;SmI{D1T{+yAqk%||#Ie&u=eg5BoR`QA7A8#Lc~ z@VkBhD{VahiA(2BmhGkN;Mjhx;nN9;p4aa^Ai)Aw>d|_jWPxw;H^T$Y$62<6qS5m| zi^@yS|NsC0KkL~Wqr&m>&%giwTi=$ld-TSr2)tJIffN$2Gd+4;*#9?JaFsG2V_@*; zt^ozyKZv1_;=`jCEOrkn2I90Hs6PSbzODjOo}EWQE=Yhm&ZG4}sT`aG4$YDPXp-~j zwk|P$eZr?VLD;9aMn%G-o7?b!Z|4J_&QJRo1Q-~6Iw2|2_CG%ZL-|^t&Sx-@*9$zl ztvxy+j(fer@Bq|A{wW7Mx~HgsB0t4LTLfH~ArdPnkwnKj#yG}0#yQ3xW^i|Qwo=e= z_Y2ijFf`IL)H7fJWkv-C1_n@6xch}NFflM50EvNu5tP0e(fA@DK?Vi}#;PC&#tH#O zX&!ct35*ON$1})4<hgVZ|l3G_30@=5eDJMk&>vN-W+^sqYe8MLvv@L4pod-FX|U{+<~ zvvA}yaOBf);!|+qlW^h_Z~~bHH3lmM@)rxk$N$(QnX%S53=GWRP(szg$-n>#E4U!o z&!Bt&6^HRXL4ILiU;u?1BLfRV0>}Xj3=A1iosyuiWME+c#Q{iY0*GK>V3381AAs^< z;)+o56Hs$NaRpVvz|6n~W5Q{OJ3z4u7XmYMz$7b!9hgQChF~TuLjagY5M~UJI7Wy- zSfJ8L5Gi~(Ai@mJIMjRN5Rbqi4sr)ll@B$Yfgv1+`dA#|NjSud85kIZkird|_81r# zDsZT;$06Q^L%auv_!J!CGjWJ7#38;ChxjHO;ta(lsl_FF$qe8Mivh%8NXtn~XUIz} zXUNY$AhoC{zlfo@q$oK9M5Scr zF{G!KSs`Dh`TYkQB_Ebg1|)kRZ5B0hL1x4B1d|SOWy6 zJ|8N63926CFJUBieuav|)E7h5b3$pDcsZ0W1f^l({ZPI-lm?j(3R_sX`9sBF>Pw*Z z!OAVFI81zySOA;CMl8TEN^osI99FTHDJwpaPxFWsclEk8t(gFs(b6(#1TLY+hj1qv5X(4n`uAY&2? z3iY)hN*|iX+Q(b0~9$73=E(&4AKj0SAp^dNUa*U9SErtKztb9 zfMzdD9ApNJ4WdEqKaiPFYd}I^d;qHd44MXzf58f%1gM<|Qep(@4 zZ41=>P;bJ78CF2;UjY|^Fwpgb+OgQeZw9E)2lf3S+Q8`#)SiOrhlL-=Kj?OYv;=?x zn}LBr0veB?HW~<{>*r*^OuHcc86XJ;28P`r4iX00hs0$7)rn9mkcAl@K;7SmBFcc# GvjYH8)nH-( literal 0 HcmV?d00001 diff --git a/util.c b/util.c new file mode 100755 index 0000000..fe044fc --- /dev/null +++ b/util.c @@ -0,0 +1,35 @@ +/* See LICENSE file for copyright and license details. */ +#include +#include +#include +#include + +#include "util.h" + +void * +ecalloc(size_t nmemb, size_t size) +{ + void *p; + + if (!(p = calloc(nmemb, size))) + die("calloc:"); + 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); + } else { + fputc('\n', stderr); + } + + exit(1); +} diff --git a/util.h b/util.h new file mode 100755 index 0000000..f633b51 --- /dev/null +++ b/util.h @@ -0,0 +1,8 @@ +/* See LICENSE file for copyright and license details. */ + +#define MAX(A, B) ((A) > (B) ? (A) : (B)) +#define MIN(A, B) ((A) < (B) ? (A) : (B)) +#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B)) + +void die(const char *fmt, ...); +void *ecalloc(size_t nmemb, size_t size); diff --git a/util.o b/util.o new file mode 100644 index 0000000000000000000000000000000000000000..b1b45c326835f724632a67a3815c8745f2d7da1a GIT binary patch literal 2216 zcmb<-^>JfjWMqH=Mg}_u1P><4z@Wj3U^{@B4h(z@ybQq}oxeRA-#lPoVDRWHQL*so z3{i3L==4$X@ac3>3GnIkQHf|dP-4Ze>7tUruj!*wz^^$)rGbHgfnRfu$^wh5ETKB zUKbUE<1Q)!91IK$$6ZuJ44~2qFF<-4tQkDIO+l;@9goiYAO~}RB|N%IR5%)HnEzXq z3h!57U|;}?8vX}UuetVf!G!jM!UilF2qryR50vtF^nzUk7Kl2WoS2i7pKQgz;O^{f zrJ&*N7pkdXXryPT2XYGo3j+fK$O2Gsy8DGPFflM50EvOj1v!in%I5@e7#J8tpfqDu z5Cda{0HZVyJI4e@1_lWR1_l|Z+)ohg$S2UuaC#egt-qKP7DkT);P>zC@sm%(Mx8~^Kmv{NXblPC@x7!Eh=ItODibK z%qvM_C@v|=NzG$OD<~~VW++H4D#|ZnNUg{$VMv7}2(WJ%7)qfu69WSSDD?jPhk%t( zaZp-dV_;x_iEoCAqpLpz6$hzjM^b+SNgNbMFmvuBiG$J>O#C&HII{Y$NaCQ>4^#ge zNt_4CUUpCdVqjnZxsw@5oChinawiDG%mL*AkWnD@APi!IunmZSngbGt#SepCab<2v zViJR1aY+$`&VaFsQgagZN>VFI81zySOA;CMl8TEN^osI99FTHDJwpb)8ka$ufdO20z|_N(7Jveqfq{Vos)3t<0i63laS2ib%3mN_4Jr;* z4iW<6AgDet2Z=xz)&beUz`#JRenY7JMo4ymm@xZc?gfc~FwA}!4e~dL4K74M3ZOU& zB*?(PAPnWhD5x+vEI?wOQ2Rk_WSk3Ah%AUjZ6pH&11O(?(j>Cd0;qm;ccJ^I5Nam6 z{smC|0mz0z!x~vA2S@x@fHD;W0|U%{Q2c}PH_U!m{DZ7Pw;Nf031sSZ~y=R literal 0 HcmV?d00001