From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 12:06:06 +0200 Subject: Removed unused includes, decrease compilation time (bzr r15025) --- src/ui/uxmanager.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/ui/uxmanager.cpp') diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index 036659661..cbce86cdb 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -10,18 +10,15 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include #endif #include "widgets/desktop-widget.h" -#include #include "uxmanager.h" #include "desktop.h" #include "util/ege-tags.h" #include "widgets/toolbox.h" -#include "preferences.h" -#include "gdkmm/screen.h" #ifdef GDK_WINDOWING_X11 #include -- cgit v1.2.3 From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 13:26:17 +0200 Subject: Reverted changes to r15024 after many building problems (bzr r15027) --- src/ui/uxmanager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/ui/uxmanager.cpp') diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index cbce86cdb..036659661 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -10,15 +10,18 @@ */ #ifdef HAVE_CONFIG_H -#include +# include "config.h" #endif #include "widgets/desktop-widget.h" +#include #include "uxmanager.h" #include "desktop.h" #include "util/ege-tags.h" #include "widgets/toolbox.h" +#include "preferences.h" +#include "gdkmm/screen.h" #ifdef GDK_WINDOWING_X11 #include -- cgit v1.2.3 From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 3 Aug 2016 15:29:38 +0200 Subject: Removed unused includes, decreased compilation time. Once again (bzr r15034) --- src/ui/uxmanager.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/ui/uxmanager.cpp') diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index 036659661..cbce86cdb 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -10,18 +10,15 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include #endif #include "widgets/desktop-widget.h" -#include #include "uxmanager.h" #include "desktop.h" #include "util/ege-tags.h" #include "widgets/toolbox.h" -#include "preferences.h" -#include "gdkmm/screen.h" #ifdef GDK_WINDOWING_X11 #include -- cgit v1.2.3 From d3f8093f20f3cc4fb86f59f24b695cd262463849 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 10 May 2017 09:27:28 +0200 Subject: Wayland fix. (bzr r15683) --- src/ui/uxmanager.cpp | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'src/ui/uxmanager.cpp') diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index cbce86cdb..15663af57 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -24,6 +24,10 @@ #include #endif // GDK_WINDOWING_X11 +#ifdef GDK_WINDOWING_WAYLAND +#include +#endif + using std::vector; @@ -132,15 +136,29 @@ UXManagerImpl::UXManagerImpl() : tags.addTag(ege::Tag("General")); tags.addTag(ege::Tag("Icons")); -#if defined(GDK_WINDOWING_X11) - char const* wmName = gdk_x11_screen_get_window_manager_name( gdk_screen_get_default() ); - //g_message("Window manager is [%s]", wmName); +// Nobody seems to use floatwindowIssues... we can probably delete all this code! +// See: https://developer.gnome.org/gdk3/stable/gdk3-Wayland-Interaction.html + GdkDisplay* display = gdk_display_get_default(); +#ifdef GDK_WINDOWING_WAYLAND + if (GDK_IS_WAYLAND_DISPLAY (display) ) { + // std::cout << "Using Wayland!" << std::endl; + } +#endif - //if (g_ascii_strcasecmp( wmName, UNKOWN_WINDOW_MANAGER_NAME ) == 0) { - if (g_ascii_strcasecmp( wmName, KDE_WINDOW_MANAGER_NAME ) == 0) { - _floatwindowIssues = true; +#ifdef GDK_WINDOWING_X11 + if (GDK_IS_X11_DISPLAY (display) ) { + // std::cout << "Using X11!" << std::endl; + char const* wmName = gdk_x11_screen_get_window_manager_name( gdk_screen_get_default() ); + //g_message("Window manager is [%s]", wmName); + + //if (g_ascii_strcasecmp( wmName, UNKOWN_WINDOW_MANAGER_NAME ) == 0) { + if (g_ascii_strcasecmp( wmName, KDE_WINDOW_MANAGER_NAME ) == 0) { + _floatwindowIssues = true; + } } -#elif defined(GDK_WINDOWING_WIN32) +#endif + +#ifdef GDK_WINDOWING_WIN32 _floatwindowIssues = true; #endif // GDK_WINDOWING_WIN32 -- cgit v1.2.3 From bcdb768272d4e982b2a344e803362e0453a065bb Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 10 May 2017 09:30:49 +0200 Subject: Remove unused floatscreenissue variable and supporting code. (Previous commit shows how to fix it for Wayland if it were ever to be needed.) (bzr r15684) --- src/ui/uxmanager.cpp | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'src/ui/uxmanager.cpp') diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index 15663af57..c2f0dc5c4 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -101,11 +101,9 @@ public: virtual gint getDefaultTask( SPDesktop *desktop ); virtual void setTask(SPDesktop* dt, gint val); - virtual bool isFloatWindowProblem() const; virtual bool isWidescreen() const; private: - bool _floatwindowIssues; bool _widescreen; }; @@ -127,7 +125,6 @@ UXManager::~UXManager() } UXManagerImpl::UXManagerImpl() : - _floatwindowIssues(false), _widescreen(false) { ege::TagSet tags; @@ -136,33 +133,6 @@ UXManagerImpl::UXManagerImpl() : tags.addTag(ege::Tag("General")); tags.addTag(ege::Tag("Icons")); -// Nobody seems to use floatwindowIssues... we can probably delete all this code! -// See: https://developer.gnome.org/gdk3/stable/gdk3-Wayland-Interaction.html - GdkDisplay* display = gdk_display_get_default(); -#ifdef GDK_WINDOWING_WAYLAND - if (GDK_IS_WAYLAND_DISPLAY (display) ) { - // std::cout << "Using Wayland!" << std::endl; - } -#endif - -#ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_DISPLAY (display) ) { - // std::cout << "Using X11!" << std::endl; - char const* wmName = gdk_x11_screen_get_window_manager_name( gdk_screen_get_default() ); - //g_message("Window manager is [%s]", wmName); - - //if (g_ascii_strcasecmp( wmName, UNKOWN_WINDOW_MANAGER_NAME ) == 0) { - if (g_ascii_strcasecmp( wmName, KDE_WINDOW_MANAGER_NAME ) == 0) { - _floatwindowIssues = true; - } - } -#endif - -#ifdef GDK_WINDOWING_WIN32 - _floatwindowIssues = true; -#endif // GDK_WINDOWING_WIN32 - - Glib::RefPtr defaultScreen = Gdk::Screen::get_default(); if (defaultScreen) { int width = defaultScreen->get_width(); @@ -178,11 +148,6 @@ UXManagerImpl::~UXManagerImpl() { } -bool UXManagerImpl::isFloatWindowProblem() const -{ - return _floatwindowIssues; -} - bool UXManagerImpl::isWidescreen() const { return _widescreen; -- cgit v1.2.3 From 26a82e8f97a5c10cb64fd3898099a3017f48f5c9 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 10 May 2017 09:36:10 +0200 Subject: Remove more unused stuff missed in last commit. (bzr r15685) --- src/ui/uxmanager.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/ui/uxmanager.cpp') diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp index c2f0dc5c4..c263eaded 100644 --- a/src/ui/uxmanager.cpp +++ b/src/ui/uxmanager.cpp @@ -20,21 +20,8 @@ #include "util/ege-tags.h" #include "widgets/toolbox.h" -#ifdef GDK_WINDOWING_X11 -#include -#endif // GDK_WINDOWING_X11 - -#ifdef GDK_WINDOWING_WAYLAND -#include -#endif - using std::vector; - -gchar const* KDE_WINDOW_MANAGER_NAME = "KWin"; -gchar const* UNKOWN_WINDOW_MANAGER_NAME = "unknown"; - - class TrackItem { public: -- cgit v1.2.3