From ca3562217933a1a77e2ef04642a78cc5b09df33a Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 10 Apr 2018 13:12:24 +0800 Subject: [PATCH] BrowserWindow.bjs BrowserWindow.vala --- BrowserWindow.bjs | 10 +- BrowserWindow.vala | 410 +++++++++++++++++++++++---------------------- 2 files changed, 218 insertions(+), 202 deletions(-) diff --git a/BrowserWindow.bjs b/BrowserWindow.bjs index e46e231..7f11c22 100644 --- a/BrowserWindow.bjs +++ b/BrowserWindow.bjs @@ -25,15 +25,17 @@ "items" : [ { "id" : "view", - "* init" : "\n\n{\n\t\tthis.load_try = 0;\n\n#if GTK3\n\t\t this.el.load_changed.connect( (ev ) => {\n \t\tif (ev != WebKit.LoadEvent.FINISHED) {\n\t\t \t\treturn;\t \n \t\t }\n \t\t \n this.printit(); \n\t \n \n });\n\n#else\n //listeners\n // this.el.resource_request_starting.connect( (p0, webres, netreq ) => {\n // print(\"resource req. started %s\\n\", netreq.uri);\n \n // });\n \n this.el.load_finished.connect( ( ) => {\n \t\t\n \t\t\n this.printit(); \n \n });\n#endif\n}\n", + "string cookie_file" : "", + "* init" : "\n\n{\n\t\tthis.load_try = 0;\n\n#if GTK3\n\t\t this.el.load_changed.connect( (ev ) => {\n \t\tif (ev != WebKit.LoadEvent.FINISHED) {\n\t\t \t\treturn;\t \n \t\t }\n \t\t \n this.printit(); \n\t \n \n });\n\t\t\tthis.el.resource_load_started.connect( (resource, request) => {\n\t\t\t\tprint(\"Adding referrer header %s\\n\" , request.get_uri());\n \t\t\t\trequest.get_http_headers().remove(\"Referer\");\t\t\n \t\t\t\trequest.get_http_headers().append(\"Referer\", \"http://www.google.com/\" );\n\t\t\t\t\n });\n#else\n //listeners\n // this.el.resource_request_starting.connect( (p0, webres, netreq ) => {\n // print(\"resource req. started %s\\n\", netreq.uri);\n \n // });\n \n this.el.load_finished.connect( ( ) => {\n \t\t\n \t\t\n this.printit(); \n \n });\n WebKit.get_default_session().request_started.connect((message, socket) => {\n \t Soup.URI uri = message.get_uri();\n\t\t\t\n\t\t\t\tvar host = uri.get_host ();\n\n\t\t\t\tprint(\"Adding header http://%s/\\n\", host);\n\t\t\t\tmessage.request_headers.remove(\"Referer\");\t\t\t\t\n\t\t\t\tmessage.request_headers.append(\"Referer\", \"http://www.google.com/\");\n\t\t\t\t\n \n });\n \n \n#endif\n}\n\t \tthis.cookie_file = \"\";\n\t\tif (webkitpdf.opt_cookies != null) {\n\t\t\tprint(\"setting cookie %s\\n\",webkitpdf.opt_cookies);\n\n\t\t\tvar uri = new Soup.URI (webkitpdf.opt_url);\n\t\t\t\n\t\t\tstring[] cookies = webkitpdf.opt_cookies.split (\"=\", 2);\n\n\t\t\tif(cookies.length > 1 ) {\n\t\t\t\t\t \n\t\t\t#if GTK3\t\t\n\t\t\t\tvar context = WebKit.WebContext.get_default();\t \n\t\t\t\tvar cookie_manager = context.get_cookie_manager();\n\t\t\t\tcookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER);\n\t\t\t\tstring scheme = uri.get_scheme ();\n\t\t\t\n\t\t\t\ttry { \n\t\t\t\t FileIOStream iostream;\t\t \n\t\t\t\t File file = File.new_tmp (\"cookie-XXXXXX.txt\", out iostream);\n\t\t\t\t this.cookie_file = file.get_path (); \n\t\t\t\t print(\"cookie tmp file name: %s\\n\", file.get_path ());\n\t\t \t \n\t\t\t\t OutputStream ostream = iostream.output_stream;\n\t\t\t\t DataOutputStream dostream = new DataOutputStream (ostream);\t\t\t\t\t \n\t\t\t\t dostream.put_string (\"%s\\tTRUE\\t/\\t%s\\t2147483647\\t%s\\t%s\".printf(uri.get_host(),scheme == \"http\" ? \"FALSE\" : \"TRUE\",cookies[0],cookies[1]));\t\t \n\t\t\t\t cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT);\t\t \n\t\t\t\t} catch (Error e) {\n\t\t\t\t stdout.printf (\"Error: %s\\n\", e.message);\n\t\t\t\t} \t\t\n\t\t\t#else\n\t\t\t\tvar sess = WebKit.get_default_session();\n\t\t\t\tvar cookie_jar = new Soup.CookieJar();\t\t\n\t\t\t\tvar cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), \"/\", -1);\n\t\t\t\tif(uri.get_scheme() ==\"https\") {\n\t\t\t\t cookie.set_secure(true); \n\t\t\t\t}\t \n\t\t\t\tcookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER);\t\t\t\t \n\t\t\t\tcookie_jar.add_cookie(cookie);\t\t\t \n\t\t\t\tsess.add_feature(cookie_jar);\n\t\t\t#endif\n\t\t\t\t\t \t\t\t \t\t\t \n\t\t\t}\n\n\t\t} \n // init method", "| void printit" : "() {\n print(\"load_finsihed\\n\");\n \n if (this.print_started) {\n print(\"load_finsihed - already printing..%d %s\\n\", this.load_try, this.el.uri);\n \n \n \n \n return;\n }\n \n \n this.print_started = true; // flag to stop double call.\n \n \n\t// inject any javascript if needed..\n\tif (webkitpdf.opt_inject_js != null) {\n\t\n\t\tprint(\"injecting javascript files \\n\");\n\t\tforeach(var inject_js in webkitpdf.opt_inject_js) {\n\t\tprint(\"inject? %s\\n\", inject_js);\n\t\t\tstring str;\n\t\t\ttry {\n\t\t\t\tFileUtils.get_contents( inject_js, out str);\n\t\t\t} catch(FileError e) {\n\t\t\t\tprint(\"Failed to inject %s\\n\", inject_js);\n\t\t\t\tcontinue;\n\t\t\t}\n#if GTK3\n\t\t\tGLib.MainLoop mainloop = new GLib.MainLoop();\n\t\t\tthis.el.run_javascript.begin(str, null, (obj,res) => {\n\t\t\t\tmainloop.quit();\n\t\t\t});\n\t\t\tmainloop.run();\n\t\t\t\n#else \t\t\t\n\t\t\tthis.el.execute_script(str);\n#endif\n\t\t}\n\t}\n\t \n\tprint(\"calling print in %d seconds\\n\", (int)webkitpdf.opt_delay);\n\tif (webkitpdf.opt_target_pdf != null) {\n\t\tGLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { \n\t\t\tprint(\"delay done URL: %s\\n\", this.el.uri);\n\t\t\n\t\t\t \n\t\t\tthis.printpdf();\n\t\t\t return false;\n\t\t}, GLib.Priority.DEFAULT);\n\t\treturn;\n\t}\n\t\t\n\n#if GTK3\n\tprint(\"PNG not supported in webkit2\\n\");\n\treturn;\n#else\n\t\t\n GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { \n \n\t\t\n\t\t// ----------------- JPEG \n\t\t// resize the window...\n\t\t// window.document.documentElement.scrollHeight\n\t\tvar scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height;\n\t\tprint(\"Scroll height %d\\n\", scroll_height);\n\t\tif (scroll_height> 1024 || webkitpdf.opt_width > 0 || webkitpdf.opt_height > 0 ) {\n\t\t\tvar w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200;\n\t\t\tvar h = int.min(scroll_height, 6000);\n\t\t\t_this.scrolled_window.el.set_size_request( w, h); \n\t\t\t_this.el.resize (w+50, h+50);\n\t\t\tprint(\"Resize to %d, %d\\n\", w,h);\n\t\t GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { \n\t\t\t\tthis.printpng();\n\t\t\t\treturn false;\n\t\t\t }, GLib.Priority.DEFAULT);\n \t\t return false;\n\t\t}\n\t\tthis.printpng();\t\t\n\t\treturn false;\n\t }, GLib.Priority.DEFAULT);\n\n\n#endif \n \n}\n", "* pack" : "add", "xtype" : "WebView", - "| bool printpdf" : "() {\n\n\n\n\t\tvar list = Gtk.PaperSize.get_paper_sizes(false);\n\t var psetup = new Gtk.PageSetup();\n\t for(var i = 0; i < list.length(); i++ ) {\n\t var entry = list.nth_data(i).copy();\n\t if (entry.get_name() == \"iso_a2\") {\n\t psetup.set_paper_size(entry);\n\t }\n\t }\n\t \n\n#if GTK3\t \n\n\t\tvar pe = new WebKit.PrintOperation(this.el);\n\t\tpe.set_page_setup(psetup);\n\t\tpe.finished.connect( () => {\n\t\t\tprint(\"print completed\\n\");\n\t\t\t Gtk.main_quit();\n \t\t\n\t\t});\n\t\t\n\t\tvar ps = new Gtk.PrintSettings();\n\t ps.set_printer(\"Print to File\");\n\t ps.set(\"output-file-format\", \"pdf\");\n\t ps.set(\"output-uri\", \"file://\" + webkitpdf.opt_target_pdf);\n\n\t\t\n\t\tpe.set_print_settings(ps);\n\t\t\n\n\t\tpe.print();\n \t\t \n\n#else\t \n\t\tvar pe = new Gtk.PrintOperation();\n\t\tpe.export_filename = webkitpdf.opt_target_pdf;\n\t\tprint(\"got callback for print\\n\");\n\t\tpe.ref();\n\t\t/*pe.failed.connect(() => {\n\t\t\tprint(\"print failed\\n\");\n\t\t\t Gtk.main_quit();\n \t\t\n\t\t})\n\t\t*/;\n\t\t pe.done.connect(() => {\n\t\t\tprint(\"print completed\\n\");\n\t\t\t Gtk.main_quit();\n \t\t\n\t\t});\n\t\t\n\t\t//pe.run_dialog(_this.el);\n\t \n\t\t\n\t \n\n\n\t pe.set_default_page_setup(psetup);\n\t print(\"Calling Print?\\n\");\n\t //pe.run_dialog(_this.el);\n\t \n\t \n\n\n\n\t try {\n\t\t this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT);\n\t } catch (Error e) {\n\t\t\t// print failed...\n\t\t}\n#endif\t \n\t \n\t \n\t\treturn false;\n}\n", - "| void printpng" : "() {\n //var filename = \"/tmp/test.pdf\";\n //print(\"load_changed %d ?= %d\\n\", le, LoadEvent.FINISHED);\n\n //if (le != LoadEvent.FINISHED) {\n // return;\n // }\n \n// what size is the documet.\n\n print(\"making screenshot\\n\");\n#if GTK3\n\n#else \n // fix vapi - get_snapshot add '?' to all null.\n var pixmap = _this.view.el.get_snapshot( null );\n\n \n \n int w,h;\n \n // add out to gdkpixmap.get_size\n\tpixmap.get_size( out w , out h);\n\tvar pixbuf = Gdk.pixbuf_get_from_drawable(null, pixmap, null , 0, 0, 0, 0, w, h);\n\tprint(\"pixbuf size: %d x %d\\n \", w,h);\n\t \n \n \n pixbuf.save(webkitpdf.opt_target_png, \"png\");\n print(\"Saved to %s\\n\", webkitpdf.opt_target_png);\n //view.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => {\n // var sf = view.get_snapshot.end(res);\n\n // sf.write_to_png(Browser.opt_target_png);\n //});\n Gtk.main_quit();\n \n#endif \n \n \n\n}\n", + "| bool printpdf" : "() {\n\n\n\n\t\tvar list = Gtk.PaperSize.get_paper_sizes(false);\n\t var psetup = new Gtk.PageSetup();\n\t for(var i = 0; i < list.length(); i++ ) {\n\t var entry = list.nth_data(i).copy();\n\t if (entry.get_name() == \"iso_a2\") {\n\t psetup.set_paper_size(entry);\n\t }\n\t }\n\t \n\n#if GTK3\t \n\n\t\tvar pe = new WebKit.PrintOperation(this.el);\n\t\tpe.set_page_setup(psetup);\n\t\tpe.finished.connect( () => {\n\t\t\tprint(\"print completed\\n\");\n this.delete_cookiefile(); \n\t\t\t Gtk.main_quit();\n \t\t\n\t\t});\n\t\t\n\t\tvar ps = new Gtk.PrintSettings();\n\t ps.set_printer(\"Print to File\");\n\t ps.set(\"output-file-format\", \"pdf\");\n\t ps.set(\"output-uri\", \"file://\" + webkitpdf.opt_target_pdf);\n\n\t\t\n\t\tpe.set_print_settings(ps);\n\t\t\n\n\t\tpe.print();\n \t\t \n\n#else\t \n\t\tvar pe = new Gtk.PrintOperation();\n\t\tpe.export_filename = webkitpdf.opt_target_pdf;\n\t\tprint(\"got callback for print\\n\");\n\t\tpe.ref();\n\t\t/*pe.failed.connect(() => {\n\t\t\tprint(\"print failed\\n\");\n\t\t\t Gtk.main_quit();\n \t\t\n\t\t})\n\t\t*/;\n\t\t pe.done.connect(() => {\n\t\t\tprint(\"print completed\\n\");\n this.delete_cookiefile(); \n\t\t\t Gtk.main_quit();\n \t\t\n\t\t});\n\t\t\n\t\t//pe.run_dialog(_this.el);\n\t \n\t\t\n\t \n\n\n\t pe.set_default_page_setup(psetup);\n\t print(\"Calling Print?\\n\");\n\t //pe.run_dialog(_this.el);\n\t \n\t \n\n\n\n\t try {\n\t\t this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT);\n\t } catch (Error e) {\n\t\t\t// print failed...\n\t\t}\n#endif\t \n\t \n\t \n\t\treturn false;\n}\n", + "| void printpng" : "() {\n //var filename = \"/tmp/test.pdf\";\n //print(\"load_changed %d ?= %d\\n\", le, LoadEvent.FINISHED);\n\n //if (le != LoadEvent.FINISHED) {\n // return;\n // }\n \n// what size is the documet.\n\n print(\"making screenshot\\n\");\n#if GTK3\n\n#else \n // fix vapi - get_snapshot add '?' to all null.\n var pixmap = _this.view.el.get_snapshot( null );\n\n \n \n int w,h;\n \n // add out to gdkpixmap.get_size\n\tpixmap.get_size( out w , out h);\n\tvar pixbuf = Gdk.pixbuf_get_from_drawable(null, pixmap, null , 0, 0, 0, 0, w, h);\n\tprint(\"pixbuf size: %d x %d\\n \", w,h);\n\t \n \n \n pixbuf.save(webkitpdf.opt_target_png, \"png\");\n print(\"Saved to %s\\n\", webkitpdf.opt_target_png);\n //view.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => {\n // var sf = view.get_snapshot.end(res);\n\n // sf.write_to_png(Browser.opt_target_png);\n //});\n this.delete_cookiefile(); \n Gtk.main_quit();\n \n#endif \n \n \n\n}\n", "bool print_started" : false, "$ xns" : "WebKit", - "int load_try" : 0 + "int load_try" : 0, + "| void delete_cookiefile" : "() {\n \tif(this.cookie_file.length < 1 ){\n \t\treturn;\n\t}\n print(\"deleting tmp file %s\\n\",this.cookie_file);\n File file = File.new_for_path (this.cookie_file);\n try {\n if (file.query_exists () == true) {\n file.delete ();\t \n }\n } catch (Error e) {\n stdout.printf (\"Error: %s\\n\", e.message);\n }\n\n}\n" } ] } diff --git a/BrowserWindow.vala b/BrowserWindow.vala index 366537d..16cc9aa 100644 --- a/BrowserWindow.vala +++ b/BrowserWindow.vala @@ -4,7 +4,7 @@ public class BrowserWindow : Object { public Gtk.Window el; private BrowserWindow _this; - public string cookie_file; + public static BrowserWindow singleton() { if (_BrowserWindow == null) { @@ -32,46 +32,44 @@ public class BrowserWindow : Object //listeners this.el.destroy.connect( () => { - Gtk.main_quit(); }); this.el.show.connect( () => { - print("resizing window\n"); - var w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200; - var h = webkitpdf.opt_height > 0 ? webkitpdf.opt_height : 500; + print("resizing window\n"); + var w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200; + var h = webkitpdf.opt_height > 0 ? webkitpdf.opt_height : 500; - this.el.resize(w,h); - - // we have to do silly stuff with blogspot!!?!? - var blog = webkitpdf.opt_url; + this.el.resize(w,h); + // we have to do silly stuff with blogspot!!?!? + var blog = webkitpdf.opt_url; - /* Do not redirect if the domain is .com already */ - if (/\.blogspot\.com/.match(blog)) { - var r = new Regex ("\\.blogspot\\..*?/"); - blog = r.replace(blog, blog.length, 0, ".blogspot.com/ncr/"); - } - print("loading url %s\n",blog); - this.view.el.load_uri(blog); + /* Do not redirect if the domain is .com already */ + if (/\.blogspot\.com/.match(blog)) { + var r = new Regex ("\\.blogspot\\..*?/"); + blog = r.replace(blog, blog.length, 0, ".blogspot.com/ncr/"); + } - // if we have not finished in 25 seconds - // call printit... - var cd = 25; - GLib.Timeout.add_seconds(1, () => { - cd--; - print("timeout 25 seconds :%d", cd); - if (cd < 1) { - print("calling printit - timed out"); - _this.view.printit(); - - return false; - } - return true; + 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; + GLib.Timeout.add_seconds(1, () => { + cd--; + print("timeout 25 seconds :%d", cd); + if (cd < 1) { + print("calling printit - timed out"); + _this.view.printit(); + return false; + } + return true; - }); + }); }); @@ -103,7 +101,7 @@ public class BrowserWindow : Object // init method { - this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC); + this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC); } } @@ -116,10 +114,10 @@ public class BrowserWindow : Object // my vars (def) + public string cookie_file; public bool print_started; public int load_try; - public string cookie_file; - + // ctor public Xcls_view(BrowserWindow _owner ) { @@ -133,69 +131,27 @@ public class BrowserWindow : Object // set gobject values - // setting up cookie injection - this.cookie_file =""; - if(webkitpdf.opt_cookies != null) { - print("setting cookie %s\n",webkitpdf.opt_cookies); - - var uri = new Soup.URI (webkitpdf.opt_url); - - string[] cookies = webkitpdf.opt_cookies.split ("=", 2); - - if(cookies.length > 1 ) { - - #if GTK3 - var context = WebKit.WebContext.get_default(); - var cookie_manager = context.get_cookie_manager(); - cookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER); - string scheme = uri.get_scheme (); - - try { - FileIOStream iostream; - File file = File.new_tmp ("cookie-XXXXXX.txt", out iostream); - this.cookie_file = file.get_path (); - print("cookie tmp file name: %s\n", file.get_path ()); - - OutputStream ostream = iostream.output_stream; - DataOutputStream dostream = new DataOutputStream (ostream); - dostream.put_string ("%s\tTRUE\t/\t%s\t2147483647\t%s\t%s".printf(uri.get_host(),scheme == "http" ? "FALSE" : "TRUE",cookies[0],cookies[1])); - cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT); - } catch (Error e) { - 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") { - cookie.set_secure(true); - } - cookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER); - cookie_jar.add_cookie(cookie); - sess.add_feature(cookie_jar); - #endif - - } - - } // init method - - { - this.load_try = 0; + this.load_try = 0; #if GTK3 - this.el.load_changed.connect( (ev ) => { - if (ev != WebKit.LoadEvent.FINISHED) { - return; - } + this.el.load_changed.connect( (ev ) => { + if (ev != WebKit.LoadEvent.FINISHED) { + return; + } this.printit(); }); - + this.el.resource_load_started.connect( (resource, request) => { + print("Adding referrer header %s\n" , request.get_uri()); + request.get_http_headers().remove("Referer"); + request.get_http_headers().append("Referer", "http://www.google.com/" ); + + }); #else //listeners // this.el.resource_request_starting.connect( (p0, webres, netreq ) => { @@ -209,8 +165,66 @@ public class BrowserWindow : Object this.printit(); }); + WebKit.get_default_session().request_started.connect((message, socket) => { + Soup.URI uri = message.get_uri(); + + var host = uri.get_host (); + + print("Adding header http://%s/\n", host); + message.request_headers.remove("Referer"); + message.request_headers.append("Referer", "http://www.google.com/"); + + + }); + + #endif } + this.cookie_file = ""; + if (webkitpdf.opt_cookies != null) { + print("setting cookie %s\n",webkitpdf.opt_cookies); + + var uri = new Soup.URI (webkitpdf.opt_url); + + string[] cookies = webkitpdf.opt_cookies.split ("=", 2); + + if(cookies.length > 1 ) { + + #if GTK3 + var context = WebKit.WebContext.get_default(); + var cookie_manager = context.get_cookie_manager(); + cookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER); + string scheme = uri.get_scheme (); + + try { + FileIOStream iostream; + File file = File.new_tmp ("cookie-XXXXXX.txt", out iostream); + this.cookie_file = file.get_path (); + print("cookie tmp file name: %s\n", file.get_path ()); + + OutputStream ostream = iostream.output_stream; + DataOutputStream dostream = new DataOutputStream (ostream); + dostream.put_string ("%s\tTRUE\t/\t%s\t2147483647\t%s\t%s".printf(uri.get_host(),scheme == "http" ? "FALSE" : "TRUE",cookies[0],cookies[1])); + cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT); + } catch (Error e) { + 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") { + cookie.set_secure(true); + } + cookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER); + cookie_jar.add_cookie(cookie); + sess.add_feature(cookie_jar); + #endif + + } + + } + // init method } // user defined functions @@ -230,74 +244,73 @@ public class BrowserWindow : Object this.print_started = true; // flag to stop double call. - // inject any javascript if needed.. - if (webkitpdf.opt_inject_js != null) { + // inject any javascript if needed.. + if (webkitpdf.opt_inject_js != null) { - print("injecting javascript files \n"); - foreach(var inject_js in webkitpdf.opt_inject_js) { - print("inject? %s\n", inject_js); - string str; - try { - FileUtils.get_contents( inject_js, out str); - } catch(FileError e) { - print("Failed to inject %s\n", inject_js); - continue; - } + print("injecting javascript files \n"); + foreach(var inject_js in webkitpdf.opt_inject_js) { + print("inject? %s\n", inject_js); + string str; + try { + FileUtils.get_contents( inject_js, out str); + } catch(FileError e) { + print("Failed to inject %s\n", inject_js); + continue; + } #if GTK3 - GLib.MainLoop mainloop = new GLib.MainLoop(); - this.el.run_javascript.begin(str, null, (obj,res) => { - mainloop.quit(); - }); - mainloop.run(); + GLib.MainLoop mainloop = new GLib.MainLoop(); + this.el.run_javascript.begin(str, null, (obj,res) => { + mainloop.quit(); + }); + mainloop.run(); #else - this.el.execute_script(str); + this.el.execute_script(str); #endif - } - } + } + } - print("calling print in %d seconds\n", (int)webkitpdf.opt_delay); - - if (webkitpdf.opt_target_pdf != null) { - GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { - print("delay done URL: %s\n", this.el.uri); + print("calling print in %d seconds\n", (int)webkitpdf.opt_delay); + if (webkitpdf.opt_target_pdf != null) { + GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { + print("delay done URL: %s\n", this.el.uri); - this.printpdf(); - return false; - }, GLib.Priority.DEFAULT); - return; - } + this.printpdf(); + return false; + }, GLib.Priority.DEFAULT); + return; + } #if GTK3 - print("PNG not supported in webkit2\n"); - return; + print("PNG not supported in webkit2\n"); + return; #else GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { - // ----------------- JPEG - // resize the window... - // window.document.documentElement.scrollHeight - var scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height; - print("Scroll height %d\n", scroll_height); - if (scroll_height> 1024 || webkitpdf.opt_width > 0 || webkitpdf.opt_height > 0 ) { - var w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200; - var h = int.min(scroll_height, 6000); - _this.scrolled_window.el.set_size_request( w, h); - _this.el.resize (w+50, h+50); - print("Resize to %d, %d\n", w,h); - GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { - this.printpng(); - return false; - }, GLib.Priority.DEFAULT); - return false; - } - this.printpng(); - return false; - }, GLib.Priority.DEFAULT); + // ----------------- JPEG + // resize the window... + // window.document.documentElement.scrollHeight + var scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height; + print("Scroll height %d\n", scroll_height); + if (scroll_height> 1024 || webkitpdf.opt_width > 0 || webkitpdf.opt_height > 0 ) { + var w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200; + var h = int.min(scroll_height, 6000); + _this.scrolled_window.el.set_size_request( w, h); + _this.el.resize (w+50, h+50); + print("Resize to %d, %d\n", w,h); + GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { + this.printpng(); + return false; + }, GLib.Priority.DEFAULT); + return false; + } + this.printpng(); + return false; + }, GLib.Priority.DEFAULT); #endif @@ -307,80 +320,80 @@ public class BrowserWindow : Object - var list = Gtk.PaperSize.get_paper_sizes(false); - var psetup = new Gtk.PageSetup(); - for(var i = 0; i < list.length(); i++ ) { - var entry = list.nth_data(i).copy(); - if (entry.get_name() == "iso_a2") { - psetup.set_paper_size(entry); - } - } + var list = Gtk.PaperSize.get_paper_sizes(false); + var psetup = new Gtk.PageSetup(); + for(var i = 0; i < list.length(); i++ ) { + var entry = list.nth_data(i).copy(); + if (entry.get_name() == "iso_a2") { + psetup.set_paper_size(entry); + } + } #if GTK3 - var pe = new WebKit.PrintOperation(this.el); - pe.set_page_setup(psetup); - pe.finished.connect( () => { - print("print completed\n"); - this.delete_cookiefile(); - Gtk.main_quit(); + var pe = new WebKit.PrintOperation(this.el); + pe.set_page_setup(psetup); + pe.finished.connect( () => { + print("print completed\n"); + this.delete_cookiefile(); + Gtk.main_quit(); - }); + }); - var ps = new Gtk.PrintSettings(); - ps.set_printer("Print to File"); - ps.set("output-file-format", "pdf"); - ps.set("output-uri", "file://" + webkitpdf.opt_target_pdf); + var ps = new Gtk.PrintSettings(); + ps.set_printer("Print to File"); + ps.set("output-file-format", "pdf"); + ps.set("output-uri", "file://" + webkitpdf.opt_target_pdf); - pe.set_print_settings(ps); + pe.set_print_settings(ps); - pe.print(); + pe.print(); #else - var pe = new Gtk.PrintOperation(); - pe.export_filename = webkitpdf.opt_target_pdf; - print("got callback for print\n"); - pe.ref(); - /*pe.failed.connect(() => { - print("print failed\n"); - Gtk.main_quit(); + var pe = new Gtk.PrintOperation(); + pe.export_filename = webkitpdf.opt_target_pdf; + print("got callback for print\n"); + pe.ref(); + /*pe.failed.connect(() => { + print("print failed\n"); + Gtk.main_quit(); - }) - */; - pe.done.connect(() => { - print("print completed\n"); - this.delete_cookiefile(); - Gtk.main_quit(); + }) + */; + pe.done.connect(() => { + print("print completed\n"); + this.delete_cookiefile(); + Gtk.main_quit(); - }); + }); - //pe.run_dialog(_this.el); + //pe.run_dialog(_this.el); - pe.set_default_page_setup(psetup); - print("Calling Print?\n"); - //pe.run_dialog(_this.el); + pe.set_default_page_setup(psetup); + print("Calling Print?\n"); + //pe.run_dialog(_this.el); - try { - this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT); - } catch (Error e) { - // print failed... - } + try { + this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT); + } catch (Error e) { + // print failed... + } #endif - return false; + return false; } public void printpng () { //var filename = "/tmp/test.pdf"; @@ -404,9 +417,9 @@ public class BrowserWindow : Object int w,h; // add out to gdkpixmap.get_size - pixmap.get_size( out w , out h); - var pixbuf = Gdk.pixbuf_get_from_drawable(null, pixmap, null , 0, 0, 0, 0, w, h); - print("pixbuf size: %d x %d\n ", w,h); + pixmap.get_size( out w , out h); + var pixbuf = Gdk.pixbuf_get_from_drawable(null, pixmap, null , 0, 0, 0, 0, w, h); + print("pixbuf size: %d x %d\n ", w,h); @@ -417,6 +430,7 @@ public class BrowserWindow : Object // sf.write_to_png(Browser.opt_target_png); //}); + this.delete_cookiefile(); Gtk.main_quit(); #endif @@ -424,20 +438,20 @@ public class BrowserWindow : Object } - public void delete_cookiefile () { - - if(this.cookie_file.length >0 ){ - print("deleting tmp file %s\n",this.cookie_file); - File file = File.new_for_path (this.cookie_file); - try { - if (file.query_exists () == true) { - file.delete (); - } - } catch (Error e) { - stdout.printf ("Error: %s\n", e.message); + if(this.cookie_file.length < 1 ){ + return; + } + print("deleting tmp file %s\n",this.cookie_file); + File file = File.new_for_path (this.cookie_file); + try { + if (file.query_exists () == true) { + file.delete (); } - } + } catch (Error e) { + stdout.printf ("Error: %s\n", e.message); + } + } } -- 2.39.2