summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2011-01-07 01:01:04 +0000
committerMatthias Melcher <fltk@matthiasm.com>2011-01-07 01:01:04 +0000
commit7dc05cb20ee92e38b3d1fbd88664e572d73a8d54 (patch)
treec1a4f03879c8c371a67e26c1213f45c5ee0ffebb /FL
parentd6bffb20a3b75037d7e5811fdca87d0040873188 (diff)
First attempt at finding the screen pixel sizes. Can't test Xinerame, MSWindows, or X11 yet.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8204 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl.H3
-rw-r--r--FL/mac.H2
2 files changed, 3 insertions, 2 deletions
diff --git a/FL/Fl.H b/FL/Fl.H
index 2b4786983..874769354 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -773,7 +773,8 @@ public:
screen_xywh(X, Y, W, H, e_x_root, e_y_root);
}
static void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my);
- static void screen_xywh(int &X, int &Y, int &W, int &H, int n);
+ static void screen_xywh(int &X, int &Y, int &W, int &H, int n);
+ static void screen_dpi(float &h, float &v, int n=0);
/** @} */
diff --git a/FL/mac.H b/FL/mac.H
index 2c945a953..0e036702c 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -145,7 +145,7 @@ public:
void contains_GL_subwindow(void);
void set_key_window(void);
void set_cursor(Fl_Cursor);
- static int screen_init(XRectangle screens[]);
+ 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 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);