aboutsummaryrefslogtreecommitdiffstats
path: root/st.c
Commit message (Collapse)AuthorAgeFilesLines
* Render faint attributeAnders Eurenius2014-07-081-1/+9
| | | | | | | | | Faint text is implemented by allocating a new color at one-half intensity of each of the r, g, b components, or if the text bold at the same time, it is not made lighter. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com> Signed-off-by: Christoph Lohmann <20h@r-36.net>
* Remove all strcmp and strlen calls on Glyph.c[]Ivan Delalande2014-07-081-26/+16
| | | | | | | | | | There were a few occurrences of strcmp and strlen being called on Glyph.c[], which is not always null-terminated (this actually depends on the last values in the buffer s in ttyread()). This patch replace all the calls to strcmp with a test on c[0] directly or a call to tlinelen, and the one to strlen with utf8len. I also took the opportunity to refactor getsel and tdumpline. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Render struck-out attributeAnders Eurenius2014-06-271-0/+5
| | | | | | | | Implement crossed-out text with an XftDrawRect call, similar to how underline is implemented. The line is drawn at 2/3 of the font ascent, which seems to work nicely in practice. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Render invisible attributeAnders Eurenius2014-06-271-0/+3
| | | | | | | | | Implement invisible mode by setting the foreground color to be the same as the background color. Not rendering anything would also be an alternative, but this seems less likely to cause surprises in conjunction with any hacks. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Reorder and extend glyph attributesAnders Eurenius2014-06-271-14/+46
| | | | | | | | | | Faint, invisible, struck and fast blink are added as glyph attributes. Since there's an edit here, let's take the opportunity to reorder them so that they correspond to the two's power of the corresponding escape code. (just for neatness, let's hope that property never gets used for anything.) Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Remove CEIL macroRoberto E. Vargas Caballero2014-06-261-3/+3
| | | | | | | | This macro was not correct in some cases, and it was used only in one place, where we did'nt get any benefit in performance of in size, so the macro is removed and ceilf is used instead of it. The only function needed from math.h is ceilf, so this patch defines the prototype of it instead of including math.h.
* Fixed wrong nanosecond factor 10E6.Ivan Delalande2014-06-261-3/+3
| | | | | | | | | | Commit 5edeec1 introduced a wrong factor for nanosecond computation, the correct value is 1E6. Time and timeout values are 10 times less than they should be and this cause high CPU usage. Reported by pyroh on IRC. Thanks! Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Use monotonic clock to prevent timing issuesFRIGN2014-06-241-14/+13
| | | | | | | | | | | | | | This patch replaces the gettimeofday()/timeval-system with uses of clock_gettime() with a monolithic clock and timespec-structs. gettimeofday() is not accurate and prone to jumps and POSIX.1-2008 marks it as obsolete. Read more here [0]. The patch should speak for itself and decreases the binary size for me by almost 200K(!). [0]: http://blog.habets.pp.se/2010/09/gettimeofday-should-never-be-used-to-measure-time Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* update size hints on zoomTroy Sankey2014-06-211-0/+1
| | | | | | | On font zooming (i.e. xzoom()), window size hints are not updated. This patch does that. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Refactor the innermost loop of the xdraws functionSilvan Jegen2014-06-151-20/+14
| | | | | Signed-off-by: Silvan Jegen <s.jegen@gmail.com> Signed-off-by: Christoph Lohmann <20h@r-36.net>
* Style police.Christoph Lohmann2014-06-071-2/+3
|
* Simplify tdeftransRoberto E. Vargas Caballero2014-06-071-10/+5
|
* Remove unnecessary typedefFRIGN2014-06-061-1/+0
| | | | | | | This should also fix compiling-errors on OpenBSD, as reported by Nils R. Thanks! Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Refactor selsnap SNAP_WORD.Colona2014-06-051-23/+21
| | | | | | | | Refactor the SNAP_WORD part in selsnap, and fix a bug that caused the word delimiters to be ignored if it was at the very beginning or end of a wrapped line. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Fix rectangular selection.Colona2014-06-041-1/+1
| | | | | | | | | selsort computes the wrong normalized coordinates when rectangular selection is enabled, causing rectangular selection to only work when going toward either the top left corner, or the bottom right one. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* tiny cleanupHiltjo Posthuma2014-06-041-5/+2
| | | | Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Make selection consistent over line breaks.Colona2014-06-041-20/+26
| | | | | | | | | | | Currently, selection is expanded to the end of the line over line breaks only in regular selection mode, when the line in not empty and when going down and/or right. This covers all the cases including word selection mode, with the exception of rectangular selection because it would make this mode too rigid. This adjustment is made in selsort so I renamed it to selnormalize to better reflect what it does now. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Fixing color and refactor xsetcolorname.Christoph Lohmann2014-06-011-38/+50
| | | | | | | | | | | By the recommendation of FRIGN I refactored xsetcolorname to remove the unnecessary r, g, b variables when allocating a new color. Colors are now freed and set to the new color. A die() should not happen here. Oth‐ erwise it is easy for applications to kill st. St should be resilent to malicious input. Second this patch standardises the naming of »color«. There is no »colour« here. Maybe in some parts of the world.
* Revert "Refactor xsetcolorname()"Christoph Lohmann2014-06-011-14/+18
| | | | This reverts commit a32c5f5726f514b49bd396f27aab0e78c40126d3.
* Refactor xsetcolorname()FRIGN2014-06-011-18/+14
| | | | | | | | | | | | | | | I mainly improved the slightly off algorithm used to load colours in the 256-colour-space and removed unnecessary local values (r,g,b,colour). "colour" is not necessary as a punchbag for XftColorAlloc[Value,Name], as they don't mess with the result-adress until they are absolutely sure everything worked out[0]. Being at it, I changed the error-returns for AllocValue to dies (just like in xloadcols()), as a failure is most likely an OOM-situation you better catch early. In case of an invalid name everything stays the same. [0]: http://www.opensource.apple.com/source/X11libs/X11libs-40/libXft/libXft-2.1.13/src/xftcolor.c Signed-off-by: Christoph Lohmann <20h@r-36.net>
* Don't report release events for mouse wheelBalazs Kezes2014-06-011-0/+2
| | | | Signed-off-by: Christoph Lohmann <20h@r-36.net>
* Fixing italic bold.Christoph Lohmann2014-06-011-2/+7
| | | | Thanks Felipe Spychalski <spychalski@gmail.com> for the patch!
* Fixed copying empty lines inside selection.Alexander2014-05-271-1/+1
| | | | | | The code was assuming that empty lines have implicit wrap-around attribute. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
* Fixing trailing whitespaces.Christoph Lohmann2014-05-241-3/+3
|
* Fix colour-model and simplify xloadcols()FRIGN2014-05-241-36/+20
| | | | Signed-off-by: Christoph Lohmann <20h@r-36.net>
* Allow mouse selection override using ShiftMaskHiltjo Posthuma2014-05-141-4/+4
| | | | | | | | | | | Similar to xterm or urxvt holding shift before selecting text with the mouse allows to override copying text. For example in tmux with "mode-mouse on" or vim (compiled with --with-x), mc, htop, etc. forceselmod in config.h sets the modifier to use this mode, by default ShiftMask. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>
* Redraw needs all dirty lines to have flash etc. work.Christoph Lohmann2014-05-091-0/+1
|
* End a sequence only on CAN, SUB, \a and C1s.Colona2014-05-091-6/+8
|
* Also clears ESC_START on interrupt characters during sequences.Colona2014-05-091-1/+1
| | | | | | Otherwise, the rest of the input is interpreted as a new escape sequence. For the ESC character, ESC_START is re-set in tcontrolcode.
* Consistent FALLTHROUGH comments.noname2014-05-021-3/+3
|
* Fix displaying control codeRoberto E. Vargas Caballero2014-04-301-13/+9
| | | | | Control code are never displayed. It is not important if graphic charset is displayed or not.
* Remove ATTR_GFX and tselcsRoberto E. Vargas Caballero2014-04-291-22/+8
| | | | | | | | ATTR_GFX was used long time ago to detect when terminal was in graphic mode. Today graphic mode is implemented using a charset pointer, so ATTR_GFX is not needed anymore because graphic condition can be detected directly checking if current charset is GRAPHICS C0.
* Do not save cursor in tresize.noname2014-04-291-1/+3
| | | | | | | | | | | This patch fixes the bug introduced in 8f11e1cd034ff28ca47bb4955505db7fa8016ba8 To reproduce the bug: 1. Save cursor: printf '\e[s' 2. Load cursor: printf '\e[u' 3. Resize st window. 4. Load cursor again: printf '\e[u'
* Simplify selected().noname2014-04-281-11/+6
|
* Simplify xunloadfonts.noname2014-04-281-6/+2
|
* Remove one indentation level in getsel().noname2014-04-281-46/+45
|
* Remove unused dump() function.noname2014-04-281-10/+0
|
* Add missing function prototypes.noname2014-04-281-0/+5
|
* Use MODBIT in xseturgency.noname2014-04-281-1/+1
|
* Compute ena_sel as one expression.noname2014-04-281-4/+1
|
* Simplify expressions in tputc()Roberto E. Vargas Caballero2014-04-281-9/+9
|
* Fix misplaced breakRoberto E. Vargas Caballero2014-04-281-1/+1
| | | | | This misplaced break was causing an incorrect fall through from DSR to DECSTBM.
* Create a function for DEC testRoberto E. Vargas Caballero2014-04-281-9/+15
| | | | | | Almost of the sequences execute their action in a separate function, which is good because helps to read the full set of sequences faster.
* Fix tputc control code handlingRoberto E. Vargas Caballero2014-04-281-12/+8
| | | | | | | | | The patch 53105cf modified how control codes were detected, because it tried to handle also C1 control codes (0x80-0x9f), that have upper bit to 1, so they are multi byte character in utf8. Code was checking the value of width in order to known that after decoding the unicode point had a width of 1 byte, but it as incorrect because this width is the columnb width.
* Remove repeated initialisation of term.escRoberto E. Vargas Caballero2014-04-271-18/+6
| | | | | | Once a sequence is completed term.esc must return to 0, so instead of repeating this expression in all the cases is better put it at the end of the block.
* Cancel DCS with SUB, CAN, ESC or any CC1 codeRoberto E. Vargas Caballero2014-04-271-79/+127
| | | | | | | | | | | | | | | | | | | | | | From http://www.vt100.net/docs/vt510-rm/chapter4: *The VT510 ignores all following characters until it receives a SUB, ST, or any other C1 control character. So OSC, PM and APC sequence ends with a SUB (it cancels the sequence and show a question mark as error), ST or any another C1 (8 bits) code, or their C0 (7 bits) equivalent sequences (at this moment we do not handle C1 codes, but we should). But it is also said that: Cancel CAN 1/8 Immediately cancels an escape sequence, control sequence, or device control string in progress. In this case, the VT510 does not display any error character. Escape ESC 1/11 Introduces an escape sequence. ESC also cancels any escape sequence, control sequence, or device control string in progress.
* add break;s for last cases in switch statementsMarkus Teich2014-04-271-0/+4
|
* Do not eat ESC character if control string is not properly terminated.noname2014-04-261-5/+3
| | | | | | | | | | | | | | | | | | Currently tputc handles the case of too long control string waiting for the end of control string. Another case is when there is ESC character is encountered but is not followed by '\\'. In this case st stops processing control string, but ESC character is ignored. After this patch st processes ESC characters in control strings properly. Test case: printf '\e]0;abc\e[1mBOLD\e[0m' Also ^[\ is actually processed in the code that handles ST. According to ECMA-048 ST stands for STRING TERMINATOR and is used to close control strings.
* Fix for multibyte characters in techo.noname2014-04-261-1/+1
| | | | Works for both signed and unsigned char.
* s/DSC/DCS/ DCS stands for DEVICE CONTROL STRINGnoname2014-04-261-2/+2
|
remember that computers suck.