| Commit message (Collapse) | Author | Age |
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
This removes another reference to TermWindow from st.c.
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
|
|
|
|
|
|
| |
xresize is now internal to x.c
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
|
|
|
|
| |
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
|
|
|
|
|
|
| |
This allows us to make xseturgency internal.
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
run/usage/xinit are now all internal to x.c
Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
This reverts commit 6cb6d61525931c88971cce323f63e40451a6d365.
This wasn't a useful thing after all.
|
| |
|
| |
|
|
|
|
| |
This is used by, e.g., tmux.
|
| |
|
| |
|
|
|
|
| |
This reverts commit 424202798b02554092ba84dd59fb7b79b59b7b75.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
If fontconfig gives us a font without the attributes we asked for,
display an alternative color instead.
|
|
|
|
|
| |
We launch dmenu for getting a codepoint, then convert it and send it to
the terminal.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Thanks Ton van den Heuvel for the proposal!
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
This is just redundant metadata. Please add Java comment meta classes too.
|
|
|
|
| |
Signed-off-by: Christoph Lohmann <20h@r-36.net>
|
|
|
|
| |
Signed-off-by: Christoph Lohmann <20h@r-36.net>
|
|
|
|
|
| |
dvtm is too fast in starting up. It will then have a race condition in finding
the right. terminal size.
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Ttyread() calls to ttywrite, so if we check for reading before
that for writing in ttywrite we can get a circular call sequence.
|
| |
|
|
|
|
|
|
|
| |
ttywrite was assuming that if it could not write then it could
read, but this is not necessarily true, there are some situations
where you cannot read or write. The correct behaviour is to detect
if you can read or/and write.
|
|
|
|
|
|
| |
Keep everyone happy
Signed-off-by: Christoph Lohmann <20h@r-36.net>
|
|
|
|
| |
Keep the debile happy.
|