Add XCB grabbing

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Breaking
 
 ### Added
-
+- Add XCB grabber, a faster and safer alternative for X11 grabbing (#)
 ### Changed
 
 ### Fixed

assets/webconfig/js/content_dashboard.js

@@ -104,7 +104,7 @@ $(document).ready( function() {
 
 	if(grabbers.indexOf('dispmanx') > -1)
 		html += 'Raspberry Pi';
-	else if(grabbers.indexOf('x11') > -1)
+	else if(grabbers.indexOf('x11') > -1 || grabbers.indexOf('xcb') > -1)
 		html += 'X86';
 	else if(grabbers.indexOf('osx')  > -1)
 		html += 'OSX';

assets/webconfig/js/content_grabber.js

@@ -323,7 +323,7 @@ $(document).ready( function() {
 
     if (grabbers.indexOf('dispmanx') > -1)
       hideEl(["device","pixelDecimation"]);
-    else if (grabbers.indexOf('x11') > -1)
+    else if (grabbers.indexOf('x11') > -1 || grabbers.indexOf('xcb') > -1)
       hideEl(["device","width","height"]);
     else if (grabbers.indexOf('osx')  > -1 )
       hideEl(["device","pixelDecimation"]);

bin/install_hyperion.sh

@@ -236,6 +236,7 @@ else
 	ln -fs $BINSP/hyperion-v4l2 $BINTP/hyperion-v4l2
 	ln -fs $BINSP/hyperion-dispmanx $BINTP/hyperion-dispmanx 2>/dev/null
 	ln -fs $BINSP/hyperion-x11 $BINTP/hyperion-x11 2>/dev/null
+	ln -fs $BINSP/hyperion-xcb $BINTP/hyperion-xcb 2>/dev/null
 	ln -fs $BINSP/hyperion-aml $BINTP/hyperion-aml 2>/dev/null
 fi
 
@@ -260,6 +261,11 @@ elif [ $OS_OPENELEC -eq 1 ]; then
 		echo '---> Adding Hyperion-x11 to OpenELEC/LibreELEC autostart.sh'
 		echo "DISPLAY=:0.0 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/storage/hyperion/bin /storage/hyperion/bin/hyperion-x11 </dev/null >/storage/logfiles/hyperion.log 2>&1 &" >> /storage/.config/autostart.sh		
 	fi
+	# only add hyperion-xcb to startup, if not found and x32x64 detected
+	if [ $CPU_X32X64 -eq 1 ] && [ `cat /storage/.config/autostart.sh 2>/dev/null | grep hyperion-xcb | wc -l` -eq 0 ]; then
+		echo '---> Adding Hyperion-xcb to OpenELEC/LibreELEC autostart.sh'
+		echo "DISPLAY=:0.0 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/storage/hyperion/bin /storage/hyperion/bin/hyperion-xcb </dev/null >/storage/logfiles/hyperion.log 2>&1 &" >> /storage/.config/autostart.sh
+	fi
 elif [ $USE_SYSTEMD -eq 1 ]; then
 	echo '---> Installing systemd script'
 	#place startup script for systemd and activate

bin/remove_hyperion.sh

@@ -79,6 +79,7 @@ elif [ $OS_OPENELEC -eq 1 ]; then
 	echo "---> Remove Hyperion from OpenELEC autostart.sh"
 	sed -i "/hyperiond/d" /storage/.config/autostart.sh 2>/dev/null
 	sed -i "/hyperion-x11/d" /storage/.config/autostart.sh 2>/dev/null
+	sed -i "/hyperion-xcb/d" /storage/.config/autostart.sh 2>/dev/null
 elif [ $USE_SYSTEMD -eq 1 ]; then
 	# Delete and disable Hyperion systemd script
 	echo '---> Delete and disable Hyperion systemd script'
@@ -97,14 +98,15 @@ if [ $OS_OPENELEC -eq 1 ]; then
 	echo '---> Remove the OpenELEC Hyperion binaries and hyperion.config.json'
 	rm -rv /storage/hyperion 2>/dev/null
 	rm -v /storage/.config/hyperion.config.json 2>/dev/null
-else 	
+else
 	#Remove binaries on all distributions/systems (not OpenELEC)
-	echo "---> Remove links to the binaries"	
+	echo "---> Remove links to the binaries"
 	rm -v /usr/bin/hyperiond 2>/dev/null
 	rm -v /usr/bin/hyperion-remote 2>/dev/null
 	rm -v /usr/bin/hyperion-v4l2 2>/dev/null
 	rm -v /usr/bin/hyperion-dispmanx 2>/dev/null
 	rm -v /usr/bin/hyperion-x11 2>/dev/null
+	rm -v /usr/bin/hyperion-xcb 2>/dev/null
 	rm -v /usr/bin/hyperion-aml 2>/dev/null
 	rm -v /etc/hyperion.config.json 2>/dev/null
 	echo "---> Remove binaries"
@@ -116,4 +118,4 @@ echo '**************************************************************************
 echo 'Hyperion successful removed!'
 echo '*******************************************************************************'  
 exit 0
-	
+

cmake/debian/postinst

@@ -88,6 +88,7 @@ ln -fs $BINSP/hyperion-v4l2 $BINTP/hyperion-v4l2
 ln -fs $BINSP/hyperion-framebuffer $BINTP/hyperion-framebuffer 2>/dev/null
 ln -fs $BINSP/hyperion-dispmanx $BINTP/hyperion-dispmanx 2>/dev/null
 ln -fs $BINSP/hyperion-x11 $BINTP/hyperion-x11 2>/dev/null
+ln -fs $BINSP/hyperion-xcb $BINTP/hyperion-xcb 2>/dev/null
 ln -fs $BINSP/hyperion-aml $BINTP/hyperion-aml 2>/dev/null
 ln -fs $BINSP/hyperion-qt $BINTP/hyperion-qt 2>/dev/null
 

cmake/packages.cmake

@@ -134,6 +134,9 @@ endif()
 if(ENABLE_X11)
 	SET ( CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_x11" )
 endif()
+if(ENABLE_XCB)
+	SET ( CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_xcb" )
+endif()
 if(ENABLE_DISPMANX)
 	SET ( CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} "hyperion_dispmanx" )
 endif()
@@ -210,6 +213,15 @@ if(ENABLE_X11)
 		DEPENDS Hyperion
 	)
 endif()
+if(ENABLE_X11)
+	cpack_add_component(hyperion_xcb
+		DISPLAY_NAME "XCB Standalone Screencap"
+		DESCRIPTION "XCB based standalone screen capture"
+		INSTALL_TYPES Full
+		GROUP Screencapture
+		DEPENDS Hyperion
+	)
+endif()
 if(ENABLE_DISPMANX)
 	cpack_add_component(hyperion_dispmanx
 		DISPLAY_NAME "RPi dispmanx Standalone Screencap"

cmake/rpm/postinst

@@ -88,6 +88,7 @@ ln -fs $BINSP/hyperion-v4l2 $BINTP/hyperion-v4l2
 ln -fs $BINSP/hyperion-framebuffer $BINTP/hyperion-framebuffer 2>/dev/null
 ln -fs $BINSP/hyperion-dispmanx $BINTP/hyperion-dispmanx 2>/dev/null
 ln -fs $BINSP/hyperion-x11 $BINTP/hyperion-x11 2>/dev/null
+ln -fs $BINSP/hyperion-xcb $BINTP/hyperion-xcb 2>/dev/null
 ln -fs $BINSP/hyperion-aml $BINTP/hyperion-aml 2>/dev/null
 ln -fs $BINSP/hyperion-qt $BINTP/hyperion-qt 2>/dev/null