Improve macOS directPrint

@@ -160,15 +160,7 @@ class MethodChannelPrinting extends PrintingPlatform {
     final printers = <Printer>[];
     final printers = <Printer>[];
 
 
     for (final printer in list) {
     for (final printer in list) {
-      printers.add(Printer(
-        url: printer['url'],
-        name: printer['name'],
-        model: printer['model'],
-        location: printer['location'],
-        comment: printer['comment'],
-        isDefault: printer['default'],
-        available: printer['available'],
-      ));
+      printers.add(Printer.fromMap(printer));
     }
     }
 
 
     return printers;
     return printers;
@@ -187,12 +179,7 @@ class MethodChannelPrinting extends PrintingPlatform {
     if (printer == null) {
     if (printer == null) {
       return null;
       return null;
     }
     }
-    return Printer(
-      url: printer['url'],
-      name: printer['name'],
-      model: printer['model'],
-      location: printer['location'],
-    );
+    return Printer.fromMap(printer);
   }
   }
 
 
   @override
   @override
@@ -215,6 +202,12 @@ class MethodChannelPrinting extends PrintingPlatform {
       'name': name,
       'name': name,
       'printer': printer.url,
       'printer': printer.url,
       'doc': bytes,
       'doc': bytes,
+      'width': format.width,
+      'height': format.height,
+      'marginLeft': format.marginLeft,
+      'marginTop': format.marginTop,
+      'marginRight': format.marginRight,
+      'marginBottom': format.marginBottom,
       'job': job.index,
       'job': job.index,
     };
     };
     await _channel.invokeMethod<int>('directPrintPdf', params);
     await _channel.invokeMethod<int>('directPrintPdf', params);

@@ -22,13 +22,27 @@ class Printer {
   /// Create a printer information
   /// Create a printer information
   const Printer({
   const Printer({
     @required this.url,
     @required this.url,
-    this.name,
+    String name,
     this.model,
     this.model,
     this.location,
     this.location,
     this.comment,
     this.comment,
-    this.isDefault = false,
-    this.available = true,
-  }) : assert(url != null);
+    bool isDefault,
+    bool isAvailable,
+  })  : assert(url != null),
+        name = name ?? url,
+        isDefault = isDefault ?? false,
+        isAvailable = isAvailable ?? true;
+
+  /// Create an information object from a dictionnary
+  factory Printer.fromMap(Map<dynamic, dynamic> map) => Printer(
+        url: map['url'],
+        name: map['name'],
+        model: map['model'],
+        location: map['location'],
+        comment: map['comment'],
+        isDefault: map['default'],
+        isAvailable: map['available'],
+      );
 
 
   /// The platform specific printer identification
   /// The platform specific printer identification
   final String url;
   final String url;
@@ -49,8 +63,14 @@ class Printer {
   final bool isDefault;
   final bool isDefault;
 
 
   /// The printer is available for printing
   /// The printer is available for printing
-  final bool available;
+  final bool isAvailable;
 
 
   @override
   @override
-  String toString() => name ?? url;
+  String toString() => '''$runtimeType $name
+  url:$url
+  location:$location
+  model:$model
+  comment:$comment
+  isDefault:$isDefault
+  isAvailable: $isAvailable''';
 }
 }

@@ -91,7 +91,7 @@ mixin Printing {
           title: Text(title ?? 'Select Printer'),
           title: Text(title ?? 'Select Printer'),
           children: [
           children: [
             for (final printer in printers)
             for (final printer in printers)
-              if (printer.available)
+              if (printer.isAvailable)
                 SimpleDialogOption(
                 SimpleDialogOption(
                   child: Text(
                   child: Text(
                     printer.name,
                     printer.name,

@@ -72,7 +72,7 @@ class PrintingInfo {
   final bool canRaster;
   final bool canRaster;
 
 
   @override
   @override
-  String toString() => '''PrintingInfo:
+  String toString() => '''$runtimeType:
   canPrint: $canPrint
   canPrint: $canPrint
   directPrint: $directPrint
   directPrint: $directPrint
   dynamicLayout: $dynamicLayout
   dynamicLayout: $dynamicLayout
@@ -80,17 +80,4 @@ class PrintingInfo {
   canListPrinters: $canListPrinters
   canListPrinters: $canListPrinters
   canShare: $canShare
   canShare: $canShare
   canRaster: $canRaster''';
   canRaster: $canRaster''';
-
-  /// Returns a map representation of this object
-  Map<dynamic, dynamic> asMap() {
-    return <dynamic, dynamic>{
-      'canPrint': canPrint,
-      'directPrint': directPrint,
-      'dynamicLayout': dynamicLayout,
-      'canConvertHtml': canConvertHtml,
-      'canListPrinters': canListPrinters,
-      'canShare': canShare,
-      'canRaster': canRaster,
-    };
-  }
 }
 }

@@ -43,8 +43,10 @@ public class PrintJob: NSView, NSSharingServicePickerDelegate {
 
 
     // Return the number of pages available for printing
     // Return the number of pages available for printing
     override public func knowsPageRange(_ range: NSRangePointer) -> Bool {
     override public func knowsPageRange(_ range: NSRangePointer) -> Bool {
-        setFrameSize(printOperation!.printPanel.printInfo.paperSize)
-        setBoundsSize(printOperation!.printPanel.printInfo.paperSize)
+        let size = printOperation!.showsPrintPanel ? printOperation!.printPanel.printInfo.paperSize : printOperation!.printInfo.paperSize
+
+        setFrameSize(size)
+        setBoundsSize(size)
         range.pointee.length = pdfDocument?.numberOfPages ?? 0
         range.pointee.length = pdfDocument?.numberOfPages ?? 0
         return true
         return true
     }
     }
@@ -78,7 +80,47 @@ public class PrintJob: NSView, NSSharingServicePickerDelegate {
         }
         }
     }
     }
 
 
-    public func directPrintPdf(name _: String, data _: Data, withPrinter _: String) {}
+    public func listPrinters() -> [NSDictionary] {
+        var printers: Array = [NSDictionary]()
+
+        for name in NSPrinter.printerNames {
+            let printer = NSPrinter(name: name)
+            let pr: NSDictionary = [
+                "url": name,
+                "name": name,
+                "model": printer!.type,
+            ]
+            printers.append(pr)
+        }
+
+        return printers
+    }
+
+    public func directPrintPdf(name: String, data: Data, withPrinter printer: String, width: CGFloat, height: CGFloat) {
+        let sharedInfo = NSPrintInfo.shared
+        let sharedDict = sharedInfo.dictionary()
+        let printInfoDict = NSMutableDictionary(dictionary: sharedDict)
+        let printInfo = NSPrintInfo(dictionary: printInfoDict as! [NSPrintInfo.AttributeKey: Any])
+        printInfo.printer = NSPrinter(name: printer)!
+
+        let bytesPointer = UnsafeMutablePointer<UInt8>.allocate(capacity: data.count)
+        data.copyBytes(to: bytesPointer, count: data.count)
+        let dataProvider = CGDataProvider(dataInfo: nil, data: bytesPointer, size: data.count, releaseData: dataProviderReleaseDataCallback)
+        pdfDocument = CGPDFDocument(dataProvider!)
+        printInfo.paperSize = NSSize(width: width, height: height)
+        if width > height {
+            printInfo.orientation = NSPrintInfo.PaperOrientation.landscape
+        }
+
+        // Print the custom view
+        printOperation = NSPrintOperation(view: self, printInfo: printInfo)
+        printOperation!.jobTitle = name
+        printOperation!.showsPrintPanel = false
+        printOperation!.showsProgressPanel = false
+
+        let window = NSApplication.shared.mainWindow!
+        printOperation!.runModal(for: window, delegate: self, didRun: #selector(printOperationDidRun(printOperation:success:contextInfo:)), contextInfo: nil)
+    }
 
 
     public func printPdf(name: String, withPageSize size: CGSize, andMargin _: CGRect) {
     public func printPdf(name: String, withPageSize size: CGSize, andMargin _: CGRect) {
         let sharedInfo = NSPrintInfo.shared
         let sharedInfo = NSPrintInfo.shared
@@ -86,6 +128,7 @@ public class PrintJob: NSView, NSSharingServicePickerDelegate {
         let printInfoDict = NSMutableDictionary(dictionary: sharedDict)
         let printInfoDict = NSMutableDictionary(dictionary: sharedDict)
         let printInfo = NSPrintInfo(dictionary: printInfoDict as! [NSPrintInfo.AttributeKey: Any])
         let printInfo = NSPrintInfo(dictionary: printInfoDict as! [NSPrintInfo.AttributeKey: Any])
 
 
+        printInfo.paperSize = size
         if size.width > size.height {
         if size.width > size.height {
             printInfo.orientation = NSPrintInfo.PaperOrientation.landscape
             printInfo.orientation = NSPrintInfo.PaperOrientation.landscape
         }
         }
@@ -171,10 +214,6 @@ public class PrintJob: NSView, NSSharingServicePickerDelegate {
         }
         }
     }
     }
 
 
-    public static func pickPrinter(result: @escaping FlutterResult, withSourceRect _: CGRect) {
-        result(NSNumber(value: 1))
-    }
-
     public func rasterPdf(data: Data, pages: [Int]?, scale: CGFloat) {
     public func rasterPdf(data: Data, pages: [Int]?, scale: CGFloat) {
         let provider = CGDataProvider(data: data as CFData)!
         let provider = CGDataProvider(data: data as CFData)!
         let document = CGPDFDocument(provider)!
         let document = CGPDFDocument(provider)!
@@ -220,12 +259,13 @@ public class PrintJob: NSView, NSSharingServicePickerDelegate {
 
 
     public static func printingInfo() -> NSDictionary {
     public static func printingInfo() -> NSDictionary {
         let data: NSDictionary = [
         let data: NSDictionary = [
-            "directPrint": false,
+            "directPrint": true,
             "dynamicLayout": false,
             "dynamicLayout": false,
             "canPrint": true,
             "canPrint": true,
             "canConvertHtml": true,
             "canConvertHtml": true,
             "canShare": true,
             "canShare": true,
             "canRaster": true,
             "canRaster": true,
+            "canListPrinters": true,
         ]
         ]
         return data
         return data
     }
     }

@@ -56,13 +56,19 @@ public class PrintingPlugin: NSObject, FlutterPlugin {
                                   height: height - marginBottom - marginTop
                                   height: height - marginBottom - marginTop
                               ))
                               ))
             result(NSNumber(value: 1))
             result(NSNumber(value: 1))
-//        } else if call.method == "directPrintPdf" {
-//            let name = args["name"] as! String
-//            let printer = args["printer"] as! String
-//            let object = args["doc"] as! FlutterStandardTypedData
-//            let printJob = PrintJob(printing: self, index: args["job"] as! Int)
-//            printJob.directPrintPdf(name: name, data: object.data, withPrinter: printer)
-//            result(NSNumber(value: 1))
+        } else if call.method == "listPrinters" {
+            let printJob = PrintJob(printing: self, index: -1)
+            let r = printJob.listPrinters()
+            result(r)
+        } else if call.method == "directPrintPdf" {
+            let name = args["name"] as! String
+            let printer = args["printer"] as! String
+            let object = args["doc"] as! FlutterStandardTypedData
+            let width = CGFloat((args["width"] as? NSNumber)?.floatValue ?? 0.0)
+            let height = CGFloat((args["height"] as? NSNumber)?.floatValue ?? 0.0)
+            let printJob = PrintJob(printing: self, index: args["job"] as! Int)
+            printJob.directPrintPdf(name: name, data: object.data, withPrinter: printer, width: width, height: height)
+            result(NSNumber(1))
         } else if call.method == "sharePdf" {
         } else if call.method == "sharePdf" {
             let object = args["doc"] as! FlutterStandardTypedData
             let object = args["doc"] as! FlutterStandardTypedData
             PrintJob.sharePdf(
             PrintJob.sharePdf(