wilderjds
/
emacs-application-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Browser: add caret browsing to smart select text area

Browse Source 
Signed-off-by: Hollow Man <hollowman186@vip.qq.com>
master
Hollow Man 6 years ago
parent c133fd2461
commit 28e9475f45
No known key found for this signature in database
GPG Key ID: 6CA2A0660F48F7A
3 changed files with 1267 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 123
      core/browser.py
  2. 1130
      core/js/caret_browsing.js
  3. 14
      eaf.el

123
core/browser.py
Unescape View File

@ -77,6 +77,7 @@ class BrowserView(QWebEngineView):
self.clear_focus_js = self.read_js_content("clear_focus.js")
self.select_input_text_js = self.read_js_content("select_input_text.js")
self.dark_mode_js = self.read_js_content("dark_mode.js")
self.caret_browsing_js = self.read_js_content("caret_browsing.js")
self.get_selection_text_js = self.read_js_content("get_selection_text.js")
self.focus_input_js = self.read_js_content("focus_input.js")
@ -602,6 +603,10 @@ class BrowserBuffer(Buffer):
self.draw_progressbar = False
self.eval_dark_js = False
self.eval_caret_js = False
self.caret_browsing_activated = False
self.caret_browsing_mark_activated = False
self.caret_browsing_search_text = ""
self.progressbar_progress = 0
self.progressbar_color = QColor(233, 129, 35, 255)
self.progressbar_height = 2
@ -780,10 +785,13 @@ class BrowserBuffer(Buffer):
''' Update the Progress Bar.'''
if progress < 100:
# Update progres.
self.eval_caret_js = False
self.progressbar_progress = progress
self.update()
elif progress == 100 and self.draw_progressbar:
self.init_auto_fill()
self.buffer_widget.eval_js(self.buffer_widget.caret_browsing_js)
self.eval_caret_js = True
if self.emacs_var_dict["eaf-browser-enable-adblocker"] == "true":
self.buffer_widget.load_adblocker()
if self.dark_mode_is_enable():
@ -879,6 +887,10 @@ class BrowserBuffer(Buffer):
self.buffer_widget._search_text(str(result_content))
elif result_tag == "search_text_backward":
self.buffer_widget._search_text(str(result_content), True)
elif result_tag == "caret_search_text_forward":
self._caret_search_text(str(result_content))
elif result_tag == "caret_search_text_backward":
self._caret_search_text(str(result_content), True)
elif result_tag == "jump_link":
self.buffer_widget.jump_to_link(str(result_content).strip())
elif result_tag == "jump_link_new_buffer":
@ -947,6 +959,117 @@ class BrowserBuffer(Buffer):
subprocess.Popen(aria2_args, stdout=null_file)
def caret_browsing(self):
''' Init caret browsing.'''
if self.eval_caret_js:
self.buffer_widget.eval_js("CaretBrowsing.setInitialCursor();")
self.message_to_emacs.emit("Caret browsing activated.")
self.caret_browsing_activated = True
self.caret_browsing_search_text = ""
def caret_exit(self):
''' Exit caret browsing.'''
if self.caret_browsing_activated:
self.buffer_widget.eval_js("CaretBrowsing.shutdown();")
self.message_to_emacs.emit("Caret browsing deactivated.")
self.caret_browsing_activated = False
@interactive(insert_or_do=True)
def caret_next_line(self):
''' Switch to next line in caret browsing.'''
if self.caret_browsing_activated:
self.buffer_widget.eval_js("CaretBrowsing.move('forward', 'line');")
@interactive(insert_or_do=True)
def caret_previous_line(self):
''' Switch to previous line in caret browsing.'''
if self.caret_browsing_activated:
self.buffer_widget.eval_js("CaretBrowsing.move('backward', 'line');")
@interactive(insert_or_do=True)
def caret_next_character(self):
''' Switch to next character in caret browsing.'''
if self.caret_browsing_activated:
self.buffer_widget.eval_js("CaretBrowsing.move('forward', 'character');")
@interactive(insert_or_do=True)
def caret_previous_character(self):
''' Switch to previous character in caret browsing.'''
if self.caret_browsing_activated:
self.buffer_widget.eval_js("CaretBrowsing.move('backward', 'character');")
@interactive(insert_or_do=True)
def caret_next_word(self):
''' Switch to next word in caret browsing.'''
if self.caret_browsing_activated:
self.buffer_widget.eval_js("CaretBrowsing.move('forward', 'word');")
@interactive(insert_or_do=True)
def caret_previous_word(self):
''' Switch to previous word in caret browsing.'''
if self.caret_browsing_activated:
self.buffer_widget.eval_js("CaretBrowsing.move('backward', 'word');")
@interactive(insert_or_do=True)
def caret_to_bottom(self):
''' Switch to next word in caret browsing.'''
if self.caret_browsing_activated:
self.buffer_widget.eval_js("CaretBrowsing.move('forward', 'documentboundary');")
@interactive(insert_or_do=True)
def caret_to_top(self):
''' Switch to previous word in caret browsing.'''
if self.caret_browsing_activated:
self.buffer_widget.eval_js("CaretBrowsing.move('backward', 'documentboundary');")
def caret_toggle_mark(self):
''' Toggle mark in caret browsing.'''
if self.caret_browsing_activated:
self.buffer_widget.eval_js("CaretBrowsing.toggleMark();")
if self.buffer_widget.execute_js("CaretBrowsing.markEnabled"):
self.caret_browsing_mark_activated = True
self.message_to_emacs.emit("Mark is on.")
else:
self.caret_browsing_mark_activated = False
self.message_to_emacs.emit("Mark is off.")
def caret_clear_search(self):
''' Clear search text in caret browsing.'''
if self.caret_browsing_activated:
if self.caret_browsing_mark_activated:
self.caret_browsing_search_text = ""
self.message_to_emacs.emit("Cleared caret search text.")
@interactive(insert_or_do=True)
def caret_search_forward(self):
''' Search Text forward in caret browsing.'''
if self.caret_browsing_activated:
if self.caret_browsing_mark_activated:
if self.caret_browsing_search_text == "":
self.send_input_message("Forward Search Text and Select: ", "caret_search_text_forward")
else:
self._caret_search_text(self.caret_browsing_search_text)
@interactive(insert_or_do=True)
def caret_search_backward(self):
''' Search Text backward in caret browsing.'''
if self.caret_browsing_activated:
if self.caret_browsing_mark_activated:
if self.caret_browsing_search_text == "":
self.send_input_message("Backward Search Text and Select: ", "caret_search_text_backward")
else:
self._caret_search_text(self.caret_browsing_search_text,True)
def _caret_search_text(self, text, is_backward = False):
if self.caret_browsing_search_text != text:
self.caret_browsing_search_text = text
if is_backward:
if not self.buffer_widget.execute_js("window.find('"+text+"',false,true)"):
self.message_to_emacs.emit("Unable to find more, please try forward search.")
else:
if not self.buffer_widget.execute_js("window.find('"+text+"')"):
self.message_to_emacs.emit("Unable to find more, please try backward search.")
@interactive(insert_or_do=True)
def open_download_manage_page(self):
''' Open download manage page.'''

1130
core/js/caret_browsing.js
View File

File diff suppressed because it is too large Load Diff

14
eaf.el
Unescape View File

@ -294,6 +294,7 @@ Try not to modify this alist directly. Use `eaf-setq' to modify instead."
("C-y" . "yank_text")
("C-w" . "kill_text")
("M-e" . "edit_focus_text")
("M-c" . "caret_browsing")
("M-s" . "open_link")
("M-S" . "open_link_new_buffer")
("M-d" . "open_link_background_buffer")
@ -312,6 +313,19 @@ Try not to modify this alist directly. Use `eaf-setq' to modify instead."
("M->" . "scroll_to_bottom")
("M-t" . "new_blank_page")
("SPC" . "insert_or_scroll_up_page")
("C-q" . "caret_exit")
("z" . "insert_or_caret_next_line")
("Z" . "insert_or_caret_previous_line")
("a" . "insert_or_caret_next_character")
("A" . "insert_or_caret_previous_character")
("w" . "insert_or_caret_next_word")
("W" . "insert_or_caret_previous_word")
("b" . "insert_or_caret_to_bottom")
("B" . "insert_or_caret_to_top")
("/" . "insert_or_caret_search_forward")
("?" . "insert_or_caret_search_backward")
("C-i" . "caret_toggle_mark")
("C-." . "caret_clear_search")
("J" . "insert_or_select_left_tab")
("K" . "insert_or_select_right_tab")
("j" . "insert_or_scroll_up")

Write Preview
Loading…
Cancel
Save