From e0405d2135939d08289205e3a38df329076e16c1 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Sun, 1 Feb 2026 16:32:21 +0100 Subject: macOS: remove code present only to support macOS versions 10.3 and 10.4. This is a first step towards removing the code related to support of old macOS versions that are not compatible with C++11 which FLTK 1.5 requires. --- src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm | 10 +- src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm | 78 +---- src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx | 10 +- src/drivers/Darwin/Fl_Darwin_System_Driver.cxx | 59 +--- src/drivers/Quartz/Fl_Font.H | 8 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H | 35 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx | 44 +-- .../Quartz/Fl_Quartz_Graphics_Driver_font.cxx | 354 +-------------------- .../Quartz/Fl_Quartz_Image_Surface_Driver.H | 4 +- .../Quartz/Fl_Quartz_Image_Surface_Driver.cxx | 16 +- 10 files changed, 30 insertions(+), 588 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm index d286d46f3..6dff548f0 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm +++ b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm @@ -1,7 +1,7 @@ // // Class Fl_Cocoa_Gl_Window_Driver for the Fast Light Tool Kit (FLTK). // -// Copyright 2021-2022 by Bill Spitzak and others. +// Copyright 2021-2026 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -112,10 +112,8 @@ static NSOpenGLPixelFormat* mode_to_NSOpenGLPixelFormat(int m, const int *alistp //list[n++] = AGL_STEREO; attribs[n++] = 6/*NSOpenGLPFAStereo*/; } - if ((m & FL_MULTISAMPLE) && fl_mac_os_version >= 100400) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 + if (m & FL_MULTISAMPLE) { attribs[n++] = NSOpenGLPFAMultisample; // 10.4 -#endif attribs[n++] = NSOpenGLPFASampleBuffers; attribs[n++] = (NSOpenGLPixelFormatAttribute)1; attribs[n++] = NSOpenGLPFASamples; attribs[n++] = (NSOpenGLPixelFormatAttribute)4; } @@ -480,8 +478,6 @@ Fl_RGB_Image* Fl_Cocoa_Gl_Window_Driver::capture_gl_rectangle(int x, int y, int if (factor != 1) { w *= factor; h *= factor; x *= factor; y *= factor; } -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if (fl_mac_os_version >= 100500) { NSWindow *nswin = (NSWindow*)fl_mac_xid(pWindow); CGImageRef img_full = Fl_Cocoa_Window_Driver::capture_decorated_window_10_5(nswin); int bt = [nswin frame].size.height - [[nswin contentView] frame].size.height; @@ -492,8 +488,6 @@ Fl_RGB_Image* Fl_Cocoa_Gl_Window_Driver::capture_gl_rectangle(int x, int y, int Fl_RGB_Image *rgb = cgimage_to_rgb4(cgimg); CGImageRelease(cgimg); return rgb; - } -#endif [(NSOpenGLContext*)glw->context() makeCurrentContext]; // to capture also the overlay and for directGL demo [(NSOpenGLContext*)glw->context() flushBuffer]; diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm index 0df98af7e..f1a769d75 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm +++ b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm @@ -1,7 +1,7 @@ // // Mac OS X-specific printing support (objective-c++) for the Fast Light Tool Kit (FLTK). // -// Copyright 2010-2024 by Bill Spitzak and others. +// Copyright 2010-2026 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -107,8 +107,6 @@ int Fl_Cocoa_Printer_Driver::begin_job (int pagecount, int *frompage, int *topag OSStatus status = 0; fl_open_display(); Fl_Cocoa_Window_Driver::q_release_context(); -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if (fl_mac_os_version >= 100500) { NSPrintInfo *info = [NSPrintInfo sharedPrintInfo]; NSPrintPanel *panel = [NSPrintPanel printPanel]; //from 10.5 @@ -143,59 +141,6 @@ int Fl_Cocoa_Printer_Driver::begin_job (int pagecount, int *frompage, int *topag if (*topage > pagecount && pagecount > 0) *topage = pagecount; } status = PMSessionBeginCGDocumentNoDialog(printSession, printSettings, pageFormat);//from 10.4 - } - else -#endif - { -#if !defined(__LP64__) || !__LP64__ - Boolean accepted; - status = PMCreateSession(&printSession); - if (status != noErr) return 1; - status = PMCreatePageFormat(&pageFormat); - status = PMSessionDefaultPageFormat(printSession, pageFormat); - if (status != noErr) return 1; - // 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_Darwin_System_Driver::get_carbon_function("PMSessionPageSetupDialog"); - status = (*f)(printSession, pageFormat, &accepted); - if (status != noErr || !accepted) { - Fl::first_window()->show(); - return 1; - } - status = PMCreatePrintSettings(&printSettings); - if (status != noErr || printSettings == kPMNoPrintSettings) return 1; - status = PMSessionDefaultPrintSettings (printSession, printSettings); - if (status != noErr) return 1; - PMSetPageRange(printSettings, 1, (UInt32)kPMPrintAllPages); - // 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_Darwin_System_Driver::get_carbon_function("PMSessionPrintDialog"); - status = (*f2)(printSession, printSettings, pageFormat, &accepted); - if (!accepted) status = kPMCancel; - if (status != noErr) { - Fl::first_window()->show(); - return 1; - } - UInt32 from32, to32; - PMGetFirstPage(printSettings, &from32); - if (frompage) *frompage = (int)from32; - PMGetLastPage(printSettings, &to32); - if (topage) *topage = (int)to32; - if(topage && *topage > pagecount) *topage = pagecount; - CFStringRef mystring[1]; - mystring[0] = kPMGraphicsContextCoreGraphics; - CFArrayRef array = CFArrayCreate(NULL, (const void **)mystring, 1, &kCFTypeArrayCallBacks); - PMSessionSetDocumentFormatGeneration_type 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_Darwin_System_Driver::get_carbon_function("PMSessionBeginDocumentNoDialog"); - status = PMSessionBeginDocumentNoDialog(printSession, printSettings, pageFormat); -#endif //__LP64__ - } if (status != noErr) { if (perr_message) { @@ -309,19 +254,7 @@ int Fl_Cocoa_Printer_Driver::begin_page (void) { OSStatus status = PMSessionBeginPageNoDialog(printSession, pageFormat, NULL); CGContextRef gc; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if ( &PMSessionGetCGGraphicsContext != NULL ) { - status = PMSessionGetCGGraphicsContext(printSession, &gc); - } - else -#endif - { -#if !defined(__LP64__) || !__LP64__ - PMSessionGetGraphicsContext_type PMSessionGetGraphicsContext = - (PMSessionGetGraphicsContext_type)Fl_Darwin_System_Driver::get_carbon_function("PMSessionGetGraphicsContext"); - status = PMSessionGetGraphicsContext(printSession, NULL, (void **)&gc); -#endif - } + status = PMSessionGetCGGraphicsContext(printSession, &gc); // 10.4 driver()->gc(gc); Fl_Surface_Device::push_current(this); PMRect pmRect; @@ -377,13 +310,6 @@ void Fl_Cocoa_Printer_Driver::end_job (void) fl_alert ("PM Session error %d", (int)status); } PMSessionEndDocumentNoDialog(printSession); -#if !defined(__LP64__) || !__LP64__ - if (fl_mac_os_version < 100500) { - PMRelease(printSettings); - PMRelease(pageFormat); - PMRelease(printSession); - } -#endif Fl_Window *w = Fl::first_window(); if (w) w->show(); } diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx index 15983032f..ac99ab70b 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx @@ -1,7 +1,7 @@ // // Definition of Apple Cocoa window driver. // -// Copyright 1998-2018 by Bill Spitzak and others. +// Copyright 1998-2026 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -75,12 +75,10 @@ void Fl_Cocoa_Window_Driver::draw_begin() if (!Fl_Surface_Device::surface()->driver()->has_feature(Fl_Graphics_Driver::NATIVE)) return; CGContextRef my_gc = (CGContextRef)Fl_Surface_Device::surface()->driver()->gc(); if (shape_data_) { -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if (shape_data_->mask && (&CGContextClipToMask != NULL)) { + if (shape_data_->mask) { CGContextClipToMask(my_gc, CGRectMake(0,0,w(),h()), shape_data_->mask); // requires Mac OS 10.4 } CGContextSaveGState(my_gc); -# endif } } @@ -111,12 +109,10 @@ void Fl_Cocoa_Window_Driver::draw_end() } } } -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 if (Fl_Surface_Device::surface()->driver()->has_feature(Fl_Graphics_Driver::NATIVE)) { CGContextRef my_gc = (CGContextRef)Fl_Surface_Device::surface()->driver()->gc(); if (shape_data_) CGContextRestoreGState(my_gc); } -# endif } @@ -187,7 +183,6 @@ void Fl_Cocoa_Window_Driver::shape_alpha_(Fl_Image* img, int offset) { void Fl_Cocoa_Window_Driver::shape(const Fl_Image* img) { -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 if (shape_data_) { if (shape_data_->mask) { CGImageRelease(shape_data_->mask); } } @@ -203,7 +198,6 @@ void Fl_Cocoa_Window_Driver::shape(const Fl_Image* img) { else if (d == 0) shape_bitmap_((Fl_Image*)img); else if (d == 2 || d == 4) shape_alpha_((Fl_Image*)img, d - 1); else if ((d == 1 || d == 3) && img->count() == 1) shape_alpha_((Fl_Image*)img, 0); -#endif pWindow->border(false); } diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx index 431e908a5..c11a95f94 100644 --- a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx +++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx @@ -1,7 +1,7 @@ // // Definition of Apple Darwin system driver. // -// Copyright 1998-2021 by Bill Spitzak and others. +// Copyright 1998-2026 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -24,9 +24,7 @@ #include #include "../../flstring.h" #include -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 -#include -#endif +#include // 10.4 #include #include #include @@ -66,61 +64,28 @@ int Fl_Darwin_System_Driver::arg_and_value(const char *name, const char *value) return strcmp(name, "NSDocumentRevisionsDebugMode") == 0; } -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 static locale_t postscript_locale = NULL; -#endif int Fl_Darwin_System_Driver::clocale_vprintf(FILE *output, const char *format, va_list args) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if (fl_mac_os_version >= 100400) { - if (!postscript_locale) - postscript_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0); - return vfprintf_l(output, postscript_locale, format, args); - } -#endif - char *saved_locale = setlocale(LC_NUMERIC, NULL); - setlocale(LC_NUMERIC, "C"); - int retval = vfprintf(output, format, args); - setlocale(LC_NUMERIC, saved_locale); - return retval; + if (!postscript_locale) + postscript_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0); + return vfprintf_l(output, postscript_locale, format, args); // 10.4 } int Fl_Darwin_System_Driver::clocale_vsnprintf(char *output, size_t output_size, const char *format, va_list args) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if (fl_mac_os_version >= 100400) { - if (!postscript_locale) - postscript_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0); - return vsnprintf_l(output, output_size, postscript_locale, format, args); - } -#endif - char *saved_locale = setlocale(LC_NUMERIC, NULL); - setlocale(LC_NUMERIC, "C"); - int retval = vsnprintf(output, output_size, format, args); - setlocale(LC_NUMERIC, saved_locale); - return retval; + if (!postscript_locale) + postscript_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0); + return vsnprintf_l(output, output_size, postscript_locale, format, args); // 10.4 } int Fl_Darwin_System_Driver::clocale_vsscanf(const char *input, const char *format, va_list args) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if (fl_mac_os_version >= 100400) { - if (!postscript_locale) - postscript_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0); - return vsscanf_l(input, postscript_locale, format, args); - } -#endif - char *saved_locale = setlocale(LC_NUMERIC, NULL); - setlocale(LC_NUMERIC, "C"); - int retval = vsscanf(input, format, args); - setlocale(LC_NUMERIC, saved_locale); - return retval; + if (!postscript_locale) + postscript_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0); + return vsscanf_l(input, postscript_locale, format, args); // 10.4 } -/* 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::begin_job()) - */ +// Returns the address of a Carbon function after dynamically loading the Carbon library if needed. 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); diff --git a/src/drivers/Quartz/Fl_Font.H b/src/drivers/Quartz/Fl_Font.H index c700568a2..f1a710eea 100644 --- a/src/drivers/Quartz/Fl_Font.H +++ b/src/drivers/Quartz/Fl_Font.H @@ -1,7 +1,7 @@ // // Font definitions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2018 by Bill Spitzak and others. +// Copyright 1998-2026 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -31,15 +31,9 @@ class Fl_Quartz_Font_Descriptor : public Fl_Font_Descriptor { public: Fl_Quartz_Font_Descriptor(const char* fontname, Fl_Fontsize size); virtual FL_EXPORT ~Fl_Quartz_Font_Descriptor(); -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 CTFontRef fontref; // the unicode span is divided in 512 blocks of 128 characters float *width[512]; // array of arrays of character widths -# endif -# if HAS_ATSU - ATSUTextLayout layout; - ATSUStyle style; -# endif short q_width; }; diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H index ca1ffce04..0afc7369e 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H @@ -2,7 +2,7 @@ // Definition of Apple Quartz graphics driver // for the Fast Light Tool Kit (FLTK). // -// Copyright 2010-2022 by Bill Spitzak and others. +// Copyright 2010-2026 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -27,16 +27,6 @@ #include #include -// condition for the ATSU API to be available at compile time -#if ( (!defined(__LP64__) || !__LP64__) \ - && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11 \ - && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 \ - ) -#define HAS_ATSU 1 -#else -#define HAS_ATSU 0 -#endif - struct Fl_Fontdesc; class Fl_Quartz_Font_Descriptor; @@ -143,30 +133,7 @@ protected: void set_fontname_in_fontdesc(Fl_Fontdesc *f); void uncache_pixmap(fl_uintptr_t p) FL_OVERRIDE; -#if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - enum {use_CoreText = 1, use_ATSU}; - static int CoreText_or_ATSU; - static void init_CoreText_or_ATSU(); - void draw_CoreText(const char *str, int n, float x, float y); - double width_CoreText(const UniChar* txt, int n); - void descriptor_init_CoreText(const char* name, Fl_Fontsize Size, Fl_Quartz_Font_Descriptor *d); - void text_extents_CoreText(const char*, int n, int& dx, int& dy, int& w, int& h); - Fl_Font set_fonts_CoreText(const char* xstarname); - - void draw_ATSU(const char *str, int n, float x, float y); - double width_ATSU(const UniChar* txt, int n); - void descriptor_init_ATSU(const char* name, Fl_Fontsize Size, Fl_Quartz_Font_Descriptor *d); - void text_extents_ATSU(const char*, int n, int& dx, int& dy, int& w, int& h); - Fl_Font set_fonts_ATSU(const char* xstarname); - - // define 2 kinds of pointers to member function - typedef void (Fl_Quartz_Graphics_Driver::*pter_to_draw_member)(const char *str, int n, float x, float y); - typedef double (Fl_Quartz_Graphics_Driver::*pter_to_width_member)(const UniChar *str, int n); - static pter_to_draw_member CoreText_or_ATSU_draw; - static pter_to_width_member CoreText_or_ATSU_width; -#else void descriptor_init(const char* name, Fl_Fontsize Size, Fl_Quartz_Font_Descriptor *d); -#endif void overlay_rect(int x, int y, int w , int h) FL_OVERRIDE; float override_scale() FL_OVERRIDE; void restore_scale(float) FL_OVERRIDE; diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx index 7ee610d24..21c5eda4c 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx @@ -1,7 +1,7 @@ // // Rectangle drawing routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2018 by Bill Spitzak and others. +// Copyright 1998-2026 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -22,27 +22,6 @@ #include #include -#if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -Fl_Quartz_Graphics_Driver::pter_to_draw_member Fl_Quartz_Graphics_Driver::CoreText_or_ATSU_draw; -Fl_Quartz_Graphics_Driver::pter_to_width_member Fl_Quartz_Graphics_Driver::CoreText_or_ATSU_width; - -int Fl_Quartz_Graphics_Driver::CoreText_or_ATSU = 0; - -void Fl_Quartz_Graphics_Driver::init_CoreText_or_ATSU() -{ - if (Fl_Darwin_System_Driver::calc_mac_os_version() < 100500) { - // before Mac OS 10.5, only ATSU is available - CoreText_or_ATSU = use_ATSU; - CoreText_or_ATSU_draw = &Fl_Quartz_Graphics_Driver::draw_ATSU; - CoreText_or_ATSU_width = &Fl_Quartz_Graphics_Driver::width_ATSU; - } else { - CoreText_or_ATSU = use_CoreText; - CoreText_or_ATSU_draw = &Fl_Quartz_Graphics_Driver::draw_CoreText; - CoreText_or_ATSU_width = &Fl_Quartz_Graphics_Driver::width_CoreText; - } -} -#endif - void Fl_Quartz_Graphics_Driver::antialias(int state) { } @@ -58,9 +37,6 @@ Fl_Quartz_Graphics_Driver::Fl_Quartz_Graphics_Driver() : Fl_Graphics_Driver(), g quartz_line_pattern = 0; quartz_line_pattern_size = 0; high_resolution_ = false; -#if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if (!CoreText_or_ATSU) init_CoreText_or_ATSU(); -#endif } char Fl_Quartz_Graphics_Driver::can_do_alpha_blending() { @@ -91,26 +67,10 @@ CGContextRef fl_mac_gc() { return fl_gc; } void Fl_Quartz_Graphics_Driver::copy_offscreen(int x, int y, int w, int h, Fl_Offscreen osrc, int srcx, int srcy) { // draw portion srcx,srcy,w,h of osrc to position x,y (top-left) of the graphics driver's surface CGContextRef src = (CGContextRef)osrc; - void *data = CGBitmapContextGetData(src); int sw = (int)CGBitmapContextGetWidth(src); int sh = (int)CGBitmapContextGetHeight(src); CGImageRef img; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if (fl_mac_os_version >= 100400) img = CGBitmapContextCreateImage(src); // requires 10.4 - else -#endif - { - CGImageAlphaInfo alpha = CGBitmapContextGetAlphaInfo(src); - CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB(); - // when output goes to a Quartz printercontext, release of the bitmap must be - // delayed after the end of the printed page - CFRetain(src); - CGDataProviderRef src_bytes = CGDataProviderCreateWithData( src, data, sw*sh*4, bmProviderRelease); - img = CGImageCreate( sw, sh, 8, 4*8, 4*sw, lut, alpha, - src_bytes, 0L, false, kCGRenderingIntentDefault); - CGDataProviderRelease(src_bytes); - CGColorSpaceRelease(lut); - } + img = CGBitmapContextCreateImage(src); // requires 10.4 CGAffineTransform at = CGContextGetCTM(src); float s = at.a; draw_CGImage(img, x, y, w, h, srcx, srcy, sw/s, sh/s); diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx index a277010e3..d373c1768 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx @@ -14,61 +14,6 @@ // https://www.fltk.org/bugs.php // -/* Implementation of support for two text drawing APIs: Core Text (current) and ATSU (legacy) - - The HAS_ATSU macro (defined in Fl_Quartz_Graphics_Driver.H) is true - if and only if ATSU is available at compile time. - The condition - #if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - is true if and only if both APIs are available at compile time. - Depending on what MacOS SDK and what deployment target are used, the code can be - compiled in 2 ways: - 1) both APIs are available at compile time and which one is used - is determined at runtime, - or - 2) only one API is available. - - When both APIs are compiled in, the choice of which one is used at runtime is done - the first time the Fl_Quartz_Graphics_Driver constructor runs, and remains unchanged. - Core Text is selected if the running Mac OS version is ≥ 10.5. - The static function init_CoreText_or_ATSU() does this by setting the value - of the class variable CoreText_or_ATSU to either use_CoreText or use_ATSU. - - If both APIs are available, several member functions come in groups of 3. - For example, functions draw(), draw_CoreText() and draw_ATSU() are defined. The only - task of draw() is to call either draw_CoreText() or draw_ATSU() depending on - what API has been selected at program start. - - If the compilation condition authorizes a single API, one member function - is defined instead of 3 in the other case. For example, a single draw() function - is compiled, and contains the same code as what is called either draw_CoreText() - or draw_ATSU() in the other case. - - The ADD_SUFFIX(name, suffix) macro is used so that each function has the - short (e.g., draw) or long (e.g., draw_CoreText) name adequate for - each compilation condition. - - The 2 most often used text functions are draw() and width(). Two pointers to member - function are defined. Function init_CoreText_or_ATSU() assigns one with either - draw_CoreText() or draw_ATSU(), and the other with either width_CoreText() or width_ATSU(). - The draw() and width() functions only have to dereference one pointer to member - function to call the adequate code. - - If the compilation condition authorizes a single text API, only the code related - to this API (say, CoreText) is compiled whereas all code related to the other API - (thus, ATSU) is excluded from compilation. Furthermore, none of the code to - choose API at runtime and to select which member function is called is compiled. - Consequently, no pointer to member function is used. - - The condition for both APIs to be compiled-in is - - target i386 or ppc architectures - and - - use SDK ≥ 10.5 and < 10.11 - and - - set MacOS deployment target < 10.5 (through the -mmacosx-version-min= compilation option) - - */ - #include "Fl_Quartz_Graphics_Driver.H" #include "Fl_Font.H" #include @@ -87,13 +32,6 @@ static CGAffineTransform font_mx = { 1, 0, 0, -1, 0, 0 }; static int fl_free_font = FL_FREE_FONT; -#if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -# define ADD_SUFFIX(name, suffix) name##suffix -#else -# define ADD_SUFFIX(name, suffix) name -#endif - -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 static CFMutableDictionaryRef attributes = NULL; @@ -115,28 +53,7 @@ static Fl_Fontdesc built_in_table_PS[] = { // PostScript font names preferred wh {"AndaleMono"}, // there is no bold Monaco font on standard Mac {"ZapfDingbatsITC"} }; -#endif -#if HAS_ATSU -static Fl_Fontdesc built_in_table_full[] = { // full font names used before 10.5 - {"Arial"}, - {"Arial Bold"}, - {"Arial Italic"}, - {"Arial Bold Italic"}, - {"Courier"}, - {"Courier Bold"}, - {"Courier New Italic"}, - {"Courier New Bold Italic"}, - {"Times New Roman"}, - {"Times New Roman Bold"}, - {"Times New Roman Italic"}, - {"Times New Roman Bold Italic"}, - {"Symbol"}, - {"Monaco"}, - {"Andale Mono"}, // there is no bold Monaco font on standard Mac - {"Webdings"} -}; -#endif // Bug: older versions calculated the value for *ap as a side effect of // making the name, and then forgot about it. To avoid having to change @@ -178,22 +95,9 @@ int Fl_Quartz_Graphics_Driver::get_font_sizes(Fl_Font fnum, int*& sizep) { } Fl_Quartz_Font_Descriptor::Fl_Quartz_Font_Descriptor(const char* name, Fl_Fontsize Size) : Fl_Font_Descriptor(name, Size) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 fontref = NULL; -#endif -#if HAS_ATSU - layout = NULL; -#endif Fl_Quartz_Graphics_Driver *driver = (Fl_Quartz_Graphics_Driver*)&Fl_Graphics_Driver::default_driver(); -#if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if (Fl_Quartz_Graphics_Driver::CoreText_or_ATSU == Fl_Quartz_Graphics_Driver::use_ATSU) { - driver->descriptor_init_ATSU(name, size, this); - return; - } - driver->descriptor_init_CoreText(name, size, this); -#else driver->descriptor_init(name, size, this); -#endif } @@ -207,20 +111,12 @@ Fl_Quartz_Font_Descriptor::~Fl_Quartz_Font_Descriptor() { #endif */ if (this == fl_graphics_driver->font_descriptor()) fl_graphics_driver->font_descriptor(NULL); -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 if (fontref) { CFRelease(fontref); for (unsigned i = 0; i < sizeof(width)/sizeof(float*); i++) { if (width[i]) free(width[i]); } } -#endif -#if HAS_ATSU - if (layout) { - ATSUDisposeTextLayout(layout); - ATSUDisposeStyle(style); - } -#endif } @@ -332,9 +228,7 @@ double Fl_Quartz_Graphics_Driver::width(unsigned int wc) { return width(utf16, l); } - -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -static void set_fontname_CoreText(Fl_Fontdesc *f) { +void Fl_Quartz_Graphics_Driver::set_fontname_in_fontdesc(Fl_Fontdesc *f) { CFStringRef cfname = CFStringCreateWithCString(NULL, f->name, kCFStringEncodingUTF8); CTFontRef ctfont = cfname ? CTFontCreateWithName(cfname, 0, NULL) : NULL; if (cfname) { CFRelease(cfname); cfname = NULL; } @@ -348,20 +242,6 @@ static void set_fontname_CoreText(Fl_Fontdesc *f) { } if (!cfname) strlcpy(f->fontname, f->name, ENDOFBUFFER); } -#endif - -void Fl_Quartz_Graphics_Driver::set_fontname_in_fontdesc(Fl_Fontdesc *f) { -#if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if (CoreText_or_ATSU == use_ATSU) - strlcpy(f->fontname, f->name, ENDOFBUFFER); - else - set_fontname_CoreText(f); -#elif HAS_ATSU - strlcpy(f->fontname, f->name, ENDOFBUFFER); -#else - set_fontname_CoreText(f); -#endif -} const char *Fl_Quartz_Graphics_Driver::font_name(int num) { if (!fl_fonts) fl_fonts = calc_fl_fonts(); @@ -385,49 +265,11 @@ void Fl_Quartz_Graphics_Driver::font_name(int num, const char *name) { Fl_Fontdesc* Fl_Quartz_Graphics_Driver::calc_fl_fonts(void) { -#if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if (CoreText_or_ATSU == use_ATSU) return built_in_table_full; - return built_in_table_PS; -#elif HAS_ATSU - return built_in_table_full; -#else return built_in_table_PS; -#endif } -#if HAS_ATSU && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - -void Fl_Quartz_Graphics_Driver::draw(const char *str, int n, float x, float y) { - (this->*CoreText_or_ATSU_draw)(str, n, x, y); -} - -double Fl_Quartz_Graphics_Driver::width(const UniChar* txt, int n) { - return (this->*CoreText_or_ATSU_width)(txt, n); -} - -Fl_Font Fl_Quartz_Graphics_Driver::set_fonts(const char* xstarname) -{ - if (CoreText_or_ATSU == use_ATSU) return set_fonts_ATSU(xstarname); - return set_fonts_CoreText(xstarname); -} - -void Fl_Quartz_Graphics_Driver::text_extents(const char* txt, int n, int& dx, int& dy, int& w, int& h) -{ - if (CoreText_or_ATSU == use_ATSU) { - text_extents_ATSU(txt, n, dx, dy, w, h); - return; - } - text_extents_CoreText(txt, n, dx, dy, w, h); -} - -#endif - - -/// CoreText-based code -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - -void Fl_Quartz_Graphics_Driver::ADD_SUFFIX(descriptor_init, _CoreText)(const char* name, +void Fl_Quartz_Graphics_Driver::descriptor_init(const char* name, Fl_Fontsize size, Fl_Quartz_Font_Descriptor *d) { CFStringRef str = CFStringCreateWithCString(NULL, name, kCFStringEncodingUTF8); @@ -510,7 +352,7 @@ static CGFloat variation_selector_width(CFStringRef str16, Fl_Quartz_Font_Descri return retval; } -double Fl_Quartz_Graphics_Driver::ADD_SUFFIX(width, _CoreText)(const UniChar* txt, int n) +double Fl_Quartz_Graphics_Driver::width(const UniChar* txt, int n) { double retval = 0; UniChar uni; @@ -581,7 +423,7 @@ double Fl_Quartz_Graphics_Driver::ADD_SUFFIX(width, _CoreText)(const UniChar* tx // text extent calculation -void Fl_Quartz_Graphics_Driver::ADD_SUFFIX(text_extents, _CoreText)(const char *str8, int n, +void Fl_Quartz_Graphics_Driver::text_extents(const char *str8, int n, int &dx, int &dy, int &w, int &h) { Fl_Quartz_Font_Descriptor *fl_fontsize = valid_font_descriptor(); UniChar *txt = mac_Utf8_to_Utf16(str8, n, &n); @@ -615,7 +457,7 @@ static CGColorRef flcolortocgcolor(Fl_Color i) return CGColorCreate(cspace, components); } -void Fl_Quartz_Graphics_Driver::ADD_SUFFIX(draw, _CoreText)(const char *str, int n, float x, float y) +void Fl_Quartz_Graphics_Driver::draw(const char *str, int n, float x, float y) { Fl_Quartz_Font_Descriptor *fl_fontsize = valid_font_descriptor(); // convert to UTF-16 first @@ -680,7 +522,7 @@ static int name_compare(const void *a, const void *b) } } -Fl_Font Fl_Quartz_Graphics_Driver::ADD_SUFFIX(set_fonts, _CoreText)(const char* xstarname) +Fl_Font Fl_Quartz_Graphics_Driver::set_fonts(const char* xstarname) { #pragma unused ( xstarname ) if (fl_free_font > FL_FREE_FONT) return (Fl_Font)fl_free_font; // if already called @@ -717,187 +559,3 @@ Fl_Font Fl_Quartz_Graphics_Driver::ADD_SUFFIX(set_fonts, _CoreText)(const char* delete[] tabfontnames; return (Fl_Font)fl_free_font; } - - -#endif // >= 10.5 - - - -/// ATSU-based code to support Mac OS < 10.5 -#if HAS_ATSU - -void Fl_Quartz_Graphics_Driver::ADD_SUFFIX(descriptor_init, _ATSU)(const char* name, - Fl_Fontsize size, Fl_Quartz_Font_Descriptor *d) -{ - OSStatus err; - // fill our structure with a few default values - d->ascent = size*3/4.; - d->descent = size-d->ascent; - d->q_width = size*2/3.; - // now we allocate everything needed to render text in this font later - // get us the default layout and style - err = ATSUCreateTextLayout(&d->layout); - UniChar mTxt[2] = { 65, 0 }; - err = ATSUSetTextPointerLocation(d->layout, mTxt, kATSUFromTextBeginning, 1, 1); - err = ATSUCreateStyle(&d->style); - err = ATSUSetRunStyle(d->layout, d->style, kATSUFromTextBeginning, kATSUToTextEnd); - // now set the actual font, size and attributes. We also set the font matrix to - // render our font up-side-down, so when rendered through our inverted CGContext, - // text will appear normal again. - Fixed fsize = IntToFixed(size); - ATSUFontID fontID; - ATSUFindFontFromName(name, strlen(name), kFontFullName, kFontMacintoshPlatform, kFontNoScriptCode, kFontEnglishLanguage, &fontID); - - // draw the font upside-down... Compensate for fltk/OSX origin differences - ATSUAttributeTag sTag[] = { kATSUFontTag, kATSUSizeTag, kATSUFontMatrixTag }; - ByteCount sBytes[] = { sizeof(ATSUFontID), sizeof(Fixed), sizeof(CGAffineTransform) }; - ATSUAttributeValuePtr sAttr[] = { &fontID, &fsize, &font_mx }; - if (fontID != kATSUInvalidFontID) err = ATSUSetAttributes(d->style, 1, sTag, sBytes, sAttr); // set the font attribute - err = ATSUSetAttributes(d->style, 2, sTag + 1, sBytes + 1, sAttr + 1); // then the size and matrix attributes - // next, make sure that Quartz will only render at integer coordinates - ATSLineLayoutOptions llo = kATSLineUseDeviceMetrics | kATSLineDisableAllLayoutOperations; - ATSUAttributeTag aTag[] = { kATSULineLayoutOptionsTag }; - ByteCount aBytes[] = { sizeof(ATSLineLayoutOptions) }; - ATSUAttributeValuePtr aAttr[] = { &llo }; - err = ATSUSetLineControls (d->layout, kATSUFromTextBeginning, 1, aTag, aBytes, aAttr); - // now we are finally ready to measure some letter to get the bounding box - Fixed bBefore, bAfter, bAscent, bDescent; - err = ATSUGetUnjustifiedBounds(d->layout, kATSUFromTextBeginning, 1, &bBefore, &bAfter, &bAscent, &bDescent); - // Requesting a certain height font on Mac does not guarantee that ascent+descent - // equal the requested height. fl_height will reflect the actual height that we got. - // The font "Apple Chancery" is a pretty extreme example of overlapping letters. - float fa = -FixedToFloat(bAscent), fd = -FixedToFloat(bDescent); - if (fa>0.0f && fd>0.0f) { - //float f = Size/(fa+fd); - d->ascent = int(fa); //int(fa*f+0.5f); - d->descent = int(fd); //Size - ascent; - } - int w = FixedToInt(bAfter); - if (w) - d->q_width = FixedToInt(bAfter); - - // Now, by way of experiment, try enabling Transient Font Matching, this will - // cause ATSU to find a suitable font to render any chars the current font can't do... - ATSUSetTransientFontMatching (d->layout, true); -} - -void Fl_Quartz_Graphics_Driver::ADD_SUFFIX(draw, _ATSU)(const char *str, int n, float x, float y) -{ - Fl_Quartz_Font_Descriptor *fl_fontsize = valid_font_descriptor(); - // convert to UTF-16 first - UniChar *uniStr = mac_Utf8_to_Utf16(str, n, &n); - CGContextRef gc = (CGContextRef)this->gc(); - OSStatus err; - // now collect our ATSU resources - ATSUTextLayout layout = fl_fontsize->layout; - - ByteCount iSize = sizeof(CGContextRef); - ATSUAttributeTag iTag = kATSUCGContextTag; - ATSUAttributeValuePtr iValuePtr=&gc; - ATSUSetLayoutControls(layout, 1, &iTag, &iSize, &iValuePtr); - - err = ATSUSetTextPointerLocation(layout, uniStr, kATSUFromTextBeginning, n, n); - CGContextSetShouldAntialias(gc, true); - err = ATSUDrawText(layout, kATSUFromTextBeginning, n, FloatToFixed(x), FloatToFixed(y)); - CGContextSetShouldAntialias(gc, false); -} - -double Fl_Quartz_Graphics_Driver::ADD_SUFFIX(width, _ATSU)(const UniChar* txt, int n) { - OSStatus err; - Fixed bBefore, bAfter, bAscent, bDescent; - ATSUTextLayout layout; - ByteCount iSize; - ATSUAttributeTag iTag; - ATSUAttributeValuePtr iValuePtr; - - Fl_Quartz_Font_Descriptor *fl_fontsize = valid_font_descriptor(); - // Here's my ATSU text measuring attempt... This seems to do the Right Thing - // now collect our ATSU resources and measure our text string - layout = fl_fontsize->layout; - // activate the current GC - iSize = sizeof(CGContextRef); - iTag = kATSUCGContextTag; - CGContextRef value = (CGContextRef)fl_graphics_driver->gc(); - iValuePtr = &value; - ATSUSetLayoutControls(layout, 1, &iTag, &iSize, &iValuePtr); - // now measure the bounding box - err = ATSUSetTextPointerLocation(layout, txt, kATSUFromTextBeginning, n, n); - err = ATSUGetUnjustifiedBounds(layout, kATSUFromTextBeginning, n, &bBefore, &bAfter, &bAscent, &bDescent); - // If err is OK then return length, else return 0. Or something... - int len = FixedToInt(bAfter); - return len; -} - -void Fl_Quartz_Graphics_Driver::ADD_SUFFIX(text_extents, _ATSU)(const char *str8, int n, - int &dx, int &dy, int &w, int &h) -{ - Fl_Quartz_Font_Descriptor *fl_fontsize = valid_font_descriptor(); - UniChar *txt = mac_Utf8_to_Utf16(str8, n, &n); - OSStatus err; - ATSUTextLayout layout; - ByteCount iSize; - ATSUAttributeTag iTag; - ATSUAttributeValuePtr iValuePtr; - - // Here's my ATSU text measuring attempt... This seems to do the Right Thing - // now collect our ATSU resources and measure our text string - layout = fl_fontsize->layout; - // activate the current GC - iSize = sizeof(CGContextRef); - iTag = kATSUCGContextTag; - CGContextRef value = (CGContextRef)gc(); - iValuePtr = &value; - ATSUSetLayoutControls(layout, 1, &iTag, &iSize, &iValuePtr); - // now measure the bounding box - err = ATSUSetTextPointerLocation(layout, txt, kATSUFromTextBeginning, n, n); - Rect bbox; - err = ATSUMeasureTextImage(layout, kATSUFromTextBeginning, n, 0, 0, &bbox); - w = bbox.right - bbox.left; - h = bbox.bottom - bbox.top; - dx = bbox.left; - dy = -bbox.bottom; - //printf("r: %d l: %d t: %d b: %d w: %d h: %d\n", bbox.right, bbox.left, bbox.top, bbox.bottom, w, h); -} - -Fl_Font Fl_Quartz_Graphics_Driver::ADD_SUFFIX(set_fonts, _ATSU)(const char* xstarname) -{ -#pragma unused ( xstarname ) - if (fl_free_font > FL_FREE_FONT) return (Fl_Font)fl_free_font; // if already called - - ItemCount oFontCount, oCountAgain; - ATSUFontID *oFontIDs; - // How many fonts? - ATSUFontCount (&oFontCount); - // now allocate space for them... - oFontIDs = (ATSUFontID *)malloc((oFontCount+1) * sizeof(ATSUFontID)); - ATSUGetFontIDs (oFontIDs, oFontCount, &oCountAgain); - // Now oFontIDs should contain a list of all the available Unicode fonts - // Iterate through the list to get each font name - for (ItemCount idx = 0; idx < oFontCount; idx++) - { - // ByteCount actualLength = 0; - // Ptr oName; - // How to get the name - Apples docs say call this twice, once to get the length, then again - // to get the actual name... - // ATSUFindFontName (oFontIDs[idx], kFontFullName, kFontMacintoshPlatform, kFontRomanScript, kFontEnglishLanguage, - // 0, NULL, &actualLength, NULL); - // Now actualLength tells us the length of buffer we need - // oName = (Ptr)malloc(actualLength + 8); - // But who's got time for that nonsense? Let's just hard code a fixed buffer (urgh!) - ByteCount actualLength = 511; - char oName[512]; - ATSUFindFontName (oFontIDs[idx], kFontFullName, kFontMacintoshPlatform, kFontRomanScript, kFontEnglishLanguage, - actualLength, oName, &actualLength, &oCountAgain); - // bounds check and terminate the returned name - if(actualLength > 511) - oName[511] = 0; - else - oName[actualLength] = 0; - Fl::set_font((Fl_Font)(fl_free_font++), fl_strdup(oName)); - // free(oName); - } - free(oFontIDs); - return (Fl_Font)fl_free_font; -} - -#endif // HAS_ATSU diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H index 69e00dfd0..3849ea4df 100644 --- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H +++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.H @@ -1,7 +1,7 @@ // // Draw-to-image code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2021 by Bill Spitzak and others. +// Copyright 1998-2026 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -22,10 +22,8 @@ class Fl_Quartz_Image_Surface_Driver : public Fl_Image_Surface_Driver { private: -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 CGImageRef mask_; void mask(const Fl_RGB_Image *) FL_OVERRIDE; -#endif void end_current() FL_OVERRIDE; public: FLWindow *pre_window; diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx index 1e3d6b927..4615ba475 100644 --- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx @@ -1,7 +1,7 @@ // // Draw-to-image code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2023 by Bill Spitzak and others. +// Copyright 1998-2026 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -23,9 +23,7 @@ Fl_Quartz_Image_Surface_Driver::Fl_Quartz_Image_Surface_Driver(int w, int h, int high_res, Fl_Offscreen off) : Fl_Image_Surface_Driver(w, h, high_res, off) { -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 mask_ = NULL; -#endif int W = w, H = h; float s = 1; if (high_res) { @@ -53,11 +51,9 @@ Fl_Quartz_Image_Surface_Driver::Fl_Quartz_Image_Surface_Driver(int w, int h, int } Fl_Quartz_Image_Surface_Driver::~Fl_Quartz_Image_Surface_Driver() { -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 if (mask_) { CGImageRelease(mask_); } -#endif if (offscreen) CGContextRestoreGState((CGContextRef)offscreen); if (offscreen && !external_offscreen) { void *data = CGBitmapContextGetData((CGContextRef)offscreen); @@ -74,7 +70,6 @@ void Fl_Quartz_Image_Surface_Driver::set_current() { driver()->gc((CGContextRef)offscreen); fl_window = 0; ((Fl_Quartz_Graphics_Driver*)driver())->high_resolution( CGBitmapContextGetWidth((CGContextRef)offscreen) > (size_t)width ); -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 if (mask_) { int W, H; printable_rect(&W, &H); @@ -82,7 +77,6 @@ void Fl_Quartz_Image_Surface_Driver::set_current() { CGContextClipToMask((CGContextRef)offscreen, CGRectMake(0,0,W,H), mask_); // 10.4 CGContextSaveGState((CGContextRef)offscreen); } -# endif } void Fl_Quartz_Image_Surface_Driver::translate(int x, int y) { @@ -99,13 +93,11 @@ void Fl_Quartz_Image_Surface_Driver::untranslate() { Fl_RGB_Image* Fl_Quartz_Image_Surface_Driver::image() { CGContextFlush((CGContextRef)offscreen); -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 if (mask_) { CGContextRestoreGState((CGContextRef)offscreen); CGImageRelease(mask_); mask_ = NULL; } -#endif int W = (int)CGBitmapContextGetWidth((CGContextRef)offscreen); int H = (int)CGBitmapContextGetHeight((CGContextRef)offscreen); int bpr = (int)CGBitmapContextGetBytesPerRow((CGContextRef)offscreen); @@ -128,19 +120,15 @@ Fl_RGB_Image* Fl_Quartz_Image_Surface_Driver::image() void Fl_Quartz_Image_Surface_Driver::end_current() { -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 if (mask_) { CGContextRestoreGState((CGContextRef)offscreen); CGContextRestoreGState((CGContextRef)offscreen); } -# endif fl_window = pre_window; Fl_Surface_Device::end_current(); } -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - static void MyProviderReleaseData (void *info, const void *data, size_t size) { delete[] (uchar*)data; } @@ -177,5 +165,3 @@ void Fl_Quartz_Image_Surface_Driver::mask(const Fl_RGB_Image *img) { CFRelease(provider); if (using_copy) delete img; } - -#endif -- cgit v1.2.3