projects
/
app.webkitpdf
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optional javascript for screenshots
[app.webkitpdf]
/
BrowserWindow.vala
diff --git
a/BrowserWindow.vala
b/BrowserWindow.vala
index
e1f421c
..
55f24b6
100644
(file)
--- a/
BrowserWindow.vala
+++ b/
BrowserWindow.vala
@@
-148,7
+148,7
@@
public class BrowserWindow : Object
});
this.el.resource_load_started.connect( (resource, request) => {
});
this.el.resource_load_started.connect( (resource, request) => {
-
print("Adding referrer header %s\n" , request.get_uri());
+
//
print("Adding referrer header %s\n" , request.get_uri());
if (request.get_http_headers() != null) {
request.get_http_headers().remove("Referer");
if (request.get_http_headers() != null) {
request.get_http_headers().remove("Referer");
@@
-157,7
+157,13
@@
public class BrowserWindow : Object
});
var settings = this.el.get_settings();
settings.set_user_agent( "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36" );
});
var settings = this.el.get_settings();
settings.set_user_agent( "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36" );
-
+ settings.hardware_acceleration_policy = WebKit.HardwareAccelerationPolicy.NEVER;
+ settings.enable_accelerated_2d_canvas = false;
+ if (webkitpdf.opt_disable_javascript) {
+ settings.enable_javascript = false;
+ }
+
+ WebKit.WebContext.get_default().set_tls_errors_policy( WebKit.TLSErrorsPolicy.IGNORE );
#else
//listeners
#else
//listeners
@@
-167,8
+173,7
@@
public class BrowserWindow : Object
// });
this.el.load_finished.connect( ( ) => {
// });
this.el.load_finished.connect( ( ) => {
-
-
+
this.printit();
});
this.printit();
});
@@
-176,8
+181,13
@@
public class BrowserWindow : Object
Soup.URI uri = message.get_uri();
var host = uri.get_host ();
Soup.URI uri = message.get_uri();
var host = uri.get_host ();
+ if (host.contains("google-analytics") || host.contains("googlesyndication") || host.contains("facebook") ) {
+ print("DISCONNECTING: %s\n", host);
+ socket.disconnect();
+ return;
+ }
- print("Adding header
http://%s/\n", host
);
+ print("Adding header
: %s\n", uri.to_string(false)
);
message.request_headers.remove("Referer");
message.request_headers.append("Referer", "http://"+host+"/");
message.request_headers.remove("Referer");
message.request_headers.append("Referer", "http://"+host+"/");
@@
-185,7
+195,26
@@
public class BrowserWindow : Object
});
var sess = WebKit.get_default_session();
sess.user_agent= "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36";
});
var sess = WebKit.get_default_session();
sess.user_agent= "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36";
+ sess.ssl_strict = false;
+
+ var settings = this.el.get_settings();
+
+ settings.enable_webgl = false;
+ settings.enable_plugins = false;
+ settings.enable_java_applet = false;
+ if (webkitpdf.opt_disable_javascript) {
+ settings.enable_scripts = false;
+ }
+
+ this.el.console_message.connect((msg, line, sid) => {
+ print("CONSOLE: %s:%d %s\n", sid, line, msg);
+ return false;
+ });
+ this.el.create_web_view.connect((frame) => {
+ print("WEBFRAME:%s\n", frame.uri);
+ return new WebKit.WebView();
+ });
#endif
}
#endif
}
@@
-219,7
+248,7
@@
public class BrowserWindow : Object
stdout.printf ("Error: %s\n", e.message);
}
#else
stdout.printf ("Error: %s\n", e.message);
}
#else
-
var cookie_jar = new Soup.CookieJar();
+ var cookie_jar = new Soup.CookieJar();
var cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), "/", -1);
if(uri.get_scheme() =="https") {
cookie.set_secure(true);
var cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), "/", -1);
if(uri.get_scheme() =="https") {
cookie.set_secure(true);
@@
-292,8
+321,12
@@
public class BrowserWindow : Object
#if GTK3
#if GTK3
- print("PNG not supported in webkit2\n");
- return;
+ GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => {
+ print("delay done URL: %s\n", this.el.uri);
+ this.printpng();
+ return false;
+ }, GLib.Priority.DEFAULT);
+ return;
#else
GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => {
#else
GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => {
@@
-415,6
+448,16
@@
public class BrowserWindow : Object
print("making screenshot\n");
#if GTK3
print("making screenshot\n");
#if GTK3
+ GLib.MainLoop mainloop = new GLib.MainLoop();
+ _this.view.el.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => {
+ var sf = _this.view.el.get_snapshot.end(res);
+ sf.write_to_png(webkitpdf.opt_target_png);
+ print("Saved to %s\n", webkitpdf.opt_target_png);
+ mainloop.quit();
+
+ });
+
+ mainloop.run();
#else
// fix vapi - get_snapshot add '?' to all null.
#else
// fix vapi - get_snapshot add '?' to all null.
@@
-438,10
+481,12
@@
public class BrowserWindow : Object
// sf.write_to_png(Browser.opt_target_png);
//});
// sf.write_to_png(Browser.opt_target_png);
//});
+ #endif
this.delete_cookiefile();
this.delete_cookiefile();
+
Gtk.main_quit();
Gtk.main_quit();
- #endif
+