Merge lp:~santileortiz/gala/fix-print-screen into lp:gala

[Santiago]

This implements part of the interface gnome-settings-daemon uses to take screenshots by using shortcuts (or the Print Screen key). It implements window screenshots and full screen screenshots.

[Rico Tzschichholz (ricotz)]

Superseded by https://code.launchpad.net/~gala-dev/gala/screenshot/+merge/313930

review: Disapprove

Unmerged revisions

548. By Santiago on 2016-11-19

Fixing print screen key

=== modified file 'src/DBus.vala'
--- src/DBus.vala	2015-11-11 19:56:40 +0000
+++ src/DBus.vala	2016-12-16 17:54:34 +0000
@@ -39,6 +39,16 @@
 				},
 				() => {},
 				() => warning ("Could not acquire name\n") );
+
+			Bus.own_name (BusType.SESSION, "org.gnome.Shell", BusNameOwnerFlags.NONE,
+					(connection) => {
+						try {
+							connection.register_object ("/org/gnome/Shell", DBusAccelerator.init (wm));
+							connection.register_object ("/org/gnome/Shell/Screenshot", ScreenshotManager.init (wm));
+						} catch (Error e) { warning (e.message); }
+					},
+					() => {},
+					() => critical ("Could not acquire name") );
 		}
 
 		private DBus ()

=== modified file 'src/DBusAccelerator.vala'
--- src/DBusAccelerator.vala	2016-08-03 11:14:55 +0000
+++ src/DBusAccelerator.vala	2016-12-16 17:54:34 +0000
@@ -27,24 +27,13 @@
 	public class DBusAccelerator
 	{
 		static DBusAccelerator? instance;
-		static WindowManager wm;
 
 		[DBus (visible = false)]
-		public static void init (WindowManager _wm)
+		public static unowned  DBusAccelerator init (WindowManager _wm)
 		{
-			wm = _wm;
-
-			Bus.own_name (BusType.SESSION, "org.gnome.Shell", BusNameOwnerFlags.NONE,
-				(connection) => {
-					if (instance == null)
-						instance = new DBusAccelerator ();
-
-					try {
-						connection.register_object ("/org/gnome/Shell", instance);
-					} catch (Error e) { warning (e.message); }
-				},
-				() => {},
-				() => critical ("Could not acquire name") );
+			if (instance == null)
+				instance = new DBusAccelerator (wm);
+			return instance;
 		}
 
 #if HAS_GSD316
@@ -53,10 +42,12 @@
 		public signal void accelerator_activated (uint action, uint device_id, uint timestamp);
 #endif
 
+		static WindowManager wm;
 		HashTable<string, uint?> grabbed_accelerators;
 
-		DBusAccelerator ()
+		DBusAccelerator (WindowManager _wm)
 		{
+			wm = _wm;
 			grabbed_accelerators = new HashTable<string, uint> (str_hash, str_equal);
 
 			wm.get_screen ().get_display ().accelerator_activated.connect (on_accelerator_activated);

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2016-08-03 11:14:55 +0000
+++ src/Makefile.am	2016-12-16 17:54:34 +0000
@@ -8,6 +8,7 @@
 	--vapidir $(VAPIDIR) \
 	$(VAPIDIR)/config.vapi \
 	$(VAPIDIR)/cogl-fixes.vapi \
+	$(VAPIDIR)/temp_compat.vapi \
 	$(NULL)
 
 galadir = $(bindir)
@@ -41,6 +42,7 @@
 	MediaFeedback.vala \
 	PluginManager.vala \
 	ScreenSaver.vala \
+	ScreenshotManager.vala \
 	Settings.vala \
 	ShadowEffect.vala \
 	TextShadowEffect.vala \

=== added file 'src/ScreenshotManager.vala'
--- src/ScreenshotManager.vala	1970-01-01 00:00:00 +0000
+++ src/ScreenshotManager.vala	2016-12-16 17:54:34 +0000
@@ -0,0 +1,153 @@
+//
+//  Copyright (C) 2016 Rico Tzschichholz, Santiago León O.
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+namespace Gala
+{
+	[DBus (name="org.gnome.Shell.Screenshot")]
+	public class ScreenshotManager : GLib.Object
+	{
+		static ScreenshotManager? instance;
+
+		[DBus (visible = false)]
+		public static unowned ScreenshotManager init (WindowManager wm)
+		{
+			if (instance == null)
+				instance = new ScreenshotManager (wm);
+
+			return instance;
+		}
+
+		WindowManager wm;
+
+		ScreenshotManager (WindowManager _wm)
+		{
+			wm = _wm;
+		}
+
+		[DBus (visible = false)]
+		public static bool save_image (Cairo.ImageSurface image, string filename, out string used_filename)
+		{
+			used_filename = filename;
+
+			if (!Path.is_absolute (filename)) {
+				string path = Environment.get_user_special_dir (UserDirectory.PICTURES);
+				if (! FileUtils.test (path, FileTest.EXISTS)) {
+					path = Environment.get_home_dir ();
+				}
+
+				if (filename.rstr (".png") == null) {
+					used_filename = filename.concat (".png");
+				}
+
+				used_filename = Path.build_filename (path, used_filename, null);
+			}
+
+			var screenshot = Gdk.pixbuf_get_from_surface (image, 0, 0, image.get_width (), image.get_height ());
+			try {
+				screenshot.save (used_filename, "png");
+				return true;
+			} catch (GLib.Error e) {
+				return false;
+			}
+		}
+
+		[DBus (visible = false)]
+		static Cairo.ImageSurface take_screenshot (int x, int y, int width, int height)
+		{
+			var backend = Clutter.get_default_backend ();
+			var context = Clutter.backend_get_cogl_context (backend);
+
+			var image = new Cairo.ImageSurface (Cairo.Format.ARGB32, width, height);
+			unowned uchar[] data = image.get_data ();
+			int stride = image.get_stride ();
+
+			var bitmap = Cogl.bitmap_new_for_data (context, width, height,
+					Cogl.PixelFormat.BGRA_8888_PRE, stride, data);
+
+			Cogl.framebuffer_read_pixels_into_bitmap (Cogl.get_draw_framebuffer (),
+					x, y, Cogl.ReadPixelsFlags.BUFFER, bitmap );
+
+			image.mark_dirty ();
+			return image;
+		}
+
+		public void flash_area (int x, int y, int width, int height)
+		{
+			warning ("Flash area not implemented\n");
+		}
+
+		public void screenshot (bool include_cursor, bool flash, string filename, out bool success, out string filename_used)
+		{
+			filename_used = "";
+			success = false;
+
+			int width;
+			int height;
+			Meta.Screen screen = instance.wm.get_screen ();
+			screen.get_size (out width, out height);
+
+			var image = take_screenshot (0, 0, width, height);
+
+			success = save_image (image, filename, out filename_used);
+
+			debug ("Taking screenshot\n");
+		}
+
+		public async void screenshot_area (int x, int y, int width, int height, bool flash, string filename, out bool success, out string filename_used)
+		{
+			filename_used = "";
+			success = false;
+			warning ("Area screenshot not implemented\n");
+		}
+
+		public void screenshot_window (bool include_frame, bool include_cursor, bool flash, string filename, out bool success, out string filename_used)
+		{
+			filename_used = "";
+			success = false;
+
+			var display = instance.wm.get_screen ().get_display ();
+			var window = display.get_focus_window ();
+			Meta.WindowActor window_actor = (Meta.WindowActor)window.get_compositor_private ();
+			Meta.ShapedTexture stex = (Meta.ShapedTexture)window_actor.get_texture ();
+
+			float actor_x, actor_y;
+			window_actor.get_position (out actor_x, out actor_y);
+
+			var rect = window.get_frame_rect ();
+			if (include_frame) {
+				rect = window.frame_rect_to_client_rect (rect);
+			}
+
+			Cairo.RectangleInt clip = Cairo.RectangleInt ();
+			clip.x = rect.x - (int)actor_x;
+			clip.y = rect.y - (int)actor_y;
+			clip.width = rect.width;
+			clip.height = rect.height;
+
+			Cairo.ImageSurface image = (Cairo.ImageSurface)stex.get_image (clip);
+			success = save_image (image, filename, out filename_used);
+
+			debug ("Taking window screenshot\n");
+		}
+
+		public async void select_area (out int x, out int y, out int width, out int height)
+		{
+			x = 0; y = 0; width = 0; height = 0;
+			warning ("Select area not implemented\n");
+		}
+	}
+}

=== modified file 'vapi/Makefile.am'
--- vapi/Makefile.am	2016-11-14 14:38:40 +0000
+++ vapi/Makefile.am	2016-12-16 17:54:34 +0000
@@ -7,6 +7,7 @@
 	libmutter.vapi \
 	mutter-clutter-1.0.vapi \
 	mutter-cogl-1.0.vapi \
+	temp_compat.vapi \
 	xfixes-4.0.vapi \
 	$(NULL)
 

=== added file 'vapi/temp_compat.vapi'
--- vapi/temp_compat.vapi	1970-01-01 00:00:00 +0000
+++ vapi/temp_compat.vapi	2016-12-16 17:54:34 +0000
@@ -0,0 +1,24 @@
+[CCode (cheader_filename = "clutter/clutter.h")]
+namespace Cogl
+{
+	[CCode (cname = "CoglContext", free_function = "")]
+	[Compact]
+	public class Context{}
+
+	[CCode (cname = "cogl_bitmap_new_for_data")]
+	public static Cogl.Bitmap bitmap_new_for_data (Cogl.Context Context, int width, int height,
+            Cogl.PixelFormat format, int rowstride, [CCode (array_length = false)] uchar[] data);
+
+	[CCode (cname = "cogl_get_draw_framebuffer")]
+	public static unowned Cogl.Framebuffer get_draw_framebuffer ();
+
+	[CCode (cname = "cogl_framebuffer_read_pixels_into_bitmap")]
+	public static void framebuffer_read_pixels_into_bitmap (Cogl.Framebuffer framebuffer, int x, int y,
+            Cogl.ReadPixelsFlags source, Cogl.Bitmap bitmap);
+}
+
+namespace Clutter
+{
+	[CCode (cname = "clutter_backend_get_cogl_context")]
+	public static Cogl.Context backend_get_cogl_context (Clutter.Backend backend);
+}