aboutsummaryrefslogtreecommitdiffstats
path: root/st.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | set selection to IDLE on clearv4hn2015-05-151-0/+1
| | | | | | | | | | | | Otherwise a tangling bmotion event will consider the selection still valid and selnormalize segfaults because of an invalid sel.ob.y index.
* | Small bugfix for makeglyphfontspecs call in drawregionsuigin2015-05-121-1/+1
|/ | | | | | | | | Here's a patch that fixes a bug when calling `makedrawglyphfontspecs' in `drawregion'. Wasn't offseting the pointer into the input glyphs array by `x1'. The bug isn't causing any problems currently, because `drawregion' is always called with `x1' and `y1' values of 0, but if this ever changes in the future, the bug would certainly cause some problems.
* Clean up xdraws and optimize glyph drawing with non-unit kerning valuessuigin2015-05-071-196/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have another patch here for review that optimizes the performance of glyph drawing, primarily when using non-unit kerning values, and fixes a few other minor issues. It's dependent on the earlier patch from me that stores unicode codepoints in a Rune type, typedef'd to uint_least32_t. This patch is a pretty big change to xdraws so your scrutiny is appreciated. First, some performance numbers. I used Yu-Jie Lin termfps.sh shell script to benchmark before and after, and you can find it in the attachments. On my Kaveri A10 7850k machine, I get the following results: Before Patch ============ 1) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false" cwscale: 1.0, chscale: 1.0 For 273x83 100 frames. Elapsed time : 1.553 Frames/second: 64.352 Chars /second: 1,458,159 2) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true" cwscale: 1.001, chscale: 1.001 For 239x73 100 frames. Elapsed time : 159.286 Frames/second: 0.627 Chars /second: 10,953 After Patch =========== 3) Font: "Liberation Mono:pixelsize=12:antialias=false:autohint=false" cwscale: 1.0, chscale: 1.0 For 273x83 100 frames. Elapsed time : 1.544 Frames/second: 64.728 Chars /second: 1,466,690 4) Font: "Inconsolata:pixelsize=14:antialias=true:autohint=true" cwscale: 1.001, chscale: 1.001 For 239x73 100 frames. Elapsed time : 1.955 Frames/second: 51.146 Chars /second: 892,361 As you can see, while the improvements for fonts with unit-kerning is marginal, there's a huge ~81x performance increase with the patch when using kerning values other than 1.0. So what does the patch do? The `xdraws' function would render each glyph one at a time if non-unit kerning values were configured, and this was the primary cause of the slow down. Xft provides a handful of functions which allow you to render multiple characters or glyphs at time, each with a unique <x,y> position, so it was simply a matter of massaging the data into a format that would allow us to use one of these functions. I've split `xdraws' up into two functions. In the first pass with `xmakeglyphfontspecs' it will iterate over all of the glyphs in a given row and it will build up an array of corresponding XftGlyphFontSpec records. Much of the old logic for resolving fonts for glyphs using Xft and fontconfig went into this function. The second pass is done with `xrenderglyphfontspecs' which contains the old logic for determining colors, clearing the background, and finally rendering the array of XftGlyphFontSpec records. There's a couple of other things that have been improved by this patch. For instance, the UTF-32 codepoints in the Line's were being re-encoded back into UTF-8 strings to be passed to `xdraws' which in turn would then decode back to UTF-32 to verify that the Font contained a matching glyph for the code point. Next, the UTF-8 string was being passed to `XftDrawStringUtf8' which internally mallocs a scratch buffer and decodes back to UTF-32 and does the lookup of the glyphs all over again. This patch gets rid of all of this redundant round-trip encoding and decoding of characters to be rendered and only looks up the glyph index once (per font) during the font resolution phase. So this is probably what's responsible for the marginal improvements seen when kerning values are kept to 1.0. I imagine there are other performance improvements here too, not seen in the above benchmarks, if the user has lots of non-ASCII code plane characters on the screen, or several different fonts are being utilized during screen redraw. Anyway, if you see any problems, please let me know and I can fix them.
* Changed type for UTF-32 codepoints from long to uint_least32_tsuigin2015-05-061-25/+27
|
* Fix empty selection highlighting bug.noname2015-05-041-7/+5
| | | | | | | | | | | | | | When user clicks LMB, one character is selected, but will not be copied to selection until the user moves cursor a bit. Therefore, the character should not be highlighted as selected yet. Before the patch, the trick was not to mark line as dirty to avoid highlighting it. However, if user has already selected something and clicks in line that contains selection, selclear sets the line as dirty and one character is highlighted when it should not. This patch replaces dirty trick with explicit check for sel.mode inside selected().
* Fix indentation.noname2015-05-041-4/+4
|
* Add enumeration for sel.modenoname2015-05-041-9/+14
| | | | | | This patch also prevents sel.mode from increasing beyond 2. It is almost impossible, but sel.mode may overflow if mouse is moved around for too long while selecting.
* selnormalize: make special case explicitnoname2015-05-041-4/+4
| | | | | Special case is when regular selection spans multiple lines. Otherwise, just sort sel.ob.x and sel.ob.y.
* selsnap: simplify SNAP_LINE casenoname2015-05-041-3/+3
| | | | | Also make sure y never exceeds term.row-1 even if ATTR_WRAP is set for some reason.
* Remove first argument of selsnap.noname2015-05-041-5/+5
|
* Fix sigchldJochen Sprickerhof2015-05-041-1/+5
| | | | Only wait for termination of the shell.
* len assignment is never usedmvdan@mvdan.cc2015-04-271-1/+0
| | | | Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
* Clarify calculation precedence for '&' and '?'mvdan@mvdan.cc2015-04-271-3/+3
| | | | Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
* Use %u for uintmvdan@mvdan.cc2015-04-271-1/+1
| | | | Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
* Optimize memory footprint of line bufferssuigin2015-04-271-2/+2
|
* Make tputc, tsetchar and techo accept unicodenoname@inventati.org2015-04-271-62/+45
|
* Change internal character representation.noname@inventati.org2015-04-271-38/+35
|
* Remove last parameter of utf8encodenoname@inventati.org2015-04-271-5/+5
| | | | | This parameter was always UTF_SIZ, so it is better remove it and use directly UTF_SIZ in it.
* Use utf8len instead of utf8decode.noname@inventati.org2015-04-271-2/+1
|
* Make build shut up about system() without return value check.alp@alexpilon.ca2015-04-271-1/+2
| | | | | | | | | st.c:1321:2: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result] system(cmd); ^~~~~~ ~~~ Debatable whether an error here should case exit(EXIT_FAILURE). Just preserving the existing behaviour for now.
* Merge remote-tracking branch 'origin/master'Roberto E. Vargas Caballero2015-04-231-54/+30
|\
| * Move common code to xloadcolornoname@inventati.org2015-04-211-53/+29
| |
| * Use LEN(dc.col) instead of LEN(colorname).noname@inventati.org2015-04-211-2/+2
| | | | | | | | LEN(colorname) may be below 256 for some configurations.
* | Fix segmentation fault in strhandle()Roberto E. Vargas Caballero2015-04-231-2/+1
| | | | | | | | | | We cannot pass strescseq.args[0] to atoi when nargs is zero, because in this case it will be null.
* | Uses a &[] pointer loop instead of + pointer loopRoberto E. Vargas Caballero2015-04-231-1/+1
| |
* | Do not set terminal title based on stty arguments.noname@inventati.org2015-04-231-1/+1
|/
* Remove WIN_REDRAW flag.noname@inventati.org2015-04-211-14/+2
| | | | | WIN_REDRAW flag was not used since introduction of Xdbe in commit 94771d05886fbdd2422e66b7c0256ab27fa375cb
* Place memset arguments in the correct order.noname@inventati.org2015-04-201-1/+1
|
* Remove explicit 'return' from 'void' functions.noname@inventati.org2015-04-201-2/+0
|
* Increment accuaracy in drawtime calculationnoname@inventati.org2015-04-201-1/+1
| | | | This way is a bit more accurate.
* Monotonic clock cannot jump backwards.noname@inventati.org2015-04-201-2/+1
| | | | | | The check was introduced back when st used gettimeofday. The condition is also modified to increment the accuaracy of the calculation.
* Place tlinelen type on separate line.noname@inventati.org2015-04-201-1/+2
|
* Add tty line supportRoberto E. Vargas Caballero2015-04-151-12/+54
| | | | | | | | | | | Not always is desirable to create a pseudo terminal, and some times we want to open a terminal emulator over a tty line. With this new patch is possible to do someting like: $ st -l /dev/ttyS0 115200 Without this option was needed to launch another terminal emulator over st (for example minicom, picocom, cu, ...).
* Fix memmove() invocation with src/dst being NULLsin2015-04-151-2/+5
| | | | This fixes a segmentation fault on some systems.
* Use as command arguments the remaining parametersnoname@inventati.org2015-04-141-7/+10
| | | | | This change allows execute st as 'st mutt' while it keeps the compability with xterm and urxt.
* Merge branch 'master' of ssh://suckless.org/gitrepos/stRoberto E. Vargas Caballero2015-04-141-9/+14
|\
| * Implement most ICCCM rules for selection handling.Markus Wichmann2015-04-131-8/+13
| | | | | | | | | | | | | | | | ICCCM mandates the use of real timestamps to interact with the selection, to rule out race conditions if the clients are run at different speeds. I have implemented the low hanging fruit, putting the timestamps into text selection. Also, ICCCM mandates a check for whether XSetSelectionOwner() worked. Not sure my version is correct, though.
| * Merge branch 'master' of ssh://suckless.org/gitrepos/stRoberto E. Vargas Caballero2015-04-131-27/+21
| |\
| * | Do not use tmoveto in tputtab.noname@inventati.org2015-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tmoveto resets CURSOR_WRAPNEXT. Simple testcase: for i in $(seq 1 200); do printf '\t.'; usleep 100000; printf '\t@'; usleep 100000; done In st executing this script causes @ and . to overwrite each other in the last column.
* | | tresize: remove unnecessary ifnoname@inventati.org2015-04-131-4/+2
| | |
* | | Remove 'titles' variable.noname@inventati.org2015-04-131-5/+2
| | | | | | | | | | | | We do not free it until exit anyway.
* | | Remove useless if in tstrsequence.noname@inventati.org2015-04-131-15/+13
| | |
* | | Simplify tmoveto.noname@inventati.org2015-04-131-4/+2
| | | | | | | | | | | | LIMIT returns value. This fact is already used in x2col and y2row.
* | | Fix typo.noname@inventati.org2015-04-131-1/+1
| | | | | | | | | | | | | | | It seems that LICENSE files are more common than LICENCE files. At least this patch makes spelling consistent.
* | | Remove 'slide' variable in tresize.noname@inventati.org2015-04-131-5/+4
| | |
* | | Move tresize comments around.noname@inventati.org2015-04-131-6/+5
| | |
* | | tresize: move for loop outside ifnoname@inventati.org2015-04-131-5/+4
| | | | | | | | | | | | | | | There is no need to check that slide > 0 before executing loop. If slide <= 0, loop stops immediately.
* | | Simplify loop condition.noname@inventati.org2015-04-131-1/+1
| | |
* | | Remove unnecessary XFilterEvent call.noname@inventati.org2015-04-131-2/+0
| | | | | | | | | | | | | | | | | | | | | XFilterEvent usually filters KeyPress events according to input method. At this point the window is not mapped. The only events that we process are ConfigureNotify and MapNotify. They should not be filtered by input method.
* | | Use do..while in window mapping loop.noname@inventati.org2015-04-131-4/+2
| |/ |/|
remember that computers suck.