[gtk+/wip/hires-icons: 1/9] quartz: add gdk_screen_ and gdk_window_get_scale_factor()
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/hires-icons: 1/9] quartz: add gdk_screen_ and gdk_window_get_scale_factor()
- Date: Fri, 10 May 2013 16:44:49 +0000 (UTC)
commit 62e7c3aaecbdaf8abb04ad0c80dd61cf2eefc8e1
Author: Michael Natterer <mitch gimp org>
Date: Fri Jan 18 15:47:29 2013 +0100
quartz: add gdk_screen_ and gdk_window_get_scale_factor()
which return 1.0 normally and 2.0 on retina displays.
gdk/gdkscreen.h | 2 ++
gdk/gdkwindow.c | 19 +++++++++++++++++++
gdk/gdkwindow.h | 2 ++
gdk/gdkwindowimpl.h | 2 ++
gdk/quartz/gdkscreen-quartz.c | 33 +++++++++++++++++++++++++++++++++
gdk/quartz/gdkwindow-quartz.c | 22 ++++++++++++++++++++++
6 files changed, 80 insertions(+), 0 deletions(-)
---
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index e01e1a9..5a2b27b 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -99,6 +99,8 @@ gint gdk_screen_get_monitor_height_mm (GdkScreen *screen,
GDK_AVAILABLE_IN_ALL
gchar * gdk_screen_get_monitor_plug_name (GdkScreen *screen,
gint monitor_num);
+gdouble gdk_screen_get_monitor_scale_factor (GdkScreen *screen,
+ gint monitor_num);
GDK_AVAILABLE_IN_ALL
GdkScreen *gdk_screen_get_default (void);
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index f4f1440..44a51b3 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -10550,3 +10550,22 @@ gdk_window_get_frame_clock (GdkWindow *window)
return toplevel->frame_clock;
}
+
+gdouble
+gdk_window_get_scale_factor (GdkWindow *window)
+{
+ GdkWindowImplClass *impl_class;
+
+ g_return_val_if_fail (GDK_IS_WINDOW (window), 1.0);
+
+ if (GDK_WINDOW_DESTROYED (window))
+ return 1.0;
+
+ window = gdk_window_get_toplevel (window);
+ impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
+
+ if (impl_class->get_scale_factor)
+ return impl_class->get_scale_factor (window);
+
+ return 1.0;
+}
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index ddc8e70..aa1ace5 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -829,6 +829,8 @@ GDK_AVAILABLE_IN_ALL
void gdk_window_get_frame_extents (GdkWindow *window,
GdkRectangle *rect);
+gdouble gdk_window_get_scale_factor (GdkWindow *window);
+
#ifndef GDK_MULTIDEVICE_SAFE
GDK_DEPRECATED_IN_3_0_FOR(gdk_window_get_device_position)
GdkWindow * gdk_window_get_pointer (GdkWindow *window,
diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h
index 38008e5..9eeec3c 100644
--- a/gdk/gdkwindowimpl.h
+++ b/gdk/gdkwindowimpl.h
@@ -285,6 +285,8 @@ struct _GdkWindowImplClass
gint n_elements);
void (*delete_property) (GdkWindow *window,
GdkAtom property);
+
+ gdouble (* get_scale_factor) (GdkWindow *window);
};
/* Interface Functions */
diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c
index 84269f5..e942680 100644
--- a/gdk/quartz/gdkscreen-quartz.c
+++ b/gdk/quartz/gdkscreen-quartz.c
@@ -427,6 +427,39 @@ gdk_quartz_screen_get_monitor_workarea (GdkScreen *screen,
GDK_QUARTZ_RELEASE_POOL;
}
+/* Protocol to build cleanly for OSX < 10.7 */
+ protocol ScaleFactor
+- (CGFloat) backingScaleFactor;
+ end
+
+gdouble
+gdk_screen_get_monitor_scale_factor (GdkScreen *screen,
+ gint monitor_num)
+{
+ GdkScreenQuartz *quartz_screen;
+ NSArray *array;
+ NSScreen *nsscreen;
+ gdouble scale_factor = 1.0;
+
+ g_return_val_if_fail (GDK_IS_SCREEN (screen), 1.0);
+ g_return_val_if_fail (monitor_num < gdk_screen_get_n_monitors (screen), 1.0);
+ g_return_val_if_fail (monitor_num >= 0, 1.0);
+
+ quartz_screen = GDK_SCREEN_QUARTZ (screen);
+
+ GDK_QUARTZ_ALLOC_POOL;
+
+ array = [NSScreen screens];
+ nsscreen = [array objectAtIndex:monitor_num];
+
+ if (gdk_quartz_osx_version() >= GDK_OSX_LION)
+ scale_factor = [(id <ScaleFactor>) nsscreen backingScaleFactor];
+
+ GDK_QUARTZ_RELEASE_POOL;
+
+ return scale_factor;
+}
+
static gchar *
gdk_quartz_screen_make_display_name (GdkScreen *screen)
{
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 1b555e1..9049506 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -2997,6 +2997,26 @@ gdk_quartz_window_get_input_shape (GdkWindow *window)
return NULL;
}
+/* Protocol to build cleanly for OSX < 10.7 */
+ protocol ScaleFactor
+- (CGFloat) backingScaleFactor;
+ end
+
+static gdouble
+gdk_quartz_window_get_scale_factor (GdkWindow *window)
+{
+ GdkWindowImplQuartz *impl;
+
+ if (GDK_WINDOW_DESTROYED (window))
+ return 1.0;
+
+ impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl);
+
+ if (gdk_quartz_osx_version() >= GDK_OSX_LION)
+ return [(id <ScaleFactor>) impl->toplevel backingScaleFactor];
+
+ return 1.0;
+}
static void
gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
@@ -3036,6 +3056,7 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
impl_class->get_input_shape = gdk_quartz_window_get_input_shape;
impl_class->begin_paint_region = gdk_window_impl_quartz_begin_paint_region;
impl_class->end_paint = gdk_window_impl_quartz_end_paint;
+ impl_class->get_scale_factor = gdk_quartz_window_get_scale_factor;
impl_class->focus = gdk_quartz_window_focus;
impl_class->set_type_hint = gdk_quartz_window_set_type_hint;
@@ -3089,6 +3110,7 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
impl_quartz_class->get_context = gdk_window_impl_quartz_get_context;
impl_quartz_class->release_context = gdk_window_impl_quartz_release_context;
+
}
GType
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]