| Commit message (Collapse) | Author | Age |
|---|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
| |
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)).
|
| |
|
|
| |
Maybe too obvious / redundant, but OK.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
* 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.
|
| | |
|
| |
|
|
| |
Reported by Santtu Lakkala <inz@inz.fi>, thanks!
|
| |
|
|
|
|
|
|
|
| |
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).
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| | |
|
| |
|
|
|
|
|
|
| |
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).
|
| |
|
|
| |
From commit 6818e07291f3b2913e687c8ec3d3fe4711724050 by NRK, thanks
|
| |
|
|
|
|
| |
This reverts commit 6818e07291f3b2913e687c8ec3d3fe4711724050.
This broke keys such as ^W to delete-backward-word
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
| |
`items` itself is not checked for NULL as calling free on NULL is defined to be
a no-op.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
Reported by Prathu Baronia <prathu.baronia@praton.me>, patch slightly changed.
Thanks!
|
| | |
|
| |
|
|
|
|
| |
... compared to the old cistrstr().
Thanks for the feedback!
|
| | |
|
| |
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
| |
dmenu will not handle IME support (st will, atleast for now).
revert parts of commit 377bd37e212b1ec4c03a481245603c6560d0be22
this commit also broke input focus.
|
| |
|
|
| |
die() already prints a newline.
|
| |
|
|
| |
for example when IME variables are set, but the program is not started (yet).
|
| | |
|
| |
|
|
|
| |
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.
|
| |
|
|
| |
this is the proper idiom
|
| |
|
|
| |
feedback from Klemens, thanks
|
| | |
|
| | |
|
| |
|
|
| |
Thanks to nzl <uruabi@gmail.com> for the patch!
|
| | |
|
| |
|
|
| |
Mod1+b/^Left and Mod1+f/^Right
|
| |
|
|
|
|
| |
Reported by Jochen Sprickerhof, thanks!
Applied patch with minor change (only initialize `i` for XINERAMA).
|
| |
|
|
| |
loop outside directive
|
| | |
|
| |
|
|
| |
this makes it slightly easier to add colors to schemes.
|
| |
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
| |
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.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
for example: dmenu -m '-9001'
|
| |
|
|
|
|
|
| |
This reverts commit a4053bc4e403ae57343f43b7e363a0911bba5a3a.
My bad, was working on the wrong branch and accidently pushed it...
*facepalm*
|
