aboutsummaryrefslogtreecommitdiffstats
path: root/st.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Use xwrite instead of write.noname2014-04-261-3/+3
|
* Remove unnecessary breaknoname2014-04-261-1/+0
|
* Comment fix.noname2014-04-251-1/+1
|
* On terminal resize, clear the alt screen with its own cursor.Colona2014-04-251-0/+2
| | | | | Currently the alternate screen get messed up on resize if it has different colors or mode.
* Optimize tputtab.noname2014-04-251-16/+12
| | | | | | | | Before this patch executing printf '\e[10000000000I' or printf '\e[10000000000Z' resulted in long delay.
* Use != instead of ^ for logical values.noname2014-04-251-1/+1
| | | | | sel.alt is only changed by sel.alt = IS_SET(MODE_ALTSCREEN);
* Use BETWEEN macro in xsetcolorname and fix style.noname2014-04-251-3/+3
|
* Conformity in the -g geometry handling.Christoph Lohmann2014-04-251-56/+50
| | | | | | | | Thanks to Yuri Karaban for suggesting this! These changes make -g correspond to <cols>x<rows> and honor it so non-tiling window managers can work with the size hints afterwards. It also adds a -i flag to force the window size. This is needed so -g keeps being useful in dwm.
* Simplify a bit more tdeletechar and tinsertblankRoberto E. Vargas Caballero2014-04-251-4/+6
| | | | | | The large and repeated expression used in memmove to indirect the line can be simplified using a pointer, that makes more clear where begins and where ends the movement.
* Simplify tdeletechar and tinsertblank and fix memory corruption.noname2014-04-251-18/+12
| | | | | | | | | | | | | | | Current CSI parsing code uses strtol to parse arguments and allows them to be negative. Negative argument is not properly handled in tdeletechar and tinsertblank and results in memory corruption in memmove. Reproduce with printf '\e[-500@' Patch also removes special handling for corner case and simplifies the code. Removed term.dirty[term.c.y] = 1 because tclearregion sets dirty flag.
* Style fixes in tscrollup.noname2014-04-231-3/+4
|
* Do not set dirty flag twice in tscrollup and tscrolldown.noname2014-04-231-3/+1
|
* Use tsetdirt in tscrollup and tscrolldown.noname2014-04-231-6/+4
| | | | | | | | | | | | | | | | | | | | tscrollup and tscrolldown do not use tsetdirt, but their code is equivalent to tsetdirt(orig, term.bot-n); tsetdirt(orig+n, term.bot); tclearregion also marks cleared lines as dirty. In tscrolldown it sets lines from term.bot-n+1 to term.bot dirty, and in tscrollup it sets lines from orig to orig+n-1 dirty. In both functions all lines from orig to term.bot are effectively set dirty, but in tscrolldown lines from orig+n to term.bot are set dirty twice, and in tscrollup lines from orig to term.bot-n are set dirty twice. These patches make it clear which lines are set dirty and sets them dirty once in each funciton.
* Fix techo handling of control and multibyte characters.noname2014-04-231-2/+2
| | | | | | | | | | | techo compares signed char to '\x20'. Any character with code less then '\x20' is treated as control character. This way characters with MSB set to 1 are considered control characters too. Also this patch makes techo display DEL character as ^?. To reprocuce the bug, enable echo mode using printf '\e[12l', then type DEL character or any non-ASCII character.
* Make xrealloc and xstrdup style consistent.noname2014-04-231-4/+2
|
* Use BETWEEN in tsetchar.noname2014-04-231-2/+1
|
* Use uint and uchar instead of unsigned int and unsigned char.noname2014-04-231-3/+3
|
remember that computers suck.