Faris/dmenu
1
0
Fork 0
mirror of git://git.suckless.org/dmenu synced 2025-04-20 03:24:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Faris:3.9
Branches Tags
Faris:master
Faris:5.3
Faris:5.2
Faris:5.1
Faris:5.0
Faris:4.9
Faris:4.8
Faris:4.7
Faris:4.6
Faris:4.5
Faris:4.4.1
Faris:4.4
Faris:4.3.1
Faris:4.3
Faris:4.2.1
Faris:4.2
Faris:4.1.1
Faris:4.1
Faris:4.0
Faris:3.9
Faris:3.8
Faris:3.7
Faris:3.6
Faris:3.5
Faris:3.4
Faris:3.3
Faris:3.2
Faris:3.1
Faris:3.0
Faris:2.8
Faris:2.7
Faris:2.6
Faris:2.5
Faris:2.4.2
Faris:2.4.1
Faris:2.4
Faris:2.3
Faris:2.2
Faris:2.1
Faris:2.0
Faris:1.9
Faris:1.8
Faris:1.7.1
Faris:1.7
Faris:1.6
Faris:1.5
Faris:1.4
Faris:1.3
Faris:1.2
Faris:1.1
Faris:1.0
Faris:0.9
Faris:0.8
Faris:0.7
Faris:0.6
Faris:0.5
Faris:0.4
Faris:0.3
Faris:0.2
Faris:0.1
..
compare: Faris:master
Branches Tags
Faris:master
Faris:5.3
Faris:5.2
Faris:5.1
Faris:5.0
Faris:4.9
Faris:4.8
Faris:4.7
Faris:4.6
Faris:4.5
Faris:4.4.1
Faris:4.4
Faris:4.3.1
Faris:4.3
Faris:4.2.1
Faris:4.2
Faris:4.1.1
Faris:4.1
Faris:4.0
Faris:3.9
Faris:3.8
Faris:3.7
Faris:3.6
Faris:3.5
Faris:3.4
Faris:3.3
Faris:3.2
Faris:3.1
Faris:3.0
Faris:2.8
Faris:2.7
Faris:2.6
Faris:2.5
Faris:2.4.2
Faris:2.4.1
Faris:2.4
Faris:2.3
Faris:2.2
Faris:2.1
Faris:2.0
Faris:1.9
Faris:1.8
Faris:1.7.1
Faris:1.7
Faris:1.6
Faris:1.5
Faris:1.4
Faris:1.3
Faris:1.2
Faris:1.1
Faris:1.0
Faris:0.9
Faris:0.8
Faris:0.7
Faris:0.6
Faris:0.5
Faris:0.4
Faris:0.3
Faris:0.2
Faris:0.1

340 Commits
3.9 ... master

Author SHA1 Message Date
Adam Purkrt
b1e217b29a XUngrabKeyboard() instead of XUngrabKey() 
XUngrabKey(), which is currently used in cleanup(), is not the right
counterpart to XGrabKeyboard(), which is used in grabkeyboard(),
called from main().

XUngrabKeyboard() is the function to use, as grabbing the whole
keyboard is different to grabbing individual keys.

With the current code the keyboard gets ungrabbed, as far as I can tell,
only by the final XCloseDisplay() in cleanup(), as the XUngrabKey()
there effectively does nothing.
 2025-03-17 21:01:05 +01:00
Hiltjo Posthuma
86f0b5119e remove extra newline 2024-10-30 13:03:25 +01:00
Hiltjo Posthuma
dd3d348ae8 Avoid unsigned integer underflow in drw_text() 
Patch by Raymond Cole <rc@wolog.xyz>, thanks.
 2024-10-30 13:02:57 +01:00
Hiltjo Posthuma
545031a076 util.c: output function might override errno and thus affect perror() 
Original patch by Raymond Cole with some modifications, thanks!
 2024-10-27 20:08:46 +01:00
Hiltjo Posthuma
475d8093cb drw.c: use the same pattern as ellipsis_width to check for infinite recursion 2024-07-14 11:43:01 +02:00
NRK
59936c7d97 render invalid utf8 sequences as U+FFFD 
previously drw_text would do the width calculations as if
invalid utf8 sequences were replaced with U+FFFD but would pass
the invalid utf8 sequence to xft to render where xft would just
cut it off at the first invalid byte.

this change makes invalid utf8 render as U+FFFD and avoids
sending invalid sequences to xft. the following can be used to
check the behavior before and after the patch:

	$ printf "0\xef1234567\ntest" | dmenu

Ref: https://lists.suckless.org/dev/2407/35646.html
 2024-07-14 11:42:58 +02:00
NRK
51e32d49b5 overhaul utf8decode() 
this changes the utf8decode function to:

* report when an error occurs
* report how many bytes to advance on error

these will be useful in the next commit to render invalid utf8
sequences.

the new implementation is also shorter and more direct.
 2024-07-14 11:42:55 +02:00
Hiltjo Posthuma
7be720cc88 bump version to 5.3 2024-03-19 12:12:52 +01:00
Hiltjo Posthuma
8df553e004 Makefile: remove the options target 
The Makefile used to suppress output (by using @), so this target made sense at
the time.

But the Makefile should be simple and make debugging with less abstractions or
fancy printing.  The Makefile was made verbose and doesn't hide the build
output, so remove this target.

Prompted by a question on the mailing list about the options target.
 2023-09-22 15:16:44 +02:00
NRK
7ab0cb5ef0 drw: minor improvement to the nomatches cache 
1. use `unsigned int` to store the codepoints, this avoids waste on
   common case where `long` is 64bits. and POSIX guarantees `int` to be
   at least 32bits so there's no risk of truncation.
2. since switching to `unsigned int` cuts down the memory requirement by
   half, double the cache size from 64 to 128.
3. instead of a linear search, use a simple hash-table for O(1) lookups.
 2023-07-07 15:03:57 +02:00
Lucas de Sena
0fe460dbd4 fix BadMatch error when embedding on some windows 
When embedded into another window, dmenu will fail with the BadMatch
error if that window have not the same colormap/depth/visual as the
root window.

That happens because dmenu inherits the colormap/depth/visual from
its parent, but draws on a pixmap created based on the root window
using a GC created for the root window (see drw.c).  A BadMatch will
occur when copying the content of the pixmap into dmenu's window.

A solution is to create dmenu's window inside root and then reparent
it if embeded.

See this mail[1] on ports@openbsd.org mailing list for context.

[1]: https://marc.info/?l=openbsd-ports&m=168072150814664&w=2
 2023-04-06 20:28:56 +02:00
Hiltjo Posthuma
dfbbf7f6e1 readstdin: reduce memory-usage by duplicating the line from getline() 
Improves upon commit 32db2b125190d366be472ccb7cad833248696144

The getline() implementation often uses a more greedy way of allocating memory.
Using this buffer directly and forcing an allocation (by setting it to NULL)
would waste a bit of extra space, depending on the implementation of course.

Tested on musl libc and glibc.
The current glibc version allocates a minimum of 120 bytes per line.
For smaller lines musl libc seems less wasteful but still wastes a few bytes
per line.

On a dmenu_path listing on my system the memory usage was about 350kb (old) vs
30kb (new) on Void Linux glibc.

Side-note that getline() also reads NUL bytes in lines, while strdup() would
read until the NUL byte. Since dmenu reads text lines either is probably
fine(tm). Also rename junk to linesiz.
 2023-03-08 21:28:51 +01:00
Hiltjo Posthuma
ba1a347dca readstdin: allocate amount of items 
Keep track of the amount of items (not a total buffer size), allocate an array of
new items. For now change BUFSIZ bytes to 256 * sizeof(struct item)).
 2022-10-31 11:52:30 +01:00
Hiltjo Posthuma
bcbc1ef5c4 readstdin: add a comment 
Maybe too obvious / redundant, but OK.
 2022-10-31 11:46:10 +01:00
NRK
689d9bfcf6 fix leak when getline fails 
according to the getline(3) documentation, the calling code needs to
free the buffer even if getline fails.

dmenu currently doesn't do that which results in a small leak in case of
failure (e.g when piped /dev/null)

	$ ./dmenu < /dev/null
	==8201==ERROR: LeakSanitizer: detected memory leaks
	Direct leak of 120 byte(s) in 1 object(s) allocated from:
	    #0 0x7f6bf5785ef7 in malloc
	    #1 0x7f6bf538ec84 in __getdelim
	    #2 0x405d0c in readstdin dmenu.c:557

moving `line = NULL` inside the loop body wasn't strictly necessary, but
IMO it makes it more apparent that `line` is getting cleared to NULL
after each successful iteration.
 2022-10-31 11:40:35 +01:00
Hiltjo Posthuma
e42c036634 dmenu: small XmbLookupString code improvements 
* Increase the length of composed strings to the same limit as st (32 to 64 bytes).
* Initialize ksym to NoSymbol to be safe: currently this is not an issue though.
* Add comments to clarify the return values of XmbLookupString a bit.
 2022-10-26 09:43:17 +02:00
Hiltjo Posthuma
1d2b462acf bump version to 5.2 2022-10-04 19:36:02 +02:00
Tom Schwindl
7ec32fe494 dmenu: use die() to print the usage message 2022-10-01 13:20:40 +02:00
Hiltjo Posthuma
fce06f437d remove workaround for a crash with color emojis on some systems, now fixed in libXft 2.3.5 
https://gitlab.freedesktop.org/xorg/lib/libxft/-/blob/libXft-2.3.5/NEWS
 2022-09-17 15:32:26 +02:00
Hiltjo Posthuma
1e8c5b68f4 fix a regression in the previous commit for tab complete 
Reported by Santtu Lakkala <inz@inz.fi>, thanks!
 2022-09-02 19:09:50 +02:00
NRK
528d39b011 tab-complete: figure out the size before copying 
we already need to know the string length since `cursor` needs to be
adjusted.

so just calculate the length beforehand and use `memcpy` to copy exactly
as much as needed (as opposed to `strncpy` which always writes `n`
bytes).
 2022-09-02 13:00:48 +02:00
NRK
32db2b1251 readstdin: use getline(3) 
currently readstdin():
   - fgets() into a local buffer,
   - strchr() the buffer to eleminate the newline
   - stdups() the buffer into items

a simpler way is to just use getline(3), which will do the allocation
for us; eliminating the need for stdup()-ing.

additionally getline returns back the amount of bytes read, which
eliminates the need for strchr()-ing to find the newline.
 2022-09-02 12:53:34 +02:00
Hiltjo Posthuma
e35976f4a5 sync code-style patch from libsl 2022-08-08 10:42:54 +02:00
Hiltjo Posthuma
28fb3e2812 Makefile: add manual path for OpenBSD 2022-05-01 18:38:25 +02:00
Hiltjo Posthuma
fe5d5c6709 fix incorrect comment, math is hard 2022-04-30 13:19:33 +02:00
Hiltjo Posthuma
e1e1de7b3b inputw: improve correctness and startup performance, by NRK 
Always use ~30% of the monitor width for the input in horizontal mode.

Patch adapted from NRK patches.
This also does not calculate inputw when using vertical mode anymore (because
the code is removed).
 2022-04-29 20:18:02 +02:00
NRK
33685b06e9 drw_text: account for fallback fonts in ellipsis_width 
additionally, ellipsis_width (which shouldn't change) is made static to
avoid re-calculating it on each drw_text() call.
 2022-04-16 16:21:01 +02:00
NRK
e4827b0c40 drw_text: don't segfault when called with 0 width 
this patch just rejects *any* 0 width draws, which is surely an error by
the caller.

this also guards against cases where the width is too small for the
ellipsis to fit, so ellipsis_w will remain 0.
reported by Bakkeby <bakkeby@gmail.com>
 2022-04-16 16:21:01 +02:00
Hiltjo Posthuma
e73651f12a fix UB with the function iscntrl() 
From commit 6818e07291f3b2913e687c8ec3d3fe4711724050 by NRK, thanks
 2022-03-26 17:58:47 +01:00
Hiltjo Posthuma
31fa07b984 Revert "avoid redraw when there's no change" 
This reverts commit 6818e07291f3b2913e687c8ec3d3fe4711724050.

This broke keys such as ^W to delete-backward-word
 2022-03-26 17:57:50 +01:00
NRK
6818e07291 avoid redraw when there's no change 
while i was timing the performance issue, i noticed that there was lots
of random redrawing going on.

turns out there were coming from here; if someone presses CTRL/ALT etc
without pressing anything else, nothing will be inserted, so nothing
will change. but the code will `break`, go down and do a needless redraw.

this patch changes it to simply return if the keypress iscntrl()

also avoid potential UB by casting *buf into an unsigned char.
 2022-03-25 22:53:50 +01:00
NRK
b43ec0577f free all allocated items, use %zu for size_t 
`items` itself is not checked for NULL as calling free on NULL is defined to be
a no-op.
 2022-03-25 22:53:50 +01:00
NRK
22511c41d5 drw_text: improve performance when there's no match 
this was the last piece of the puzzle, the case where we can't find any
font to draw the codepoint.

in such cases, we use XftFontMatch() which is INSANELY slow. but that's
not the real problem. the real problem was we were continuously trying
to match the same thing over and over again.

this patch introduces a small cache, which keeps track a couple
codepoints for which we know we won't find any matches.

with this, i can dump lots of emojies into dmenu where some of them
don't have any matching font, and still not have dmenu lag insanely or
FREEZE completely when scrolling up and down.

this also improves startup time, which will of course depend on the
system and all installed fonts; but on my system and test case i see the
following startup time drop:

before -> after
60ms   -> 34ms
 2022-03-25 22:49:07 +01:00
NRK
77526f756e inputw: improve correctness and startup performance 
a massive amount of time inside readstdin() is spent trying to get the
max input width and then put it into inputw, only for it to get clamped
down to mw/3 inside setup().

it makes more sense to calculate inputw inside setup() once we have mw
available. similar to the last patch, i see noticeable startup
performance improvement:

before -> after
160ms  -> 60ms

additionally this will take fallback fonts into account compared to the
previous version, so it's not only more performant but also more correct.
 2022-03-25 22:49:07 +01:00
NRK
7269c5355d significantly improve performance on large strings 
this replaces inefficient pattern of `MIN(TEXTW(..), n)` with
drw_fontset_getwidth_clamp() instead, which is far more efficient when
we only want up to a certain width.

dumping a decently sized (unicode) emoji file into dmenu, I see the
startup time drop significantly with this patch.

before -> after
360ms  -> 160ms

this should also noticeably improve input latency (responsiveness) given
that calcoffsets() and drawmenu() are pretty hot functions.
 2022-03-25 22:49:07 +01:00
NRK
6be057f060 introduce drw_fontset_getwidth_clamp() 
getting the width of a string is an O(n) operation, and in many cases
users only care about getting the width upto a certain number.

instead of calling drw_fontset_getwidth() and *then* clamping the
result, this patch introduces drw_fontset_getwidth_clamp() function,
similar to strnlen(), which will stop once we reach n.

the `invert` parameter was overloaded internally to preserve the API,
however library users should be calling drw_fontset_getwidth_clamp() and
not depend upon internal behavior of drw_text().
 2022-03-25 22:49:07 +01:00
NRK
41fdabbf7c drw_text: improve both performance and correctness 
this patch makes some non-trivial changes, which significantly improves
the performance of drawing large strings as well as fixes any issues
regarding the printing of the ellipsis when string gets truncated.

* performance:

before there were two O(n) loops, one which finds how long we can go
without changing font, and the second loop would (incorrectly) truncate
the string if it's too big.

this patch merges the overflow calculation into the first loop and exits
out when overflow is detected. when dumping lots of emojies into dmenu,
i see some noticeable startup time improvement:

before -> after
460ms  -> 360ms

input latency when scrolling up/down is also noticeably better and can
be tested with the following:

	for _ in $(seq 20); do
		cat /dev/urandom | base64 | tr -d '\n' | head -c 1000000
	echo
	done | ./dmenu -l 10

* correctness:

the previous version would incorrectly assumed single byte chars and
would overwrite them with '.' , this caused a whole bunch of obvious
problems, including the ellipsis not getting rendered if then font
changed.

in addition to exiting out when we detect overflow, this patch also
keeps track of the last x-position where the ellipsis would fit. if we
detect overflow, we simply make a recursing call to drw_text() at the
ellipsis_x position and overwrite what was there.

so now the ellipsis will always be printed properly, regardless of
weather the font changes or if the string is single byte char or not.

the idea of rendering the ellipsis on top incase of overflow was
from Bakkeby <bakkeby@gmail.com>, thanks! however the original patch had
some issues incorrectly truncating the prompt (-p flag) and cutting off
emojies. those have been fixed in here.
 2022-03-25 22:49:07 +01:00
Hiltjo Posthuma
3a505cebe8 remove false-positive warning for int comparison as bool 
Reported by Prathu Baronia <prathu.baronia@praton.me>, patch slightly changed.

Thanks!
 2022-03-01 22:45:39 +01:00
Hiltjo Posthuma
308fe78b83 bump version to 5.1 2022-02-11 12:26:35 +01:00
Hiltjo Posthuma
c4b656e0da code-style: rm newline (oops) 2022-02-08 21:45:28 +01:00
Hiltjo Posthuma
3e39c526d2 revert using strcasestr and use a more optimized portable version 
... compared to the old cistrstr().

Thanks for the feedback!
 2022-02-08 19:38:23 +01:00
Hiltjo Posthuma
a9a3836861 follow-up fix: add -D_GNU_SOURCE for strcasestr for some systems 2022-02-07 10:36:13 +01:00
Hiltjo Posthuma
eb96af27f4 improve performance of case-insensitive matching 2022-02-07 00:21:12 +01:00
Hiltjo Posthuma
d78ff08d99 Revert "Improve speed of drw_text when provided with large strings" 
This reverts commit c585e8e498ec6f9c423ab8ea07cf853ee5b05fbe.

It causes issues with truncation of characters when the text does not fit and
so on.  The patch should be reworked and properly tested.
 2021-08-20 23:05:53 +02:00
Hiltjo Posthuma
cd2133a5f6 add support for more keypad keys 
The keypad Enter key was already supported. On some keyboard layouts like my
laptop the page-up and page-down key is more comfortable to use.
This adds a few lines but no complexity.
 2021-08-09 18:39:25 +02:00
Miles Alan
c585e8e498 Improve speed of drw_text when provided with large strings 
Calculates len & ew in drw_font_getexts loop by incrementing instead of
decrementing; as such avoids proportional increase in time spent in loop
based on provided strings size.
 2021-08-09 18:20:51 +02:00
Guilherme Janczak
523aa08f51 remove always true condition in if statement 2021-07-25 10:55:45 +02:00
Hiltjo Posthuma
1a13d0465d bump version to 5.0 
... and bump LICENSE year.
 2020-09-02 18:31:23 +02:00
Hiltjo Posthuma
9b38fda6fe Fix memory leaks in drw 
Synced from dwm.
Patch by Alex Flierl <shad0w73@freenet.de>, thanks.
 2020-06-11 18:45:33 +02:00
Hiltjo Posthuma
db6093f6ec revert IME support 
dmenu will not handle IME support (st will, atleast for now).

revert parts of commit 377bd37e212b1ec4c03a481245603c6560d0be22
this commit also broke input focus.
 2019-03-03 13:08:54 +01:00
Hiltjo Posthuma
a9b1de384a improve xopenim error message 
die() already prints a newline.
 2019-02-12 22:58:35 +01:00
Hiltjo Posthuma
43b0c2c3dd make dmenu_path script executable 
(as dmenu_run is)
 2019-02-12 22:13:58 +01:00
Hiltjo Posthuma
f5036b90ef fix crash when XOpenIM returns NULL 
for example when IME variables are set, but the program is not started (yet).
 2019-02-12 19:10:43 +01:00
Quentin Rameau
153aaf88bf Close when the embedding window is destroyed 2019-02-04 19:49:34 +01:00
Anselm R Garbe
65be875f5a Prepared 4.9 release. 2019-02-02 04:54:15 -08:00
Hiltjo Posthuma
7d19b2055d dmenu.1: document improved fastgrab behaviour from previous patch 2019-01-27 15:28:02 +01:00
dok
11a65377da Use slow path if stdin is a tty 
If stdin is a tty and dmenu is ran with the fast option then it's
impossible to close stdin because the keyboard is already grabbed.
 2019-01-27 15:26:04 +01:00
Quentin Rameau
bbc464dc80 dmenu_path: always use the cachedir 2018-07-21 12:49:00 +02:00
Hiltjo Posthuma
a314412f4b Makefile: just show the compiler output 
Don't be fancy and just show the actual output so debugging is simpler.
 2018-06-02 17:09:01 +02:00
Hiltjo Posthuma
a9eae39e93 Do not strip at link stage 
Building with debug symbols is worthless unless LDFLAGS are manually adjusted
as well.
 2018-06-02 17:01:24 +02:00
Hiltjo Posthuma
851b73d178 code-style for pledge: check the return code -1, not < 0 
this is the proper idiom
 2018-05-25 13:07:17 +02:00
Hiltjo Posthuma
05c138f5b8 code-style for pledge(2) 
feedback from Klemens, thanks
 2018-05-25 13:03:25 +02:00
Hiltjo Posthuma
cd132c8d5b Pledge on OpenBSD 2018-05-25 12:04:22 +02:00
David Demelier
e75494b730 Use bold for keyboard shortcuts in dmenu.1 
Like dwm, use the same syntax for all keyboard shortcuts for
consistency.
 2018-05-12 19:12:25 +02:00
Quentin Rameau
0f76dd2fb8 Fix cursor drawn position with wide glyphs 2018-04-22 14:19:20 +02:00
Quentin Rameau
0b57480218 Makefile: bikesheddingly replace ${} with $() 2018-04-22 14:09:05 +02:00
Quentin Rameau
377bd37e21 Handle IME input 
Thanks to nzl <uruabi@gmail.com> for the patch!
 2018-04-22 14:09:05 +02:00
Hiltjo Posthuma
b6d2cc9aea Fix handling of input strings 2018-04-22 14:09:05 +02:00
Quentin Rameau
2f398981fe Update LICENSE 
Only "meaningful" commits and contributors who made changes over the
years have been added.
 2018-03-15 18:29:32 +01:00
Hiltjo Posthuma
23051d78dd bump version to 4.8 2018-03-14 19:48:05 +01:00
Quentin Rameau
e2a280541e add key bindings for moving to the word start or end 
Mod1+b/^Left and Mod1+f/^Right
 2018-03-13 20:10:46 +01:00
Hiltjo Posthuma
889512811d Fix regression in 84a1bc5 
Reported by Jochen Sprickerhof, thanks!

Applied patch with minor change (only initialize `i` for XINERAMA).
 2018-01-04 23:45:49 +01:00
Vincent Carluer
84a1bc5d0d Instantiate j var outside #ifdef XINEMARA directive because it is used in loop outside directive 2018-01-04 18:14:41 +01:00
Hiltjo Posthuma
f0a5b75d6a drw: drw_scm_create: use Clr type 
in this context XftColor is a too low-level type.
 2017-11-03 21:10:38 +01:00
Hiltjo Posthuma
1cabeda550 fix a possible free of a uninitialize variable in paste() 2017-11-03 21:07:02 +01:00
Hiltjo Posthuma
41379f7c39 init colors using SchemeLast 
this makes it slightly easier to add colors to schemes.
 2017-11-03 21:05:29 +01:00
Omar Sandoval
64ab2801fb Set class name on menu window 
WM_CLASS is a standard ICCCM property which is used to identify windows.
Window managers and compositors use it to allow per-application
configurable behavior.
 2017-11-03 20:41:03 +01:00
Hiltjo Posthuma
f428f3e01a release 4.7 2017-05-02 18:32:04 +02:00
Andrew Gregory
5cd66e2c6c Revert "fix input text matching" 
This reverts commit 09d0a36e0370f7ca9bdb171bf93c5ac3131c5a92.

Using strncmp with the length of the user input turns it into a prefix
match rather than an exact match as it's supposed to be.
 2016-12-11 12:33:16 +01:00
Thomas Gardner
e90b88e12a Xinerama: correct variable declarations in preprocessor conditional 2016-11-25 14:21:40 +01:00
Hiltjo Posthuma
a280bdad1f die() on calloc failure 
thanks Markus Teich and David!
 2016-11-05 11:36:42 +01:00
Quentin Rameau
a9a5c6cc2d add embedding support with -w option 2016-10-14 15:26:35 +02:00
Quentin Rameau
a97f550aa7 dmenu.1: group single options 2016-10-14 15:26:34 +02:00
Quentin Rameau
ff8daf8847 dmenu.1: fix -l option 2016-10-14 15:26:34 +02:00
Hiltjo Posthuma
026827fd65 die() consistency: always add newline 2016-08-12 14:39:30 +02:00
Hiltjo Posthuma
d14670b995 fix crash if negative monitor (< -1) was passed 
for example: dmenu -m '-9001'
 2016-07-26 23:13:06 +02:00
Hiltjo Posthuma
aa92cd68bd Revert "Print highlighted input text only on single match" 
This reverts commit a4053bc4e403ae57343f43b7e363a0911bba5a3a.

My bad, was working on the wrong branch and accidently pushed it...
*facepalm*
 2016-07-26 23:02:34 +02:00
Quentin Rameau
a4053bc4e4 Print highlighted input text only on single match 
When the input text fully matches a single item, do not draw the item
and highlight the input text to show that it matches an item in
opposition to regular input text not matching anything.
 2016-07-26 18:29:42 +02:00
Quentin Rameau
657122f781 Partially revert 44c7de3: fix items text width offset calculation 
Without this, we discard the item if it's longer than assigned width
instead of truncating it.
 2016-07-25 19:57:31 +02:00
Hiltjo Posthuma
3c91eed0fb config.def.h: style improvement, use color Scheme enum 2016-06-28 17:56:25 +02:00
S. Gilles
76eb578304 fix: Do not crash on e.g. dmenu < /dev/null 2016-06-28 17:51:28 +02:00
Markus Teich
44c7de3dcf import new drw from libsl and minor fixes. 
- extract drawitem function (code deduplication)
- fix bug where inputw was not correctly calculated from the widest item, but
  just from the one with the longest strlen() which is not the same. It's better
  now, but does not account for fallback fonts, since it would be too slow to
  calculate all the correct item widths on startup.
- minor code style fixes (indentation, useless line breaks)
 2016-06-03 19:13:15 +02:00
Lucas Gabriel Vuotto
b3d9451c2d arg.h: fixed argv checks order 
This prevents accessing to a potentially out-of-bounds memory section.

Signed-off-by: Lucas Gabriel Vuotto <l.vuotto92@gmail.com>
 2016-02-23 00:31:03 +01:00
Klemens Nanni
3de85ca21c Typofix 2016-01-14 23:02:27 +01:00
Quentin Rameau
bf3deb6357 Shut up glibc about _BSD_SOURCE being deprecated 2015-12-19 20:32:17 +01:00
Quentin Rameau
120e840107 Add config option for word delimiters 
Let the user configure word boundaries other than ' ', only works with
the portable character set.
 2015-12-19 20:32:14 +01:00
Hiltjo Posthuma
32f2564dbb arg.h: remove unused ARGNUM* macros 2015-11-08 23:37:47 +01:00
Hiltjo Posthuma
cc596365ac unboolify dmenu 2015-11-08 23:03:34 +01:00
Hiltjo Posthuma
c9e4e152e6 Makefile: package config.def.h on make dist 2015-11-08 16:46:34 +01:00
Hiltjo Posthuma
cc99007809 remove .hgtags file 2015-11-08 16:44:41 +01:00
Hiltjo Posthuma
34f549adb2 dmenu.1: clarify monitor numbers are starting from 0 (first mon) 2015-11-07 12:53:00 +01:00
Hiltjo Posthuma
da0b9eb6c9 fix: multimon: always spawn client on first monitor if specified with -m 0 
This was always broken.

Reproduce:
	focus client on second monitor, spawn dmenu with -m 0.

Result:
	Old wrong behaviour: dmenu spawns on second monitor (focused client).
	Now: dmenu spawns on specified monitor (first).
 2015-11-07 12:43:00 +01:00
Hiltjo Posthuma
44b242c763 drw: cleanup drw_text, prevent gcc warning false-positive of unused var 
... we don't allow passing text is NULL anymore either, for that behaviour
just use drw_rect() (it is used in dwm).
 2015-10-20 22:56:57 +02:00
Hiltjo Posthuma
e2e7fcb219 drw: simplify drw_font_xcreate and prevent a potential unneeded allocation 2015-10-20 22:55:39 +02:00
Hiltjo Posthuma
1f2226df13 drw: a valid (non-NULL) Drw and Fnt context must be passed 
don't do these checks on this level. However for resource drw_*_free
we will allow it.
 2015-10-20 22:53:55 +02:00
Hiltjo Posthuma
5a20b409c6 add sbase-style ecalloc(), calloc: or die 
... remove intermediary variables
 2015-10-20 22:51:57 +02:00
Hiltjo Posthuma
164986763a free schemes as array 
this makes it slightly easier to add custom schemes aswell
 2015-10-18 18:37:20 +02:00
Quentin Rameau
09d0a36e03 fix input text matching 
just compare the size of the input string
 2015-10-04 15:04:59 +02:00
Davide Del Zompo
acbf35a5e3 fix incorrect ordering of match results 
look for exact matches comparing the user input against the item text
 2015-10-04 14:03:07 +02:00
Hiltjo Posthuma
240a7810e4 fix paste from clipboard (ctrl+shift+y) 
from Joshua Lloret on the ML:

"attached is a small patch to enable pasting from clipboard, as well as primary.

It seems like there was already code in there to allow this, but since there was never any case to match the upper case 'Y', that inline if would always evaluate to false."
 2015-10-04 12:32:07 +02:00
Hiltjo Posthuma
d5ce8df9d9 minor style fix 2015-09-28 00:38:17 +02:00
FRIGN
ba75bb30fa Remove function prototypes and reorder functions accordingly 2015-09-28 00:33:29 +02:00
FRIGN
10fd4f275f Untypedef struct item 
Adds clarity. Typedefs for structs are definitely a discussion matter,
but there's no reason to hide a simple data-structure behind a
meaningless typedef.
 2015-09-28 00:33:26 +02:00
Quentin Rameau
b048eacc9d Fix the conversion from microseconds to nanoseconds 2015-09-28 00:27:09 +02:00
Quentin Rameau
c42c378027 Replace deprecated usleep() with nanosleep() 2015-09-28 00:15:13 +02:00
Hiltjo Posthuma
c15a95a061 config.mk: use -std=c99 2015-09-28 00:02:28 +02:00
Hiltjo Posthuma
cf0fb79cd8 dmenu: style improvements 
- move main to bottom, usage above main.
- dont use variable names with function prototypes.
- space before if, for, while, etc: 'if(' -> 'if ('.

this makes the code-style more consistent
 2015-09-27 23:57:39 +02:00
Hiltjo Posthuma
03cb1ec55a drw style improvements 
this makes the code-style more consistent aswell.
 2015-09-27 23:56:02 +02:00
Hiltjo Posthuma
bc20c13db0 separate program-specific c99 bool and X11 
True, False are X11-specific, make sure to use c99 stdbool for
program-specific things.

... also remove left-over vim mode string in config.
 2015-09-27 23:02:33 +02:00
Hiltjo Posthuma
96e60c66bc config.mk: fix _XOPEN_SOURCE=700 for getline() 2015-09-27 22:55:21 +02:00
Hiltjo Posthuma
2d2175ff6f config.mk: improve feature test check 
this fixes a crash on NetBSD because it requires -D_XOPEN_SOURCE (strdup, usleep).

thanks k0ga and stateless for reporting and fixing this issue!
 2015-09-27 22:38:14 +02:00
Eric Pruitt
bbf7b95dc9 Fixed typo introduced by shared code 2015-08-06 12:47:51 +02:00
Hiltjo Posthuma
d6742ef8a6 stest: get rid of getopt, use suckless arg.h 
... also some style improvements.
 2015-07-19 21:38:42 +02:00
Hiltjo Posthuma
5feb0c689d config.mk: add FREETYPELIBS and FREETYPEINC 
These variables make it simpler to change the paths to this for ports.
`pkg-config` is avoided because it sucks, in particular for cross-compilation.

A commented path for *BSD is added, the Xft includes are located at:
/usr/X11R6/include there.

Also already bump the version number to 4.6, a release will come
approximately in August.
 2015-07-19 20:32:08 +02:00
Hiltjo Posthuma
1c242df124 fix prompt color style how it used to be 
This is the style how it was before the big Xft change. The colors were
inverted, this was not the case before the change.

Reported by "zvz" on #suckless IRC, thanks!
 2015-07-19 20:29:26 +02:00
Hiltjo Posthuma
4b1fecd44e Use libdraw: add Xft and fallback-fonts support to graphics lib 
- libdraw, util: add drw.{c,h}, util.{c,h} and update code.
- libdraw: fix drw_rect(): use w and h parameter.
- libdraw: print errstr if last character in string was ":" (sbase).
- libdraw: drw_clr_free() allow valid free(NULL).
- config.def.h: set default font to monospace.
- cleanup() on exit.
- LICENSE: update license string for dmenu -v to 2015.
- LICENSE: add myself to LICENSE
 2015-06-27 21:47:10 +02:00
Anselm R Garbe
13a529ce63 applied Hiltjo's patch as suggested on the ml to fix ControlMask for C-j and C-m 2014-09-17 13:40:11 +02:00
Hiltjo Posthuma
aa69426670 fix crash with ctrl-enter as input 
reproduce: ./dmenu; send EOF; press ctrl+enter.
 2014-07-30 20:07:47 +01:00
Anselm R Garbe
4c50e43df4 updated copyright notices in LICENSE and dmenu.c file 2014-05-29 18:03:53 +02:00
Anselm R Garbe
5ed5e90bfb applied Martin Kühl's inverse matching flag to stest 2013-08-13 19:15:04 +02:00
Anselm R Garbe
13f787306f applied Martti Kühne's dmenu monitor patch 
f6581ca966/monarg.patch becomes upstream now
 2013-08-02 22:30:20 +02:00
Anselm R Garbe
597d4b4337 accepted vi'is exit approach ^[ (suggested by Arkaduisz) 2013-06-28 22:06:02 +02:00
Anselm R Garbe
55c9be06ca forgot to add config.def.h, thanks William 2013-04-17 21:16:51 +02:00
Anselm R Garbe
14f72a2763 adopted Alex Sedov's config.h revival patch to tip 2013-04-17 21:04:05 +02:00
Anselm R Garbe
ec64f273fb applied Alex Sedov's Tab buffer termination patch, thanks 2013-04-17 20:59:12 +02:00
Anselm R Garbe
0d12a47415 applied multisel patch to mainline 2013-04-17 20:56:54 +02:00
Quentin Glidic
dec9a28863 dmenu_run: Split cache logic to dmenu_path again 
This allows to run dmenu_path to update the cache using
a packager manager hook system
 2012-07-30 17:02:12 +02:00
Moritz Wilhelmy
1299e41447 ignore prompt if it is empty in addition to NULL 2012-05-15 11:47:54 +02:00
Connor Lane Smith
38fccafada _POSIX_C_SOURCE=200809L 2012-04-06 16:38:01 +01:00
Connor Lane Smith
1f11faf7b5 listen for C-S-[jm] 2012-02-10 00:37:42 +00:00
Karl F
50145384c8 add ^G escape keybinding 2012-01-19 22:52:17 +00:00
Connor Lane Smith
7707111c10 remove _POSIX_C_SOURCE cflag 2012-01-18 23:56:13 +00:00
Connor Lane Smith
7f45b3f7aa update version 4.5-hg 2012-01-08 13:13:00 +01:00
anselm@garbe.us
0f91dd1c74 config.mk cleanup 2012-01-04 13:30:47 +01:00
Connor Lane Smith
3402a8d53a align M-[hjkl] closer to vi keys 2012-01-02 19:48:11 +01:00
Connor Lane Smith
d3e9bd152e happy new year! 2012-01-01 20:33:56 +01:00
Connor Lane Smith
b95fb20269 add Mod1Mask keybindings 2012-01-01 20:32:40 +01:00
Connor Lane Smith
6664e4233f merge stest -> default 2011-12-19 16:52:48 +01:00
Connor Lane Smith
26c78cd952 comment xdg fallback behaviour 2011-12-19 16:05:55 +01:00
Connor Lane Smith
6b1d658d12 stest: restore stream testing 2011-12-09 11:49:44 +01:00
Connor Lane Smith
56a0d1fa14 fork dmenu_run to disown child shell 2011-12-09 11:36:26 +01:00
Connor Lane Smith
32ef0f5662 stest: cleanup 2011-11-27 23:40:48 +01:00
Connor Lane Smith
dcd6e771a1 stest: remove unneeded lstat 2011-11-27 23:37:01 +01:00
Connor Lane Smith
8cc28cb426 simplify stest 2011-11-27 23:35:09 +01:00
Connor Lane Smith
942199ccd0 dmenu_run: use $SHELL 2011-11-23 15:17:32 +01:00
Connor Lane Smith
3f9b10c86a set window background_pixel 2011-11-23 14:40:21 +01:00
Connor Lane Smith
5162d1b37a fix dmenu_path exec sh 2011-11-19 21:31:18 +01:00
Connor Lane Smith
a02a1a6623 faster dmenu_run -f 2011-11-19 21:24:07 +01:00
Connor Lane Smith
bb4424df07 replace lsx with stest 2011-11-19 19:54:55 +01:00
Connor Lane Smith
8ac44eb75a update manpage 2011-11-16 11:26:15 +01:00
Connor Lane Smith
ebd94a6c00 limit direction keys in vline 2011-11-15 20:32:39 +01:00
Connor Lane Smith
2b31952731 fix C-n / C-p directions (thanks bastien) 2011-11-14 20:02:16 +01:00
Connor Lane Smith
c01f36a1f3 new default colour scheme 2011-11-14 00:46:56 +01:00
Connor Lane Smith
168221b2f8 makefile: *.o depend on draw.h 2011-10-26 14:16:12 +01:00
Connor Lane Smith
dc77337ef3 add paste from clipboard 2011-10-26 13:28:15 +01:00
Connor Lane Smith
7b1493a631 add lots of comments 2011-10-26 13:20:14 +01:00
Connor Lane Smith
dd29c5d480 input focus: calculate areas of intersection 2011-10-26 12:14:50 +01:00
Connor Lane Smith
70b3418e3e simplify dmenu_run 2011-10-17 10:22:23 +01:00
Connor Lane Smith
cf641ae496 merge xim -> default 2011-10-17 10:11:48 +01:00
Connor Lane Smith
5e0156c072 merge lsx -> default 2011-10-17 10:08:04 +01:00
Connor Lane Smith
ca7ef6d2c9 use ~/.dmenu_cache if no xdg cache 2011-10-17 02:12:33 +01:00
Connor Lane Smith
7bbd4c56eb lsx: detect read errors 2011-10-17 01:44:07 +01:00
Connor Lane Smith
24565608cb xim: check for corner cases 2011-10-17 01:18:57 +01:00
Connor Lane Smith
05026fb5ce fix extra warning 2011-10-16 18:26:11 +01:00
Connor Lane Smith
c71abdc65c lsx: return failure on error 2011-10-16 18:14:51 +01:00
Connor Lane Smith
4126b1e323 merge default -> lsx 2011-10-16 18:13:29 +01:00
Troels Henriksen
c8f0a37638 add xim support 2011-10-16 17:21:33 +01:00
Connor Lane Smith
1cf3864464 limit lines to input 2011-10-13 20:43:59 +01:00
Connor Lane Smith
8e302717cb input focus: fix for reparenting wms 2011-10-04 21:39:56 +01:00
Connor Lane Smith
e30ad490b2 fix monitor select when no focus 2011-09-30 21:08:37 +01:00
Connor Lane Smith
5020734408 merge token -> default 2011-09-20 00:11:01 +01:00
Connor Lane Smith
4c8d43ab73 tweak match 2011-09-20 00:09:20 +01:00
Connor Lane Smith
0582480801 update manpage 2011-09-20 00:06:13 +01:00
Connor Lane Smith
f1848a3ef0 detect active monitor using input focus 2011-09-19 18:15:03 +01:00
Connor Lane Smith
b26d3f54ee add token matching 2011-09-19 10:40:56 +01:00
Connor Lane Smith
3af80cd7d8 change version to 'hg' 2011-09-19 10:40:07 +01:00
Connor Lane Smith
4692f84ff0 dmenu_run: sh -c 2011-07-24 20:04:58 +01:00
Connor Lane Smith
c805dcbeaf fix loadfont 2011-07-22 18:16:57 +01:00
Connor Lane Smith
a6cbc6c9a7 Added tag 4.4 for changeset 2b105eaae831 2011-07-19 21:30:14 +01:00
Connor Lane Smith
bae58f61cf add lsx.1 to dist 2011-07-19 21:30:09 +01:00
Connor Lane Smith
1636e12210 tweaks 2011-07-17 14:06:53 +01:00
Connor Lane Smith
2b92c95230 efficiency tweaks 2011-07-14 20:03:08 +01:00
Connor Lane Smith
16a0c0d52a fix extra warning 2011-07-14 20:03:00 +01:00
Connor Lane Smith
5867c53390 simpler vline 2011-07-06 13:40:36 +01:00
Connor Lane Smith
34a816f87d rebind ^N ^P 2011-07-04 16:55:09 +01:00
Connor Lane Smith
0288b576ca include limits.h 2011-06-25 17:02:14 +01:00
Connor Lane Smith
59dafc4ad6 make clean lsx 2011-06-23 22:39:20 +01:00
Connor Lane Smith
49672e9d05 merge lsx -> default 2011-06-23 20:27:28 +01:00
Connor Lane Smith
07d452e0c8 close lsx branch 2011-06-23 20:26:57 +01:00
Connor Lane Smith
88d44169e9 lsx: check snprintf 2011-06-23 20:04:50 +01:00
Connor Lane Smith
f7cbe710a2 update draw.c 2011-06-18 22:11:19 +01:00
Connor Lane Smith
86e9e6f1ec simpler lsx 2011-06-18 07:50:46 +01:00
Connor Lane Smith
eadf090413 new dmenu_run 2011-06-13 21:50:31 +01:00
Connor Lane Smith
8ec1b41cac add lsx.1 2011-06-13 19:32:45 +01:00
Connor Lane Smith
ab3bcac0bf new lsx branch 2011-06-13 19:28:30 +01:00
Connor Lane Smith
723cbabc12 add ^M 2011-06-13 19:25:40 +01:00
Connor Lane Smith
86775cc44b Added tag 4.3.1 for changeset 34a2d77049a9 2011-05-18 17:01:59 +01:00
Connor Lane Smith
2103ae2891 bugfix 2011-05-18 17:01:44 +01:00
Connor Lane Smith
b028ec0e07 Added tag 4.3 for changeset 14c79f054bdf 2011-05-18 16:21:45 +01:00
Connor Lane Smith
bb3e33def3 no -m, cleanup 2011-05-18 16:20:03 +01:00
Connor Lane Smith
3a60b19514 fix possible overflow 2011-05-16 23:35:14 +01:00
Connor Lane Smith
dd2f298252 fixed extra warnings 2011-05-16 12:59:31 +01:00
Connor Lane Smith
11ea52d170 portability 2011-05-15 21:54:26 +01:00
Connor Lane Smith
4354074607 efficient incremental search 2011-05-15 16:05:32 +01:00
Connor Lane Smith
4776d6dc61 match first 2011-05-15 14:21:00 +01:00
Connor Lane Smith
d0051e7bb8 faster grab 2011-05-15 14:13:31 +01:00
Connor Lane Smith
fb67bd666e cleanup 2011-05-15 13:58:54 +01:00
Connor Lane Smith
f5bd1eed8d fast but inexact 2011-05-15 13:02:33 +01:00
Connor Lane Smith
1654d6cd62 cleanup 2011-05-15 02:37:49 +01:00
Connor Lane Smith
6cc0b0dc08 increment version 2011-05-14 23:26:41 +01:00
Connor Lane Smith
b2bb6ebec9 only match links 2011-05-14 23:21:38 +01:00
Connor Lane Smith
a662fc6e0a follow symlinks 2011-05-14 23:14:31 +01:00
Connor Lane Smith
d066975e78 cleanup 2011-05-14 22:43:42 +01:00
Connor Lane Smith
26236a4900 whoops, wrong dmenu_path version 2011-05-14 22:12:28 +01:00
Connor Lane Smith
15505bd711 fast dmenu_path script 2011-05-14 20:43:11 +01:00
Connor Lane Smith
86468aafe5 instant ^E 2011-05-14 18:39:27 +01:00
Connor Lane Smith
be9afce035 fix typo 2011-05-14 17:47:12 +01:00
Connor Lane Smith
3c067598fc use array for items 2011-05-14 17:46:20 +01:00
Connor Lane Smith
86019c5855 fixed xinerama corner case 2011-05-12 13:17:41 +01:00
Connor Lane Smith
0291c722fb fixed -m bug (thanks Rob) 2011-05-11 12:25:50 +01:00
Connor Lane Smith
e0e6b071c6 fast grab patch (thanks Rob) 2011-05-08 15:15:24 +01:00
Connor Lane Smith
cd3b4915c3 helpful errors 2011-05-06 21:13:02 +01:00
Connor Lane Smith
210b303941 paring 2011-05-05 15:46:48 +01:00
Connor Lane Smith
47e3e8be7b update license 2011-01-07 18:55:00 +00:00
Connor Lane Smith
d515d2758f cache option in config.mk 2011-01-07 18:54:40 +00:00
Connor Lane Smith
a8ea79715f gmake spews 2010-12-01 20:25:10 +00:00
Connor Lane Smith
3e0a141016 posix makefile 2010-12-01 20:23:16 +00:00
Anselm R Garbe
cbd8257914 Added tag 4.2.1 for changeset abb6579a324f 2010-11-20 09:25:08 +00:00
Anselm R Garbe
22cf9626c7 fixed dist target bug 2010-11-20 09:25:04 +00:00
Anselm R Garbe
9e13ecabe8 Added tag 4.2 for changeset 379813a051f0 2010-11-19 11:51:01 +00:00
Connor Lane Smith
266f3dd311 removed unnecessary defines 2010-11-17 04:51:30 +00:00
Connor Lane Smith
8d9ade36de moved main, updated args 2010-11-17 04:33:34 +00:00
Connor Lane Smith
da81f57f6d fixed config.mk dep 2010-11-12 00:30:03 +00:00
Connor Lane Smith
c1241bcba3 updated manpage 2010-11-12 00:01:54 +00:00
Connor Lane Smith
eeba6221b1 rebound paste to ^Y 2010-11-12 00:00:32 +00:00
Connor Lane Smith
a0a99d10e1 removed libdc dependence 2010-11-11 23:56:39 +00:00
Connor Lane Smith
7cf66b443a -m flag to fix dwm selmon bug 2010-11-02 12:15:15 +00:00
Connor Lane Smith
038a78a3f4 updated manpage 2010-10-08 23:40:11 +01:00
Connor Lane Smith
e0add428d2 cleaned up 2010-10-08 23:36:45 +01:00
Connor Lane Smith
bf7b8e37ee dmenu_path.c (shell is a bottleneck) 2010-10-08 23:24:22 +01:00
Connor Lane Smith
610a0a8d12 fixed linking bug (thanks Jacob Nixdorf) & iscntrl corner case 2010-09-13 14:22:02 +01:00
Connor Lane Smith
f0818217b3 simplification 2010-09-11 19:48:10 +01:00
Connor Lane Smith
3c366bd73d update to libdc, fixed utf8 bug 2010-09-11 13:37:01 +01:00
Connor Lane Smith
75a19c35bd arrow offset 2010-08-20 19:57:13 +01:00
Connor Lane Smith
a5f31f5707 fixed width bug 2010-08-20 19:42:58 +01:00
Connor Lane Smith
b81c1e88cd rebound paste, removed useless max widths 2010-08-20 13:50:44 +01:00
Connor Lane Smith
5376113039 new libdraw 2010-08-19 16:43:39 +01:00
Connor Lane Smith
c7a8f17bd2 new libdraw 2010-08-19 16:17:57 +01:00
Connor Lane Smith
128d4cf376 resorted globals 2010-08-18 17:35:23 +01:00
Connor Lane Smith
e4fdaba88d signed ints, ignore negative -l value 2010-08-18 17:33:34 +01:00
Connor Lane Smith
849f1dd7a3 fixed insert segfault, added nextrune 2010-08-12 15:35:51 +01:00
Connor Lane Smith
402dc2bc95 fixed paste 2010-08-11 15:02:03 +01:00
Connor Lane Smith
00a60cb7b2 new libdraw, replaced cistrstr with fstrstr, simpler readstdin 2010-08-11 14:24:25 +01:00
Connor Lane Smith
e149c531b8 more efficient initfont 2010-08-10 18:09:02 +01:00
Connor Lane Smith
605e9b6c03 reverted calcoffsets 2010-08-10 14:14:37 +01:00
Connor Lane Smith
caf5246268 simplifications 2010-08-10 13:38:49 +01:00
Connor Lane Smith
93af72e116 cursor fix + style 2010-08-09 11:54:46 +01:00
Connor Lane Smith
0b8072a5a9 added ^D, removed ^M 2010-08-06 14:16:08 +01:00
Connor Lane Smith
31ffcd3b9a new libdraw, typo fixes 2010-08-05 15:41:56 +01:00
Connor Lane Smith
9cf07b4b9b another typo fix (thanks, Gene Auyeung) 2010-08-03 18:19:59 +01:00
Connor Lane Smith
7a2782d02d typo fix 2010-08-03 17:29:53 +01:00
Connor Lane Smith
1c91c2a99c cleaned up 2010-08-03 17:18:24 +01:00
Connor Lane Smith
b7695fa98c merged *{h,v} functions 2010-08-03 17:10:29 +01:00
Connor Lane Smith
b54c179d58 retyped promptw 2010-08-02 15:13:33 +01:00
Connor Lane Smith
06c18808b6 replaced promptw 2010-08-02 14:49:14 +01:00
Connor Lane Smith
a7aee433cc fixed bugs, no more config.h, updated manpage, new libdraw 2010-08-02 14:22:54 +01:00
Connor Lane Smith
a3606ecb0e updated manpage, added paste, cleaned up, new libdraw 2010-07-31 14:56:27 +01:00
Connor Lane Smith
7d5fe17391 merged dmenu & dinput (clunky interface) 2010-07-30 13:40:56 +01:00
Connor Lane Smith
7f36736d11 underline match 2010-07-30 10:26:12 +01:00
Connor Lane Smith
115c01b74e new libdraw 2010-07-30 10:25:55 +01:00
Connor Lane Smith
d77340ed53 fixed vlist select 2010-07-30 09:18:35 +01:00
Connor Lane Smith
da7a799121 updated to libdraw tip 2010-07-27 13:40:32 +01:00
Connor Lane Smith
855a566319 added dmenu.h, common.c 2010-07-02 06:49:05 +01:00
Connor Lane Smith
29e8faed6c updated to new libdraw 2010-07-02 05:50:19 +01:00
Connor Lane Smith
d9c24564d2 atexit cleanup 2010-07-02 03:44:01 +01:00
Connor Lane Smith
6ba5103df4 removed -e flag (too buggy), cleaned up 2010-06-30 22:42:15 +01:00
Connor Lane Smith
309d071df5 fixed no-input invisible text bug 2010-06-30 10:45:24 +01:00
Connor Lane Smith
26b9f3de0f libdraw now has own repo 2010-06-30 01:36:15 +01:00
Connor Lane Smith
7afd296c40 resizing vlist, new dinput binding 2010-06-30 00:52:14 +01:00
Connor Lane Smith
cc8b3b999b cleaned up 2010-06-30 00:05:32 +01:00
Connor Lane Smith
f2abaf8b30 decosmetics 2010-06-29 19:19:20 +01:00
Connor Lane Smith
340b176de6 dinput with dmenu flags, fixed usage & -v, cosmetics 2010-06-29 16:07:31 +01:00
Connor Lane Smith
18dcf73896 extended libdraw 2010-06-28 06:09:34 +01:00
Connor Lane Smith
9f3b0c6ea8 cleaned up 2010-06-25 04:33:41 +01:00
Connor Lane Smith
4508fd2c4e moved draw.c to libdraw.a 2010-06-24 17:44:35 +01:00
Connor Lane Smith
723361fa12 removed colors from dc 2010-06-24 16:24:04 +01:00
Connor Lane Smith
96c65400cc decoupled draw.c from dmenu & dinput 2010-06-24 16:18:18 +01:00
Connor Lane Smith
6c1d0e4d60 fixed offsets, updated eprint, cleaned up 2010-06-24 14:22:34 +01:00
Connor Lane Smith
6efe1932be fixed static symbols in config.def.h 2010-06-24 11:30:30 +01:00
Connor Lane Smith
8f7b62e2b6 fixed makefile 2010-06-23 14:29:32 +01:00
Connor Lane Smith
2ec16d9cb2 cleaned up 2010-06-23 13:49:24 +01:00
Connor Lane Smith
146bc23c11 cleaned up 2010-06-23 13:31:11 +01:00
Connor Lane Smith
595e797660 added draw.h 2010-06-23 13:29:15 +01:00
Connor Lane Smith
bba30e2686 overlapping code 2010-06-23 12:42:08 +01:00
Connor Lane Smith
08b264393d typo fixes 2010-06-23 12:15:07 +01:00
Connor Lane Smith
b4e63454e5 initial dmenu / dinput separation 2010-06-23 12:04:54 +01:00
Connor Lane Smith
bff1526d31 fixed vlist cursor 2010-06-22 10:45:07 +01:00
Connor Lane Smith
9a33a72c6a updated manpage, changed keybinds 
M- binds tend to be wm level, and there were up to 3 binds for the same action
M-{hjkl} also no longer made sense in vlist mode
 2010-06-20 15:04:15 +01:00
Connor Lane Smith
97797d90a6 cleaned up 2010-06-20 01:19:17 +01:00
Connor Lane Smith
4983707c70 added ^K, optimisations 2010-06-20 00:44:26 +01:00
Connor Lane Smith
4229fb7b78 added sselp requirement to readme 2010-06-19 21:44:32 +01:00
Connor Lane Smith
b27ffbd78b cleaned up 2010-06-16 15:36:17 +01:00
Connor Lane Smith
6366f94e36 fixed vlist paging, cleaned up 2010-06-11 09:24:33 +01:00
Connor Lane Smith
645f1d0dfc updated manpage 2010-06-09 10:13:26 +01:00
Anselm R Garbe
d7d14e53da Added tag 4.1.1 for changeset 72749a826cab 2010-05-29 12:56:37 +01:00
Anselm R Garbe
851672cadc prepared bugfix release 4.1.1 2010-05-29 12:56:33 +01:00
Anselm R Garbe
504b797be8 applied Ramils patch 2010-05-29 12:55:38 +01:00
Anselm R Garbe
503ca75af4 Added tag 4.1 for changeset 844587572673 2010-05-28 11:42:54 +01:00
Anselm R Garbe
8623bf5d19 prepared dmenu-4.1 release 2010-05-28 11:42:49 +01:00
Connor Lane Smith
5bc288b2b1 fixed vlist alignment 2010-05-05 11:42:39 +01:00
Connor Lane Smith
a6835349df cleaning up 2010-05-02 23:17:02 +01:00
Connor Lane Smith
518c9b72d1 fixed bad parenting, simpler vlist 2010-04-14 17:35:19 +00:00
Connor Lane Smith
09db46f54f fixed ^U cursor support 2010-04-13 20:14:45 +00:00
Connor Lane Smith
e3623cd7f2 fixed 3 bugs and some inconsistency 2010-04-07 16:15:34 +00:00
Anselm R Garbe
0ba3bae981 applied Troels' patch, thanks Troels! 2010-04-01 21:40:11 +01:00
Anselm R Garbe
ebeb4e4752 added Connor to LICENSE file 2010-04-01 21:32:06 +01:00
Anselm R Garbe
3472085f59 commited Connor's sanity patch 2010-04-01 21:31:09 +01:00
pancake
7ffe519816 apply nibble patch removing per-item length limit 2010-04-01 19:30:21 +02:00
pancake
29686bd1b8 add ^a and ^e keybindings 2010-04-01 19:10:41 +02:00
Anselm R Garbe
052ffae192 applied Connor's subwindow patch 2010-03-31 22:43:49 +01:00
Anselm R Garbe
eededaa76f applied Connor's next nice patch, thanks a lot! 2010-03-31 22:37:41 +01:00
anselm@garbe.us
8e3e61170b applied cls' patch, thanks Connor! 2010-03-22 07:50:26 +00:00
Anselm R Garbe
37236f8840 applied Connor's patch, thanks! 2010-03-07 08:32:16 +00:00
Anselm R Garbe
7082ba1e10 this is only a temporary workaround, the command executed by -p must be configurable through some switch, that was the initial idea, just using sselp is too limited, I'll look into the other issues soon 2009-12-05 16:52:53 +00:00
Anselm R Garbe
569a1f925a applied cursor, vertical and paste patches for upcoming 4.1 dmenu version (due to the fact that surf is using dmenu as well) 2009-11-28 12:28:15 +00:00
Anselm R Garbe
0f4d3ffdb5 Added tag 4.0 for changeset 78f9f72cc9c6 2009-04-18 12:50:12 +01:00
Anselm R Garbe
a1ad9c2a1c applied Matthias Christian Ott's sanity fixes (thanks a lot!) 2009-02-21 19:21:54 +00:00
a@null
51224dcb79 next release will be 4.0 2008-12-12 19:58:52 +00:00
a@null
4e74263ba0 minor modification 2008-12-09 21:55:47 +00:00
Anselm R Garbe
bab59a9807 Added tag 3.9 for changeset 21a1ed9a69b9 2008-09-09 20:45:07 +01:00
18 changed files with 1729 additions and 798 deletions
Show Stats Expand all files Collapse all files

40
.hgtags
View File

@ -1,40 +0,0 @@
fcc8a282cb52c6a9343b461026b386825590cd31 0.1
656be0f47df545dfdd2e1e0663663b8b1b26f031 0.2
d352e9dc112ee96aa5cad961a0ed880ae9ce7276 0.3
7acf0dde1120542917bae12e0e42293f9d2cc899 0.4
4a0ecd881c4fc15de4a0bebd79308b064be020ef 0.5
25f679fb19686140a907684ffcb423b9e9d44b53 0.6
5fc20d7158bd16b4d5f8d1c25e177680b6d54252 0.7
409667a57221f7e50ba8b5248f638915cd61b366 0.8
d046c818ea467555cc338751c9bf3024609f1f12 0.9
9e11140d4cc3eecac3b0ab752f91528fd5e04be8 1.0
e8c1e9733752db12f2dbd1fa93c46f5806242ba9 1.1
bee7fe6d1189174d0204ca3195b83cdc1bb4f82e 1.2
2eb9997be51cb1b11a8900728ccc0904f9371157 1.3
df3fbb050004c544d14e43c36f6a94cca6ed4a69 1.4
e071fb045bd9e8574947acff7196360bc0270e68 1.5
dcc5427f99f51a978386a0dd770467cd911ac84b 1.6
58dbef4aef3d45c7a3da6945e53c9667c0f02d5b 1.7
3696d77aaf02f5d15728dde3b9e35abcaf291496 1.7.1
d3e6fa22ae45b38b1bdb0d813390365e5930360b 1.8
c7f5f4d543170f03d70468e98a3a0ec8d2c4161b 1.9
1fce5c464fcd870b9f024aa1853d5cf3a3eb371b 2.0
7656557298c954469a6a9564e6649b1fb5db663e 2.1
90f0e34e7f118c9ad3227a1606211ee825942b1c 2.2
b6e09682c8adcb6569656bee73c311f9ab457715 2.3
9e9036cbfb4b7306c6fb366249e81dc0e65bdfde 2.4
03e83e2788c83ddd63b45a667939d7ec783c98cb 2.4.1
1ca5d430524e838c52ede912533cb90108c5cd66 2.4.2
041143e9fc544c62edc58af52cae9ac5237e5945 2.5
775f761a5647a05038e091d1c99fc35d3034cd68 2.6
fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7
dd3d02b07cac44fbafc074a361c1002cebe7aae4 2.8
59b3024854db49739c6d237fa9077f04a2da847a 3.0
8f0f917ac988164e1b4446236e3a6ab6cfcb8c67 3.1
e4c81a78ffbad6ba4d1ad119cc654da6eca63a4c 3.2
709df5a4bad7015a346b2b44b1b3b573ea3088ff 3.3
9ab649b3b3e5bfccf1c8f352c59e5361e070a25f 3.4
05e5bd706b3b3e61399d57c4bb43df296a20112d 3.5
0bc2751d06e8b95e0138854c7815e154c5c3d990 3.6
0508a3a6ee106f36d9b8ff07bb5b28584edfa89c 3.7
644b0798fcccd570fd519899e1601c6857496b91 3.8

13
LICENSE
View File

@ -1,8 +1,15 @@
MIT/X Consortium License
© 2006-2008 Anselm R. Garbe <garbeam at gmail dot com>
© 2006-2008 Sander van Dijk <a dot h dot vandijk at gmail dot com>
© 2006-2007 Michał Janeczek <janeczek at gmail dot com>
© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
© 2006-2008 Sander van Dijk <a.h.vandijk@gmail.com>
© 2006-2007 Michał Janeczek <janeczek@gmail.com>
© 2007 Kris Maglione <jg@suckless.org>
© 2009 Gottox <gottox@s01.de>
© 2009 Markus Schnalke <meillo@marmaro.de>
© 2009 Evan Gates <evan.gates@gmail.com>
© 2010-2012 Connor Lane Smith <cls@lubutu.com>
© 2014-2022 Hiltjo Posthuma <hiltjo@codemadness.org>
© 2015-2019 Quentin Rameau <quinq@fifth.space>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),

78
Makefile
View File

@ -3,56 +3,56 @@
include config.mk
SRC = dmenu.c
OBJ = ${SRC:.c=.o}
SRC = drw.c dmenu.c stest.c util.c
OBJ = $(SRC:.c=.o)
all: options dmenu
options:
@echo dmenu build options:
@echo "CFLAGS = ${CFLAGS}"
@echo "LDFLAGS = ${LDFLAGS}"
@echo "CC = ${CC}"
all: dmenu stest
.c.o:
@echo CC $<
@${CC} -c ${CFLAGS} $<
$(CC) -c $(CFLAGS) $<
${OBJ}: config.h config.mk
config.h:
cp config.def.h $@
dmenu: ${OBJ}
@echo CC -o $@
@${CC} -o $@ ${OBJ} ${LDFLAGS}
$(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:
@echo cleaning
@rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz
rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
dist: clean
@echo creating dist tarball
@mkdir -p dmenu-${VERSION}
@cp -R LICENSE Makefile README config.mk dmenu.1 config.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
@gzip dmenu-${VERSION}.tar
@rm -rf dmenu-${VERSION}
mkdir -p dmenu-$(VERSION)
cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\
drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\
dmenu-$(VERSION)
tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
gzip dmenu-$(VERSION).tar
rm -rf dmenu-$(VERSION)
install: all
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
@mkdir -p ${DESTDIR}${PREFIX}/bin
@cp -f dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
@mkdir -p ${DESTDIR}${MANPREFIX}/man1
@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
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:
@echo removing executable file from ${DESTDIR}${PREFIX}/bin
@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
@rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_run
@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
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
.PHONY: all clean dist install uninstall

6
README
View File

@ -1,6 +1,6 @@
dmenu - dynamic menu
====================
dmenu is a generic and efficient menu for X.
dmenu is an efficient dynamic menu for X.
Requirements
@ -13,8 +13,8 @@ Installation
Edit config.mk to match your local setup (dmenu is installed into
the /usr/local namespace by default).
Afterwards enter the following command to build and install dmenu (if
necessary as root):
Afterwards enter the following command to build and install dmenu
(if necessary as root):
make clean install

49
arg.h Normal file
View File

@ -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

23
config.def.h Normal file
View File

@ -0,0 +1,23 @@
/* See LICENSE file for copyright and license details. */
/* Default settings; can be overriden by command line. */
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
/* -fn option overrides fonts[0]; default X11 font or font set */
static const char *fonts[] = {
"monospace:size=10"
};
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
static const char *colors[SchemeLast][2] = {
/* fg bg */
[SchemeNorm] = { "#bbbbbb", "#222222" },
[SchemeSel] = { "#eeeeee", "#005577" },
[SchemeOut] = { "#000000", "#00ffff" },
};
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
static unsigned int lines = 0;
/*
* Characters not considered part of a word while deleting words
* for example: " /?\"&[]"
*/
static const char worddelimiters[] = " ";

9
config.h
View File

@ -1,9 +0,0 @@
/* See LICENSE file for copyright and license details. */
/* appearance */
static const char *font = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
static const char *normbgcolor = "#cccccc";
static const char *normfgcolor = "#000000";
static const char *selbgcolor = "#0066ff";
static const char *selfgcolor = "#ffffff";
static unsigned int spaceitem = 30; /* px between menu items */

29
config.mk
View File

@ -1,31 +1,32 @@
# dmenu version
VERSION = 3.9
# Customize below to fit your system
VERSION = 5.3
# paths
PREFIX = /usr/local
MANPREFIX = ${PREFIX}/share/man
MANPREFIX = $(PREFIX)/share/man
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
# Xinerama, comment if you don't want it
XINERAMALIBS = -L${X11LIB} -lXinerama
XINERAMALIBS = -lXinerama
XINERAMAFLAGS = -DXINERAMA
# freetype
FREETYPELIBS = -lfontconfig -lXft
FREETYPEINC = /usr/include/freetype2
# OpenBSD (uncomment)
#FREETYPEINC = $(X11INC)/freetype2
#MANPREFIX = ${PREFIX}/man
# includes and libs
INCS = -I. -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
INCS = -I$(X11INC) -I$(FREETYPEINC)
LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
# flags
CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -s ${LIBS}
# Solaris
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
#LDFLAGS = ${LIBS}
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

240
dmenu.1
View File

@ -3,96 +3,192 @@
dmenu \- dynamic menu
.SH SYNOPSIS
.B dmenu
.RB [ \-i ]
.RB [ \-b ]
.RB [ \-fn " <font>"]
.RB [ \-nb " <color>"]
.RB [ \-nf " <color>"]
.RB [ \-p " <prompt>"]
.RB [ \-sb " <color>"]
.RB [ \-sf " <color>"]
.RB [ \-v ]
.RB [ \-bfiv ]
.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 ]
.P
.BR dmenu_run " ..."
.SH DESCRIPTION
.SS Overview
dmenu is a generic menu for X, originally designed for
.BR dwm (1).
It manages huge amounts (up to 10.000 and more) of user defined menu items
efficiently.
.SS Options
.TP
.B \-i
makes dmenu match menu entries case insensitively.
.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
defines that dmenu appears at the bottom.
dmenu appears at the bottom of the screen.
.TP
.B \-fn <font>
defines the font.
.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 \-nb <color>
defines the normal background color (#RGB, #RRGGBB, and color names are supported).
.B \-i
dmenu matches menu items case insensitively.
.TP
.B \-nf <color>
defines the normal foreground color (#RGB, #RRGGBB, and color names are supported).
.BI \-l " lines"
dmenu lists items vertically, with the given number of lines.
.TP
.B \-p <prompt>
defines a prompt to be displayed before the input area.
.BI \-m " monitor"
dmenu is displayed on the monitor number supplied. Monitor numbers are starting
from 0.
.TP
.B \-sb <color>
defines the selected background color (#RGB, #RRGGBB, and color names are supported).
.BI \-p " prompt"
defines the prompt to be displayed to the left of the input field.
.TP
.B \-sf <color>
defines the selected foreground color (#RGB, #RRGGBB, and color names are supported).
.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 standard output, then exits.
prints version information to stdout, then exits.
.TP
.BI \-w " windowid"
embed into windowid.
.SH USAGE
dmenu reads a list of newline-separated items from standard input and creates a
menu. When the user selects an item or enters any text and presses Return, his/her
choice is printed to standard output and dmenu terminates.
.P
dmenu is completely controlled by the keyboard. The following keys are recognized:
dmenu is completely controlled by the keyboard. Items are selected using the
arrow keys, page up, page down, home, and end.
.TP
.B Any printable character
Appends the character to the text in the input field. This works as a filter:
only items containing this text will be displayed.
.TP
.B Left/Right (Mod1\-h/Mod1\-l)
Select the previous/next item.
.TP
.B PageUp/PageDown (Mod1\-k/Mod1\-j)
Select the first item of the previous/next 'page' of items.
.TP
.B Home/End (Mod1\-g/Mod1\-G)
Select the first/last item.
.TP
.B Tab (Control\-i)
.B Tab
Copy the selected item to the input field.
.TP
.B Return (Control\-j)
Confirm selection and quit (print the selected item to standard output). Returns
.B 0
on termination.
.B Return
Confirm selection. Prints the selected item to stdout and exits, returning
success.
.TP
.B Shift\-Return (Control\-Shift\-j)
Confirm selection and quit (print the text in the input field to standard output).
Returns
.B 0
on termination.
.B Ctrl-Return
Confirm selection. Prints the selected item to stdout and continues.
.TP
.B Escape (Control\-bracketleft)
Quit without selecting an item. Returns
.B 1
on termination.
.B Shift\-Return
Confirm input. Prints the input text to stdout and exits, returning success.
.TP
.B Backspace (Control\-h)
Remove a character from the input field.
.B Escape
Exit without selecting an item, returning failure.
.TP
.B Control\-u
Remove all characters from the input field.
.B Ctrl-Left
Move cursor to the start of the current word
.TP
.B Control\-w
Remove all characters of current word from the input field.
.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
.BR dwm (1),
.BR wmii (1) .
.IR dwm (1),
.IR stest (1)

1254
dmenu.c
View File

File diff suppressed because it is too large Load Diff

33
dmenu_path
View File

@ -1,26 +1,13 @@
#!/bin/sh
CACHE=$HOME/.dmenu_cache
cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}"
cache="$cachedir/dmenu_run"
[ ! -e "$cachedir" ] && mkdir -p "$cachedir"
IFS=:
uptodate() {
test -f "$CACHE" &&
for dir in $PATH
do
test ! $dir -nt "$CACHE" || return 1
done
}
if ! uptodate
then
for dir in $PATH
do
cd "$dir" &&
for file in *
do
test -x "$file" && echo "$file"
done
done | sort | uniq > "$CACHE".$$ &&
mv "$CACHE".$$ "$CACHE"
if stest -dqr -n "$cache" $PATH; then
stest -flx $PATH | sort -u | tee "$cache"
else
cat "$cache"
fi
cat "$CACHE"

2
dmenu_run
View File

@ -1,2 +1,2 @@
#!/bin/sh
exe=`dmenu_path | dmenu ${1+"$@"}` && exec $exe
dmenu_path | dmenu "$@" | ${SHELL:-"/bin/sh"} &

448
drw.c Normal file
View File

@ -0,0 +1,448 @@
/* See LICENSE file for copyright and license details. */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <X11/Xlib.h>
#include <X11/Xft/Xft.h>
#include "drw.h"
#include "util.h"
#define UTF_INVALID 0xFFFD
static int
utf8decode(const char *s_in, long *u, int *err)
{
static const unsigned char lens[] = {
/* 0XXXX */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
/* 10XXX */ 0, 0, 0, 0, 0, 0, 0, 0, /* invalid */
/* 110XX */ 2, 2, 2, 2,
/* 1110X */ 3, 3,
/* 11110 */ 4,
/* 11111 */ 0, /* invalid */
};
static const unsigned char leading_mask[] = { 0x7F, 0x1F, 0x0F, 0x07 };
static const unsigned int overlong[] = { 0x0, 0x80, 0x0800, 0x10000 };
const unsigned char *s = (const unsigned char *)s_in;
int len = lens[*s >> 3];
*u = UTF_INVALID;
*err = 1;
if (len == 0)
return 1;
long cp = s[0] & leading_mask[len - 1];
for (int i = 1; i < len; ++i) {
if (s[i] == '\0' || (s[i] & 0xC0) != 0x80)
return i;
cp = (cp << 6) | (s[i] & 0x3F);
}
/* out of range, surrogate, overlong encoding */
if (cp > 0x10FFFF || (cp >> 11) == 0x1B || cp < overlong[len - 1])
return len;
*err = 0;
*u = cp;
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.");
}
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)
{
int ty, ellipsis_x = 0;
unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len, hash, h0, h1;
XftDraw *d = NULL;
Fnt *usedfont, *curfont, *nextfont;
int utf8strlen, utf8charlen, utf8err, render = x || y || w || h;
long utf8codepoint = 0;
const char *utf8str;
FcCharSet *fccharset;
FcPattern *fcpattern;
FcPattern *match;
XftResult result;
int charexists = 0, overflow = 0;
/* keep track of a couple codepoints for which we have no match. */
static unsigned int nomatches[128], ellipsis_width, invalid_width;
static const char invalid[] = "<EFBFBD>";
if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
return 0;
if (!render) {
w = invert ? invert : ~invert;
} else {
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
if (w < lpad)
return x + w;
d = XftDrawCreate(drw->dpy, drw->drawable,
DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen));
x += lpad;
w -= lpad;
}
usedfont = drw->fonts;
if (!ellipsis_width && render)
ellipsis_width = drw_fontset_getwidth(drw, "...");
if (!invalid_width && render)
invalid_width = drw_fontset_getwidth(drw, invalid);
while (1) {
ew = ellipsis_len = utf8err = utf8charlen = utf8strlen = 0;
utf8str = text;
nextfont = NULL;
while (*text) {
utf8charlen = utf8decode(text, &utf8codepoint, &utf8err);
for (curfont = drw->fonts; curfont; curfont = curfont->next) {
charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
if (charexists) {
drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
if (ew + ellipsis_width <= w) {
/* keep track where the ellipsis still fits */
ellipsis_x = x + ew;
ellipsis_w = w - ew;
ellipsis_len = utf8strlen;
}
if (ew + tmpw > w) {
overflow = 1;
/* called from drw_fontset_getwidth_clamp():
* it wants the width AFTER the overflow
*/
if (!render)
x += tmpw;
else
utf8strlen = ellipsis_len;
} else if (curfont == usedfont) {
text += utf8charlen;
utf8strlen += utf8err ? 0 : utf8charlen;
ew += utf8err ? 0 : tmpw;
} else {
nextfont = curfont;
}
break;
}
}
if (overflow || !charexists || nextfont || utf8err)
break;
else
charexists = 0;
}
if (utf8strlen) {
if (render) {
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen);
}
x += ew;
w -= ew;
}
if (utf8err && (!render || invalid_width < w)) {
if (render)
drw_text(drw, x, y, w, h, 0, invalid, invert);
x += invalid_width;
w -= invalid_width;
}
if (render && overflow)
drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert);
if (!*text || overflow) {
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;
hash = (unsigned int)utf8codepoint;
hash = ((hash >> 16) ^ hash) * 0x21F0AAAD;
hash = ((hash >> 15) ^ hash) * 0xD35A2D97;
h0 = ((hash >> 15) ^ hash) % LENGTH(nomatches);
h1 = (hash >> 17) % LENGTH(nomatches);
/* avoid expensive XftFontMatch call when we know we won't find a match */
if (nomatches[h0] == utf8codepoint || nomatches[h1] == utf8codepoint)
goto no_match;
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);
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);
nomatches[nomatches[h0] ? h1 : h0] = utf8codepoint;
no_match:
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);
}
unsigned int
drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
{
unsigned int tmp = 0;
if (drw && drw->fonts && text && n)
tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
return MIN(n, tmp);
}
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);
}

58
drw.h Normal file
View File

@ -0,0 +1,58 @@
/* 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);
unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
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);

90
stest.1 Normal file
View File

@ -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)

109
stest.c Normal file
View File

@ -0,0 +1,109 @@
/* See LICENSE file for copyright and license details. */
#include <sys/stat.h>
#include <dirent.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#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 (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;
}

37
util.c Normal file
View File

@ -0,0 +1,37 @@
/* See LICENSE file for copyright and license details. */
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "util.h"
void
die(const char *fmt, ...)
{
va_list ap;
int saved_errno;
saved_errno = errno;
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
va_end(ap);
if (fmt[0] && fmt[strlen(fmt)-1] == ':')
fprintf(stderr, " %s", strerror(saved_errno));
fputc('\n', stderr);
exit(1);
}
void *
ecalloc(size_t nmemb, size_t size)
{
void *p;
if (!(p = calloc(nmemb, size)))
die("calloc:");
return p;
}

9
util.h Normal file
View File

@ -0,0 +1,9 @@
/* 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))
#define LENGTH(X) (sizeof (X) / sizeof (X)[0])
void die(const char *fmt, ...);
void *ecalloc(size_t nmemb, size_t size);