summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-12Small bugfix for makeglyphfontspecs call in drawregionsuigin
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.
2015-05-07Clean up xdraws and optimize glyph drawing with non-unit kerning valuessuigin
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.
2015-05-06Changed type for UTF-32 codepoints from long to uint_least32_tsuigin
2015-05-04Fix empty selection highlighting bug.noname
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().
2015-05-04Fix indentation.noname
2015-05-04Add enumeration for sel.modenoname
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.
2015-05-04selnormalize: make special case explicitnoname
Special case is when regular selection spans multiple lines. Otherwise, just sort sel.ob.x and sel.ob.y.
2015-05-04selsnap: simplify SNAP_LINE casenoname
Also make sure y never exceeds term.row-1 even if ATTR_WRAP is set for some reason.
2015-05-04Remove first argument of selsnap.noname
2015-05-04Fix sigchldJochen Sprickerhof
Only wait for termination of the shell.
2015-04-27len assignment is never usedmvdan@mvdan.cc
Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
2015-04-27Clarify calculation precedence for '&' and '?'mvdan@mvdan.cc
Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
2015-04-27Use %u for uintmvdan@mvdan.cc
Signed-off-by: Daniel Martí <mvdan@mvdan.cc>
2015-04-27Optimize memory footprint of line bufferssuigin
2015-04-27Make tputc, tsetchar and techo accept unicodenoname@inventati.org
2015-04-27Change internal character representation.noname@inventati.org
2015-04-27Remove last parameter of utf8encodenoname@inventati.org
This parameter was always UTF_SIZ, so it is better remove it and use directly UTF_SIZ in it.
2015-04-27Use utf8len instead of utf8decode.noname@inventati.org
2015-04-27Make build shut up about system() without return value check.alp@alexpilon.ca
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.
2015-04-23Merge remote-tracking branch 'origin/master'Roberto E. Vargas Caballero
2015-04-23Fix segmentation fault in strhandle()Roberto E. Vargas Caballero
We cannot pass strescseq.args[0] to atoi when nargs is zero, because in this case it will be null.
2015-04-23Uses a &[] pointer loop instead of + pointer loopRoberto E. Vargas Caballero
2015-04-23Do not set terminal title based on stty arguments.noname@inventati.org
2015-04-21Move common code to xloadcolornoname@inventati.org
2015-04-21Use LEN(dc.col) instead of LEN(colorname).noname@inventati.org
LEN(colorname) may be below 256 for some configurations.
2015-04-21Remove WIN_REDRAW flag.noname@inventati.org
WIN_REDRAW flag was not used since introduction of Xdbe in commit 94771d05886fbdd2422e66b7c0256ab27fa375cb
2015-04-20Place memset arguments in the correct order.noname@inventati.org
2015-04-20Remove explicit 'return' from 'void' functions.noname@inventati.org
2015-04-20Increment accuaracy in drawtime calculationnoname@inventati.org
This way is a bit more accurate.
2015-04-20Monotonic clock cannot jump backwards.noname@inventati.org
The check was introduced back when st used gettimeofday. The condition is also modified to increment the accuaracy of the calculation.
2015-04-20Place tlinelen type on separate line.noname@inventati.org
2015-04-15Add tty line supportRoberto E. Vargas Caballero
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, ...).
2015-04-15Fix memmove() invocation with src/dst being NULLsin
This fixes a segmentation fault on some systems.
2015-04-14Use as command arguments the remaining parametersnoname@inventati.org
This change allows execute st as 'st mutt' while it keeps the compability with xterm and urxt.
2015-04-14Merge branch 'master' of ssh://suckless.org/gitrepos/stRoberto E. Vargas Caballero
2015-04-13Implement most ICCCM rules for selection handling.Markus Wichmann
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.
2015-04-13Merge branch 'master' of ssh://suckless.org/gitrepos/stRoberto E. Vargas Caballero
2015-04-13Do not use tmoveto in tputtab.noname@inventati.org
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.
2015-04-13tresize: remove unnecessary ifnoname@inventati.org
2015-04-13Remove old TODO entry.noname@inventati.org
It probably refers to http://lists.suckless.org/dev/1211/13427.html and does not seem like a bug in st.
2015-04-13Remove 'titles' variable.noname@inventati.org
We do not free it until exit anyway.
2015-04-13Remove useless if in tstrsequence.noname@inventati.org
2015-04-13Simplify tmoveto.noname@inventati.org
LIMIT returns value. This fact is already used in x2col and y2row.
2015-04-13Fix typo.noname@inventati.org
It seems that LICENSE files are more common than LICENCE files. At least this patch makes spelling consistent.
2015-04-13Remove 'slide' variable in tresize.noname@inventati.org
2015-04-13Move tresize comments around.noname@inventati.org
2015-04-13tresize: move for loop outside ifnoname@inventati.org
There is no need to check that slide > 0 before executing loop. If slide <= 0, loop stops immediately.
2015-04-13Simplify loop condition.noname@inventati.org
2015-04-13Remove unnecessary XFilterEvent call.noname@inventati.org
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.
2015-04-13Use do..while in window mapping loop.noname@inventati.org