add new VisibilityTracker class to implement cycling window visibility "properly" - i.e. avoiding hide+show/present to get a hidden or partially obscured window visible again

3 files changed, 97 insertions, 0 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h
new file mode 100644
index 0000000000..6415dd6d2b
--- /dev/null
+++ b/libs/gtkmm2ext/gtkmm2ext/visibility_tracker.h
@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    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 2 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, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __libgtkmm2ext_visibility_tracker__
+#define __libgtkmm2ext_visibility_tracker__
+
+#include <gdk/gdkevents.h>
+
+namespace GTK {
+	class Window;
+}
+
+namespace Gtkmm2ext {
+
+class VisibilityTracker {
+  public:
+    VisibilityTracker (Gtk::Window&);
+    virtual ~VisibilityTracker() {}
+    
+    void cycle_visibility ();
+
+  private:
+    Gtk::Window& window;
+    GdkVisibilityState _visibility;
+    bool handle_visibility_notify_event (GdkEventVisibility*);
+};
+
+}
+
+#endif /* __libgtkmm2ext_visibility_tracker__ */ 
diff --git a/libs/gtkmm2ext/visibility_tracker.cc b/libs/gtkmm2ext/visibility_tracker.cc
new file mode 100644
index 0000000000..c0aabdfca6
--- /dev/null
+++ b/libs/gtkmm2ext/visibility_tracker.cc
@@ -0,0 +1,50 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    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 2 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, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <gtkmm/window.h>
+
+#include "gtkmm2ext/visibility_tracker.h"
+
+using namespace Gtkmm2ext;
+
+VisibilityTracker::VisibilityTracker (Gtk::Window& win)
+	: window (win)
+	, _visibility (GdkVisibilityState (0))
+{
+	window.add_events (Gdk::VISIBILITY_NOTIFY_MASK);
+	window.signal_visibility_notify_event().connect (sigc::mem_fun (*this, &VisibilityTracker::handle_visibility_notify_event));
+}
+
+bool
+VisibilityTracker::handle_visibility_notify_event (GdkEventVisibility* ev)
+{
+	_visibility = ev->state;
+	return false;
+}
+
+void
+VisibilityTracker::cycle_visibility ()
+{
+	if (window.is_mapped() && (_visibility == GDK_VISIBILITY_UNOBSCURED)) {
+		window.hide ();
+	} else {
+		window.present ();
+	}
+}
+
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index f2d53117ad..494ec8b225 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -61,6 +61,7 @@ gtkmm2ext_sources = [
         'treeutils.cc',
         'utils.cc',
         'version.cc',
+        'visibility_tracker.cc',
         'window_title.cc'
 ]