Merge lp:~agateau/notify-osd/no-bubble-in-fullscreen into lp:notify-osd/trunk

[Aurélien Gâteau]

[Aurélien Gâteau (agateau)]

Do not show notifications if a fullscreen application is running on the default screen.

[David Barth (dbarth)]

The fix comes with a test. Looks good to me.

review: Approve

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2009-04-16 14:02:12 +0000
+++ src/Makefile.am	2009-06-02 16:28:26 +0000
@@ -80,6 +80,7 @@
 	$(GLIB_CFLAGS) 		\
 	$(GCONF_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
+	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
 	$(WNCK_CFLAGS)		\
 	$(NULL)
 

=== modified file 'src/dnd.c'
--- src/dnd.c	2009-05-15 08:17:36 +0000
+++ src/dnd.c	2009-06-03 09:18:29 +0000
@@ -40,6 +40,8 @@
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 
+#include <libwnck/libwnck.h>
+
 #include "dbus.h"
 
 static DBusGProxy *gsmgr = NULL;
@@ -167,6 +169,29 @@
 	return FALSE;
 }
 
+static int
+is_fullscreen_cb (WnckWindow *window, WnckWorkspace *workspace)
+{
+	if (wnck_window_is_visible_on_workspace (window, workspace)
+		&& wnck_window_is_fullscreen (window))
+	{
+		return 0;
+	} else {
+		return 1;
+	}
+}
+
+gboolean
+dnd_has_one_fullscreen_window (void)
+{
+	WnckScreen *screen = wnck_screen_get_default ();
+	wnck_screen_force_update (screen);
+	WnckWorkspace *workspace = wnck_screen_get_active_workspace (screen);
+	GList *list = wnck_screen_get_windows (screen);
+	GList *item = g_list_find_custom (list, workspace, (GCompareFunc) is_fullscreen_cb);
+	return item != NULL;
+}
+
 /* Tries to determine whether the user is in "do not disturb" mode */
 gboolean
 dnd_dont_disturb_user (void)
@@ -175,5 +200,6 @@
 		|| dnd_is_xscreensaver_active()
 		|| dnd_is_screensaver_active()
 		|| dnd_is_screensaver_inhibited()
+		|| dnd_has_one_fullscreen_window()
 		);
 }

=== modified file 'src/dnd.h'
--- src/dnd.h	2009-03-19 10:53:20 +0000
+++ src/dnd.h	2009-06-02 16:28:26 +0000
@@ -44,6 +44,8 @@
 gboolean
 dnd_is_screensaver_active (void);
 
+gboolean
+dnd_has_one_fullscreen_window (void);
 
 G_END_DECLS
 

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2009-05-15 08:27:09 +0000
+++ tests/Makefile.am	2009-06-02 16:28:26 +0000
@@ -43,6 +43,7 @@
 	-Wall -Werror -std=c99  \
 	$(GLIB_CFLAGS)		\
 	$(GTK_CFLAGS)		\
+	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
 	$(WNCK_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	-I$(top_srcdir)/src

=== modified file 'tests/test-dnd.c'
--- tests/test-dnd.c	2009-03-19 14:52:08 +0000
+++ tests/test-dnd.c	2009-06-03 09:18:29 +0000
@@ -32,6 +32,8 @@
 
 #include "dnd.h"
 
+#include <libwnck/libwnck.h>
+
 #define TEST_DBUS_NAME "org.freedesktop.Notificationstest"
 
 static
@@ -49,20 +51,77 @@
 		g_debug ("screensaver is active");
 }
 
+static
+gboolean
+check_fullscreen (GMainLoop *loop)
+{
+	g_assert (dnd_has_one_fullscreen_window());
+	g_main_loop_quit (loop);
+	return FALSE;
+}
+
+static
+gboolean
+check_no_fullscreen (GMainLoop *loop)
+{
+	g_assert (!dnd_has_one_fullscreen_window());
+	g_main_loop_quit (loop);
+	return FALSE;
+}
+
+static
+WnckWorkspace *
+find_free_workspace (WnckScreen *screen)
+{
+	WnckWorkspace *active_workspace = wnck_screen_get_active_workspace (screen);
+	GList *lst = wnck_screen_get_workspaces (screen);
+
+	if (lst->data != active_workspace) {
+		return WNCK_WORKSPACE(lst->data);
+	}
+	lst = g_list_next (lst);
+	g_assert (lst);
+	return WNCK_WORKSPACE(lst->data);
+}
+
+static
+void
+test_dnd_fullscreen (void)
+{
+	g_assert (!dnd_has_one_fullscreen_window());
+
+	GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_window_fullscreen (GTK_WINDOW (window));
+	gtk_widget_show_now (window);
+
+	GMainLoop* loop = g_main_loop_new (NULL, FALSE);
+	g_timeout_add (2000, (GSourceFunc) check_fullscreen, loop);
+	g_main_loop_run (loop);
+
+	// Move window to a free workspace, dnd_has_one_fullscreen_window should
+	// not find it anymore
+	WnckScreen *screen = wnck_screen_get_default ();
+	WnckWindow *wnck_window = wnck_screen_get_active_window (screen);
+	g_assert (wnck_window);
+	WnckWorkspace *free_workspace = find_free_workspace (screen);
+	g_assert (free_workspace);
+	wnck_window_move_to_workspace (wnck_window, free_workspace);
+
+	g_timeout_add (2000, (GSourceFunc) check_no_fullscreen, loop);
+	g_main_loop_run (loop);
+
+	gtk_widget_destroy (window);
+}
+
 GTestSuite *
 test_dnd_create_test_suite (void)
 {
 	GTestSuite *ts = NULL;
-	GTestCase  *tc = NULL;
 
 	ts = g_test_create_suite ("dnd");
-	tc = g_test_create_case ("detect screensaver",
-				 0,
-				 NULL,
-				 NULL,
-				 test_dnd_screensaver,
-				 NULL);
-	g_test_suite_add (ts, tc);
+#define TC(x) g_test_create_case(#x, 0, NULL, NULL, x, NULL)
+	g_test_suite_add (ts, TC(test_dnd_screensaver));
+	g_test_suite_add (ts, TC(test_dnd_fullscreen));
 
 	return ts;
 }