From 77e5a5c11ae4d00a6ffe96c3334ea9906fc0fc78 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sat, 2 Apr 2016 07:03:18 +0000
Subject: Move get_carbon_function() to the Fl_Darwin_System_Driver class where
 it belongs.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11501 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm   | 11 ++++++-----
 src/drivers/Darwin/Fl_Darwin_System_Driver.H   |  1 +
 src/drivers/Darwin/Fl_Darwin_System_Driver.cxx | 11 +++++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
index 188828da4..3c536ae7c 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
+++ b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
@@ -20,6 +20,7 @@
 #include <FL/Fl_Shared_Image.H>
 #include <FL/Fl_Window_Driver.H>
 #include "../Quartz/Fl_Quartz_Printer_Graphics_Driver.H"
+#include "../Darwin/Fl_Darwin_System_Driver.H"
 
 #include <FL/Fl.H>
 #include <FL/x.H>
@@ -137,7 +138,7 @@ int Fl_Cocoa_Printer_Driver::start_job (int pagecount, int *frompage, int *topag
     // get pointer to the PMSessionPageSetupDialog Carbon function
     typedef OSStatus (*dialog_f)(PMPrintSession, PMPageFormat, Boolean *);
     static dialog_f f = NULL;
-    if (!f) f = (dialog_f)Fl_X::get_carbon_function("PMSessionPageSetupDialog");
+    if (!f) f = (dialog_f)Fl_Darwin_System_Driver::get_carbon_function("PMSessionPageSetupDialog");
     status = (*f)(printSession, pageFormat, &accepted);
     if (status != noErr || !accepted) {
       Fl::first_window()->show();
@@ -151,7 +152,7 @@ int Fl_Cocoa_Printer_Driver::start_job (int pagecount, int *frompage, int *topag
     // get pointer to the PMSessionPrintDialog Carbon function
     typedef OSStatus (*dialog_f2)(PMPrintSession, PMPrintSettings, PMPageFormat, Boolean *);
     static dialog_f2 f2 = NULL;
-    if (!f2) f2 = (dialog_f2)Fl_X::get_carbon_function("PMSessionPrintDialog");
+    if (!f2) f2 = (dialog_f2)Fl_Darwin_System_Driver::get_carbon_function("PMSessionPrintDialog");
     status = (*f2)(printSession, printSettings, pageFormat, &accepted);
     if (!accepted) status = kPMCancel;
     if (status != noErr) {
@@ -168,11 +169,11 @@ int Fl_Cocoa_Printer_Driver::start_job (int pagecount, int *frompage, int *topag
     mystring[0] = kPMGraphicsContextCoreGraphics;
     CFArrayRef array = CFArrayCreate(NULL, (const void **)mystring, 1, &kCFTypeArrayCallBacks);
     PMSessionSetDocumentFormatGeneration_type PMSessionSetDocumentFormatGeneration =
-      (PMSessionSetDocumentFormatGeneration_type)Fl_X::get_carbon_function("PMSessionSetDocumentFormatGeneration");
+      (PMSessionSetDocumentFormatGeneration_type)Fl_Darwin_System_Driver::get_carbon_function("PMSessionSetDocumentFormatGeneration");
     status = PMSessionSetDocumentFormatGeneration(printSession, kPMDocumentFormatDefault, array, NULL);
     CFRelease(array);
     PMSessionBeginDocumentNoDialog_type PMSessionBeginDocumentNoDialog =
-      (PMSessionBeginDocumentNoDialog_type)Fl_X::get_carbon_function("PMSessionBeginDocumentNoDialog");
+      (PMSessionBeginDocumentNoDialog_type)Fl_Darwin_System_Driver::get_carbon_function("PMSessionBeginDocumentNoDialog");
     status = PMSessionBeginDocumentNoDialog(printSession, printSettings, pageFormat);
 #endif //__LP64__
   }
@@ -292,7 +293,7 @@ int Fl_Cocoa_Printer_Driver::start_page (void)
   {
 #if ! __LP64_
     PMSessionGetGraphicsContext_type PMSessionGetGraphicsContext =
-      (PMSessionGetGraphicsContext_type)Fl_X::get_carbon_function("PMSessionGetGraphicsContext");
+      (PMSessionGetGraphicsContext_type)Fl_Darwin_System_Driver::get_carbon_function("PMSessionGetGraphicsContext");
     status = PMSessionGetGraphicsContext(printSession, NULL, (void **)&gc);
 #endif
   }
diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.H b/src/drivers/Darwin/Fl_Darwin_System_Driver.H
index 3ba7155b6..ab99c54d0 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.H
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.H
@@ -63,6 +63,7 @@ public:
   virtual int rmdir(const char* f) {return ::rmdir(f);}
   virtual int rename(const char* f, const char *n) {return ::rename(f, n);}
   virtual int clocale_printf(FILE *output, const char *format, va_list args);
+  static void *get_carbon_function(const char *name);
 };
 
 #endif // FL_DARWIN_SYSTEM_DRIVER_H
diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
index 3740e55cf..450857652 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
@@ -28,6 +28,7 @@
 #include <locale.h>
 #endif
 #include <stdio.h>
+#include <dlfcn.h>
 
 int Fl_X::next_marked_length = 0;
 
@@ -79,6 +80,16 @@ int Fl_Darwin_System_Driver::clocale_printf(FILE *output, const char *format, va
   return retval;
 }
 
+/* Returns the address of a Carbon function after dynamically loading the Carbon library if needed.
+ Supports old Mac OS X versions that may use a couple of Carbon calls:
+ GetKeys used by OS X 10.3 or before (in Fl::get_key())
+ PMSessionPageSetupDialog and PMSessionPrintDialog used by 10.4 or before (in Fl_Printer::start_job())
+ */
+void *Fl_Darwin_System_Driver::get_carbon_function(const char *function_name) {
+  static void *carbon = dlopen("/System/Library/Frameworks/Carbon.framework/Carbon", RTLD_LAZY);
+  return (carbon ? dlsym(carbon, function_name) : NULL);
+}
+
 //
 // End of "$Id$".
 //
-- 
cgit v1.2.3