From b31ade0db9cd85dab14ddd3cb525b7fd2de7778d Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Sun, 3 Sep 2017 22:15:00 +0200
Subject: Use new display/monitor API

---
 src/slideshow.c | 10 ++++++----
 src/testcard.c  | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/slideshow.c b/src/slideshow.c
index b994f69..71e8d9a 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -151,7 +151,7 @@ void sc_slideshow_set_slide(SCSlideshow *ss, SCBlock *ns)
 
 SCSlideshow *sc_slideshow_new(struct presentation *p)
 {
-	GdkScreen *screen;
+	GdkDisplay *display;
 	int n_monitors;
 	int i;
 	SCSlideshow *ss;
@@ -186,14 +186,16 @@ SCSlideshow *sc_slideshow_new(struct presentation *p)
 
 	gtk_widget_grab_focus(GTK_WIDGET(ss->drawingarea));
 
-	screen = gdk_screen_get_default();
-	n_monitors = gdk_screen_get_n_monitors(screen);
+	display = gdk_display_get_default();
+	n_monitors = gdk_display_get_n_monitors(display);
 	for ( i=0; i<n_monitors; i++ ) {
 
+		GdkMonitor *monitor;
 		GdkRectangle rect;
 		int w;
 
-		gdk_screen_get_monitor_geometry(screen, i, &rect);
+		monitor = gdk_display_get_monitor(display, i);
+		gdk_monitor_get_geometry(monitor,&rect);
 		snprintf(ss->geom, 255, "%ix%i+%i+%i",
 		         rect.width, rect.height, rect.x, rect.y);
 
diff --git a/src/testcard.c b/src/testcard.c
index 8928463..a5f34a6 100644
--- a/src/testcard.c
+++ b/src/testcard.c
@@ -222,7 +222,7 @@ static gboolean realize_sig(GtkWidget *w, struct testcard *tc)
 
 void show_testcard(struct presentation *p)
 {
-	GdkScreen *screen;
+	GdkDisplay *display;
 	int n_monitors;
 	int i;
 	struct testcard *tc;
@@ -257,14 +257,16 @@ void show_testcard(struct presentation *p)
 
 	gtk_widget_grab_focus(GTK_WIDGET(tc->drawingarea));
 
-	screen = gdk_screen_get_default();
-	n_monitors = gdk_screen_get_n_monitors(screen);
+	display = gdk_display_get_default();
+	n_monitors = gdk_display_get_n_monitors(display);
 	for ( i=0; i<n_monitors; i++ ) {
 
+		GdkMonitor *monitor;
 		GdkRectangle rect;
 		int w;
 
-		gdk_screen_get_monitor_geometry(screen, i, &rect);
+		monitor = gdk_display_get_monitor(display, i);
+		gdk_monitor_get_geometry(monitor,&rect);
 		snprintf(tc->geom, 255, "%ix%i+%i+%i",
 		         rect.width, rect.height, rect.x, rect.y);
 
-- 
cgit v1.2.3