summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-06-24Setup gitignoreSteph Enders
2024-03-19bump version to 5.3Hiltjo Posthuma
2023-09-22Makefile: remove the options targetHiltjo Posthuma
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-07-07drw: minor improvement to the nomatches cacheNRK
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-04-06fix BadMatch error when embedding on some windowsLucas de Sena
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-03-08readstdin: reduce memory-usage by duplicating the line from getline()Hiltjo Posthuma
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.
2022-10-31readstdin: allocate amount of itemsHiltjo Posthuma
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-31readstdin: add a commentHiltjo Posthuma
Maybe too obvious / redundant, but OK.
2022-10-31fix leak when getline failsNRK
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-26dmenu: small XmbLookupString code improvementsHiltjo Posthuma
* 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-04bump version to 5.2Hiltjo Posthuma
2022-10-01dmenu: use die() to print the usage messageTom Schwindl
2022-09-17remove workaround for a crash with color emojis on some systems, now fixed ↵Hiltjo Posthuma
in libXft 2.3.5 https://gitlab.freedesktop.org/xorg/lib/libxft/-/blob/libXft-2.3.5/NEWS
2022-09-02fix a regression in the previous commit for tab completeHiltjo Posthuma
Reported by Santtu Lakkala <inz@inz.fi>, thanks!
2022-09-02tab-complete: figure out the size before copyingNRK
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-02readstdin: use getline(3)NRK
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-08-08sync code-style patch from libslHiltjo Posthuma
2022-05-01Makefile: add manual path for OpenBSDHiltjo Posthuma
2022-04-30fix incorrect comment, math is hardHiltjo Posthuma
2022-04-29inputw: improve correctness and startup performance, by NRKHiltjo Posthuma
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-16drw_text: account for fallback fonts in ellipsis_widthNRK
additionally, ellipsis_width (which shouldn't change) is made static to avoid re-calculating it on each drw_text() call.
2022-04-16drw_text: don't segfault when called with 0 widthNRK
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-03-26fix UB with the function iscntrl()Hiltjo Posthuma
From commit 6818e07291f3b2913e687c8ec3d3fe4711724050 by NRK, thanks
2022-03-26Revert "avoid redraw when there's no change"Hiltjo Posthuma
This reverts commit 6818e07291f3b2913e687c8ec3d3fe4711724050. This broke keys such as ^W to delete-backward-word
2022-03-25avoid redraw when there's no changeNRK
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-25free all allocated items, use %zu for size_tNRK
`items` itself is not checked for NULL as calling free on NULL is defined to be a no-op.
2022-03-25drw_text: improve performance when there's no matchNRK
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-25inputw: improve correctness and startup performanceNRK
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-25significantly improve performance on large stringsNRK
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-25introduce drw_fontset_getwidth_clamp()NRK
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-25drw_text: improve both performance and correctnessNRK
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-01remove false-positive warning for int comparison as boolHiltjo Posthuma
Reported by Prathu Baronia <prathu.baronia@praton.me>, patch slightly changed. Thanks!
2022-02-11bump version to 5.1Hiltjo Posthuma
2022-02-08code-style: rm newline (oops)Hiltjo Posthuma
2022-02-08revert using strcasestr and use a more optimized portable versionHiltjo Posthuma
... compared to the old cistrstr(). Thanks for the feedback!
2022-02-07follow-up fix: add -D_GNU_SOURCE for strcasestr for some systemsHiltjo Posthuma
2022-02-07improve performance of case-insensitive matchingHiltjo Posthuma
2021-08-20Revert "Improve speed of drw_text when provided with large strings"Hiltjo Posthuma
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-09add support for more keypad keysHiltjo Posthuma
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-09Improve speed of drw_text when provided with large stringsMiles Alan
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-07-25remove always true condition in if statementGuilherme Janczak
2020-09-02bump version to 5.0Hiltjo Posthuma
... and bump LICENSE year.
2020-06-11Fix memory leaks in drwHiltjo Posthuma
Synced from dwm. Patch by Alex Flierl <shad0w73@freenet.de>, thanks.
2019-03-03revert IME supportHiltjo Posthuma
dmenu will not handle IME support (st will, atleast for now). revert parts of commit 377bd37e212b1ec4c03a481245603c6560d0be22 this commit also broke input focus.
2019-02-12improve xopenim error messageHiltjo Posthuma
die() already prints a newline.
2019-02-12make dmenu_path script executableHiltjo Posthuma
(as dmenu_run is)
2019-02-12fix crash when XOpenIM returns NULLHiltjo Posthuma
for example when IME variables are set, but the program is not started (yet).
2019-02-04Close when the embedding window is destroyedQuentin Rameau
2019-02-02Prepared 4.9 release.Anselm R Garbe
2019-01-27dmenu.1: document improved fastgrab behaviour from previous patchHiltjo Posthuma