Removed all references to Quartz driver files from library headers in Xcode. Works in Xcode.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11065 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
parent
6177c23d90
commit
780f43a4f1
@ -274,10 +274,6 @@ protected:
|
||||
|
||||
#if defined(__APPLE__)
|
||||
|
||||
#if FL_LIBRARY
|
||||
#include "src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
|
||||
#endif
|
||||
|
||||
#elif defined(WIN32) || defined(FL_DOXYGEN)
|
||||
|
||||
#if FL_LIBRARY
|
||||
|
||||
@ -694,6 +694,15 @@
|
||||
C96290C21274D0CF007D3CFE /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9628FFD1274D0B3007D3CFE /* Cocoa.framework */; };
|
||||
C96290E61274D100007D3CFE /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C96290E51274D100007D3CFE /* OpenGL.framework */; };
|
||||
C96291151274D1FD007D3CFE /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9628FFD1274D0B3007D3CFE /* Cocoa.framework */; };
|
||||
C97E30B51C5976A600E22076 /* Fl_Quartz_Graphics_Driver.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97E30B11C59704300E22076 /* Fl_Quartz_Graphics_Driver.cxx */; };
|
||||
C97E30B61C5976A600E22076 /* Fl_Quartz_Graphics_Driver_rect.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97E30A11C596CC900E22076 /* Fl_Quartz_Graphics_Driver_rect.cxx */; };
|
||||
C97E30B71C5976A600E22076 /* Fl_Quartz_Graphics_Driver_image.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97E30A31C596CC900E22076 /* Fl_Quartz_Graphics_Driver_image.cxx */; };
|
||||
C97E30B81C5976A600E22076 /* Fl_Quartz_Graphics_Driver_arci.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97E30A41C596CC900E22076 /* Fl_Quartz_Graphics_Driver_arci.cxx */; };
|
||||
C97E30B91C5976A600E22076 /* Fl_Quartz_Graphics_Driver_color.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97E30A51C596CC900E22076 /* Fl_Quartz_Graphics_Driver_color.cxx */; };
|
||||
C97E30BA1C5976A600E22076 /* Fl_Quartz_Graphics_Driver_font.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97E30A61C596CC900E22076 /* Fl_Quartz_Graphics_Driver_font.cxx */; };
|
||||
C97E30BB1C5976A600E22076 /* Fl_Quartz_Graphics_Driver_line_style.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97E30A71C596CC900E22076 /* Fl_Quartz_Graphics_Driver_line_style.cxx */; };
|
||||
C97E30BC1C5976A600E22076 /* Fl_Quartz_Graphics_Driver_vertex.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97E30A81C596CC900E22076 /* Fl_Quartz_Graphics_Driver_vertex.cxx */; };
|
||||
C97E30BD1C5976A600E22076 /* Fl_Quartz_Printer_Graphics_Driver.cxx in Sources */ = {isa = PBXBuildFile; fileRef = C97E30B01C59704300E22076 /* Fl_Quartz_Printer_Graphics_Driver.cxx */; };
|
||||
C984AFA812D02A1800D66DAD /* demo.menu in Resources */ = {isa = PBXBuildFile; fileRef = C984AFA712D02A1800D66DAD /* demo.menu */; };
|
||||
C99FD8E212D2A2AD002FC776 /* browser.cxx in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6D999C03407EAEE9C4D3477A /* browser.cxx */; };
|
||||
C9A374AB3AD29E141C659819 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = FEB0F8FE6383384180570D94 /* fltk.framework */; };
|
||||
@ -4736,6 +4745,17 @@
|
||||
C9165ED31291A376003FF4F0 /* unittests.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = unittests.cxx; path = ../../test/unittests.cxx; sourceTree = SOURCE_ROOT; };
|
||||
C9628FFD1274D0B3007D3CFE /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
|
||||
C96290E51274D100007D3CFE /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
|
||||
C97E30A11C596CC900E22076 /* Fl_Quartz_Graphics_Driver_rect.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Quartz_Graphics_Driver_rect.cxx; path = ../../src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx; sourceTree = "<group>"; };
|
||||
C97E30A21C596CC900E22076 /* Fl_Quartz_Graphics_Driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Fl_Quartz_Graphics_Driver.h; path = ../../src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h; sourceTree = "<group>"; };
|
||||
C97E30A31C596CC900E22076 /* Fl_Quartz_Graphics_Driver_image.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Quartz_Graphics_Driver_image.cxx; path = ../../src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx; sourceTree = "<group>"; };
|
||||
C97E30A41C596CC900E22076 /* Fl_Quartz_Graphics_Driver_arci.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Quartz_Graphics_Driver_arci.cxx; path = ../../src/drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx; sourceTree = "<group>"; };
|
||||
C97E30A51C596CC900E22076 /* Fl_Quartz_Graphics_Driver_color.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Quartz_Graphics_Driver_color.cxx; path = ../../src/drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx; sourceTree = "<group>"; };
|
||||
C97E30A61C596CC900E22076 /* Fl_Quartz_Graphics_Driver_font.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Quartz_Graphics_Driver_font.cxx; path = ../../src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx; sourceTree = "<group>"; };
|
||||
C97E30A71C596CC900E22076 /* Fl_Quartz_Graphics_Driver_line_style.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Quartz_Graphics_Driver_line_style.cxx; path = ../../src/drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx; sourceTree = "<group>"; };
|
||||
C97E30A81C596CC900E22076 /* Fl_Quartz_Graphics_Driver_vertex.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Quartz_Graphics_Driver_vertex.cxx; path = ../../src/drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx; sourceTree = "<group>"; };
|
||||
C97E30B01C59704300E22076 /* Fl_Quartz_Printer_Graphics_Driver.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Quartz_Printer_Graphics_Driver.cxx; path = ../../src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.cxx; sourceTree = "<group>"; };
|
||||
C97E30B11C59704300E22076 /* Fl_Quartz_Graphics_Driver.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Quartz_Graphics_Driver.cxx; path = ../../src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx; sourceTree = "<group>"; };
|
||||
C97E30B21C59704300E22076 /* Fl_Quartz_Printer_Graphics_Driver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Fl_Quartz_Printer_Graphics_Driver.h; path = ../../src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.h; sourceTree = "<group>"; };
|
||||
C984AFA712D02A1800D66DAD /* demo.menu */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = demo.menu; path = ../../test/demo.menu; sourceTree = SOURCE_ROOT; };
|
||||
C9EDD143127338F600ADB21C /* README.OSX.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.OSX.txt; path = ../../README.OSX.txt; sourceTree = SOURCE_ROOT; };
|
||||
C9EDD4DE1274BB6600ADB21C /* png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = png.h; path = ../../png/png.h; sourceTree = SOURCE_ROOT; };
|
||||
@ -5671,6 +5691,7 @@
|
||||
07A2E7B74BC0E97DC2AF181A /* fltk */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
C97E309F1C596C5700E22076 /* Drivers */,
|
||||
B04F6E032ADAF0A16A860A2E /* Headers */,
|
||||
C9FCF4D61C4ADE4800BE15FD /* config_lib.h */,
|
||||
7F66B1D612BB924C00C67B59 /* Fl_cocoa.mm */,
|
||||
@ -6688,6 +6709,32 @@
|
||||
name = Resources;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
C97E309F1C596C5700E22076 /* Drivers */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
C97E30A01C596C8500E22076 /* Quartz */,
|
||||
);
|
||||
name = Drivers;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
C97E30A01C596C8500E22076 /* Quartz */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
C97E30A21C596CC900E22076 /* Fl_Quartz_Graphics_Driver.h */,
|
||||
C97E30B11C59704300E22076 /* Fl_Quartz_Graphics_Driver.cxx */,
|
||||
C97E30A11C596CC900E22076 /* Fl_Quartz_Graphics_Driver_rect.cxx */,
|
||||
C97E30A31C596CC900E22076 /* Fl_Quartz_Graphics_Driver_image.cxx */,
|
||||
C97E30A41C596CC900E22076 /* Fl_Quartz_Graphics_Driver_arci.cxx */,
|
||||
C97E30A51C596CC900E22076 /* Fl_Quartz_Graphics_Driver_color.cxx */,
|
||||
C97E30A61C596CC900E22076 /* Fl_Quartz_Graphics_Driver_font.cxx */,
|
||||
C97E30A71C596CC900E22076 /* Fl_Quartz_Graphics_Driver_line_style.cxx */,
|
||||
C97E30A81C596CC900E22076 /* Fl_Quartz_Graphics_Driver_vertex.cxx */,
|
||||
C97E30B21C59704300E22076 /* Fl_Quartz_Printer_Graphics_Driver.h */,
|
||||
C97E30B01C59704300E22076 /* Fl_Quartz_Printer_Graphics_Driver.cxx */,
|
||||
);
|
||||
name = Quartz;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
C9EDD4DC1274BB4100ADB21C /* Headers */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@ -9707,6 +9754,7 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
C97E30BD1C5976A600E22076 /* Fl_Quartz_Printer_Graphics_Driver.cxx in Sources */,
|
||||
7F66B1D912BB924C00C67B59 /* Fl_cocoa.mm in Sources */,
|
||||
7F66B1DA12BB924C00C67B59 /* Fl_Native_File_Chooser_MAC.mm in Sources */,
|
||||
7F66B1DB12BB924C00C67B59 /* Fl_Quartz_Printer.mm in Sources */,
|
||||
@ -9731,6 +9779,7 @@
|
||||
EE1DAA8B2CB944B2D5426CB6 /* Fl_Double_Window.cxx in Sources */,
|
||||
745C2AF79ABD813E3AE9CD70 /* Fl_File_Browser.cxx in Sources */,
|
||||
2C0BDF55B026879D401DF915 /* Fl_File_Chooser.cxx in Sources */,
|
||||
C97E30BC1C5976A600E22076 /* Fl_Quartz_Graphics_Driver_vertex.cxx in Sources */,
|
||||
61407877A424C4E1A74036C0 /* Fl_File_Chooser2.cxx in Sources */,
|
||||
6DA839CF781EBC87AD3CF6B4 /* Fl_File_Icon.cxx in Sources */,
|
||||
9DFFD353B45F553EA8D7A505 /* Fl_File_Input.cxx in Sources */,
|
||||
@ -9738,6 +9787,7 @@
|
||||
74D195DEE3A33FA0C8C7A5BE /* Fl_Help_View.cxx in Sources */,
|
||||
6F8B4EC22CC54B6B06F9D5C7 /* Fl_Image.cxx in Sources */,
|
||||
0BD1B4FF53C27EDA7B9F2C66 /* Fl_Input.cxx in Sources */,
|
||||
C97E30B91C5976A600E22076 /* Fl_Quartz_Graphics_Driver_color.cxx in Sources */,
|
||||
2CFBED9BA0BE01679B285434 /* Fl_Input_.cxx in Sources */,
|
||||
5D1D08BF3F79DC7C29D6FCF4 /* Fl_Light_Button.cxx in Sources */,
|
||||
E3C29EE9B0D666B794852902 /* Fl_Menu.cxx in Sources */,
|
||||
@ -9752,6 +9802,7 @@
|
||||
291FA24A9E91A2036BC718A2 /* Fl_Overlay_Window.cxx in Sources */,
|
||||
2E43C0679E5714486D7D535F /* Fl_Pack.cxx in Sources */,
|
||||
B082626A90693D0C12904CB7 /* Fl_Pixmap.cxx in Sources */,
|
||||
C97E30B51C5976A600E22076 /* Fl_Quartz_Graphics_Driver.cxx in Sources */,
|
||||
812129561A1981D6DEFBCBFB /* Fl_Positioner.cxx in Sources */,
|
||||
AD0F285A651FEF5CB6FC7012 /* Fl_Printer.cxx in Sources */,
|
||||
C616A9C9EDD193DF4BADDA5A /* Fl_Preferences.cxx in Sources */,
|
||||
@ -9761,6 +9812,7 @@
|
||||
D0CF9C806A93CFB18B0DAA6F /* Fl_Roller.cxx in Sources */,
|
||||
495C752B9742C0729399A646 /* Fl_Round_Button.cxx in Sources */,
|
||||
878478F960A354C2DF2DC7E6 /* Fl_Scroll.cxx in Sources */,
|
||||
C97E30B81C5976A600E22076 /* Fl_Quartz_Graphics_Driver_arci.cxx in Sources */,
|
||||
D49C72834787A96D62E0DC96 /* Fl_Scrollbar.cxx in Sources */,
|
||||
2C4DB237B4B8ACD2FB305BD5 /* Fl_Shared_Image.cxx in Sources */,
|
||||
ED169E1E1FC93C1F97D21AC4 /* Fl_Single_Window.cxx in Sources */,
|
||||
@ -9803,6 +9855,7 @@
|
||||
3C2E57EF6298BB0FC9412871 /* Fl_own_colormap.cxx in Sources */,
|
||||
AC85BE9A50BEE739620E7080 /* Fl_visual.cxx in Sources */,
|
||||
9B1EDE4CD694BD6EECFDD3D9 /* Fl_x.cxx in Sources */,
|
||||
C97E30B71C5976A600E22076 /* Fl_Quartz_Graphics_Driver_image.cxx in Sources */,
|
||||
F8C4B882B6A9C15C2105AAA8 /* filename_absolute.cxx in Sources */,
|
||||
D7E6146CFE9389C35447F23B /* filename_expand.cxx in Sources */,
|
||||
FD872A3C0217DEF3E1042A02 /* filename_ext.cxx in Sources */,
|
||||
@ -9810,6 +9863,7 @@
|
||||
2BE1A3AC07CE39EEAC5E2B98 /* filename_list.cxx in Sources */,
|
||||
A355A5A2EEF58A53CD2CF081 /* filename_match.cxx in Sources */,
|
||||
3FD5B1D9C066066CCA52724A /* filename_setext.cxx in Sources */,
|
||||
C97E30BB1C5976A600E22076 /* Fl_Quartz_Graphics_Driver_line_style.cxx in Sources */,
|
||||
95AFA1B1A6FA7902372E96A6 /* fl_arc.cxx in Sources */,
|
||||
88E3AAF4EEE5C45BE693C493 /* fl_arci.cxx in Sources */,
|
||||
1CD7ED77B7B8FE0D99290351 /* fl_ask.cxx in Sources */,
|
||||
@ -9851,8 +9905,10 @@
|
||||
0262498E858406B6E51BD4E4 /* fl_symbols.cxx in Sources */,
|
||||
3BD005D954ABCB5983F540AB /* fl_utf.c in Sources */,
|
||||
AEC9E288AC9E09B99855D15C /* fl_utf8.cxx in Sources */,
|
||||
C97E30BA1C5976A600E22076 /* Fl_Quartz_Graphics_Driver_font.cxx in Sources */,
|
||||
D2649C006A1AF19ADB38855E /* fl_vertex.cxx in Sources */,
|
||||
51FC4E43CA74B5CB3FD91147 /* flstring.c in Sources */,
|
||||
C97E30B61C5976A600E22076 /* Fl_Quartz_Graphics_Driver_rect.cxx in Sources */,
|
||||
DC4BEF50B12F14C694F1C9DE /* numericsort.c in Sources */,
|
||||
C8D2445DE4DB272D6140EB4D /* ps_image.cxx in Sources */,
|
||||
5849E21F505FC39533995DCA /* scandir.c in Sources */,
|
||||
|
||||
@ -275,18 +275,6 @@ int Fl_Bitmap::start(int XP, int YP, int WP, int HP, int &cx, int &cy,
|
||||
}
|
||||
|
||||
#ifdef __APPLE__
|
||||
void Fl_Quartz_Graphics_Driver::draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) {
|
||||
int X, Y, W, H;
|
||||
if (bm->start(XP, YP, WP, HP, cx, cy, X, Y, W, H)) {
|
||||
return;
|
||||
}
|
||||
if (bm->id_ && fl_gc) {
|
||||
CGRect rect = { { (CGFloat)X, (CGFloat)Y }, { (CGFloat)W, (CGFloat)H } };
|
||||
Fl_X::q_begin_image(rect, cx, cy, bm->w(), bm->h());
|
||||
CGContextDrawImage(fl_gc, rect, (CGImageRef)bm->id_);
|
||||
Fl_X::q_end_image();
|
||||
}
|
||||
}
|
||||
|
||||
#elif defined(WIN32)
|
||||
void Fl_GDI_Graphics_Driver::draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) {
|
||||
|
||||
@ -20,6 +20,11 @@
|
||||
#include <FL/Fl_Device.H>
|
||||
#include <FL/Fl_Image.H>
|
||||
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
#include "drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
|
||||
#endif
|
||||
|
||||
#if defined(WIN32) || defined(__APPLE__)
|
||||
#elif defined(FL_PORTING)
|
||||
# pragma message "FL_PORTING: instantiate and implement various device drivers here"
|
||||
@ -31,7 +36,6 @@ const char *Fl_Surface_Device::class_id = "Fl_Surface_Device";
|
||||
const char *Fl_Display_Device::class_id = "Fl_Display_Device";
|
||||
const char *Fl_Graphics_Driver::class_id = "Fl_Graphics_Driver";
|
||||
#if defined(__APPLE__) || defined(FL_DOXYGEN)
|
||||
const char *Fl_Quartz_Graphics_Driver::class_id = "Fl_Quartz_Graphics_Driver";
|
||||
# ifndef FL_DOXYGEN
|
||||
bool Fl_Display_Device::high_res_window_ = false;
|
||||
# endif
|
||||
|
||||
@ -238,21 +238,12 @@ void Fl_GDI_Graphics_Driver::copy_offscreen_with_alpha(int x,int y,int w,int h,H
|
||||
|
||||
#elif defined(__APPLE_QUARTZ__) || defined(FL_DOXYGEN)
|
||||
|
||||
#include "src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
|
||||
|
||||
char fl_can_do_alpha_blending() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
#if ! defined(FL_DOXYGEN)
|
||||
Fl_Offscreen Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(int w, int h) {
|
||||
void *data = calloc(w*h,4);
|
||||
CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB();
|
||||
CGContextRef ctx = CGBitmapContextCreate(
|
||||
data, w, h, 8, w*4, lut, kCGImageAlphaPremultipliedLast);
|
||||
CGColorSpaceRelease(lut);
|
||||
return (Fl_Offscreen)ctx;
|
||||
}
|
||||
#endif
|
||||
|
||||
/** \addtogroup fl_drawings
|
||||
@{
|
||||
*/
|
||||
|
||||
@ -629,22 +629,6 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) {
|
||||
fl_graphics_driver->draw(this, XP, YP, WP, HP, cx, cy);
|
||||
}
|
||||
|
||||
static int start(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int w, int h, int &cx, int &cy,
|
||||
int &X, int &Y, int &W, int &H)
|
||||
{
|
||||
// account for current clip region (faster on Irix):
|
||||
fl_clip_box(XP,YP,WP,HP,X,Y,W,H);
|
||||
cx += X-XP; cy += Y-YP;
|
||||
// clip the box down to the size of image, quit if empty:
|
||||
if (cx < 0) {W += cx; X -= cx; cx = 0;}
|
||||
if (cx+W > w) W = w-cx;
|
||||
if (W <= 0) return 1;
|
||||
if (cy < 0) {H += cy; Y -= cy; cy = 0;}
|
||||
if (cy+H > h) H = h-cy;
|
||||
if (H <= 0) return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/** Draws an Fl_Image scaled to width \p W & height \p H with top-left corner at \em X,Y
|
||||
\return zero when the graphics driver doesn't implement scaled drawing, non-zero if it does implement it.
|
||||
*/
|
||||
@ -653,83 +637,6 @@ int Fl_Graphics_Driver::draw_scaled(Fl_Image *img, int X, int Y, int W, int H) {
|
||||
}
|
||||
|
||||
#ifdef __APPLE__
|
||||
static void imgProviderReleaseData (void *info, const void *data, size_t size)
|
||||
{
|
||||
if (!info || *(bool*)info) delete[] (unsigned char *)data;
|
||||
delete (bool*)info;
|
||||
}
|
||||
|
||||
void Fl_Quartz_Graphics_Driver::draw(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy) {
|
||||
int X, Y, W, H;
|
||||
// Don't draw an empty image...
|
||||
if (!img->d() || !img->array) {
|
||||
img->draw_empty(XP, YP);
|
||||
return;
|
||||
}
|
||||
if (start(img, XP, YP, WP, HP, img->w(), img->h(), cx, cy, X, Y, W, H)) {
|
||||
return;
|
||||
}
|
||||
if (!img->id_) {
|
||||
CGColorSpaceRef lut = img->d()<=2 ? CGColorSpaceCreateDeviceGray() : CGColorSpaceCreateDeviceRGB();
|
||||
int ld = img->ld();
|
||||
if (!ld) ld = img->w() * img->d();
|
||||
// If img->alloc_array == 0, the CGImage data provider must not release the image data.
|
||||
// If img->alloc_array != 0, the CGImage data provider will take responsibilty of deleting RGB image data after use:
|
||||
// when the CGImage is deallocated, the release callback of its data provider
|
||||
// (imgProviderReleaseData) is called and can delete the RGB image data.
|
||||
// If the CGImage is printed, it is not deallocated until after the end of the page,
|
||||
// therefore, with img->alloc_array != 0, the RGB image can be safely deleted any time after return from this function.
|
||||
// The previously unused mask_ member allows to make sure the RGB image data is not deleted by Fl_RGB_Image::uncache().
|
||||
if (img->alloc_array) img->mask_ = new bool(true);
|
||||
CGDataProviderRef src = CGDataProviderCreateWithData(img->mask_, img->array, ld * img->h(),
|
||||
img->alloc_array?imgProviderReleaseData:NULL);
|
||||
img->id_ = CGImageCreate(img->w(), img->h(), 8, img->d()*8, ld,
|
||||
lut, (img->d()&1)?kCGImageAlphaNone:kCGImageAlphaLast,
|
||||
src, 0L, false, kCGRenderingIntentDefault);
|
||||
CGColorSpaceRelease(lut);
|
||||
CGDataProviderRelease(src);
|
||||
}
|
||||
if (img->id_ && fl_gc) {
|
||||
if (!img->alloc_array && has_feature(PRINTER) && !CGImageGetShouldInterpolate((CGImageRef)img->id_)) {
|
||||
// When printing, the image data is used when the page is completed, that is, after return from this function.
|
||||
// If the image has alloc_array = 0, we must protect against image data being freed before it is used:
|
||||
// we duplicate the image data and have it deleted after use by the release-callback of the CGImage data provider
|
||||
Fl_RGB_Image* img2 = (Fl_RGB_Image*)img->copy();
|
||||
img2->alloc_array = 0;
|
||||
const uchar *img_bytes = img2->array;
|
||||
int ld = img2->ld();
|
||||
if (!ld) ld = img2->w() * img2->d();
|
||||
delete img2;
|
||||
img->uncache();
|
||||
CGColorSpaceRef lut = img->d()<=2 ? CGColorSpaceCreateDeviceGray() : CGColorSpaceCreateDeviceRGB();
|
||||
CGDataProviderRef src = CGDataProviderCreateWithData( NULL, img_bytes, ld * img->h(), imgProviderReleaseData);
|
||||
img->id_ = CGImageCreate(img->w(), img->h(), 8, img->d()*8, ld,
|
||||
lut, (img->d()&1)?kCGImageAlphaNone:kCGImageAlphaLast,
|
||||
src, 0L, true, kCGRenderingIntentDefault);
|
||||
CGColorSpaceRelease(lut);
|
||||
CGDataProviderRelease(src);
|
||||
}
|
||||
CGRect rect = CGRectMake(X, Y, W, H);
|
||||
Fl_X::q_begin_image(rect, cx, cy, img->w(), img->h());
|
||||
CGContextDrawImage(fl_gc, rect, (CGImageRef)img->id_);
|
||||
Fl_X::q_end_image();
|
||||
}
|
||||
}
|
||||
|
||||
int Fl_Quartz_Graphics_Driver::draw_scaled(Fl_Image *img, int XP, int YP, int WP, int HP) {
|
||||
int X, Y, W, H;
|
||||
fl_clip_box(XP,YP,WP,HP,X,Y,W,H); // X,Y,W,H will give the unclipped area of XP,YP,WP,HP
|
||||
if (W == 0 || H == 0) return 1;
|
||||
fl_push_no_clip(); // remove the FLTK clip that can't be rescaled
|
||||
CGContextSaveGState(fl_gc);
|
||||
CGContextClipToRect(fl_gc, CGRectMake(X, Y, W, H)); // this clip path will be rescaled & translated
|
||||
CGContextTranslateCTM(fl_gc, XP, YP);
|
||||
CGContextScaleCTM(fl_gc, float(WP)/img->w(), float(HP)/img->h());
|
||||
img->draw(0, 0, img->w(), img->h(), 0, 0);
|
||||
CGContextRestoreGState(fl_gc);
|
||||
fl_pop_clip(); // restore FLTK's clip
|
||||
return 1;
|
||||
}
|
||||
|
||||
#elif defined(WIN32)
|
||||
static Fl_Offscreen build_id(Fl_RGB_Image *img, void **pmask)
|
||||
|
||||
@ -20,7 +20,13 @@
|
||||
#include <FL/Fl_Printer.H>
|
||||
#include <FL/Fl.H>
|
||||
|
||||
#if defined(WIN32) || defined(__APPLE__)
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
#include "drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
|
||||
#endif
|
||||
|
||||
#if defined(WIN32)
|
||||
#elif defined(__APPLE__)
|
||||
#elif defined(FL_PORTING)
|
||||
# pragma message "FL_PORTING: implement image surface handling here"
|
||||
#else
|
||||
|
||||
@ -23,8 +23,12 @@
|
||||
#include <FL/Fl.H>
|
||||
#include <FL/fl_draw.H>
|
||||
|
||||
const char *Fl_Paged_Device::class_id = "Fl_Paged_Device";
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
#include "drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
|
||||
#endif
|
||||
|
||||
const char *Fl_Paged_Device::class_id = "Fl_Paged_Device";
|
||||
|
||||
/**
|
||||
@brief Draws the widget on the printed page.
|
||||
|
||||
@ -32,7 +32,9 @@
|
||||
#include <FL/Fl_Pixmap.H>
|
||||
#include <FL/Fl_Printer.H>
|
||||
|
||||
#if defined(WIN32) || defined(__APPLE__)
|
||||
#if defined(WIN32)
|
||||
#elif defined(__APPLE__)
|
||||
#include "src/drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
|
||||
#elif defined(FL_PORTING)
|
||||
# pragma message "FL_PORTING: this file needs a lot of custom code to draw Pixmaps correctly"
|
||||
#else
|
||||
@ -146,12 +148,6 @@ int Fl_Pixmap::prepare(int XP, int YP, int WP, int HP, int &cx, int &cy,
|
||||
#ifdef __APPLE__ // Apple, Mac OS X
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
void Fl_Quartz_Graphics_Driver::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) {
|
||||
int X, Y, W, H;
|
||||
if (pxm->prepare(XP, YP, WP, HP, cx, cy, X, Y, W, H)) return;
|
||||
copy_offscreen(X, Y, W, H, (Fl_Offscreen)pxm->id_, cx, cy);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
#elif defined(WIN32) // Windows GDI
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <FL/Fl_Printer.H>
|
||||
#include "drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.h"
|
||||
|
||||
#include <FL/Fl.H>
|
||||
#include <FL/fl_ask.H>
|
||||
|
||||
@ -43,6 +43,7 @@ extern "C" {
|
||||
#include <FL/Fl_Tooltip.H>
|
||||
#include <FL/Fl_Printer.H>
|
||||
#include <FL/Fl_Copy_Surface.H>
|
||||
#include "drivers/Quartz/Fl_Quartz_Graphics_Driver.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
@ -54,6 +55,8 @@ extern "C" {
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
|
||||
|
||||
// #define DEBUG_SELECT // UNCOMMENT FOR SELECT()/THREAD DEBUGGING
|
||||
#ifdef DEBUG_SELECT
|
||||
#include <stdio.h> // testing
|
||||
|
||||
@ -34,10 +34,6 @@
|
||||
|
||||
// FIXME: maybe we can forget about color mapping and assume RGB?
|
||||
|
||||
static unsigned fl_cmap[256] = {
|
||||
#include "../../fl_cmap.h" // this is a file produced by "cmap.cxx":
|
||||
};
|
||||
|
||||
// Translations to win32 data structures:
|
||||
Fl_XMap fl_xmap[256];
|
||||
|
||||
|
||||
@ -16,8 +16,6 @@
|
||||
// http://www.fltk.org/str.php
|
||||
//
|
||||
|
||||
#ifndef FL_CFG_GFX_QUARTZ_RECT_CXX
|
||||
#define FL_CFG_GFX_QUARTZ_RECT_CXX
|
||||
|
||||
|
||||
/**
|
||||
@ -232,8 +230,6 @@ void Fl_GDI_Graphics_Driver::restore_clip() {
|
||||
}
|
||||
|
||||
|
||||
#endif // FL_CFG_GFX_GDI_RECT_CXX
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
//
|
||||
|
||||
41
src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
Normal file
41
src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
Normal file
@ -0,0 +1,41 @@
|
||||
//
|
||||
// "$Id$"
|
||||
//
|
||||
// Rectangle drawing routines for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 1998-2016 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
|
||||
// file is missing or damaged, see the license at:
|
||||
//
|
||||
// http://www.fltk.org/COPYING.php
|
||||
//
|
||||
// Please report all bugs and problems on the following page:
|
||||
//
|
||||
// http://www.fltk.org/str.php
|
||||
//
|
||||
|
||||
|
||||
#include "../../config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
#include "Fl_Quartz_Graphics_Driver.h"
|
||||
|
||||
|
||||
const char *Fl_Quartz_Graphics_Driver::class_id = "Fl_Quartz_Graphics_Driver";
|
||||
|
||||
Fl_Offscreen Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(int w, int h) {
|
||||
void *data = calloc(w*h,4);
|
||||
CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB();
|
||||
CGContextRef ctx = CGBitmapContextCreate(data, w, h, 8, w*4, lut, kCGImageAlphaPremultipliedLast);
|
||||
CGColorSpaceRelease(lut);
|
||||
return (Fl_Offscreen)ctx;
|
||||
}
|
||||
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
//
|
||||
@ -22,8 +22,11 @@
|
||||
\brief Definition of Apple Quartz graphics driver.
|
||||
*/
|
||||
|
||||
#ifndef FL_CFG_GFX_QUARTZ_H
|
||||
#define FL_CFG_GFX_QUARTZ_H
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
#ifndef FL_QUARTZ_GRAPHICS_DRIVER_H
|
||||
#define FL_QUARTZ_GRAPHICS_DRIVER_H
|
||||
|
||||
#include <FL/Fl_Device.H>
|
||||
|
||||
@ -117,15 +120,9 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
/** Graphics driver used for Mac OS X printing. */
|
||||
class Fl_Quartz_Printer_Graphics_Driver : public Fl_Quartz_Graphics_Driver {
|
||||
public:
|
||||
virtual int has_feature(driver_feature mask) { return mask & (NATIVE | PRINTER); }
|
||||
};
|
||||
#endif // FL_QUARTZ_GRAPHICS_DRIVER_H
|
||||
|
||||
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ_H
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id: quartz.H 11017 2016-01-20 21:40:12Z matt $".
|
||||
|
||||
@ -16,8 +16,8 @@
|
||||
// http://www.fltk.org/str.php
|
||||
//
|
||||
|
||||
#ifndef FL_CFG_GFX_QUARTZ_ARCI_CXX
|
||||
#define FL_CFG_GFX_QUARTZ_ARCI_CXX
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
#include "Fl_Quartz_Graphics_Driver.h"
|
||||
|
||||
@ -68,7 +68,7 @@ void Fl_Quartz_Graphics_Driver::pie(int x,int y,int w,int h,double a1,double a2)
|
||||
CGContextSetShouldAntialias(fl_gc, false);
|
||||
}
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ_ARCI_CXX
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
|
||||
@ -16,6 +16,9 @@
|
||||
// http://www.fltk.org/str.php
|
||||
//
|
||||
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
// The fltk "colormap". This allows ui colors to be stored in 8-bit
|
||||
// locations, and provides a level of indirection so that global color
|
||||
// changes can be made. Not to be confused with the X colormap, which
|
||||
@ -77,6 +80,8 @@ void Fl::set_color(Fl_Color i, unsigned c) {
|
||||
}
|
||||
}
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
//
|
||||
|
||||
@ -16,10 +16,15 @@
|
||||
// http://www.fltk.org/str.php
|
||||
//
|
||||
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
#include "Fl_Quartz_Graphics_Driver.h"
|
||||
|
||||
#include <config.h>
|
||||
#include <math.h>
|
||||
#include <FL/Fl.H>
|
||||
#include <FL/fl_utf8.h>
|
||||
|
||||
Fl_Fontdesc* fl_fonts = NULL;
|
||||
|
||||
@ -583,6 +588,8 @@ void Fl_Quartz_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) {
|
||||
draw(c, n, x - w - dx, y);
|
||||
}
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
//
|
||||
|
||||
@ -16,7 +16,10 @@
|
||||
// http://www.fltk.org/str.php
|
||||
//
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
#include "Fl_Quartz_Graphics_Driver.h"
|
||||
|
||||
#include <config.h>
|
||||
#include <FL/Fl.H>
|
||||
@ -162,6 +165,123 @@ void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) {
|
||||
fl_rectf(x,y,w,h);
|
||||
}
|
||||
|
||||
void Fl_Quartz_Graphics_Driver::draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) {
|
||||
int X, Y, W, H;
|
||||
if (bm->start(XP, YP, WP, HP, cx, cy, X, Y, W, H)) {
|
||||
return;
|
||||
}
|
||||
if (bm->id_ && fl_gc) {
|
||||
CGRect rect = { { (CGFloat)X, (CGFloat)Y }, { (CGFloat)W, (CGFloat)H } };
|
||||
Fl_X::q_begin_image(rect, cx, cy, bm->w(), bm->h());
|
||||
CGContextDrawImage(fl_gc, rect, (CGImageRef)bm->id_);
|
||||
Fl_X::q_end_image();
|
||||
}
|
||||
}
|
||||
|
||||
static void imgProviderReleaseData (void *info, const void *data, size_t size)
|
||||
{
|
||||
if (!info || *(bool*)info) delete[] (unsigned char *)data;
|
||||
delete (bool*)info;
|
||||
}
|
||||
|
||||
static int start(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int w, int h, int &cx, int &cy,
|
||||
int &X, int &Y, int &W, int &H)
|
||||
{
|
||||
// account for current clip region (faster on Irix):
|
||||
fl_clip_box(XP,YP,WP,HP,X,Y,W,H);
|
||||
cx += X-XP; cy += Y-YP;
|
||||
// clip the box down to the size of image, quit if empty:
|
||||
if (cx < 0) {W += cx; X -= cx; cx = 0;}
|
||||
if (cx+W > w) W = w-cx;
|
||||
if (W <= 0) return 1;
|
||||
if (cy < 0) {H += cy; Y -= cy; cy = 0;}
|
||||
if (cy+H > h) H = h-cy;
|
||||
if (H <= 0) return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void Fl_Quartz_Graphics_Driver::draw(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy) {
|
||||
int X, Y, W, H;
|
||||
// Don't draw an empty image...
|
||||
if (!img->d() || !img->array) {
|
||||
img->draw_empty(XP, YP);
|
||||
return;
|
||||
}
|
||||
if (start(img, XP, YP, WP, HP, img->w(), img->h(), cx, cy, X, Y, W, H)) {
|
||||
return;
|
||||
}
|
||||
if (!img->id_) {
|
||||
CGColorSpaceRef lut = img->d()<=2 ? CGColorSpaceCreateDeviceGray() : CGColorSpaceCreateDeviceRGB();
|
||||
int ld = img->ld();
|
||||
if (!ld) ld = img->w() * img->d();
|
||||
// If img->alloc_array == 0, the CGImage data provider must not release the image data.
|
||||
// If img->alloc_array != 0, the CGImage data provider will take responsibilty of deleting RGB image data after use:
|
||||
// when the CGImage is deallocated, the release callback of its data provider
|
||||
// (imgProviderReleaseData) is called and can delete the RGB image data.
|
||||
// If the CGImage is printed, it is not deallocated until after the end of the page,
|
||||
// therefore, with img->alloc_array != 0, the RGB image can be safely deleted any time after return from this function.
|
||||
// The previously unused mask_ member allows to make sure the RGB image data is not deleted by Fl_RGB_Image::uncache().
|
||||
if (img->alloc_array) img->mask_ = new bool(true);
|
||||
CGDataProviderRef src = CGDataProviderCreateWithData(img->mask_, img->array, ld * img->h(),
|
||||
img->alloc_array?imgProviderReleaseData:NULL);
|
||||
img->id_ = CGImageCreate(img->w(), img->h(), 8, img->d()*8, ld,
|
||||
lut, (img->d()&1)?kCGImageAlphaNone:kCGImageAlphaLast,
|
||||
src, 0L, false, kCGRenderingIntentDefault);
|
||||
CGColorSpaceRelease(lut);
|
||||
CGDataProviderRelease(src);
|
||||
}
|
||||
if (img->id_ && fl_gc) {
|
||||
if (!img->alloc_array && has_feature(PRINTER) && !CGImageGetShouldInterpolate((CGImageRef)img->id_)) {
|
||||
// When printing, the image data is used when the page is completed, that is, after return from this function.
|
||||
// If the image has alloc_array = 0, we must protect against image data being freed before it is used:
|
||||
// we duplicate the image data and have it deleted after use by the release-callback of the CGImage data provider
|
||||
Fl_RGB_Image* img2 = (Fl_RGB_Image*)img->copy();
|
||||
img2->alloc_array = 0;
|
||||
const uchar *img_bytes = img2->array;
|
||||
int ld = img2->ld();
|
||||
if (!ld) ld = img2->w() * img2->d();
|
||||
delete img2;
|
||||
img->uncache();
|
||||
CGColorSpaceRef lut = img->d()<=2 ? CGColorSpaceCreateDeviceGray() : CGColorSpaceCreateDeviceRGB();
|
||||
CGDataProviderRef src = CGDataProviderCreateWithData( NULL, img_bytes, ld * img->h(), imgProviderReleaseData);
|
||||
img->id_ = CGImageCreate(img->w(), img->h(), 8, img->d()*8, ld,
|
||||
lut, (img->d()&1)?kCGImageAlphaNone:kCGImageAlphaLast,
|
||||
src, 0L, true, kCGRenderingIntentDefault);
|
||||
CGColorSpaceRelease(lut);
|
||||
CGDataProviderRelease(src);
|
||||
}
|
||||
CGRect rect = CGRectMake(X, Y, W, H);
|
||||
Fl_X::q_begin_image(rect, cx, cy, img->w(), img->h());
|
||||
CGContextDrawImage(fl_gc, rect, (CGImageRef)img->id_);
|
||||
Fl_X::q_end_image();
|
||||
}
|
||||
}
|
||||
|
||||
int Fl_Quartz_Graphics_Driver::draw_scaled(Fl_Image *img, int XP, int YP, int WP, int HP) {
|
||||
int X, Y, W, H;
|
||||
fl_clip_box(XP,YP,WP,HP,X,Y,W,H); // X,Y,W,H will give the unclipped area of XP,YP,WP,HP
|
||||
if (W == 0 || H == 0) return 1;
|
||||
fl_push_no_clip(); // remove the FLTK clip that can't be rescaled
|
||||
CGContextSaveGState(fl_gc);
|
||||
CGContextClipToRect(fl_gc, CGRectMake(X, Y, W, H)); // this clip path will be rescaled & translated
|
||||
CGContextTranslateCTM(fl_gc, XP, YP);
|
||||
CGContextScaleCTM(fl_gc, float(WP)/img->w(), float(HP)/img->h());
|
||||
img->draw(0, 0, img->w(), img->h(), 0, 0);
|
||||
CGContextRestoreGState(fl_gc);
|
||||
fl_pop_clip(); // restore FLTK's clip
|
||||
return 1;
|
||||
}
|
||||
|
||||
void Fl_Quartz_Graphics_Driver::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy) {
|
||||
int X, Y, W, H;
|
||||
if (pxm->prepare(XP, YP, WP, HP, cx, cy, X, Y, W, H)) return;
|
||||
copy_offscreen(X, Y, W, H, (Fl_Offscreen)pxm->id_, cx, cy);
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
//
|
||||
|
||||
@ -16,8 +16,12 @@
|
||||
// http://www.fltk.org/str.php
|
||||
//
|
||||
|
||||
#ifndef FL_CFG_GFX_QUARTZ_LINE_STYLE_CXX
|
||||
#define FL_CFG_GFX_QUARTZ_LINE_STYLE_CXX
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
#include <FL/fl_draw.h>
|
||||
|
||||
extern int fl_line_width_;
|
||||
|
||||
/**
|
||||
\file quartz_line_style.cxx
|
||||
@ -53,7 +57,9 @@ void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) {
|
||||
fl_quartz_line_width_ = (float)width;
|
||||
fl_quartz_line_cap_ = Cap[(style>>8)&3];
|
||||
// when printing kCGLineCapSquare seems better for solid lines
|
||||
if ( Fl_Surface_Device::surface() != Fl_Display_Device::display_device() && style == FL_SOLID && dashes == NULL ) {
|
||||
if ( Fl_Surface_Device::surface() != Fl_Display_Device::display_device()
|
||||
&& style == FL_SOLID && dashes == NULL )
|
||||
{
|
||||
fl_quartz_line_cap_ = kCGLineCapSquare;
|
||||
}
|
||||
fl_quartz_line_join_ = Join[(style>>12)&3];
|
||||
@ -91,7 +97,7 @@ void Fl_Quartz_Graphics_Driver::line_style(int style, int width, char* dashes) {
|
||||
fl_quartz_restore_line_style_();
|
||||
}
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ_LINE_STYLE_CXX
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
|
||||
@ -17,8 +17,10 @@
|
||||
//
|
||||
|
||||
|
||||
#ifndef FL_CFG_GFX_QUARTZ_RECT_CXX
|
||||
#define FL_CFG_GFX_QUARTZ_RECT_CXX
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
#include <FL/Fl.H>
|
||||
|
||||
|
||||
/**
|
||||
@ -210,7 +212,7 @@ void Fl_Quartz_Graphics_Driver::push_clip(int x, int y, int w, int h) {
|
||||
}
|
||||
if (rstackptr < region_stack_max) rstack[++rstackptr] = r;
|
||||
else Fl::warning("Fl_Quartz_Graphics_Driver::push_clip: clip stack overflow!\n");
|
||||
fl_restore_clip();
|
||||
restore_clip();
|
||||
}
|
||||
|
||||
int Fl_Quartz_Graphics_Driver::clip_box(int x, int y, int w, int h, int& X, int& Y, int& W, int& H){
|
||||
@ -251,7 +253,7 @@ int Fl_Quartz_Graphics_Driver::not_clipped(int x, int y, int w, int h) {
|
||||
void Fl_Quartz_Graphics_Driver::push_no_clip() {
|
||||
if (rstackptr < region_stack_max) rstack[++rstackptr] = 0;
|
||||
else Fl::warning("Fl_Quartz_Graphics_Driver::push_no_clip: clip stack overflow!\n");
|
||||
fl_restore_clip();
|
||||
restore_clip();
|
||||
}
|
||||
|
||||
// pop back to previous clip:
|
||||
@ -260,7 +262,7 @@ void Fl_Quartz_Graphics_Driver::pop_clip() {
|
||||
Fl_Region oldr = rstack[rstackptr--];
|
||||
if (oldr) XDestroyRegion(oldr);
|
||||
} else Fl::warning("Fl_Quartz_Graphics_Driver::pop_clip: clip stack underflow!\n");
|
||||
fl_restore_clip();
|
||||
restore_clip();
|
||||
}
|
||||
|
||||
void Fl_Quartz_Graphics_Driver::restore_clip() {
|
||||
@ -277,7 +279,7 @@ void Fl_Quartz_Graphics_Driver::restore_clip() {
|
||||
}
|
||||
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ_RECT_CXX
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
|
||||
@ -16,8 +16,8 @@
|
||||
// http://www.fltk.org/str.php
|
||||
//
|
||||
|
||||
#ifndef FL_CFG_GFX_QUARTZ_VERTEX_CXX
|
||||
#define FL_CFG_GFX_QUARTZ_VERTEX_CXX
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
/**
|
||||
\file quartz_vertex.cxx
|
||||
@ -135,7 +135,7 @@ void Fl_Quartz_Graphics_Driver::circle(double x, double y,double r) {
|
||||
CGContextSetShouldAntialias(fl_gc, false);
|
||||
}
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ_VERTEX_CXX
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
|
||||
34
src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.cxx
Normal file
34
src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.cxx
Normal file
@ -0,0 +1,34 @@
|
||||
//
|
||||
// "$Id$"
|
||||
//
|
||||
// Rectangle drawing routines for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 1998-2016 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
|
||||
// file is missing or damaged, see the license at:
|
||||
//
|
||||
// http://www.fltk.org/COPYING.php
|
||||
//
|
||||
// Please report all bugs and problems on the following page:
|
||||
//
|
||||
// http://www.fltk.org/str.php
|
||||
//
|
||||
|
||||
|
||||
#include "config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
#include "Fl_Quartz_Printer_Graphics_Driver.h"
|
||||
|
||||
int Fl_Quartz_Printer_Graphics_Driver::has_feature(driver_feature mask)
|
||||
{
|
||||
return mask & (NATIVE | PRINTER);
|
||||
}
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
//
|
||||
42
src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.h
Normal file
42
src/drivers/Quartz/Fl_Quartz_Printer_Graphics_Driver.h
Normal file
@ -0,0 +1,42 @@
|
||||
//
|
||||
// "$Id: quartz.H 11017 2016-01-20 21:40:12Z matt $"
|
||||
//
|
||||
// Definition of Apple Quartz graphics driver
|
||||
// for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 2010-2016 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
|
||||
// file is missing or damaged, see the license at:
|
||||
//
|
||||
// http://www.fltk.org/COPYING.php
|
||||
//
|
||||
// Please report all bugs and problems on the following page:
|
||||
//
|
||||
// http://www.fltk.org/str.php
|
||||
//
|
||||
|
||||
#include "../../config_lib.h"
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
#ifndef FL_QUARTZ_PRINTER_GRAPHICS_DRIVER_H
|
||||
#define FL_QUARTZ_PRINTER_GRAPHICS_DRIVER_H
|
||||
|
||||
#include "Fl_Quartz_Graphics_Driver.h"
|
||||
|
||||
|
||||
/** Graphics driver used for Mac OS X printing. */
|
||||
class Fl_Quartz_Printer_Graphics_Driver : public Fl_Quartz_Graphics_Driver {
|
||||
public:
|
||||
virtual int has_feature(driver_feature mask);
|
||||
};
|
||||
|
||||
|
||||
#endif // FL_QUARTZ_PRINTER_GRAPHICS_DRIVER_H
|
||||
|
||||
#endif // FL_CFG_GFX_QUARTZ
|
||||
|
||||
//
|
||||
// End of "$Id: quartz.H 11017 2016-01-20 21:40:12Z matt $".
|
||||
//
|
||||
@ -35,14 +35,8 @@
|
||||
#include <config.h>
|
||||
#include "config_lib.h"
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx"
|
||||
|
||||
#endif
|
||||
// Apple Quartz driver in "drivers/Quartz/Fl_Quartz_Graphics_Driver_arci.cxx"
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
@ -24,18 +24,16 @@
|
||||
// Implementation of fl_color(i), fl_color(r,g,b).
|
||||
|
||||
#include <FL/Fl_Device.H>
|
||||
#include <FL/Fl.H>
|
||||
#include <config.h>
|
||||
#include "config_lib.h"
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Apple Quartz driver in "drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx"
|
||||
|
||||
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_color.cxx"
|
||||
|
||||
#endif
|
||||
static unsigned fl_cmap[256] = {
|
||||
#include "fl_cmap.h" // this is a file produced by "cmap.cxx":
|
||||
};
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
#ifdef WIN32
|
||||
# include "drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx"
|
||||
#elif defined(__APPLE__)
|
||||
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx"
|
||||
// Apple Quartz driver in "drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx"
|
||||
#else
|
||||
# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx"
|
||||
#endif
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
#ifdef WIN32
|
||||
# include "drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx"
|
||||
#elif defined(__APPLE__)
|
||||
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx"
|
||||
// Apple Quartz driver in "drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx"
|
||||
#elif USE_XFT
|
||||
# include "drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx"
|
||||
#elif defined(FL_PORTING)
|
||||
|
||||
@ -35,14 +35,7 @@
|
||||
int fl_line_width_ = 0;
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx"
|
||||
|
||||
#endif
|
||||
// Apple Quartz driver in "drivers/Quartz/Fl_Quartz_Graphics_Driver_line_style.cxx"
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
@ -65,11 +65,7 @@ Fl_Region Fl_Graphics_Driver::clip_region() {
|
||||
|
||||
|
||||
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx"
|
||||
|
||||
#endif
|
||||
// Apple Quartz driver in "drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx"
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
@ -148,11 +148,7 @@ void Fl_Graphics_Driver::fixloop() { // remove equal points from closed path
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
|
||||
#ifdef FL_CFG_GFX_QUARTZ
|
||||
|
||||
# include "drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx"
|
||||
|
||||
#endif
|
||||
// Apple Quartz graphics driver "drivers/Quartz/Fl_Quartz_Graphics_Driver_vertex.cxx"
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
Loading…
Reference in New Issue
Block a user