summaryrefslogtreecommitdiff
path: root/dmenu.c
Commit message (Collapse)AuthorAgeFilesLines
* fix BadMatch error when embedding on some windowsHEADmasterLucas de Sena2023-04-061-1/+2
| | | | | | | | | | | | | | | | | | 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
* readstdin: reduce memory-usage by duplicating the line from getline()Hiltjo Posthuma2023-03-081-4/+5
| | | | | | | | | | | | | | | | | | | | 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.
* readstdin: allocate amount of itemsHiltjo Posthuma2022-10-311-4/+6
| | | | | 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)).
* readstdin: add a commentHiltjo Posthuma2022-10-311-1/+1
| | | | Maybe too obvious / redundant, but OK.
* fix leak when getline failsNRK2022-10-311-1/+3
| | | | | | | | | | | | | | | | | | | 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.
* dmenu: small XmbLookupString code improvementsHiltjo Posthuma2022-10-261-4/+4
| | | | | | * 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.
* dmenu: use die() to print the usage messageTom Schwindl2022-10-011-3/+2
|
* fix a regression in the previous commit for tab completeHiltjo Posthuma2022-09-021-1/+1
| | | | Reported by Santtu Lakkala <inz@inz.fi>, thanks!
* tab-complete: figure out the size before copyingNRK2022-09-021-2/+2
| | | | | | | | | 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).
* readstdin: use getline(3)NRK2022-09-021-7/+7
| | | | | | | | | | | | | 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.
* fix incorrect comment, math is hardHiltjo Posthuma2022-04-301-1/+1
|
* inputw: improve correctness and startup performance, by NRKHiltjo Posthuma2022-04-291-8/+2
| | | | | | | | 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).
* fix UB with the function iscntrl()Hiltjo Posthuma2022-03-261-1/+1
| | | | From commit 6818e07291f3b2913e687c8ec3d3fe4711724050 by NRK, thanks
* Revert "avoid redraw when there's no change"Hiltjo Posthuma2022-03-261-3/+2
| | | | | | This reverts commit 6818e07291f3b2913e687c8ec3d3fe4711724050. This broke keys such as ^W to delete-backward-word
* avoid redraw when there's no changeNRK2022-03-251-2/+3
| | | | | | | | | | | | | 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.
* free all allocated items, use %zu for size_tNRK2022-03-251-3/+6
| | | | | `items` itself is not checked for NULL as calling free on NULL is defined to be a no-op.
* inputw: improve correctness and startup performanceNRK2022-03-251-10/+9
| | | | | | | | | | | | | | | | 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.
* significantly improve performance on large stringsNRK2022-03-251-3/+10
| | | | | | | | | | | | | | | 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.
* remove false-positive warning for int comparison as boolHiltjo Posthuma2022-03-011-1/+1
| | | | | | Reported by Prathu Baronia <prathu.baronia@praton.me>, patch slightly changed. Thanks!
* code-style: rm newline (oops)Hiltjo Posthuma2022-02-081-1/+0
|
* revert using strcasestr and use a more optimized portable versionHiltjo Posthuma2022-02-081-1/+20
| | | | | | ... compared to the old cistrstr(). Thanks for the feedback!
* improve performance of case-insensitive matchingHiltjo Posthuma2022-02-071-12/+1
|
* add support for more keypad keysHiltjo Posthuma2021-08-091-0/+11
| | | | | | 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.
* revert IME supportHiltjo Posthuma2019-03-031-12/+3
| | | | | | | dmenu will not handle IME support (st will, atleast for now). revert parts of commit 377bd37e212b1ec4c03a481245603c6560d0be22 this commit also broke input focus.
* improve xopenim error messageHiltjo Posthuma2019-02-121-1/+1
| | | | die() already prints a newline.
* fix crash when XOpenIM returns NULLHiltjo Posthuma2019-02-121-2/+11
| | | | for example when IME variables are set, but the program is not started (yet).
* Close when the embedding window is destroyedQuentin Rameau2019-02-041-1/+6
|
* Use slow path if stdin is a ttydok2019-01-271-3/+1
| | | | | 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.
* code-style for pledge: check the return code -1, not < 0Hiltjo Posthuma2018-05-251-1/+1
| | | | this is the proper idiom
* code-style for pledge(2)Hiltjo Posthuma2018-05-251-6/+5
| | | | feedback from Klemens, thanks
* Pledge on OpenBSDHiltjo Posthuma2018-05-251-0/+9
|
* Fix cursor drawn position with wide glyphsQuentin Rameau2018-04-221-1/+1
|
* Handle IME inputQuentin Rameau2018-04-221-1/+4
| | | | Thanks to nzl <uruabi@gmail.com> for the patch!
* Fix handling of input stringsHiltjo Posthuma2018-04-221-14/+21
|
* add key bindings for moving to the word start or endQuentin Rameau2018-03-131-0/+34
| | | | Mod1+b/^Left and Mod1+f/^Right
* Fix regression in 84a1bc5Hiltjo Posthuma2018-01-041-1/+2
| | | | | | Reported by Jochen Sprickerhof, thanks! Applied patch with minor change (only initialize `i` for XINERAMA).
* Instantiate j var outside #ifdef XINEMARA directive because it is used in ↵Vincent Carluer2018-01-041-3/+2
| | | | loop outside directive
* fix a possible free of a uninitialize variable in paste()Hiltjo Posthuma2017-11-031-4/+6
|
* init colors using SchemeLastHiltjo Posthuma2017-11-031-3/+2
| | | | this makes it slightly easier to add colors to schemes.
* Set class name on menu windowOmar Sandoval2017-11-031-0/+2
| | | | | | 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.
* Revert "fix input text matching"Andrew Gregory2016-12-111-1/+1
| | | | | | | 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.
* Xinerama: correct variable declarations in preprocessor conditionalThomas Gardner2016-11-251-5/+6
|
* add embedding support with -w optionQuentin Rameau2016-10-141-12/+53
|
* dmenu.1: group single optionsQuentin Rameau2016-10-141-2/+2
|
* die() consistency: always add newlineHiltjo Posthuma2016-08-121-4/+4
|
* fix crash if negative monitor (< -1) was passedHiltjo Posthuma2016-07-261-2/+2
| | | | for example: dmenu -m '-9001'
* Revert "Print highlighted input text only on single match"Hiltjo Posthuma2016-07-261-13/+3
| | | | | | | This reverts commit a4053bc4e403ae57343f43b7e363a0911bba5a3a. My bad, was working on the wrong branch and accidently pushed it... *facepalm*
* Print highlighted input text only on single matchQuentin Rameau2016-07-261-3/+13
| | | | | | 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.
* Partially revert 44c7de3: fix items text width offset calculationQuentin Rameau2016-07-251-2/+2
| | | | | Without this, we discard the item if it's longer than assigned width instead of truncating it.
* fix: Do not crash on e.g. dmenu < /dev/nullS. Gilles2016-06-281-1/+1
|
View Lorry Controller Status