BrowserWindow.bjs
[app.webkitpdf] / BrowserWindow.vala
index c06cce2..b1dc3b9 100644 (file)
@@ -37,13 +37,18 @@ public class BrowserWindow : Object
         this.el.show.connect( () => {
                
                print("resizing window\n");
-               this.el.resize(1200,500);
+               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);
                print("loading url\n");
                this.view.el.load_uri(webkitpdf.opt_url);
                
                // if we have not finished in 25 seconds
                // call printit...
                  GLib.Timeout.add_seconds(25, () => { 
+                       print("Calling printit - timeout 25 seconds");
                                _this.view.printit();
                                return true;
                });
@@ -105,28 +110,31 @@ public class BrowserWindow : Object
 
             // set gobject values
 
-            //listeners
-            this.el.mime_type_policy_decision_requested.connect( (p0, netreq, mimetype, pol ) => {
-             //  print("resource response  %s, %s\n",   webres.get_mime_type(), netres.uri);
-               print("mimetype:  %s", mimetype);
-             // netres.message.got_headers.connect(() => { 
-             //   print("GOT HEADERS?  [%s] : %s\n", 
-               //  netres.message.request_headers.get_content_type(null),netres.uri);
-               //  });
-               
-               return true; // default behaviour..
-              
-               
-            });
-            this.el.resource_request_starting.connect( (p0, webres, netreq ) => {
-              print("resource req. started %s\n", netreq.uri);
-               
-            });
-            this.el.load_finished.connect( ( ) => {
-                        
-                   this.printit();
-             
-            });
+            // init method
+
+            {
+            #if GTK3
+                        this.el.load_changed.connect( (ev ) => {
+                                       if (ev == WebKit.LoadEvent.FINISHED) {
+                                  this.printit(); 
+                               }
+                         
+                        });
+            
+            #else
+             //listeners
+                      //  this.el.resource_request_starting.connect( (p0, webres, netreq ) => {
+                        //  print("resource req. started %s\n", netreq.uri);
+                             
+                      //  });
+                        
+                        this.el.load_finished.connect( ( ) => {
+                                        
+                               this.printit(); 
+                         
+                        });
+            #endif
+            }
         }
 
         // user defined functions
@@ -143,15 +151,27 @@ public class BrowserWindow : Object
             
                // inject any javascript if needed..
                if (webkitpdf.opt_inject_js != null) {
-                       for(var i =0; i < webkitpdf.opt_inject_js.length;i++) {
+               
+                       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( webkitpdf.opt_inject_js[i], out str);
+                                       FileUtils.get_contents( inject_js, out str);
                                } catch(FileError e) {
-                                       print("Failed to inject %s", str);
+                                       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
                        }
                }
                
@@ -164,8 +184,14 @@ public class BrowserWindow : Object
                                this.printpdf();
                                 return false;
                        }, GLib.Priority.DEFAULT);
+                       return;
                }
                        
+        
+        #if GTK3
+               print("PNG not supported in webkit2\n");
+               return;
+        #else
                        
             GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { 
            
@@ -175,11 +201,13 @@ public class BrowserWindow : Object
                        // 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) {
-                               //_this.scrolled_window.el.set_size_request(1200, int.min(scroll_height, 6000));
-                               _this.scrolled_window.el.set_size_request(1200, int.min(scroll_height, 6000));
-                               print("Resize to %d\n", scroll_height);
-                           GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { 
+                       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);
@@ -190,14 +218,49 @@ public class BrowserWindow : Object
                  }, GLib.Priority.DEFAULT);
         
         
-            
+        #endif    
             
         }
         public bool printpdf () {
-                
+        
+        
+        
+                       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");
+                                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);
+        
+                       
+                       pe.set_print_settings(ps);
+                       
+        
+                       pe.print();
+                                 
+        
+        #else      
                        var  pe = new  Gtk.PrintOperation();
                        pe.export_filename = webkitpdf.opt_target_pdf;
-                       print("got callback for print");
+                       print("got callback for print\n");
                        pe.ref();
                        /*pe.failed.connect(() => {
                                print("print failed\n");
@@ -214,26 +277,24 @@ public class BrowserWindow : Object
                        //pe.run_dialog(_this.el);
                 
                        
-                   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);
-                       }
-                   }
                        
         
         
                    pe.set_default_page_setup(psetup);
                    print("Calling Print?\n");
                    //pe.run_dialog(_this.el);
+                   
+                   
+        
+                       this.el.get_main_frame().print(pe);
+        
+        
                    try {
                            this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT);
                    } catch (Error e) {
                                // print failed...
                        }
-                   
+        #endif     
                    
                     
                        return false;
@@ -249,7 +310,9 @@ public class BrowserWindow : Object
         // what size is the documet.
         
              print("making screenshot\n");
-             
+        #if GTK3
+        
+        #else     
             // fix vapi - get_snapshot add '?' to all null.
             var pixmap = _this.view.el.get_snapshot( null );
         
@@ -273,7 +336,7 @@ public class BrowserWindow : Object
             //});
             Gtk.main_quit();
              
-           
+        #endif