aboutsummaryrefslogtreecommitdiff
path: root/st.c
Commit message (Collapse)AuthorAgeFilesLines
* Limit usage of extern to config.h globalsDevin J. Pohly2018-02-251-12/+17
| | | | | | | | Prefer passing arguments to declaring external global variables. The only remaining usage of extern is for config.h variables which are needed in st.c instead of x.c (where it is now included). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Remove x.c dependency on termDevin J. Pohly2018-02-251-1/+21
| | | | | | | | | | | The xinit function only needs to the rows/cols, so pass those in rather than accessing term directly. With a bit of arithmetic, we are able to avoid the need for term.row and term.col in x2col, y2row, and xdrawglyphfontspecs as well, completing the removal. Term is now fully internal to st.c. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Pull term references out of xdrawcursorDevin J. Pohly2018-02-251-1/+14
| | | | | | | | | Gradually reducing x.c dependency on Term object. Old and new cursor glyph/position are passed to xdrawcursor. (There may be an opportunity to refactor further if we can unify "clear old cursor" and "draw new cursor" functionality.) Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move win-agnostic parts of draw/drawregion to st.cDevin J. Pohly2018-02-251-0/+25
| | | | | | | | | | Introduces three functions to encapsulate X-specific behavior: * xdrawline: draws a portion of a single line (used by drawregion) * xbegindraw: called to prepare for drawing (will be useful for e.g. Wayland) and returns true if drawing should happen * xfinishdraw: called to finish drawing (used by draw) Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Split mode bits between Term and TermWindowDevin J. Pohly2018-02-251-32/+32
| | | | | | | | | | | | | Moves the mode bits used by x.c from Term to TermWindow, absorbing UI/input-related mode bits (visible/focused/numlock) along the way. This is gradually reducing external references to Term. Since TermWindow is already internal to x.c, we add xsetmode() to allow st to modify window bits in accordance with escape sequences. IS_SET() is redefined accordingly (term.mode in st.c, win.mode in x.c). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move CRLF input processing into ttywriteDevin J. Pohly2018-02-251-3/+29
| | | | | | | | | This also allows us to remove the crlf field from the Key struct, since the only difference it made was converting "\r" to "\r\n" (which is now done automatically in ttywrite). In addition, MODE_CRLF is no longer referenced from x.c. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move terminal echo logic into st.cDevin J. Pohly2018-02-251-14/+9
| | | | | | | The only thing differentiating ttywrite and ttysend was the potential for echo; make this a parameter and remove ttysend. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move remaining selection mode logic into selextendDevin J. Pohly2018-02-251-2/+12
| | | | | | | The "done" parameter indicates a change which finalizes the selection (e.g. a mouse button release as opposed to motion). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move terminal-related selection logic into st.cDevin J. Pohly2018-02-251-0/+37
| | | | | | | | | | | The front-end determines information about mouse clicks and motion, and the terminal handles the actual selection start/extend/dirty logic by row and column. While we're in the neighborhood, we'll also rename getbuttoninfo() to mousesel() which is, at least, less wrong. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move X-specific selection info into XSelectionDevin J. Pohly2018-02-251-4/+0
| | | | | | | Data about PRIMARY/CLIPBOARD and clicks are part of the front-end, not the terminal. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Have selected() check whether selection existsDevin J. Pohly2018-02-251-1/+2
| | | | Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Rely on ttyresize to set tty sizeDevin J. Pohly2018-02-251-2/+1
| | | | | | | | This removes ttynew's dependency on cresize being called first, and then allows us to absorb the ttyresize call into cresize (which always precedes it). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Remove X and fontconfig from st.cDevin J. Pohly2018-02-251-5/+0
| | | | | | | None of the X-related includes are needed any longer. In addition, move the X modifier defines into x.c, as they are not used outside. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Remove Time argument from xsetselDevin J. Pohly2018-02-251-1/+1
| | | | | | | | | This is an X type and should be internal to x.c. The selcopy() function was a single line and only used in one place, so it was inlined to reduce LOC. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Make win variable internal to x.cDevin J. Pohly2018-02-251-5/+1
| | | | | | | There was only a single reference to the `win` variable in st.c, so exporting that to x.c allows us to rid ourselves of another extern. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move config.h include from st.c to x.cDevin J. Pohly2018-02-251-43/+4
| | | | | | | | config.h includes references to KeySyms and other X stuff. Until we come up with a cleaner way to separate configuration, it is simpler (leads to more code removal) to have this here. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Factor out equivalent code from ttyread/ttysendDevin J. Pohly2018-02-251-61/+40
| | | | | | | | | | | | The echo-to-terminal portions of ttyread and ttysend were actually doing the same thing. New function twrite() now handles this. The parameter show_ctrl determines whether control characters are shown as "^A". This was the only difference between tputc and techo, and techo is now unused and removed. (This commit should not change st's behaviour.) Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move opt_* into same file as main()/run()Devin J. Pohly2018-02-251-30/+20
| | | | | | | | This commit is purely about reducing externs and LOC. If the main and run functions ever move elsewhere (which will probably make sense eventually), these should come along with them. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move key-matching functions into x.cDevin J. Pohly2018-02-251-56/+2
| | | | | | | | Modifiers and keysyms are specific to X, and the functions match and kmap are only used in x.c. Needed to global-ize the key arrays and lengths from config.h (for now). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Pass new dimensions into ttyresizeDevin J. Pohly2018-02-251-3/+3
| | | | | | This removes another reference to TermWindow from st.c. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move window-manipulating functions into x.cDevin J. Pohly2018-02-251-36/+0
| | | | | | xresize is now internal to x.c Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move font/fontspec variables into x.c and XWindowDevin J. Pohly2018-02-251-11/+0
| | | | Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move window urgency handling entirely into x.cDevin J. Pohly2018-02-251-4/+1
| | | | | | This allows us to make xseturgency internal. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move zoom functions into x.cDevin J. Pohly2018-02-251-35/+1
| | | | | | | This makes x(un)loadfonts internal to x.c. Needed to reorder includes and move a typedef to keep the compiler happy. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move usage() to be with run() in x.cDevin J. Pohly2018-02-251-15/+0
| | | | | | run/usage/xinit are now all internal to x.c Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Call xsetenv() in main process instead of childDevin J. Pohly2018-02-251-6/+2
| | | | | | | | | This makes xsetenv internal to x.c, and allows iso14755's external command to use $WINDOWID instead of having to snprintf it again. (The same benefit will apply to the externalpipe patch.) The xwinid function is no longer needed. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* base64dec: skip non-printable characters like \r\nSuraj N. Kurapati2017-09-151-5/+12
| | | | | | | | Non-printable characters, such as line breaks, in a base64 encoded string violate the "string length must be a multiple of four" rule. This patch pads the result buffer by one extra unit of four bytes, and skips over non-printable characters found in the input string.
* Revert "Add bold off SGR"Quentin Rameau2017-07-121-3/+0
| | | | | This reverts commit 6cb6d61525931c88971cce323f63e40451a6d365. This wasn't a useful thing after all.
* Add bold off SGRQuentin Rameau2017-06-031-0/+3
|
* Fix commented out codeAlexander Krotov2017-03-291-1/+1
|
* Support xterm Ms feature to set clipboardosandov@osandov.com2017-03-191-0/+57
| | | | This is used by, e.g., tmux.
* Split X-specific code into x.cMichael Forney2017-01-201-1961/+65
|
* Move column and row default numbers into config.hfpqc2016-12-161-2/+0
|
* Revert "Initial font size issue."Roberto E. Vargas Caballero2016-11-241-3/+0
| | | | This reverts commit 424202798b02554092ba84dd59fb7b79b59b7b75.
* Fixed 'missing glyph doesn't use fontconfig config substitutions' bugSpencer Phippen2016-11-241-3/+19
| | | | | | | | | | | | | | | | XftFontMatch does display-specific font configuration (commit 528241a). Nice. Unfortunately, when we switched from FcFontMatch, we also stopped storing the post-Fc{Config,Default}Substitute FcPattern for future lookups. The result is that if a glyph isn't found in the primary font, secondary font lookups use the original FcPattern, not the configured one. If you have custom fontconfig rules (like me), this can be disappointing. I basically just copied the guts out of XftFontMatch[1] and saved the intermediate configured FcPattern. Could be related to the bug that inspired commit 4242027. [1]: https://cgit.freedesktop.org/xorg/lib/libXft/tree/src/xftfont.c
* Initial font size issue.ian@remmler.org2016-11-141-0/+3
| | | | | | | | | | | | | | | Hi, When I specify a font by point size (I'm using "Inconsolata:size=12"), characters that are substituted from another font because they are not in the main one appear too small. Doing a zoom reset fixes it. For example: Before: http://i.imgur.com/G4Mfv4X.png After: http://i.imgur.com/PMDhfQA.png I found that adding the pixel size (acquired from the initial font load) to the pattern then reloading the font fixes the problem. I'm not sure if this is a proper fix, though.
* Make strdump(), csidump(), print to stderrpl@ninthfloor.org2016-11-141-14/+15
| | | | | | | | | The two functions strdump(), csidump() are called to show errors and their output is introduced by a message printed to stderr. Thus, it it more consistent to have them print to stderr. Moreover stderr is unbuffered (at least on Linux), making problems immediately visible.
* Do not use color when font attributes are supportedQuentin Rameau2016-10-231-8/+32
| | | | | If fontconfig gives us a font without the attributes we asked for, display an alternative color instead.
* Add support for iso14755Quentin Rameau2016-10-181-0/+28
| | | | | We launch dmenu for getting a codepoint, then convert it and send it to the terminal.
* Add parsing of DCS q sequencesRoberto E. Vargas Caballero2016-09-141-23/+45
| | | | | | These sequences are used to operate with sixels, but they are still str sequences, so they are finished with \a, ST or with a C1 control code. This patch also disables utf8 handling for the case of sixels.
* Add support for enabling/disabling utfRoberto E. Vargas Caballero2016-09-131-17/+62
| | | | | | | There are some ocasions where we want to disable the enconding/decoding of utf8, mainly because it adds an important overhead. This is partial patch for ESC % G and ESC % @, where they modified the way that st reads and write from/to the serial line, but it does not modifies how it interacts with the X window part.
* Use XftFontMatch in place of FcFontMatch.Christoph Lohmann2016-06-031-4/+1
| | | | | | | | | | | | | | git am -s didn't like your patch: From: Mark Edgar <medgar123@gmail.com> XftFontMatch calls XftDefaultSubstitute which configures various match properties according to the user's configured Xft defaults (xrdb) as well as according to the current display and screen. Most importantly, the screen DPI is computed [1]. Without this, st uses a "default" DPI of 75 [2]. [1]: https://cgit.freedesktop.org/xorg/lib/libXft/tree/src/xftdpy.c?id=libXft-2.3.2#n535 [2]: https://cgit.freedesktop.org/fontconfig/tree/src/fcdefault.c?id=2.11.1#n255
* delete clipboard properties after pasting themv4hn2016-06-031-2/+1
| | | | | | | | | | | | | | https://tronche.com/gui/x/icccm/sec-2.html#s-2.4 specifies: > Once all the data in the selection has been retrieved, > the requestor should delete the property in the SelectionNotify request Most Clipboard-Owners ignore whether or not the property is already set, so this is mostly a cosmetic change to keep the windows property list clean. However, at least synergy decides to wait for the requestor to delete the properties if they are already set by a previous paste (from synergy). Signed-off-by: Christoph Lohmann <20h@r-36.net>
* Remove stupid assignation in memcpy()Roberto E. Vargas Caballero2016-04-151-2/+2
|
* st: Fix off-by-one error when calculating character width.Tor Andersson2016-03-091-2/+2
| | | | | | | | | | | | LEN(str) is one larger than strlen(str) because it also counts the zero terminator. The original code would include the .notdef glyph (since it'll try to encode character 0, which gets encoded to the .notdef glyph) when measuring the average dimensions of printable ascii characters. This causes problems with fonts like GNU Unifont where the .notdef glyph is not the same width as the usual half-width characters. Signed-off-by: Christoph Lohmann <20h@r-36.net>
* Fix vertical character alignment in some casesTon van den Heuvel2016-03-081-1/+1
| | | | | | | | | The y-position of a character found by asking fontconfig for a matching font does not take the border pixels into account, resulting in a slightly misaligned vertical position. Signed-off-by: Ton van den Heuvel <tonvandenheuvel@gmail.com> Signed-off-by: Christoph Lohmann <20h@r-36.net>
* Measure the single advance width with a heuristic methodRyusei Yamaguchi2016-03-081-1/+7
| | | | | | | | This fix is needed to use dual-width fonts, which have double-width glyphs (e.g. CJK unified ideographs). Signed-off-by: Ryusei Yamaguchi <mandel59@gmail.com> Signed-off-by: Christoph Lohmann <20h@r-36.net>
* xtermclear() is now done by xdrawglyphfontspecs()Christoph Lohmann2016-03-071-13/+0
| | | | Thanks Ton van den Heuvel for the proposal!
* Fix forgotten bracket and duplicate option in usage()Quentin Rameau2016-02-011-6/+8
| | | | | | | | | | Scratch the preceding patch, this one is more correct (don't forget to 'git am --scissors' ;)) -- >8 -- Also reformat the strings in a saner layout Signed-off-by: Christoph Lohmann <20h@r-36.net>
* Extract ttyresize() out of cresize()Quentin Rameau2016-01-301-4/+4
| | | | | | | This way we can call cresize() to set the terminal size before creating a tty or spawning a process, which will start with the correct size. Signed-off-by: Christoph Lohmann <20h@r-36.net>