xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-01-11 18:42:29 +00:00
Code Issues Projects Releases Wiki Activity

Add iterm tiling support

Browse Source 
Also, block sixel attempts, since that is not implemented.
This commit is contained in:
Jarrod Johnson
2025-04-22 10:58:25 -04:00
parent 94af42031e
commit bfdd6a56f6
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
confluent_client/bin/nodeconsole
View File

@@ -171,7 +171,7 @@ def draw_image(data, width, height):
if imageformat == 'sixel':
sixel_draw(data)
elif imageformat == 'iterm':
iterm_draw(data)
iterm_draw(data, width, height)
else:
kitty_draw(data, width, height)
@@ -183,11 +183,15 @@ def sixel_draw(data):
binfile.seek(0)
DumbWriter().draw(binfile)
def iterm_draw(data):
def iterm_draw(data, width, height):
if not height:
height = 'auto'
if not width:
width = 'auto'
bindata = base64.b64decode(data)
datalen = len(bindata)
sys.stdout.write(
'\x1b]1337;File=inline=1;size={}:'.format(datalen))
'\x1b]1337;File=inline=1;width={};height={};size={}:'.format(width,height,datalen))
sys.stdout.write(data.decode('utf8'))
sys.stdout.write('\a')
sys.stdout.write('\n')
@@ -282,6 +286,10 @@ if options.screenshot:
cheight = None
sess = client.Command()
if options.tile:
imageformat = os.environ.get('CONFLUENT_IMAGE_PROTOCOL', 'kitty')
if imageformat not in ('kitty', 'iterm'):
sys.stderr.write('Tiled screenshots only supported with kitty or iterm protocol')
sys.exit(1)
allnodes = []
numnodes = 0
for res in sess.read('/noderange/{}/nodes/'.format(args[0])):
@@ -323,10 +331,11 @@ if options.screenshot:
sys.exit(1)
sticky_cursor()
sys.stdout.write('{}: '.format(node))
draw_image(imgdata.encode(), cwidth, cheight - 1)
sys.stdout.write(f'\x1b[{cwidth}D')
sys.stdout.write(f'\x1b[{cheight - 1}A')
# one row is used by our own name, so cheight - 1 for that allowance
draw_image(imgdata.encode(), cwidth, cheight - 1 if cheight else cheight)
if node in nodepositions:
sys.stdout.write(f'\x1b[{cwidth}D')
sys.stdout.write(f'\x1b[{cheight - 1}A')
reset_cursor(node)
else:
sys.stdout.write('\n')