itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Alter get_text_range call based on VTE version 

In vte 0.72 there was a regression that caused
Vte.Terminal.get_text_range() to fail to return the text requested
However, in the same version, there was a new call introduced that
does retrieve the text, so if I detect a vte minor version above
72, I call that instead.
This commit is contained in:
Matt Rose 2023-06-17 21:31:00 -04:00
parent 2285ceb68b
commit 1a4921b262
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
terminatorlib/plugins/logger.py
View File

@ -6,7 +6,7 @@ terminals """
import os import os
import sys import sys
from gi.repository import Gtk from gi.repository import Gtk,Vte
import terminatorlib.plugin as plugin import terminatorlib.plugin as plugin
from terminatorlib.translation import _ from terminatorlib.translation import _
@ -19,6 +19,7 @@ class Logger(plugin.MenuItem):
dialog_action = Gtk.FileChooserAction.SAVE dialog_action = Gtk.FileChooserAction.SAVE
dialog_buttons = (_("_Cancel"), Gtk.ResponseType.CANCEL, dialog_buttons = (_("_Cancel"), Gtk.ResponseType.CANCEL,
_("_Save"), Gtk.ResponseType.OK) _("_Save"), Gtk.ResponseType.OK)
vte_version = Vte.get_minor_version()
def __init__(self): def __init__(self):
plugin.MenuItem.__init__(self) plugin.MenuItem.__init__(self)
@ -40,8 +41,11 @@ class Logger(plugin.MenuItem):
def write_content(self, terminal, row_start, col_start, row_end, col_end): def write_content(self, terminal, row_start, col_start, row_end, col_end):
""" Final function to write a file """ """ Final function to write a file """
content = terminal.get_text_range(row_start, col_start, row_end, col_end, if self.vte_version < 72:
content = terminal.get_text_range(row_start, col_start, row_end, col_end,
lambda *a: True) lambda *a: True)
else:
content = terminal.get_text_range_format(Vte.Format.TEXT,row_start, col_start, row_end, col_end)
content = content[0] content = content[0]
fd = self.loggers[terminal]["fd"] fd = self.loggers[terminal]["fd"]
# Don't write the last char which is always '\n' # Don't write the last char which is always '\n'