limepotato/jexer
1
0
Fork 0
mirror of https://gitlab.com/AutumnMeowMeow/jexer synced 2024-09-19 03:40:20 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Jexer image protocol performance

Browse source
This commit is contained in:
Kevin Lamonte 2019-11-02 19:58:10 -05:00
parent 101bc589ae
commit 977b473d95
2 changed files with 85 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
examples/imgls Executable file
View file

@ -0,0 +1,64 @@
#!/bin/bash
# This is a modified version of the 'imgls' from iTerm2 located at
# https://iterm2.com/utilities/imgls, modified to emit images with the
# Jexer image protocol.
# tmux requires unrecognized OSC sequences to be wrapped with DCS tmux;
# <sequence> ST, and for all ESCs in <sequence> to be replaced with ESC ESC. It
# only accepts ESC backslash for ST.
function print_osc() {
if [ x"$TERM" = "xscreen" ] ; then
printf "\033Ptmux;\033\033]"
else
printf "\033]"
fi
}
function check_dependency() {
if ! (builtin command -V "$1" > /dev/null 2>& 1); then
echo "imgcat: missing dependency: can't find $1" 1>& 2
exit 1
fi
}
# More of the tmux workaround described above.
function print_st() {
if [ x"$TERM" = "xscreen" ] ; then
printf "\a\033\\"
else
printf "\a"
fi
}
function list_file() {
fn=$1
test -f "$fn" || return 0
if [ "${fn: -4}" == ".png" ]; then
print_osc
printf '444;1;1;'
base64 < "$fn"
print_st
elif [ "${fn: -4}" == ".jpg" ]; then
print_osc
printf '444;2;1;'
base64 < "$fn"
print_st
fi
}
check_dependency base64
if [ $# -eq 0 ]; then
for fn in *
do
list_file "$fn"
done < <(ls -ls)
else
for fn in "$@"
do
list_file "$fn"
done
fi

25
src/jexer/tterminal/ECMA48.java
View file

@ -4778,13 +4778,22 @@ public class ECMA48 implements Runnable {
private void oscPut(final char xtermChar) {
// System.err.println("oscPut: " + xtermChar);
boolean oscEnd = false;
if (xtermChar == 0x07) {
oscEnd = true;
}
if ((xtermChar == '\\')
&& (collectBuffer.charAt(collectBuffer.length() - 1) == '\033')
) {
oscEnd = true;
}
// Collect first
collectBuffer.append(xtermChar);
// Xterm cases...
if ((xtermChar == 0x07)
|| (collectBuffer.toString().endsWith("\033\\"))
) {
if (oscEnd) {
String args = null;
if (xtermChar == 0x07) {
args = collectBuffer.substring(0, collectBuffer.length() - 1);
@ -4867,11 +4876,19 @@ public class ECMA48 implements Runnable {
private void pmPut(final char pmChar) {
// System.err.println("pmPut: " + pmChar);
boolean pmEnd = false;
if ((pmChar == '\\')
&& (collectBuffer.charAt(collectBuffer.length() - 1) == '\033')
) {
pmEnd = true;
}
// Collect first
collectBuffer.append(pmChar);
// Xterm cases...
if (collectBuffer.toString().endsWith("\033\\")) {
if (pmEnd) {
String arg = null;
arg = collectBuffer.substring(0, collectBuffer.length() - 2);