mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mac OS: exact implementation of the Fl::screen_dpi() function. 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8619 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2011-04-22 17:30:37 +00:00
parent 239489c4b8
commit 65b9610a96
3 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FL/mac.H
View File

@ -143,7 +143,6 @@ public:
void contains_GL_subwindow(void); void contains_GL_subwindow(void);
void set_key_window(void); void set_key_window(void);
void set_cursor(Fl_Cursor); void set_cursor(Fl_Cursor);
static int screen_init(XRectangle screens[], float dpi[]);
static CGImageRef CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h); static CGImageRef CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h);
static unsigned char *bitmap_from_window_rect(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel); static unsigned char *bitmap_from_window_rect(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel);
static Fl_Region intersect_region_and_rect(Fl_Region current, int x,int y,int w, int h); static Fl_Region intersect_region_and_rect(Fl_Region current, int x,int y,int w, int h);

31
src/Fl_cocoa.mm
View File

@ -2823,37 +2823,6 @@ void Fl_X::set_cursor(Fl_Cursor c)
cursor = icrsr; cursor = icrsr;
} }
int Fl_X::screen_init(XRectangle screens[], float dpi[])
{
NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init];
NSArray *a = [NSScreen screens];
NSScreen *object;
int count = (int)[a count];
NSRect r;
int i, num_screens = 0;
for( i = 0; i < count; i++) {
object = (NSScreen*)[a objectAtIndex:i];
r = [object frame];
screens[num_screens].x = int(r.origin.x);
screens[num_screens].y = int(r.size.height - (r.origin.y + r.size.height));
screens[num_screens].width = int(r.size.width);
screens[num_screens].height = int(r.size.height);
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ([object respondsToSelector:@selector(userSpaceScaleFactor)]) {
dpi[num_screens] = float([object userSpaceScaleFactor])*72.0f;
} else
#endif
{
dpi[num_screens] = 72.0f;
}
num_screens ++;
if (num_screens >= 16) break;
}
[localPool release];
return num_screens;
}
@interface FLaboutItemTarget : NSObject @interface FLaboutItemTarget : NSObject
{ {
} }

22
src/screen_xywh.cxx
View File

@ -118,10 +118,25 @@ static void screen_init() {
} }
#elif defined(__APPLE__) #elif defined(__APPLE__)
static XRectangle screens[16]; static XRectangle screens[16];
static float dpi[16]; static float dpi_h[16];
static float dpi_v[16];
static void screen_init() { static void screen_init() {
num_screens = Fl_X::screen_init(screens, dpi); CGDirectDisplayID displays[16];
CGDisplayCount count, i;
CGRect r;
CGGetActiveDisplayList(16, displays, &count);
for( i = 0; i < count; i++) {
r = CGDisplayBounds(displays[i]);
screens[i].x = int(r.origin.x);
screens[i].y = int(r.size.height - (r.origin.y + r.size.height));
screens[i].width = int(r.size.width);
screens[i].height = int(r.size.height);
CGSize s = CGDisplayScreenSize(displays[i]);
dpi_h[i] = screens[i].width / (s.width/25.4);
dpi_v[i] = screens[i].height / (s.height/25.4);
}
num_screens = count;
} }
#elif HAVE_XINERAMA #elif HAVE_XINERAMA
# include <X11/extensions/Xinerama.h> # include <X11/extensions/Xinerama.h>
@ -338,7 +353,8 @@ void Fl::screen_dpi(float &h, float &v, int n)
} }
#elif defined(__APPLE__) #elif defined(__APPLE__)
if (n >= 0 && n < num_screens) { if (n >= 0 && n < num_screens) {
h = v = dpi[n]; h = dpi_h[n];
v = dpi_v[n];
} }
#elif HAVE_XINERAMA #elif HAVE_XINERAMA
if (n >= 0 && n < num_screens) { if (n >= 0 && n < num_screens) {