Supporting always-on-top and borderless in Linux now, with windowTest update to match

Author: andrewfb

src/cinder/app/linux/WindowImplLinuxGlfw.cpp

@@ -25,8 +25,6 @@
 #include "cinder/app/linux/WindowImplLinux.h"
 #include "cinder/app/linux/AppImplLinux.h"
 #include "cinder/app/linux/PlatformLinux.h"
-#include "cinder/Log.h"
-
 namespace cinder { namespace app {
 
 WindowImplLinux::WindowImplLinux( const Window::Format &format, WindowImplLinux *sharedRendererWindow, AppImplLinux *appImpl )
@@ -74,6 +72,7 @@ WindowImplLinux::WindowImplLinux( const Window::Format &format, WindowImplLinux
 	::glfwWindowHint( GLFW_CONTEXT_VERSION_MINOR, minorVersion );
 	::glfwWindowHint( GLFW_DECORATED, format.isBorderless() ? GL_FALSE : GL_TRUE );
 	::glfwWindowHint( GLFW_RESIZABLE, format.isResizable() ? GL_TRUE : GL_FALSE );
+	::glfwWindowHint( GLFW_FLOATING, format.isAlwaysOnTop() ? GL_TRUE : GL_FALSE );
 	if( options.getCoreProfile() ) {
 		::glfwWindowHint( GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE );
 		std::cout << "Rendering with OpenGL Core Profile " << majorVersion << "." << minorVersion << std::endl;
@@ -105,6 +104,9 @@ WindowImplLinux::WindowImplLinux( const Window::Format &format, WindowImplLinux
 	mWindowRef = Window::privateCreate__( this, mAppImpl->getApp() );
 
 	mAppImpl->registerWindowEvents( this );
+
+	setBorderless( format.isBorderless() );
+	setAlwaysOnTop( format.isAlwaysOnTop() );
 }
 
 WindowImplLinux::~WindowImplLinux()
@@ -188,14 +190,30 @@ const std::vector<TouchEvent::Touch>& WindowImplLinux::getActiveTouches() const
 
 void WindowImplLinux::setBorderless( bool borderless )
 {
-	CI_LOG_W( "Window::setBorderless() currently unimplemented in GLFW" );
-	// TODO: Find a way to do this w/o recreating 
+	if( mBorderless == borderless )
+		return;
+
+#if ! defined( CINDER_HEADLESS )
+	if( mGlfwWindow ) {
+		::glfwSetWindowAttrib( mGlfwWindow, GLFW_DECORATED, borderless ? GLFW_FALSE : GLFW_TRUE );
+	}
+#endif
+
+	mBorderless = borderless;
 }
 
 void WindowImplLinux::setAlwaysOnTop( bool alwaysOnTop )
 {
-	CI_LOG_W( "Window::setAlwaysOnTop() currently unimplemented in GLFW" );
-	// TODO: Find a way to do this w/o recreating 
+	if( mAlwayOnTop == alwaysOnTop )
+		return;
+
+#if ! defined( CINDER_HEADLESS )
+	if( mGlfwWindow ) {
+		::glfwSetWindowAttrib( mGlfwWindow, GLFW_FLOATING, alwaysOnTop ? GLFW_TRUE : GLFW_FALSE );
+	}
+#endif
+
+	mAlwayOnTop = alwaysOnTop;
 }
 
 void WindowImplLinux::keyDown( const KeyEvent &event )

test/windowTest/src/windowTestApp.cpp

@@ -205,10 +205,14 @@ void WindowTestApp::keyDown( KeyEvent event )
 			getWindowIndex(0)->hide();
 	}
 	else if( event.getChar() == 'b' ) {
-		getWindow()->setBorderless( ! getWindow()->isBorderless() );
+		auto window = getWindow();
+		window->setBorderless( ! window->isBorderless() );
+		CI_LOG_V( "Borderless toggled, now: " << ( window->isBorderless() ? "true" : "false" ) );
 	}
 	else if( event.getChar() == 't' ) {
-		getWindow()->setAlwaysOnTop( ! getWindow()->isAlwaysOnTop() );
+		auto window = getWindow();
+		window->setAlwaysOnTop( ! window->isAlwaysOnTop() );
+		CI_LOG_V( "Always-on-top toggled, now: " << ( window->isAlwaysOnTop() ? "true" : "false" ) );
 	}
 	else if( event.getChar() == 's' ) {
 		getWindow()->setBorderless();
@@ -245,9 +249,17 @@ void WindowTestApp::windowDraw()
 
 	glEnable( GL_LINE_SMOOTH );
 	glHint( GL_LINE_SMOOTH_HINT, GL_NICEST );
+
+	const auto window = getWindow();
+	std::string info = "f : toggle fullscreen\n";
+	info += "b : toggle borderless (current: " + std::string( window->isBorderless() ? "on" : "off" ) + ")\n";
+	info += "t : toggle always-on-top (current: " + std::string( window->isAlwaysOnTop() ? "on" : "off" ) + ")\n";
+	info += "h : hide/show\n";
+	info += "s : span displays\n";
+	gl::drawString( info, vec2( 12.0f, 12.0f ), ColorA( 1, 1, 1, 0.9f ) );
 
 	gl::begin( GL_LINE_STRIP );
-	const vector<vec2> &points = getWindow()->getUserData<WindowData>()->mPoints;
+	const vector<vec2> &points = window->getUserData<WindowData>()->mPoints;
 	for( auto pointIter = points.begin(); pointIter != points.end(); ++pointIter ) {
 		gl::vertex( *pointIter /*+ vec2( 0, getElapsedSeconds() )*/ );
 	}