From 9a5f07e008367db8676586551e71357443a2aa21 Mon Sep 17 00:00:00 2001
From: ZenWalker <scow@riseup.net>
Date: Fri, 25 Aug 2017 15:53:40 +0200
Subject: avoid deprecated gdk_screen_get_active_window

make new function taken from:

https://git.gnome.org/browse/gtk+/commit/?id=6b9e481e38571f73237f6b8a38cb4bc6987bc4ca

with little changes adapted to work in screenshot-utils.c
---
 mate-screenshot/src/screenshot-utils.c | 45 +++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'mate-screenshot')

diff --git a/mate-screenshot/src/screenshot-utils.c b/mate-screenshot/src/screenshot-utils.c
index 8001b502..e0a34e8d 100644
--- a/mate-screenshot/src/screenshot-utils.c
+++ b/mate-screenshot/src/screenshot-utils.c
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "screenshot-utils.h"
 
+#include <X11/Xatom.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <glib.h>
@@ -132,6 +133,48 @@ screenshot_release_lock (void)
   gdk_flush ();
 }
 
+static GdkWindow *
+screen_get_active_window (GdkScreen *screen)
+{
+  GdkWindow *ret = NULL;
+  Atom type_return;
+  gint format_return;
+  gulong nitems_return;
+  gulong bytes_after_return;
+  guchar *data = NULL;
+
+  if (!gdk_x11_screen_supports_net_wm_hint (screen,
+                                            gdk_atom_intern_static_string ("_NET_ACTIVE_WINDOW")))
+    return NULL;
+
+  if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen)),
+                          RootWindow (GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen)),
+                                      GDK_SCREEN_XNUMBER (screen)),
+                          gdk_x11_get_xatom_by_name_for_display (gdk_screen_get_display (screen),
+                                                                 "_NET_ACTIVE_WINDOW"),
+                          0, 1, False, XA_WINDOW, &type_return,
+                          &format_return, &nitems_return,
+                          &bytes_after_return, &data)
+      == Success)
+    {
+      if ((type_return == XA_WINDOW) && (format_return == 32) && (data))
+        {
+          Window window = *(Window *) data;
+
+          if (window != None)
+            {
+              ret = gdk_x11_window_foreign_new_for_display (gdk_screen_get_display (screen),
+                                                            window);
+            }
+        }
+    }
+
+  if (data)
+    XFree (data);
+
+  return ret;
+}
+
 static GdkWindow *
 screenshot_find_active_window (void)
 {
@@ -139,7 +182,7 @@ screenshot_find_active_window (void)
   GdkScreen *default_screen;
 
   default_screen = gdk_screen_get_default ();
-  window = gdk_screen_get_active_window (default_screen);
+  window = screen_get_active_window (default_screen);
 
   return window;
 }
-- 
cgit v1.2.1