Fix #7287 - upgrade to newer webkit
authorAlan <alan@roojs.com>
Wed, 29 Jun 2022 06:54:38 +0000 (14:54 +0800)
committerAlan <alan@roojs.com>
Wed, 29 Jun 2022 06:54:38 +0000 (14:54 +0800)
BrowserWindow.bjs
BrowserWindow.vala
README.txt
config1.builder
webkitpdf.vala

index ccfb659..56f04a3 100644 (file)
 {
- "name" : "BrowserWindow",
- "parent" : "",
- "title" : "",
- "path" : "/home/alan/gitlive/app.webkitpdf/BrowserWindow.bjs",
- "permname" : "",
- "modOrder" : "",
  "build_module" : "webkitpdf",
  "items" : [
   {
-   "listeners" : {
-    "destroy" : "() => {\n    Gtk.main_quit();\n}",
-    "show" : "() => {\n\t\n\tprint(\"resizing window\\n\");\n\tvar w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;\n\tvar h = webkitpdf.opt_height > 0 ?  webkitpdf.opt_height  :  500;\n\t\t\t\n\t\n\tthis.el.resize(w,h);\n\n\t// we have to do silly stuff with blogspot!!?!?\n\tvar blog = webkitpdf.opt_url;\n\n\n  /* Do not redirect if the domain is .com already */\n  if (/\\.blogspot\\.com/.match(blog)) {\n\t\tvar r =  new Regex (\"\\\\.blogspot\\\\..*?/\");\n\t\tblog = r.replace(blog, blog.length, 0, \".blogspot.com/ncr/\");\n  }\n\t\n\tprint(\"loading url %s\\n\",blog);\t\n\tthis.view.el.load_uri(blog);\n\t \n\t// if we have not finished in 25 seconds\n\t// call printit...\n\tvar cd = webkitpdf.opt_delay > 25 ? webkitpdf.opt_delay : 25;\n\t  GLib.Timeout.add_seconds(1, () => { \n\t\tcd--;\n\t\tprint(\"timeout %d seconds :%d\", (int)( webkitpdf.opt_delay > 25 ? webkitpdf.opt_delay : 25), (int)cd);\n\t\tif (cd < 1) {\n\t\t\tprint(\"calling printit - timed out\");\n\t\t\t_this.view.printit();\n\t\t\treturn false;\t\t\t\n\t\t}\n\t\treturn true;\n\n\t});\n\t\n\n}"
-   },
-   "xtype" : "Window",
    "$ xns" : "Gtk",
    "Gtk.WindowType type" : "Gtk.WindowType.TOPLEVEL",
    "items" : [
     {
-     "id" : "scrolled_window",
-     "* init" : "{\n\tthis.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);\n}\n",
-     "* pack" : "add",
-     "xtype" : "ScrolledWindow",
      "$ xns" : "Gtk",
+     "* init" : [
+      "{",
+      "\tthis.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);",
+      "}",
+      ""
+     ],
+     "* pack" : "add",
+     "id" : "scrolled_window",
      "items" : [
       {
-       "id" : "view",
-       "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            \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\t\n\t\t\t\tif (request.get_http_headers() != null) {\n\t \t\t\t\trequest.get_http_headers().remove(\"Referer\");\t\t\n\t \t\t\t\trequest.get_http_headers().append(\"Referer\", request.get_uri());\n\t\t\t\t}\n            });\n            var settings = this.el.get_settings();\n\t\t\tsettings.set_user_agent( \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36\" );\n\t\t\tsettings.hardware_acceleration_policy = WebKit.HardwareAccelerationPolicy.NEVER;\n\t\t\tsettings.enable_accelerated_2d_canvas = false;\n\t\t\tif (webkitpdf.opt_disable_javascript) { \n\t \t\t\tsettings.enable_javascript  = false;\n \t\t\t}\n\n\t\t\tWebKit.WebContext.get_default().set_tls_errors_policy(\tWebKit.TLSErrorsPolicy.IGNORE );\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                   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\t\t\t\tif (host.contains(\"google-analytics\") || host.contains(\"googlesyndication\") || host.contains(\"facebook\") ) {\n\t\t\t\t\tprint(\"DISCONNECTING: %s\\n\", host);\n\t\t\t\t\tsocket.disconnect();\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tprint(\"Adding header: %s\\n\", uri.to_string(false));\n\t\t\t\tmessage.request_headers.remove(\"Referer\");\t\t\t\t\n\t\t\t\tmessage.request_headers.append(\"Referer\", \"http://\"+host+\"/\");\n\t\t\t\t\n            \n            });\n            var sess = WebKit.get_default_session();\n\t\t\tsess.user_agent= \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36\";\n\t\t\tsess.ssl_strict = false;\n\t\t\t\n            var settings = this.el.get_settings();\n            \n\t\t\tsettings.enable_webgl = false;\n\t\t\tsettings.enable_plugins  = false;\n\t\t\tsettings.enable_java_applet  = false;\n\t\t\tif (webkitpdf.opt_disable_javascript) { \n\t \t\t\tsettings.enable_scripts  = false;\n \t\t\t}\n\t\t\t\n\t\t\t\n\t\t\tthis.el.console_message.connect((msg, line, sid) => {\n\t\t\t\tprint(\"CONSOLE: %s:%d %s\\n\", sid, line, msg);\n\t\t\t\treturn false;\n\t\t\t});\n\t\t\tthis.el.create_web_view.connect((frame) => {\n\t\t\t\tprint(\"WEBFRAME:%s\\n\", frame.uri);\n \t\t\t\treturn new WebKit.WebView();\n\t\t\t});\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\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 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\tWebKit.get_default_session().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\tGLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { \n\t\t\tprint(\"delay done URL: %s\\n\", this.el.uri);\n\t\t\tthis.printpng();\t\n\t\t\treturn false;\n\t\t}, GLib.Priority.DEFAULT);\n\t\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",
+       "# bool print_started" : false,
+       "# int load_try" : 0,
+       "# string cookie_file" : "",
+       "$ xns" : "WebKit",
+       "* init" : [
+        "",
+        "",
+        "{",
+        "\t\tthis.load_try = 0;",
+        "",
+        "",
+        "",
+        "",
+        "#if GTK3",
+        "\t\t this.el.load_changed.connect( (ev ) => {",
+        "    \t\tif (ev != WebKit.LoadEvent.FINISHED) {",
+        "\t\t    \t\treturn;\t ",
+        "    \t\t  }",
+        "    \t\t  ",
+        "               this.printit(); ",
+        "\t          ",
+        "             ",
+        "            });",
+        "            ",
+        "\t\t\tthis.el.resource_load_started.connect( (resource, request) => {",
+        "\t\t\t//\tprint(\"Adding referrer header %s\\n\" , request.get_uri());",
+        "\t\t\t\t",
+        "\t\t\t\tif (request.get_http_headers() != null) {",
+        "\t \t\t\t\trequest.get_http_headers().remove(\"Referer\");\t\t",
+        "\t \t\t\t\trequest.get_http_headers().append(\"Referer\", request.get_uri());",
+        "\t\t\t\t}",
+        "            });",
+        "            var settings = this.el.get_settings();",
+        "\t\t\tsettings.set_user_agent( \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36\" );",
+        "\t\t\tsettings.hardware_acceleration_policy = WebKit.HardwareAccelerationPolicy.NEVER;",
+        "\t\t\tsettings.enable_accelerated_2d_canvas = false;",
+        "\t\t\tif (webkitpdf.opt_disable_javascript) { ",
+        "\t \t\t\tsettings.enable_javascript  = false;",
+        " \t\t\t}",
+        "",
+        "\t\t\tWebKit.WebContext.get_default().set_tls_errors_policy(\tWebKit.TLSErrorsPolicy.IGNORE );",
+        "           ",
+        "#else",
+        " //listeners",
+        "          //  this.el.resource_request_starting.connect( (p0, webres, netreq ) => {",
+        "            //  print(\"resource req. started %s\\n\", netreq.uri);",
+        "                 ",
+        "          //  });",
+        "            ",
+        "            this.el.load_finished.connect( ( ) => {",
+        "        \t\t ",
+        "                   this.printit(); ",
+        "             ",
+        "            });",
+        "            WebKit.get_default_session().request_started.connect((message, socket) => {",
+        "          \t    Soup.URI uri = message.get_uri();",
+        "\t\t\t",
+        "\t\t\t\tvar host = uri.get_host ();",
+        "\t\t\t\tif (host.contains(\"google-analytics\") || host.contains(\"googlesyndication\") || host.contains(\"facebook\") ) {",
+        "\t\t\t\t\tprint(\"DISCONNECTING: %s\\n\", host);",
+        "\t\t\t\t\tsocket.disconnect();",
+        "\t\t\t\t\treturn;",
+        "\t\t\t\t}",
+        "",
+        "\t\t\t\tprint(\"Adding header: %s\\n\", uri.to_string(false));",
+        "\t\t\t\tmessage.request_headers.remove(\"Referer\");\t\t\t\t",
+        "\t\t\t\tmessage.request_headers.append(\"Referer\", \"http://\"+host+\"/\");",
+        "\t\t\t\t",
+        "            ",
+        "            });",
+        "            var sess = WebKit.get_default_session();",
+        "\t\t\tsess.user_agent= \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36\";",
+        "\t\t\tsess.ssl_strict = false;",
+        "\t\t\t",
+        "            var settings = this.el.get_settings();",
+        "            ",
+        "\t\t\tsettings.enable_webgl = false;",
+        "\t\t\tsettings.enable_plugins  = false;",
+        "\t\t\tsettings.enable_java_applet  = false;",
+        "\t\t\tif (webkitpdf.opt_disable_javascript) { ",
+        "\t \t\t\tsettings.enable_scripts  = false;",
+        " \t\t\t}",
+        "\t\t\t",
+        "\t\t\t",
+        "\t\t\tthis.el.console_message.connect((msg, line, sid) => {",
+        "\t\t\t\tprint(\"CONSOLE: %s:%d %s\\n\", sid, line, msg);",
+        "\t\t\t\treturn false;",
+        "\t\t\t});",
+        "\t\t\tthis.el.create_web_view.connect((frame) => {",
+        "\t\t\t\tprint(\"WEBFRAME:%s\\n\", frame.uri);",
+        " \t\t\t\treturn new WebKit.WebView();",
+        "\t\t\t});",
+        "            ",
+        "#endif",
+        "}",
+        "\t \tthis.cookie_file = \"\";",
+        "\t\tif (webkitpdf.opt_cookies != null) {",
+        "\t\t\tprint(\"setting cookie %s\\n\",webkitpdf.opt_cookies);",
+        "",
+        "\t\t\tvar uri =   GLib.Uri.parse (webkitpdf.opt_url, GLib.UriFlags.NONE);",
+        "\t\t\t",
+        "\t\t\tstring[] cookies = webkitpdf.opt_cookies.split (\"=\", 2);",
+        "",
+        "\t\t\tif(cookies.length > 1 ) {",
+        "\t\t",
+        "#if GTK3\t",
+        "\t\t\t\tvar context = WebKit.WebContext.get_default();\t         ",
+        "\t\t\t\tvar cookie_manager = context.get_cookie_manager();",
+        "\t\t\t\tcookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER);",
+        "\t\t\t\tstring scheme = uri.get_scheme ();",
+        "\t\t\t",
+        "\t\t\t\ttry {            ",
+        "\t\t\t\t    FileIOStream iostream;\t\t              ",
+        "\t\t\t\t    File file = File.new_tmp (\"cookie-XXXXXX.txt\", out iostream);",
+        "\t\t\t\t    this.cookie_file = file.get_path ();        ",
+        "\t\t\t\t    print(\"cookie tmp file name: %s\\n\", file.get_path ());",
+        "\t\t \t ",
+        "\t\t\t\t    OutputStream ostream = iostream.output_stream;",
+        "\t\t\t\t    DataOutputStream dostream = new DataOutputStream (ostream);\t\t\t\t\t     ",
+        "\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              ",
+        "\t\t\t\t    cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT);\t\t              ",
+        "\t\t\t\t} catch (Error e) {",
+        "\t\t\t\t    stdout.printf (\"Error: %s\\n\", e.message);",
+        "\t\t\t\t} \t\t",
+        "#else",
+        "\t\t\t\tvar cookie_jar = new Soup.CookieJar();\t\t",
+        "\t\t\t\tvar cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), \"/\", -1);",
+        "\t\t\t\tif(uri.get_scheme() ==\"https\") {",
+        "\t\t\t\t    cookie.set_secure(true);                    ",
+        "\t\t\t\t}\t    ",
+        "\t\t\t\tcookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER);\t\t\t\t ",
+        "\t\t\t\tcookie_jar.add_cookie(cookie);\t\t\t    ",
+        "\t\t\t\tWebKit.get_default_session().add_feature(cookie_jar);",
+        "#endif",
+        "\t\t\t\t\t        \t\t\t    \t\t\t    ",
+        "\t\t\t}",
+        "",
+        "\t\t} ",
+        "            // init method"
+       ],
        "* pack" : "add",
+       "id" : "view",
        "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            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\nGLib.MainLoop mainloop = new GLib.MainLoop();\n  _this.view.el.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => {\n  \t\t var sf = _this.view.el.get_snapshot.end(res);\n  \t\t sf.write_to_png(webkitpdf.opt_target_png);\n     \tprint(\"Saved to %s\\n\", webkitpdf.opt_target_png);\n  \t\t mainloop.quit();\n  \t\t \n  });\n\n\tmainloop.run();\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#endif       \n   this.delete_cookiefile(); \n   \n    Gtk.main_quit();\n     \n\n    \n    \n\n}\n",
-       "bool print_started" : false,
-       "$ xns" : "WebKit",
-       "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"
+       "| bool printpdf" : [
+        "() {",
+        "",
+        "",
+        "",
+        "\t\tvar list = Gtk.PaperSize.get_paper_sizes(false);",
+        "\t    var psetup = new Gtk.PageSetup();",
+        "\t    for(var i = 0; i < list.length(); i++ ) {",
+        "\t        var entry = list.nth_data(i).copy();",
+        "\t        if (entry.get_name() == \"iso_a2\") {",
+        "\t            psetup.set_paper_size(entry);",
+        "\t        }",
+        "\t    }",
+        "\t    ",
+        "",
+        "#if GTK3\t ",
+        "",
+        "\t\tvar  pe = new  WebKit.PrintOperation(this.el);",
+        "\t\tpe.set_page_setup(psetup);",
+        "\t\tpe.finished.connect( () => {",
+        "\t\t\tprint(\"print completed\\n\");",
+        "            this.delete_cookiefile(); ",
+        "\t\t\t Gtk.main_quit();",
+        "    \t\t",
+        "\t\t});",
+        "\t\t",
+        "\t\tvar ps = new Gtk.PrintSettings();",
+        "\t    ps.set_printer(\"Print to File\");",
+        "\t    ps.set(\"output-file-format\", \"pdf\");",
+        "\t    ps.set(\"output-uri\", \"file://\" + webkitpdf.opt_target_pdf);",
+        "",
+        "\t\t",
+        "\t\tpe.set_print_settings(ps);",
+        "\t\t",
+        "",
+        "\t\tpe.print();",
+        "            \t\t  ",
+        "",
+        "#else\t    ",
+        "\t\tvar  pe = new  Gtk.PrintOperation();",
+        "\t\tpe.export_filename = webkitpdf.opt_target_pdf;",
+        "\t\tprint(\"got callback for print\\n\");",
+        "\t\tpe.ref();",
+        "\t\t/*pe.failed.connect(() => {",
+        "\t\t\tprint(\"print failed\\n\");",
+        "\t\t\t Gtk.main_quit();",
+        "    \t\t",
+        "\t\t})",
+        "\t\t*/;",
+        "\t\t pe.done.connect(() => {",
+        "\t\t\tprint(\"print completed\\n\");",
+        "            this.delete_cookiefile(); ",
+        "\t\t\t Gtk.main_quit();",
+        "    \t\t",
+        "\t\t});",
+        "\t\t",
+        "\t\t//pe.run_dialog(_this.el);",
+        "\t ",
+        "\t\t",
+        "\t        ",
+        "",
+        "",
+        "\t    pe.set_default_page_setup(psetup);",
+        "\t    print(\"Calling Print?\\n\");",
+        "\t    //pe.run_dialog(_this.el);",
+        "\t    ",
+        "\t    ",
+        "",
+        "",
+        "",
+        "\t    try {",
+        "\t\t    this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT);",
+        "\t    } catch (Error e) {",
+        "\t\t\t// print failed...",
+        "\t\t}",
+        "#endif\t    ",
+        "\t    ",
+        "\t     ",
+        "\t\treturn false;",
+        "}",
+        ""
+       ],
+       "| void delete_cookiefile" : [
+        "() {",
+        " \tif(this.cookie_file.length < 1 ){",
+        " \t\treturn;",
+        "\t}",
+        "    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 ();\t             ",
+        "        }",
+        "    } catch (Error e) {",
+        "        stdout.printf (\"Error: %s\\n\", e.message);",
+        "    }",
+        "",
+        "}",
+        ""
+       ],
+       "| void printit" : [
+        "() {",
+        "   print(\"load_finsihed\\n\");",
+        "   ",
+        "   if (this.print_started) {",
+        "       print(\"load_finsihed - already printing..%d %s\\n\", this.load_try, this.el.uri);",
+        "   ",
+        "      ",
+        "      ",
+        "      ",
+        "      return;",
+        "  }",
+        "   ",
+        " ",
+        "    this.print_started = true; // flag to stop double call.",
+        "    ",
+        "    ",
+        "\t// inject any javascript if needed..",
+        "\tif (webkitpdf.opt_inject_js != null) {",
+        "\t",
+        "\t\tprint(\"injecting javascript files \\n\");",
+        "\t\tforeach(var inject_js in  webkitpdf.opt_inject_js) {",
+        "\t\tprint(\"inject? %s\\n\", inject_js);",
+        "\t\t\tstring str;",
+        "\t\t\ttry {",
+        "\t\t\t\tFileUtils.get_contents( inject_js, out str);",
+        "\t\t\t} catch(FileError e) {",
+        "\t\t\t\tprint(\"Failed to inject %s\\n\",  inject_js);",
+        "\t\t\t\tcontinue;",
+        "\t\t\t}",
+        "#if GTK3",
+        "\t\t\tGLib.MainLoop mainloop = new GLib.MainLoop();",
+        "\t\t\tthis.el.run_javascript.begin(str, null, (obj,res) => {",
+        "\t\t\t\tmainloop.quit();",
+        "\t\t\t});",
+        "\t\t\tmainloop.run();",
+        "\t\t\t",
+        "#else \t\t\t",
+        "\t\t\tthis.el.execute_script(str);",
+        "#endif",
+        "\t\t}",
+        "\t}",
+        "\t  ",
+        "\tprint(\"calling print in %d seconds\\n\", (int)webkitpdf.opt_delay);",
+        "\tif (webkitpdf.opt_target_pdf != null) {",
+        "\t\tGLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { ",
+        "\t\t\tprint(\"delay done URL: %s\\n\", this.el.uri);",
+        "\t\t",
+        "\t\t\t ",
+        "\t\t\tthis.printpdf();",
+        "\t\t\t return false;",
+        "\t\t}, GLib.Priority.DEFAULT);",
+        "\t\treturn;",
+        "\t}",
+        "\t\t",
+        "",
+        "#if GTK3",
+        "\tGLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { ",
+        "\t\t\tprint(\"delay done URL: %s\\n\", this.el.uri);",
+        "\t\t\tthis.printpng();\t",
+        "\t\t\treturn false;",
+        "\t\t}, GLib.Priority.DEFAULT);",
+        "\t\treturn;",
+        "#else",
+        "\t\t",
+        "    GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { ",
+        "   ",
+        "\t\t",
+        "\t\t// ----------------- JPEG ",
+        "\t\t// resize the window...",
+        "\t\t// window.document.documentElement.scrollHeight",
+        "\t\tvar scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height;",
+        "\t\tprint(\"Scroll height %d\\n\", scroll_height);",
+        "\t\tif (scroll_height> 1024 || webkitpdf.opt_width > 0  || webkitpdf.opt_height > 0  ) {",
+        "\t\t\tvar w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;",
+        "\t\t\tvar h = int.min(scroll_height, 6000);",
+        "\t\t\t_this.scrolled_window.el.set_size_request( w, h); ",
+        "\t\t\t_this.el.resize (w+50, h+50);",
+        "\t\t\tprint(\"Resize to %d, %d\\n\", w,h);",
+        "\t\t    GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { ",
+        "\t\t\t\tthis.printpng();",
+        "\t\t\t\treturn false;",
+        "\t\t\t  }, GLib.Priority.DEFAULT);",
+        "  \t\t    return false;",
+        "\t\t}",
+        "\t\tthis.printpng();\t\t",
+        "\t\treturn false;",
+        "\t  }, GLib.Priority.DEFAULT);",
+        "",
+        "",
+        "#endif    ",
+        "    ",
+        "}",
+        ""
+       ],
+       "| void printpng" : [
+        "() {",
+        "    //var filename = \"/tmp/test.pdf\";",
+        "    //print(\"load_changed %d ?= %d\\n\", le, LoadEvent.FINISHED);",
+        "",
+        "    //if (le != LoadEvent.FINISHED) {",
+        "    //    return;",
+        "   // }",
+        "   ",
+        "// what size is the documet.",
+        "",
+        "     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) => {",
+        "  \t\t var sf = _this.view.el.get_snapshot.end(res);",
+        "  \t\t sf.write_to_png(webkitpdf.opt_target_png);",
+        "     \tprint(\"Saved to %s\\n\", webkitpdf.opt_target_png);",
+        "  \t\t mainloop.quit();",
+        "  \t\t ",
+        "  });",
+        "",
+        "\tmainloop.run();",
+        "",
+        "#else     ",
+        "    // fix vapi - get_snapshot add '?' to all null.",
+        "    var pixmap = _this.view.el.get_snapshot( null );",
+        "",
+        "    ",
+        "    ",
+        "    int w,h;",
+        "    ",
+        "    // add out to gdkpixmap.get_size",
+        "\tpixmap.get_size( out  w , out   h);",
+        "\tvar pixbuf  = Gdk.pixbuf_get_from_drawable(null, pixmap, null , 0, 0, 0, 0, w, h);",
+        "\tprint(\"pixbuf size: %d x %d\\n \", w,h);",
+        "\t ",
+        "    ",
+        "    ",
+        "     pixbuf.save(webkitpdf.opt_target_png, \"png\");",
+        "     print(\"Saved to %s\\n\", webkitpdf.opt_target_png);",
+        "    //view.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => {",
+        "    //    var sf = view.get_snapshot.end(res);",
+        "",
+        "    //    sf.write_to_png(Browser.opt_target_png);",
+        "    //});",
+        "#endif       ",
+        "   this.delete_cookiefile(); ",
+        "   ",
+        "    Gtk.main_quit();",
+        "     ",
+        "",
+        "    ",
+        "    ",
+        "",
+        "}",
+        ""
+       ]
       }
-     ]
+     ],
+     "xtype" : "ScrolledWindow"
     }
-   ]
+   ],
+   "listeners" : {
+    "destroy" : [
+     "() => {",
+     "    Gtk.main_quit();",
+     "}"
+    ],
+    "show" : [
+     "() => {",
+     "\t",
+     "\tprint(\"resizing window\\n\");",
+     "\tvar w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;",
+     "\tvar h = webkitpdf.opt_height > 0 ?  webkitpdf.opt_height  :  500;",
+     "\t\t\t",
+     "\t",
+     "\tthis.el.resize(w,h);",
+     "",
+     "\t// we have to do silly stuff with blogspot!!?!?",
+     "\tvar blog = webkitpdf.opt_url;",
+     "",
+     "",
+     "  /* Do not redirect if the domain is .com already */",
+     "  if (/\\.blogspot\\.com/.match(blog)) {",
+     "\t\tvar r =  new Regex (\"\\\\.blogspot\\\\..*?/\");",
+     "\t\tblog = r.replace(blog, blog.length, 0, \".blogspot.com/ncr/\");",
+     "  }",
+     "\t",
+     "\tprint(\"loading url %s\\n\",blog);\t",
+     "\tthis.view.el.load_uri(blog);",
+     "\t ",
+     "\t// if we have not finished in 25 seconds",
+     "\t// call printit...",
+     "\tvar cd = webkitpdf.opt_delay > 25 ? webkitpdf.opt_delay : 25;",
+     "\t  GLib.Timeout.add_seconds(1, () => { ",
+     "\t\tcd--;",
+     "\t\tprint(\"timeout %d seconds :%d\", (int)( webkitpdf.opt_delay > 25 ? webkitpdf.opt_delay : 25), (int)cd);",
+     "\t\tif (cd < 1) {",
+     "\t\t\tprint(\"calling printit - timed out\");",
+     "\t\t\t_this.view.printit();",
+     "\t\t\treturn false;\t\t\t",
+     "\t\t}",
+     "\t\treturn true;",
+     "",
+     "\t});",
+     "\t",
+     "",
+     "}"
+    ]
+   },
+   "xtype" : "Window"
   }
- ]
+ ],
+ "modOrder" : "",
+ "name" : "BrowserWindow",
+ "parent" : "",
+ "path" : "/home/alan/gitlive/app.webkitpdf/BrowserWindow.bjs",
+ "permname" : "",
+ "title" : ""
 }
\ No newline at end of file
index 55f24b6..d92c1f9 100644 (file)
@@ -114,8 +114,8 @@ public class BrowserWindow : Object
 
 
             // my vars (def)
-        public string cookie_file;
         public bool print_started;
+        public string cookie_file;
         public int load_try;
 
         // ctor
@@ -136,6 +136,9 @@ public class BrowserWindow : Object
             {
                        this.load_try = 0;
             
+            
+            
+            
             #if GTK3
                         this.el.load_changed.connect( (ev ) => {
                                if (ev != WebKit.LoadEvent.FINISHED) {
@@ -222,13 +225,13 @@ public class BrowserWindow : Object
                        if (webkitpdf.opt_cookies != null) {
                                print("setting cookie %s\n",webkitpdf.opt_cookies);
             
-                               var uri = new Soup.URI (webkitpdf.opt_url);
+                               var uri =   GLib.Uri.parse (webkitpdf.opt_url, GLib.UriFlags.NONE);
                                
                                string[] cookies = webkitpdf.opt_cookies.split ("=", 2);
             
                                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);
@@ -247,7 +250,7 @@ public class BrowserWindow : Object
                                        } catch (Error e) {
                                            stdout.printf ("Error: %s\n", e.message);
                                        }               
-                               #else
+            #else
                                        var cookie_jar = new Soup.CookieJar();          
                                        var cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), "/", -1);
                                        if(uri.get_scheme() =="https") {
@@ -256,7 +259,7 @@ public class BrowserWindow : Object
                                        cookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER);                          
                                        cookie_jar.add_cookie(cookie);                      
                                        WebKit.get_default_session().add_feature(cookie_jar);
-                               #endif
+            #endif
                                                                                                            
                                }
             
@@ -265,98 +268,6 @@ public class BrowserWindow : Object
         }
 
         // user defined functions
-        public void printit () {
-           print("load_finsihed\n");
-           
-           if (this.print_started) {
-               print("load_finsihed - already printing..%d %s\n", this.load_try, this.el.uri);
-           
-              
-              
-              
-              return;
-          }
-           
-         
-            this.print_started = true; // flag to stop double call.
-            
-            
-               // 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;
-                               }
-        #if GTK3
-                               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);
-        #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);
-                       
-                                
-                               this.printpdf();
-                                return false;
-                       }, GLib.Priority.DEFAULT);
-                       return;
-               }
-                       
-        
-        #if GTK3
-               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, () => { 
-           
-                       
-                       // ----------------- 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    
-            
-        }
         public bool printpdf () {
         
         
@@ -505,6 +416,98 @@ public class BrowserWindow : Object
                 stdout.printf ("Error: %s\n", e.message);
             }
         
+        }
+        public void printit () {
+           print("load_finsihed\n");
+           
+           if (this.print_started) {
+               print("load_finsihed - already printing..%d %s\n", this.load_try, this.el.uri);
+           
+              
+              
+              
+              return;
+          }
+           
+         
+            this.print_started = true; // flag to stop double call.
+            
+            
+               // 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;
+                               }
+        #if GTK3
+                               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);
+        #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);
+                       
+                                
+                               this.printpdf();
+                                return false;
+                       }, GLib.Priority.DEFAULT);
+                       return;
+               }
+                       
+        
+        #if GTK3
+               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, () => { 
+           
+                       
+                       // ----------------- 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    
+            
         }
     }
 
index cb5529d..8f8736a 100644 (file)
@@ -1 +1,3 @@
-No readme yet
\ No newline at end of file
+No readme yet
+
\ No newline at end of file
index e0fccb3..eab0251 100644 (file)
@@ -8,8 +8,7 @@
             "..//app.webkitpdf/BrowserWindow.vala",
             "..//app.webkitpdf/webkitpdf.vala"
         ],
-        "packages" : [
-        ]
+        "packages" : []
     },
     {
         "name" : "_default_",
@@ -24,9 +23,9 @@
             "glib-2.0",
             "gee-1.0",
             "gio-2.0",
-            "webkit-1.0",
-            "gtk+-2.0",
-            "gdk-2.0"
+            "webkit2gtk-4.1",
+            "gdk-3.0",
+            "gtk+-3.0"
         ]
     }
 ]
\ No newline at end of file
index c5941e6..5b47595 100644 (file)
@@ -1,12 +1,14 @@
 
 /*
- sudo valac   --vapidir=. --thread  webkitpdf.vala  BrowserWindow.vala  --vapidir=./vapi \
+sudo valac   --vapidir=. --thread  webkitpdf.vala  BrowserWindow.vala  --vapidir=./vapi \
     --pkg glib-2.0 --pkg webkit-1.0 --pkg gtk+-2.0 -o /usr/bin/webkitpdf --target-glib=2.32 
   
- sudo valac -D GTK3   webkitpdf.vala  BrowserWindow.vala  --vapidir=./vapi \
+sudo valac -D GTK3   webkitpdf.vala  BrowserWindow.vala  --vapidir=./vapi \
     --pkg glib-2.0 --pkg webkit2gtk-4.0 --pkg gtk+-3.0 --pkg gio-2.0 -o /usr/bin/webkitpdf2 --target-glib=2.32 
   
-  
+sudo valac -D GTK3   webkitpdf.vala  BrowserWindow.vala  --vapidir=./vapi \
+    --pkg glib-2.0 --pkg webkit2gtk-4.0 --pkg gtk+-3.0 --pkg gio-2.0 -o /usr/bin/webkitpdf2 --target-glib=2.32 
+   
     
 */
 public class webkitpdf {