This project now builds under GNU/Linux in my testing environment. Updated GNU-Linux_build_instructions.txt to reflect current build requirements. The Windows Clang/C2 builds now also build successfully once again. Guards added to require libpng 1.6.X or later and to provide non-R4 compliant functionality where the <filesystem> API is not available. (I never imagined I'd be adding guards because Visual C++ has functionality that other major vendors do not yet have; it's a very welcome development in terms of everyone's commitment to standards compliance). Various other changes to fix bugs exposed by building with Clang 4.0. This commit will be tagged R4. An R4 branch will be created to fix any bugs or issues with this. The main branch will reflect the development of R5 (the successor to R4).

Author: mikebmcl

GNU-Linux_build_instructions.txt

@@ -1,23 +1,29 @@
 You will need a relatively recent build of GNU autotools. Any recent distro
 should have a reasonably new version available which will fit the needs here.
-You will also need cairo, GTK+3, and related libraries; as long as you have
-autotools, if you should be able to generate a configure script and it will
-tell you if you are missing any other dependencies.
+
+You will also need cairo version 1.12.14 or newer and libjpeg-turbo (note: on 
+Ubuntu it's called libturbojpeg, maybe on other distros). To support PNG
+functionality, you need libpng 1.6.X or later.
+
+This has been tested with Clang 4.0 and the version of libc++ that accompanies 
+it. It will likely work with GCC 7 and the version of libstdc++ that 
+accompanies it. The reason is that it requires std::variant, std::optional, 
+and various other library features that are only in C++.
 
 To build the project, from this directory run the command 'autoreconf -i'. It
 should run for a bit then complete silently. If so, you should then run the
 generated './configure' script with any necessary parameters. This should
 notify you if you are missing any pre-requisites or have an older version that
 won't work. If configure completes successfully, you should be able to run the
 'make' command and then execute the resulting executable by calling
-the './N3888_RefImpl/src/N3888_RefImpl' executable.
+the './N3888_RefImpl/src/N3888_RefImpl' executable. In sample_draw.cpp, the 
+test_image_load_and_save function will only work if you run N3888_RefImpl from 
+the N3888_RefImpl/src/ directory since it uses relative paths to load the 
+images it uses.
 
-The drawing portion is the same code as in the Windows version. The entry
-point uses GTK+3 and is primarily C code. It is patterned after Gnome project
-utilities. It has improved significantly and is now essentially on par with
-the Windows version.
+By default it will build using Xlib. You can use Xcb by passing the 
+"--enable-xcb" option to configure.
 
-Tested on OpenSUSE 13.2 with GCC 4.9.0 using the following configure command:
-'./configure CC=gcc-4.9 CXX=g++-4.9 CXXFLAGS="-g -std=c++1y"'. Also tested
-with Clang 3.5 using the configure settings found in the
-run-configure-with-clang-and-libstdc++.sh shell script.
+The "run-configure-with-*" shell scripts are provided as examples only. They 
+are used for my personal testing. Like everything else, they are subject to 
+the terms of LICENSE.md.

N3888_RefImpl/src/Makefile.am

@@ -25,17 +25,20 @@ if USE_XLIB
 N3888_RefImpl_SOURCES +=	display_surface-xlib.cpp
 endif
 
-N3888_RefImpl_LDADD = 		@GTKCAIRO_LIBS@
+N3888_RefImpl_LDADD = @LIBS@
+N3888_RefImpl_LDADD += 		@GTKCAIRO_LIBS@
 if USE_XCB
 N3888_RefImpl_LDADD += @xcb_LIBS@
 endif
 
-N3888_RefImpl_CPPFLAGS =	@GTKCAIRO_CFLAGS@
+N3888_RefImpl_CPPFLAGS = @CPPFLAGS@
+N3888_RefImpl_CXXFLAGS = @CXXFLAGS@
+N3888_RefImpl_CXXFLAGS +=	@GTKCAIRO_CFLAGS@
 if USE_XCB
-N3888_RefImpl_CPPFLAGS += @xcb_CFLAGS@ -DUSE_XCB
+N3888_RefImpl_CXXFLAGS += @xcb_CFLAGS@ -DUSE_XCB
 endif
 if USE_XLIB
-N3888_RefImpl_CPPFLAGS += -DUSE_XLIB
+N3888_RefImpl_CXXFLAGS += -DUSE_XLIB
 endif
 ##if ! [ [ test "$CXX" = "g++" ] || [ test "$CXX" = "gcc" ] ]]
 ##then

N3888_RefImpl/src/N3888_RefImpl.vcxproj

@@ -184,12 +184,11 @@ copy "$(ProjectDir)alpha8.png" "$(OutputPath)"
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0601;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>-Weverything -pedantic -Wno-c++98-compat -Wno-covered-switch-default -Wno-c++98-compat-pedantic -Wno-global-constructors -Wno-float-equal -Wno-documentation -Wno-documentation-unknown-command -Wno-padded -Wno-exit-time-destructors -Wno-reserved-id-macro -Wno-language-extension-token</AdditionalOptions>
+      <AdditionalOptions>-Weverything -pedantic -Wno-c++98-compat -Wno-covered-switch-default -Wno-c++98-compat-pedantic -Wno-global-constructors -Wno-float-equal -Wno-documentation -Wno-documentation-unknown-command -Wno-padded -Wno-exit-time-destructors -Wno-reserved-id-macro -Wno-language-extension-token -std=c++1z</AdditionalOptions>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <ExceptionHandling>Enabled</ExceptionHandling>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <UndefinePreprocessorDefinitions>NDEBUG</UndefinePreprocessorDefinitions>
-      <CppLanguageStandard>c++1y</CppLanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

N3888_RefImpl/src/display_surface-xcb.cpp

@@ -65,7 +65,7 @@ display_surface::display_surface(int preferredWidth, int preferredHeight, experi
 
 display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, experimental::io2d::scaling scl, experimental::io2d::refresh_rate rr, double fps)
 	: surface({ nullptr, nullptr }, preferredFormat)
-	, _Default_brush(cairo_pattern_create_rgba(0.0, 0.0, 0.0, 1.0))
+	, _Default_brush(bgra_color::transparent_black())
 	, _Display_width(preferredDisplayWidth)
 	, _Display_height(preferredDisplayHeight)
 	, _Scaling(scl)
@@ -74,7 +74,7 @@ display_surface::display_surface(int preferredWidth, int preferredHeight, experi
 	, _Draw_fn()
 	, _Size_change_fn()
 	, _User_scaling_fn()
-	, _Letterbox_brush(cairo_pattern_create_rgba(0.0, 0.0, 0.0, 1.0))
+	, _Letterbox_brush()
 	, _Auto_clear(false)
 	, _Screen(nullptr)
 	, _Wndw()
@@ -240,7 +240,7 @@ int display_surface::show() {
 					if (_Auto_clear) {
 						clear();
 					}
-					_Draw_fn(*this);
+					(*_Draw_fn)(*this);
 				}
 				else {
 					throw system_error(make_error_code(errc::operation_would_block));
@@ -274,7 +274,7 @@ int display_surface::show() {
 				if (resized) {
 					cairo_xcb_surface_set_size(_Native_surface.get(), _Display_width, _Display_height);
 					if (_Size_change_fn != nullptr) {
-						_Size_change_fn(*this);
+						(*_Size_change_fn)(*this);
 					}
 				}
 			} break;
@@ -316,7 +316,7 @@ int display_surface::show() {
 						if (_Auto_clear) {
 							clear();
 						}
-						_Draw_fn(*this);
+						(*_Draw_fn)(*this);
 					}
 					else {
 						throw system_error(make_error_code(errc::operation_would_block));
@@ -420,7 +420,8 @@ int display_surface::show() {
 		if (_Can_draw) {
 			bool redraw = true;
 			if (_Refresh_rate == experimental::io2d::refresh_rate::as_needed) {
-				redraw = _Redraw_requested.exchange(false, std::memory_order_acquire);
+				redraw = _Redraw_requested;
+				_Redraw_requested = false;
 			}
 
 			auto desiredElapsed = 1'000'000'000.0 / _Desired_frame_rate;
@@ -435,7 +436,7 @@ int display_surface::show() {
 					if (_Auto_clear) {
 						clear();
 					}
-					_Draw_fn(*this);
+					(*_Draw_fn)(*this);
 				}
 				else {
 					throw system_error(make_error_code(errc::operation_would_block));

N3888_RefImpl/src/display_surface-xlib.cpp

@@ -136,64 +136,6 @@ display_surface::native_handle_type display_surface::native_handle() const {
 	return{ { _Surface.get(), _Context.get() }, _Display.get(), _Wndw, _Display_mutex, _Display_ref_count };
 }
 
-//display_surface::display_surface(display_surface&& other) noexcept
-//	: surface(move(other))
-//	, _Default_brush(move(other._Default_brush))
-//	, _Display_width(move(other._Display_width))
-//	, _Display_height(move(other._Display_height))
-//	, _Scaling(move(other._Scaling))
-//	, _Width(move(other._Width))
-//	, _Height(move(other._Height))
-//	, _Draw_fn(move(other._Draw_fn))
-//	, _Size_change_fn(move(other._Size_change_fn))
-//	, _User_scaling_fn(move(other._User_scaling_fn))
-//	, _Letterbox_brush(move(other._Letterbox_brush))
-//	, _Auto_clear(move(other._Auto_clear))
-//	, _Wndw(move(other._Wndw))
-//	, _Can_draw(move(other._Can_draw))
-//	, _Refresh_rate(move(other._Refresh_rate))
-//	, _Desired_frame_rate(move(other._Desired_frame_rate))
-//	, _Redraw_requested(other._Redraw_requested.load())
-//	, _Elapsed_draw_time(move(other._Elapsed_draw_time))
-//	, _Native_surface(move(other._Native_surface))
-//	, _Native_context(move(other._Native_context)) {
-//	other._Draw_fn = nullptr;
-//	other._Size_change_fn = nullptr;
-//	other._Wndw = None;
-//}
-//
-//display_surface& display_surface::operator=(display_surface&& other) noexcept {
-//	if (this != &other) {
-//		surface::operator=(move(other));
-//		_Default_brush = move(other._Default_brush);
-//		_Display_width = move(other._Display_width);
-//		_Display_height = move(other._Display_height);
-//		_Scaling = move(other._Scaling);
-//		_Width = move(other._Width);
-//		_Height = move(other._Height);
-//		_Draw_fn = move(other._Draw_fn);
-//		_Size_change_fn = move(other._Size_change_fn);
-//		_User_scaling_fn = move(other._User_scaling_fn);
-//		_Letterbox_brush = move(other._Letterbox_brush);
-//		_Auto_clear = move(other._Auto_clear);
-//		_Wndw = move(other._Wndw);
-//		_Can_draw = move(other._Can_draw);
-//		_Refresh_rate = move(other._Refresh_rate);
-//		_Desired_frame_rate = move(other._Desired_frame_rate);
-//		_Redraw_requested = other._Redraw_requested.load();
-//		_Elapsed_draw_time = move(other._Elapsed_draw_time);
-//		_Native_surface = move(other._Native_surface);
-//		_Native_context = move(other._Native_context);
-//
-//		other._Wndw = None;
-//		other._Draw_fn = nullptr;
-//		other._Size_change_fn = nullptr;
-//		other._Can_draw = false;
-//	}
-//
-//	return *this;
-//}
-//
 mutex display_surface::_Display_mutex;
 unique_ptr<Display, function<void(Display*)>> display_surface::_Display{ nullptr, [](Display*) { return; } };
 int display_surface::_Display_ref_count = 0;
@@ -236,7 +178,7 @@ display_surface::display_surface(int preferredWidth, int preferredHeight, experi
 
 display_surface::display_surface(int preferredWidth, int preferredHeight, experimental::io2d::format preferredFormat, int preferredDisplayWidth, int preferredDisplayHeight, experimental::io2d::scaling scl, experimental::io2d::refresh_rate rr, double fps)
 	: surface({ nullptr, nullptr }, preferredFormat)
-	, _Default_brush(cairo_pattern_create_rgba(0.0, 0.0, 0.0, 1.0))
+	, _Default_brush(bgra_color::transparent_black())
 	, _Display_width(preferredDisplayWidth)
 	, _Display_height(preferredDisplayHeight)
 	, _Scaling(scl)
@@ -245,7 +187,7 @@ display_surface::display_surface(int preferredWidth, int preferredHeight, experi
 	, _Draw_fn()
 	, _Size_change_fn()
 	, _User_scaling_fn()
-	, _Letterbox_brush(cairo_pattern_create_rgba(0.0, 0.0, 0.0, 1.0))
+	, _Letterbox_brush()
 	, _Auto_clear(false)
 	, _Wndw(None)
 	, _Can_draw(false)
@@ -312,7 +254,7 @@ display_surface::~display_surface() {
 	}
 }
 
-int display_surface::show() {
+int display_surface::begin_show() {
 	bool exit = false;
 	XEvent event;
 
@@ -337,7 +279,7 @@ int display_surface::show() {
 					if (_Auto_clear) {
 						clear();
 					}
-					_Draw_fn(*this);
+					(*_Draw_fn)(*this);
 				}
 				else {
 					throw system_error(make_error_code(errc::operation_would_block));
@@ -370,7 +312,7 @@ int display_surface::show() {
 				if (resized) {
 					cairo_xlib_surface_set_size(_Native_surface.get(), _Display_width, _Display_height);
 					if (_Size_change_fn != nullptr) {
-						_Size_change_fn(*this);
+						(*_Size_change_fn)(*this);
 					}
 				}
 			} break;
@@ -406,7 +348,7 @@ int display_surface::show() {
 						if (_Auto_clear) {
 							clear();
 						}
-						_Draw_fn(*this);
+						(*_Draw_fn)(*this);
 					}
 					else {
 						throw system_error(make_error_code(errc::operation_would_block));
@@ -498,7 +440,8 @@ int display_surface::show() {
 		if (_Can_draw) {
 			bool redraw = true;
 			if (_Refresh_rate == experimental::io2d::refresh_rate::as_needed) {
-				redraw = _Redraw_requested.exchange(false, std::memory_order_acquire);
+				redraw = _Redraw_requested;
+				_Redraw_requested = false;
 			}
 
 			auto desiredElapsed = 1'000'000'000.0 / _Desired_frame_rate;
@@ -513,7 +456,7 @@ int display_surface::show() {
 					if (_Auto_clear) {
 						clear();
 					}
-					_Draw_fn(*this);
+					(*_Draw_fn)(*this);
 				}
 				else {
 					throw system_error(make_error_code(errc::operation_would_block));