[bug 846] 846-mouseless-keyboard-url-open-fails-to-extract-text-and-clear-search-between-commands #846
- this includes the changes in #835 since its required to decouple - made plugin dependent on focus-in and removed tab-change - plugin is now decoupled from main terminator code
This commit is contained in:
parent
c7c9fd0d4b
commit
b052da7efc
@ -48,6 +48,8 @@ class MouseFreeURLHandler(plugin.Plugin):
|
|||||||
keyb = KeyBindUtil(config)
|
keyb = KeyBindUtil(config)
|
||||||
matches = []
|
matches = []
|
||||||
matches_ptr = -1
|
matches_ptr = -1
|
||||||
|
vte = None
|
||||||
|
cur_term = None
|
||||||
#basic pattern
|
#basic pattern
|
||||||
searchtext = "https?\:\/\/[^\s]+[\/\w]"
|
searchtext = "https?\:\/\/[^\s]+[\/\w]"
|
||||||
|
|
||||||
@ -64,16 +66,9 @@ class MouseFreeURLHandler(plugin.Plugin):
|
|||||||
[PluginUrlLaunch, PluginUrlActLaunch, "<Alt>Return"])
|
[PluginUrlLaunch, PluginUrlActLaunch, "<Alt>Return"])
|
||||||
|
|
||||||
def connect_signals(self):
|
def connect_signals(self):
|
||||||
#this is not giving list off all connected terminals in window
|
for term in Terminator().terminals:
|
||||||
dbg("direct terminals: %s" % Terminator().terminals)
|
|
||||||
|
|
||||||
#get list of all terminals indirectly
|
|
||||||
terms = Terminator().terminals[0]
|
|
||||||
dbg("in-direct get terminals: %s" % terms.terminator.terminals)
|
|
||||||
|
|
||||||
for term in terms.terminator.terminals:
|
|
||||||
dbg("signal connect term:%s" % term)
|
dbg("signal connect term:%s" % term)
|
||||||
term.connect('tab-change', self.on_focus_in)
|
term.connect('focus-in', self.on_focus_in)
|
||||||
|
|
||||||
self.windows = Terminator().get_windows()
|
self.windows = Terminator().get_windows()
|
||||||
for window in self.windows:
|
for window in self.windows:
|
||||||
@ -81,9 +76,7 @@ class MouseFreeURLHandler(plugin.Plugin):
|
|||||||
|
|
||||||
def unload(self):
|
def unload(self):
|
||||||
dbg("unloading")
|
dbg("unloading")
|
||||||
#disconnect all signals and events
|
for term in Terminator().terminals:
|
||||||
terms = Terminator().terminals[0]
|
|
||||||
for term in terms.terminator.terminals:
|
|
||||||
try:
|
try:
|
||||||
term.disconnect_by_func(self.on_focus_in)
|
term.disconnect_by_func(self.on_focus_in)
|
||||||
except:
|
except:
|
||||||
@ -107,23 +100,30 @@ class MouseFreeURLHandler(plugin.Plugin):
|
|||||||
def extract(self):
|
def extract(self):
|
||||||
#can we do extract more efficiently
|
#can we do extract more efficiently
|
||||||
col, row = self.vte.get_cursor_position()
|
col, row = self.vte.get_cursor_position()
|
||||||
(txt, attr) = self.vte.get_text_range(0,0,row, col)
|
(txt, attr) = self.vte.get_text_range_format(
|
||||||
|
Vte.Format.TEXT, 0, 0, row, col)
|
||||||
self.matches = re.findall(self.searchtext, txt)
|
self.matches = re.findall(self.searchtext, txt)
|
||||||
self.matches_ptr = len(self.matches)-1
|
self.matches_ptr = len(self.matches)-1
|
||||||
|
|
||||||
def get_term(self):
|
|
||||||
return Terminator().last_focused_term
|
|
||||||
|
|
||||||
def get_selected_url(self):
|
def get_selected_url(self):
|
||||||
if len(self.matches):
|
if len(self.matches):
|
||||||
dbg("found selected URL (%s %s %s)" %
|
dbg("found selected URL (%s %s)" %
|
||||||
(self.matches_ptr, self.matches[self.matches_ptr], self))
|
(self.matches_ptr, self.matches[self.matches_ptr]))
|
||||||
return self.matches[self.matches_ptr]
|
return self.matches[self.matches_ptr]
|
||||||
dbg("selected URL (%s %s)" % (self.matches_ptr, "not found"))
|
dbg("selected URL (%s %s)" % (self.matches_ptr, "not found"))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def on_focus_in(self, widget, event):
|
def get_focussed_terminal(self):
|
||||||
dbg("focus-in clear url search buffer: %s" % self)
|
"""iterate over all the terminals to find which, if any, has focus"""
|
||||||
|
for terminal in Terminator().terminals:
|
||||||
|
if terminal.get_vte().has_focus():
|
||||||
|
return(terminal)
|
||||||
|
return(None)
|
||||||
|
|
||||||
|
def on_focus_in(self, widget, event = None):
|
||||||
|
dbg("focus-in clear url search buffer widget: %s" % widget)
|
||||||
|
self.cur_term = self.get_focussed_terminal()
|
||||||
|
self.vte = self.cur_term.get_vte()
|
||||||
self.clear_search()
|
self.clear_search()
|
||||||
|
|
||||||
def on_keypress(self, widget, event):
|
def on_keypress(self, widget, event):
|
||||||
@ -160,8 +160,8 @@ class MouseFreeURLHandler(plugin.Plugin):
|
|||||||
self.get_selected_url() # dbg url print
|
self.get_selected_url() # dbg url print
|
||||||
self.vte.copy_clipboard()
|
self.vte.copy_clipboard()
|
||||||
return True
|
return True
|
||||||
|
else:
|
||||||
self.vte.search_find_previous()
|
self.vte.search_find_previous()
|
||||||
|
|
||||||
if self.matches_ptr > 0:
|
if self.matches_ptr > 0:
|
||||||
self.matches_ptr -= 1
|
self.matches_ptr -= 1
|
||||||
@ -174,26 +174,44 @@ class MouseFreeURLHandler(plugin.Plugin):
|
|||||||
|
|
||||||
if act == PluginUrlActEsc:
|
if act == PluginUrlActEsc:
|
||||||
self.clear_search()
|
self.clear_search()
|
||||||
|
return
|
||||||
|
|
||||||
if act == PluginUrlActLaunch:
|
if act == PluginUrlActLaunch:
|
||||||
url = self.get_selected_url()
|
url = self.get_selected_url()
|
||||||
if url:
|
if url:
|
||||||
self.get_term().open_url(url, prepare=False)
|
self.cur_term.open_url(url, prepare=False)
|
||||||
|
|
||||||
|
return
|
||||||
|
|
||||||
|
#TODO: use case for KeyBindUtil
|
||||||
|
#So this is capturing <Return> key as if user presses return
|
||||||
|
#then the current selection would be cleared in case he types
|
||||||
|
#more commands or text in terminal has more urls now. So next
|
||||||
|
#time search should restart with complete text
|
||||||
|
|
||||||
|
#For KeyBindUtil if we register <Return> then keybinding will
|
||||||
|
#be shown in Preferences->Keybindings and if any other plugin
|
||||||
|
#wants to listen to same key code it will throw error since in
|
||||||
|
#UI binding has to be unique. May be we can have keybinds
|
||||||
|
#hidden from UI which plugins can use internally
|
||||||
|
|
||||||
|
if event.keyval == 65293: #<Return>
|
||||||
|
self.clear_search()
|
||||||
|
return
|
||||||
|
|
||||||
def clear_search(self):
|
def clear_search(self):
|
||||||
self.matches = []
|
self.matches = []
|
||||||
self.flag_http_on = False
|
self.flag_http_on = False
|
||||||
self.matches_ptr = -1
|
self.matches_ptr = -1
|
||||||
if self.get_term():
|
|
||||||
self.vte = self.get_term().get_vte()
|
if self.vte:
|
||||||
self.vte.search_set_regex(None, 0)
|
self.vte.search_set_regex(None, 0)
|
||||||
dbg("search URL off")
|
dbg("search URL off")
|
||||||
|
self.vte.unselect_all()
|
||||||
|
|
||||||
def search(self):
|
def search(self):
|
||||||
dbg("searching text")
|
dbg("searching text")
|
||||||
self.flag_http_on = True
|
self.flag_http_on = True
|
||||||
self.vte = self.get_term().get_vte()
|
|
||||||
|
|
||||||
self.vte.search_set_wrap_around(True)
|
self.vte.search_set_wrap_around(True)
|
||||||
regex_flags_pcre2 = (regex.FLAGS_PCRE2 | regex.PCRE2_CASELESS)
|
regex_flags_pcre2 = (regex.FLAGS_PCRE2 | regex.PCRE2_CASELESS)
|
||||||
|
Loading…
Reference in New Issue
Block a user