X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=BrowserWindow.vala;h=55f24b6cfca9fb9f9598561c3b0ec92a1c24cb53;hb=6d2f96c1d01f452707f50a7928525745e5c3407b;hp=08643e8e9eb215c72b3bf5c3223dc421ac2844ab;hpb=bc6144634cd527f4e06565346bbde05061e07791;p=app.webkitpdf

diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index 08643e8..55f24b6 100644
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -55,13 +55,13 @@ public class BrowserWindow : Object
         	
         	print("loading url %s\n",blog);	
         	this.view.el.load_uri(blog);
-        	
+        	 
         	// if we have not finished in 25 seconds
         	// call printit...
-        	var cd = 25;
+        	var cd = webkitpdf.opt_delay > 25 ? webkitpdf.opt_delay : 25;
         	  GLib.Timeout.add_seconds(1, () => { 
         		cd--;
-        		print("timeout 25 seconds :%d", cd);
+        		print("timeout %d seconds :%d", (int)( webkitpdf.opt_delay > 25 ? webkitpdf.opt_delay : 25), (int)cd);
         		if (cd < 1) {
         			print("calling printit - timed out");
         			_this.view.printit();
@@ -146,13 +146,25 @@ public class BrowserWindow : Object
             	          
                          
                         });
+                        
             			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");		
-            	 				request.get_http_headers().append("Referer", "http://www.google.com/" );
+            	 				request.get_http_headers().append("Referer", request.get_uri());
             				}
                         });
+                        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
                       //  this.el.resource_request_starting.connect( (p0, webres, netreq ) => {
@@ -161,8 +173,7 @@ public class BrowserWindow : Object
                       //  });
                         
                         this.el.load_finished.connect( ( ) => {
-                    		
-                    		
+                    		 
                                this.printit(); 
                          
                         });
@@ -170,14 +181,40 @@ public class BrowserWindow : Object
                       	    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://www.google.com/");
+            				message.request_headers.append("Referer", "http://"+host+"/");
             				
                         
                         });
+                        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
             }
@@ -191,7 +228,7 @@ public class BrowserWindow : Object
             
             			if(cookies.length > 1 ) {
             					     
-            			#if GTK3		
+            			#if GTK3	
             				var context = WebKit.WebContext.get_default();	         
             				var cookie_manager = context.get_cookie_manager();
             				cookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER);
@@ -211,7 +248,6 @@ public class BrowserWindow : Object
             				    stdout.printf ("Error: %s\n", e.message);
             				} 		
             			#else
-            				var sess = WebKit.get_default_session();
             				var cookie_jar = new Soup.CookieJar();		
             				var cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), "/", -1);
             				if(uri.get_scheme() =="https") {
@@ -219,7 +255,7 @@ public class BrowserWindow : Object
             				}	    
             				cookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER);				 
             				cookie_jar.add_cookie(cookie);			    
-            				sess.add_feature(cookie_jar);
+            				WebKit.get_default_session().add_feature(cookie_jar);
             			#endif
             					        			    			    
             			}
@@ -285,8 +321,12 @@ public class BrowserWindow : Object
         		
         
         #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, () => { 
@@ -408,6 +448,16 @@ public class BrowserWindow : Object
         
              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.
@@ -431,10 +481,12 @@ public class BrowserWindow : Object
         
             //    sf.write_to_png(Browser.opt_target_png);
             //});
+        #endif       
            this.delete_cookiefile(); 
+           
             Gtk.main_quit();
              
-        #endif   
+