aboutsummarylogtreecommitdiffstats
path: root/st.h
AgeCommit message (Collapse)Author
2018-02-25Clean up #includesDevin J. Pohly
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Reduce visibility wherever possibleDevin J. Pohly
When possible, declare functions/variables static and move struct definitions out of headers. In order to allow utf8decode to become internal, use codepoint for DECSCUSR extension directly. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Limit usage of extern to config.h globalsDevin J. Pohly
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>
2018-02-25Remove x.c dependency on termDevin J. Pohly
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>
2018-02-25Pull term references out of xdrawcursorDevin J. Pohly
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>
2018-02-25Move win-agnostic parts of draw/drawregion to st.cDevin J. Pohly
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>
2018-02-25Split mode bits between Term and TermWindowDevin J. Pohly
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>
2018-02-25Move terminal echo logic into st.cDevin J. Pohly
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>
2018-02-25Move remaining selection mode logic into selextendDevin J. Pohly
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>
2018-02-25Move terminal-related selection logic into st.cDevin J. Pohly
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>
2018-02-25Move X-specific selection info into XSelectionDevin J. Pohly
Data about PRIMARY/CLIPBOARD and clicks are part of the front-end, not the terminal. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Make win variable internal to x.cDevin J. Pohly
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>
2018-02-25Move X-related config.h types into x.cDevin J. Pohly
No need to expose Shortcut, MouseShortcut, and Key anymore. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move config.h include from st.c to x.cDevin J. Pohly
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>
2018-02-25Factor out equivalent code from ttyread/ttysendDevin J. Pohly
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>
2018-02-25Move opt_* into same file as main()/run()Devin J. Pohly
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>
2018-02-25Move key-matching functions into x.cDevin J. Pohly
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>
2018-02-25Pass new dimensions into ttyresizeDevin J. Pohly
This removes another reference to TermWindow from st.c. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move window-manipulating functions into x.cDevin J. Pohly
xresize is now internal to x.c Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move font/fontspec variables into x.c and XWindowDevin J. Pohly
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move window urgency handling entirely into x.cDevin J. Pohly
This allows us to make xseturgency internal. Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2018-02-25Move zoom functions into x.cDevin J. Pohly
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>
2018-02-25Move usage() to be with run() in x.cDevin J. Pohly
run/usage/xinit are now all internal to x.c Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
2017-01-20Split X-specific code into x.cMichael Forney
2009-06-16added/removed files, updated Makefile.Aurélien Aptel
2009-06-11added sigchld handler, cleaned error checking.Aurélien Aptel
2009-05-14handle tabulation (still not perfect)Aurélien Aptel
2009-05-14removed the truecolor stuffAurélien Aptel
2009-05-10backport of local changesAnselm R Garbe