aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Limit usage of extern to config.h globalsDevin J. Pohly2018-02-254-27/+29
| | | | | | | | 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-253-39/+39
| | | | | | | | | | | 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-254-42/+40
| | | | | | | | | 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-254-47/+65
| | | | | | | | | | 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-254-83/+88
| | | | | | | | | | | | | 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-253-221/+240
| | | | | | | | | 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-253-25/+19
| | | | | | | 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-253-22/+22
| | | | | | | 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-253-41/+54
| | | | | | | | | | | 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-253-21/+19
| | | | | | | 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-252-7/+6
| | | | Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Rely on ttyresize to set tty sizeDevin J. Pohly2018-02-252-6/+3
| | | | | | | | 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-253-10/+5
| | | | | | | 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-253-11/+11
| | | | | | | | | 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-254-6/+13
| | | | | | | 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 X-related config.h types into x.cDevin J. Pohly2018-02-252-23/+24
| | | | | | No need to expose Shortcut, MouseShortcut, and Key anymore. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Remove unneeded array-length variablesDevin J. Pohly2018-02-251-15/+7
| | | | | | | These were only used in x.c, which now has direct visibility of the config.h arrays. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Inline clipboard functionsDevin J. Pohly2018-02-252-33/+19
| | | | | | | No need to keep a function that only calls another function in the same file. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move config.h include from st.c to x.cDevin J. Pohly2018-02-255-119/+91
| | | | | | | | 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-252-62/+41
| | | | | | | | | | | | 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-253-40/+33
| | | | | | | | 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-254-62/+68
| | | | | | | | 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-253-7/+7
| | | | | | 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-254-46/+45
| | | | | | 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-253-22/+15
| | | | Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
* Move window urgency handling entirely into x.cDevin J. Pohly2018-02-255-9/+10
| | | | | | 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-254-40/+39
| | | | | | | 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-254-19/+18
| | | | | | 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-253-14/+4
| | | | | | | | | 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>
* Fix color with FAINT attributeBenno Fünfstück2017-12-261-0/+1
| | | | The alpha value needs to be initialized as well.
* Apply ATTR_REVERSE after ATTR_FAINTBenno Fünfstück2017-12-261-6/+7
| | | | | | | | | | | | | | | | An example where the new behaviour makes more sense: Suppose some text is formatted with ATTR_FAINT for red for the foreground, so it is rendered in a dark red. In that case, when selected with the mouse, the intended behaviour is that foreground and background color are swapped: so the selection should be rendered in dark red and the text in the default background color. Before this patch, what happened was that the selection would be in normal red and the text in the darkened background color, making it almost unreadable. For an example application that uses the FAINT attribute, try dmesg from util-linux with color support, it uses FAINT for segfault messages.
* Fix FAQ typoGeorge Ornbo2017-12-211-1/+1
|
* Fix manpage typoParide Legovini2017-10-101-1/+1
| | | | Signed-off-by: Paride Legovini <pl@ninthfloor.org>
* Add an error for XftFontOpenPattern failure.Gary Allen Vollink2017-09-151-0/+3
|
* Revert "Revert "fixed STLDFLAG order in broken st Makefile""Hiltjo Posthuma2017-09-151-1/+1
| | | | | | | | | | This reverts commit 274d46ace00003d1df718b974d17642cbce167d5. Sorry, the original commit was correct after all. It allows has the correct link order and supports static-linking also. Just a reminder: it is important to give a (brief) rationale of the patch intentions.
* 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 "fixed STLDFLAG order in broken st Makefile"Hiltjo Posthuma2017-09-131-1/+1
| | | | | | | | This reverts commit 7f990328e4fec8dfaaad311cb8af2304b58c872e. this was wrong as pointed out by k0ga: "STLDFLAGS is about flags to the linker, for example -L not about -l for that reason it must go before the object list".
* Revert "make clipboard patch obsolete"Hiltjo Posthuma2017-09-021-1/+0
| | | | | | | This reverts commit 77c51c5a6b16387f1792e23acbcf2080f790aa25. Having multiple clipboards are useful, for example for plumber scripts. I've discussed this on IRC and it is useful to have.
* make clipboard patch obsoleteAnselm R Garbe2017-09-011-0/+1
|
* fixed STLDFLAG order in broken st MakefileAnselm R Garbe2017-07-231-1/+1
|
* Revert "Add bold off SGR"Quentin Rameau2017-07-121-3/+0
| | | | | This reverts commit 6cb6d61525931c88971cce323f63e40451a6d365. This wasn't a useful thing after all.
* Add dim/smxx/rmxx to terminfo, remove duplicate kich1Quentin Rameau2017-07-121-2/+5
|
* Let the user specify C and LD FLAGSQuentin Rameau2017-07-122-6/+6
|
* Do not obfuscate what make is doing.Quentin Rameau2017-07-122-41/+33
| | | | Change some styling too while we're at it.
* Add color change terminfo capabilitiesMarc André Tanner2017-06-031-0/+3
|
* Add bold off SGRQuentin Rameau2017-06-031-0/+3
|
* st.1: modify man page to accurately reflect default keybindingsgreg.reagle@umbc.edu2017-04-101-10/+7
| | | | | | | | | | | | | Attached. ===> 2/ (text/x-patch) [file] cp /mail/fs/mbox/298/2/body /usr/k0ga/0001-st.1-modify-man-page-to-accurately-reflect-default-k.patch From 265db94b1eca5850d484f86b7db4af8e57822cfe Mon Sep 17 00:00:00 2001 From: Greg Reagle <greg.reagle@umbc.edu> Date: Sun, 9 Apr 2017 23:05:47 -0400 Subject: [PATCH] st.1: modify man page to accurately reflect default keybindings
* Simplify how we keep ATTRs under cursorQuentin Rameau2017-04-041-3/+2
| | | | Thanks to tarug0 for the suggestion/patch.
* Fix commented out codeAlexander Krotov2017-03-291-1/+1
|
* keep some glyph modes for the cursorNils Reuße2017-03-291-0/+3
| | | | | | | | | | | | | st currently does not keep any mode for the cursor that was active in the underlying glyph (e.g. italic text), the mode is always ATTR_NULL [1]. At [2] you can find a screenshot that shows the implications. Other terminals (at least vte-based, such as XFCE-terminal) keep some modes for the cursor. I find the current behaviour very disruptive, so here is a patch that keeps a few (arbitrarily chosen) modes for the cursor. [1] http://git.suckless.org/st/tree/st.c#n3963 [2] http://i.imgur.com/R2yCEaC.png
remember that computers suck.