Merge lp:~ricotz/plank/hidpi into lp:plank

[Rico Tzschichholz]

Simple hack to figure out what needs to be done to support HiDPI

The main problem are Pixbuf based drawings with need to be upscaled by the scale-factor and downscaled for the dock-rendering again. The Gdk-API is providing scaled coords automatically. On the other hand Wnck is working with the real unscaled dimensions.

Run with "GDK_SCALE=2 src/plank"

[Cassidy James Blaede (cassidyjames)]

This looks to be doing the right thing when run with GDK_SCALE=2.

review: Approve

[lp:~ricotz/plank/hidpi]

1008. By Rico Tzschichholz on 2014-03-20

Add support for GTK's HiDPI

The main problem are Pixbuf based drawings which need to be upscaled
by the scale-factor and downscaled for the dock-rendering again.

The Gdk-API is providing scaled coords automatically while Wnck is
working with and returning the real unscaled dimensions. So we are
adjusting those accordingly.

=== modified file 'configure.ac'
--- configure.ac	2014-01-29 10:37:49 +0000
+++ configure.ac	2014-03-20 10:19:57 +0000
@@ -141,6 +141,15 @@
 # Optional Dependencies
 # -----------------------------------------------------------
 
+# Check for HiDPI support of Gtk+
+GTK_MIN_VERSION=3.10.0
+GTK_PKGS="gtk+-3.0 >= $GTK_MIN_VERSION"
+PKG_CHECK_MODULES(GTK, $GTK_PKGS, [enable_hidpi=yes], [enable_hidpi=no])
+if test "x$enable_hidpi" = "xyes" ; then
+    VALAFLAGS="$VALAFLAGS --define HAVE_GTK_3_10"
+fi
+AM_CONDITIONAL([HAVE_hidpi], [test "x$enable_hidpi" = "xyes"])
+
 # Check for newer BAMF
 BAMF_MIN_VERSION=0.4.0
 BAMF_PKGS="libbamf3 >= $BAMF_MIN_VERSION"
@@ -310,6 +319,7 @@
 
     Use gee-0.8.................:  ${enable_gee_0_8}
     Dbusmenu support............:  ${enable_dbusmenu}
+    HiDPI support...............:  ${enable_hidpi}
 
     Apport support..............:  ${enable_apport}
 
 
=== modified file 'lib/DockRenderer.vala'
--- lib/DockRenderer.vala	2014-02-27 12:27:55 +0000
+++ lib/DockRenderer.vala	2014-03-20 10:19:57 +0000
@@ -62,6 +62,7 @@
 		
 		bool screen_is_composited = false;
 		uint reset_position_manager_timer = 0;
+		int window_scale_factor = 1;
 		
 		/**
 		 * Create a new dock renderer for a dock.
@@ -242,6 +243,13 @@
 		 */
 		public void draw_dock (Context cr)
 		{
+#if HAVE_GTK_3_10
+#if VALA_0_22
+			window_scale_factor = controller.window.get_window ().get_scale_factor ();
+#else
+			window_scale_factor = gdk_window_get_scale_factor (controller.window.get_window ());
+#endif
+#endif
 			// take the previous frame values into account to decide if we
 			// can bail a full draw to not miss a finishing animation-frame
 			var no_full_draw_needed = (hide_progress == 1.0 && opacity == 1.0);
@@ -380,7 +388,7 @@
 #if BENCHMARK
 			var start = new DateTime.now_local ();
 #endif
-			var icon_surface = item.get_surface_copy (icon_size, icon_size, main_buffer);
+			var icon_surface = item.get_surface_copy (icon_size * window_scale_factor, icon_size * window_scale_factor, main_buffer);
 			unowned Context icon_cr = icon_surface.Context;
 			
 			DockSurface? icon_shadow_surface = null;
@@ -532,14 +540,26 @@
 			
 			// draw the icon shadow
 			if (icon_shadow_surface != null) {
+				if (window_scale_factor > 1) {
+					shadow_cr.save ();
+					shadow_cr.scale (1.0 / window_scale_factor, 1.0 / window_scale_factor);
+				}
 				shadow_cr.set_operator (Cairo.Operator.OVER);
-				shadow_cr.set_source_surface (icon_shadow_surface.Internal, draw_value.draw_region.x - shadow_size, draw_value.draw_region.y - shadow_size);
+				shadow_cr.set_source_surface (icon_shadow_surface.Internal, (draw_value.draw_region.x - shadow_size) * window_scale_factor, (draw_value.draw_region.y - shadow_size) * window_scale_factor);
 				shadow_cr.paint ();
+				if (window_scale_factor > 1)
+					shadow_cr.restore ();
 			}
 
 			// draw the icon
-			main_cr.set_source_surface (icon_surface.Internal, draw_value.draw_region.x, draw_value.draw_region.y);
+			if (window_scale_factor > 1) {
+				main_cr.save ();
+				main_cr.scale (1.0 / window_scale_factor, 1.0 / window_scale_factor);
+			}
+			main_cr.set_source_surface (icon_surface.Internal, draw_value.draw_region.x * window_scale_factor, draw_value.draw_region.y * window_scale_factor);
 			main_cr.paint ();
+			if (window_scale_factor > 1)
+				main_cr.restore ();
 			
 			// draw indicators
 			if (item.Indicator != IndicatorState.NONE)
@@ -559,7 +579,7 @@
 			Logger.verbose ("DockItem.draw_item_overlay (width = %i, height = %i)", width, height);
 			var surface = new DockSurface.with_dock_surface (width, height, icon_surface);
 			
-			var icon_size = position_manager.IconSize;
+			var icon_size = position_manager.IconSize * window_scale_factor;
 			var urgent_color = get_styled_color ();
 			urgent_color.add_hue (theme.UrgentHueShift);
 			
@@ -576,7 +596,7 @@
 		
 		DockSurface draw_item_shadow (DockItem item, DockSurface icon_surface, DockSurface? current_surface)
 		{
-			var shadow_size = controller.position_manager.IconShadowSize;
+			var shadow_size = controller.position_manager.IconShadowSize * window_scale_factor;
 			
 			// Inflate size to fit shadow
 			var width = icon_surface.Width + 2 * shadow_size;
 
=== modified file 'lib/Factories/AbstractMain.vala'
--- lib/Factories/AbstractMain.vala	2013-11-15 15:14:36 +0000
+++ lib/Factories/AbstractMain.vala	2014-03-20 10:19:57 +0000
@@ -175,6 +175,9 @@
 			message ("Kernel version: %s", Posix.utsname ().release);
 			message ("GLib version: %u.%u.%u", GLib.Version.major, GLib.Version.minor, GLib.Version.micro);
 			message ("GTK+ version: %u.%u.%u", Gtk.get_major_version (), Gtk.get_minor_version () , Gtk.get_micro_version ());
+#if HAVE_GTK_3_10
+			message ("+ HiDPI support enabled");
+#endif
 			message ("Wnck version: %d.%d.%d", Wnck.Version.MAJOR_VERSION, Wnck.Version.MINOR_VERSION, Wnck.Version.MICRO_VERSION);
 			message ("Cairo version: %s", Cairo.version_string ());
 			message ("Pango version: %s", Pango.version_string ());
 
=== modified file 'lib/HideManager.vala'
--- lib/HideManager.vala	2014-02-18 07:45:27 +0000
+++ lib/HideManager.vala	2014-03-20 10:19:57 +0000
@@ -317,6 +317,19 @@
 		void update_window_intersect ()
 		{
 			var dock_rect = controller.position_manager.get_static_dock_region ();
+#if HAVE_GTK_3_10
+#if VALA_0_22
+			var window_scale_factor = controller.window.get_window ().get_scale_factor ();
+#else
+			var window_scale_factor = gdk_window_get_scale_factor (controller.window.get_window ());
+#endif
+			if (window_scale_factor > 1) {
+				dock_rect.x *= window_scale_factor;
+				dock_rect.y *= window_scale_factor;
+				dock_rect.width *= window_scale_factor;
+				dock_rect.height *= window_scale_factor;
+			}
+#endif
 			
 			var intersect = false;
 			var dialog_intersect = false;
 
=== modified file 'lib/PositionManager.vala'
--- lib/PositionManager.vala	2014-02-13 10:40:46 +0000
+++ lib/PositionManager.vala	2014-03-20 10:19:57 +0000
@@ -106,6 +106,7 @@
 		Gdk.Rectangle monitor_geo;
 		
 		bool screen_is_composited;
+		int window_scale_factor = 1;
 		
 		/**
 		 * Creates a new position manager.
@@ -436,24 +437,31 @@
 		{
 			var cursor_region = static_dock_region;
 			var progress = 1.0 - controller.renderer.hide_progress;
+#if HAVE_GTK_3_10
+#if VALA_0_22
+			window_scale_factor = controller.window.get_window ().get_scale_factor ();
+#else
+			window_scale_factor = gdk_window_get_scale_factor (controller.window.get_window ());
+#endif
+#endif
 			
 			switch (controller.prefs.Position) {
 			default:
 			case PositionType.BOTTOM:
-				cursor_region.height = int.max (1, (int) (progress * cursor_region.height));
-				cursor_region.y = DockHeight - cursor_region.height;
+				cursor_region.height = int.max (1 * window_scale_factor, (int) (progress * cursor_region.height));
+				cursor_region.y = DockHeight - cursor_region.height + (window_scale_factor - 1);
 				break;
 			case PositionType.TOP:
-				cursor_region.height = int.max (1, (int) (progress * cursor_region.height));
+				cursor_region.height = int.max (1 * window_scale_factor, (int) (progress * cursor_region.height));
 				cursor_region.y = 0;
 				break;
 			case PositionType.LEFT:
-				cursor_region.width = int.max (1, (int) (progress * cursor_region.width));
+				cursor_region.width = int.max (1 * window_scale_factor, (int) (progress * cursor_region.width));
 				cursor_region.x = 0;
 				break;
 			case PositionType.RIGHT:
-				cursor_region.width = int.max (1, (int) (progress * cursor_region.width));
-				cursor_region.x = DockWidth - cursor_region.width;
+				cursor_region.width = int.max (1 * window_scale_factor, (int) (progress * cursor_region.width));
+				cursor_region.x = DockWidth - cursor_region.width + (window_scale_factor - 1);
 				break;
 			}
 			
@@ -1065,27 +1073,34 @@
 		 */
 		public void get_struts (ref ulong[] struts)
 		{
+#if HAVE_GTK_3_10
+#if VALA_0_22
+			window_scale_factor = controller.window.get_window ().get_scale_factor ();
+#else
+			window_scale_factor = gdk_window_get_scale_factor (controller.window.get_window ());
+#endif
+#endif
 			switch (controller.prefs.Position) {
 			default:
 			case PositionType.BOTTOM:
-				struts [Struts.BOTTOM] = VisibleDockHeight + controller.window.get_screen ().get_height () - monitor_geo.y - monitor_geo.height;
-				struts [Struts.BOTTOM_START] = monitor_geo.x;
-				struts [Struts.BOTTOM_END] = monitor_geo.x + monitor_geo.width - 1;
+				struts [Struts.BOTTOM] = (VisibleDockHeight + controller.window.get_screen ().get_height () - monitor_geo.y - monitor_geo.height) * window_scale_factor;
+				struts [Struts.BOTTOM_START] = monitor_geo.x * window_scale_factor;
+				struts [Struts.BOTTOM_END] = (monitor_geo.x + monitor_geo.width) * window_scale_factor - 1;
 				break;
 			case PositionType.TOP:
-				struts [Struts.TOP] = monitor_geo.y + VisibleDockHeight;
-				struts [Struts.TOP_START] = monitor_geo.x;
-				struts [Struts.TOP_END] = monitor_geo.x + monitor_geo.width - 1;
+				struts [Struts.TOP] = (monitor_geo.y + VisibleDockHeight) * window_scale_factor;
+				struts [Struts.TOP_START] = monitor_geo.x * window_scale_factor;
+				struts [Struts.TOP_END] = (monitor_geo.x + monitor_geo.width) * window_scale_factor - 1;
 				break;
 			case PositionType.LEFT:
-				struts [Struts.LEFT] = monitor_geo.x + VisibleDockWidth;
-				struts [Struts.LEFT_START] = monitor_geo.y;
-				struts [Struts.LEFT_END] = monitor_geo.y + monitor_geo.height - 1;
+				struts [Struts.LEFT] = (monitor_geo.x + VisibleDockWidth) * window_scale_factor;
+				struts [Struts.LEFT_START] = monitor_geo.y * window_scale_factor;
+				struts [Struts.LEFT_END] = (monitor_geo.y + monitor_geo.height) * window_scale_factor - 1;
 				break;
 			case PositionType.RIGHT:
-				struts [Struts.RIGHT] = VisibleDockWidth + controller.window.get_screen ().get_width () - monitor_geo.x - monitor_geo.width;
-				struts [Struts.RIGHT_START] = monitor_geo.y;
-				struts [Struts.RIGHT_END] = monitor_geo.y + monitor_geo.height - 1;
+				struts [Struts.RIGHT] = (VisibleDockWidth + controller.window.get_screen ().get_width () - monitor_geo.x - monitor_geo.width) * window_scale_factor;
+				struts [Struts.RIGHT_START] = monitor_geo.y * window_scale_factor;
+				struts [Struts.RIGHT_END] = (monitor_geo.y + monitor_geo.height) * window_scale_factor - 1;
 				break;
 			}
 		}
 
=== modified file 'vapi/compat.vapi'
--- vapi/compat.vapi	2014-02-14 07:00:32 +0000
+++ vapi/compat.vapi	2014-03-20 10:19:57 +0000
@@ -21,6 +21,10 @@
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cname = "gdk_pixbuf_new_from_resource")]
 	public Gdk.Pixbuf gdk_pixbuf_new_from_resource (string resource_path) throws GLib.Error;
 #endif
+#if !VALA_0_22 && HAVE_GTK_3_10
+	[CCode (cheader_filename = "gdk/gdk.h", cname = "gdk_window_get_scale_factor")]
+	public int gdk_window_get_scale_factor (Gdk.Window window);
+#endif
 #if !VALA_0_24
 	[CCode (cheader_filename = "gtk/gtk.h", cname = "gtk_widget_shape_combine_region")]
 	public void gtk_widget_shape_combine_region (Gtk.Widget widget, Cairo.Region? region);