Added a web extension to do the scrolling.

Author: antoyo

Cargo.lock

@@ -4,13 +4,19 @@ version = "0.1.0"
 authors = ["Antoni Boucher <[email protected]>"]
 
 [dependencies]
+dbus = "^0.4"
+dbus-macros = "^0.0.3"
 docopt = "^0.6"
+libc = "^0.2"
 #mg = "^0.0.4"
 mg-settings = "^0.0.2"
 rustc-serialize = "^0.3"
 url = "^1.2"
 xdg = "^2.0"
 
+[features]
+default = ["webkit2/v2_4"]
+
 [dependencies.gdk]
 git = "https://github.com/gtk-rs/gdk"
 version = "0.5.0"

Cargo.toml

@@ -0,0 +1,18 @@
+Copyright (c) 2016 Boucher, Antoni <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

LICENSE

@@ -136,6 +136,7 @@ impl App {
             webview.connect_scrolled(move |scroll_percentage| {
                 let text =
                     match scroll_percentage {
+                        -1 => "[all]".to_string(),
                         0 => "[top]".to_string(),
                         100 => "[bot]".to_string(),
                         _ => format!("[{}%]", scroll_percentage),

src/app.rs

@@ -20,7 +20,11 @@
  */
 
 /*
+ * FIXME: webview hides when resizing the screen (seems related to the web extension, or when the
+ * page is not yet loaded, error: WebKitWebProcess: cairo-ft-font.c :669 : _cairo_ft_unscaled_font_lock_face:  l'assertion « !unscaled->from_face » a échoué.).
+ * TODO: show error if communication is not working.
  * TODO: follow link.
+ * TODO: activate insert mode after focusing a text element.
  * TODO: support bookmarks with tags.
  * TODO: settings (third-party cookies).
  * TODO: download manager.
@@ -29,20 +33,28 @@
  * TODO: command/open completions.
  * TODO: copy/paste URLs.
  * TODO: handle network errors.
+ * TODO: activate selected links with Enter.
+ * TODO: support marks.
  * TODO: preferred languages.
  * TODO: store cache.
+ * TODO: log console message to stdout.
  * TODO: NoScript.
  * TODO: open textarea in text editor.
  * TODO: non-modal javascript alert, prompt and confirm.
  * TODO: add option to use light theme variant instead of dark variant.
  * TODO: add content to the default config file.
+ * TODO: switch from dbus to gdbus.
  */
 
+extern crate dbus;
+#[macro_use]
+extern crate dbus_macros;
 extern crate docopt;
 extern crate gdk;
 extern crate glib;
 extern crate gtk;
 extern crate gtk_sys;
+extern crate libc;
 #[macro_use]
 extern crate mg;
 #[macro_use]

src/main.rs

@@ -24,7 +24,9 @@ use std::cell::{Cell, RefCell};
 use std::ops::Deref;
 use std::rc::Rc;
 
+use glib::ToVariant;
 use gtk::{Inhibit, WidgetExt};
+use libc::getpid;
 use url::Url;
 use webkit2::{self, CookiePersistentStorage, FindController, FindOptions, WebContext, WebViewExt, FIND_OPTIONS_BACKWARDS, FIND_OPTIONS_CASE_INSENSITIVE, FIND_OPTIONS_WRAP_AROUND};
 use xdg::BaseDirectories;
@@ -33,10 +35,19 @@ use app::APP_NAME;
 
 const SCROLL_LINE_VERTICAL: i32 = 40;
 
+dbus_interface!("com.titanium.client", interface MessageServer {
+    fn get_scroll_percentage() -> i64;
+    fn scroll_bottom();
+    fn scroll_by(pixels: i64);
+    fn scroll_top();
+});
+
+
 /// Webkit-based view.
 pub struct WebView {
     find_controller: FindController,
-    scrolled_callback: RefCell<Option<Rc<Box<Fn(u8)>>>>,
+    message_server: MessageServer,
+    scrolled_callback: RefCell<Option<Rc<Box<Fn(i64)>>>>,
     search_backwards: Cell<bool>,
     view: webkit2::WebView,
 }
@@ -46,6 +57,13 @@ impl WebView {
     pub fn new() -> Rc<Self> {
         let context = WebContext::get_default().unwrap();
         context.set_web_extensions_directory("/usr/local/lib/titanium/web-extensions");
+
+        let pid = unsafe { getpid() };
+        let bus_name = format!("com.titanium.process{}", pid);
+        let message_server = MessageServer::new(&bus_name);
+
+        context.set_web_extensions_initialization_user_data(&bus_name.to_variant());
+
         let view = webkit2::WebView::new_with_context(&context);
 
         let find_controller = view.get_find_controller().unwrap();
@@ -59,6 +77,7 @@ impl WebView {
         let webview =
             Rc::new(WebView {
                 find_controller: find_controller,
+                message_server: message_server,
                 scrolled_callback: RefCell::new(None),
                 search_backwards: Cell::new(false),
                 view: view,
@@ -78,27 +97,22 @@ impl WebView {
 
     /// Clear the selection.
     pub fn clear_selection(&self) {
+        // TODO: write this in the web extension.
         self.run_javascript("window.getSelection().empty();");
     }
 
     /// Connect the scrolled event.
-    pub fn connect_scrolled<F: Fn(u8) + 'static>(&self, callback: F) {
+    pub fn connect_scrolled<F: Fn(i64) + 'static>(&self, callback: F) {
         *self.scrolled_callback.borrow_mut() = Some(Rc::new(Box::new(callback)));
     }
 
     /// Emit the scrolled event.
     pub fn emit_scrolled_event(&self) {
         if let Some(ref callback) = *self.scrolled_callback.borrow() {
             let callback = callback.clone();
-            self.run_javascript_with_callback("window.scrollY / (document.body.scrollHeight - window.innerHeight)", move |result| {
-                if let Ok(result) = result {
-                    let context = result.get_global_context().unwrap();
-                    let value = result.get_value().unwrap();
-                    if let Some(number) = value.to_number(&context) {
-                        callback((number * 100.0).round() as u8);
-                    }
-                }
-            });
+            if let Ok(scroll_percentage) = self.message_server.get_scroll_percentage() {
+                callback(scroll_percentage);
+            }
         }
     }
 
@@ -121,12 +135,12 @@ impl WebView {
 
     /// Scroll by the specified number of pixels.
     fn scroll(&self, pixels: i32) {
-        self.run_javascript(&format!("window.scrollBy(0, {});", pixels));
+        self.message_server.scroll_by(pixels as i64).ok();
     }
 
     /// Scroll to the bottom of the page.
     pub fn scroll_bottom(&self) {
-        self.run_javascript("window.scrollTo(0, document.body.clientHeight);");
+        self.message_server.scroll_bottom().ok();
     }
 
     /// Scroll down by one line.
@@ -148,7 +162,7 @@ impl WebView {
 
     /// Scroll to the top of the page.
     pub fn scroll_top(&self) {
-        self.run_javascript("window.scrollTo(0, 0);");
+        self.message_server.scroll_top().ok();
     }
 
     /// Scroll up by one line.