Add experimental framebuffer device.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2937 dfc29bdd-3216-0410-991c-e03cc46cb475

include/EDeviceTypes.h

@@ -30,6 +30,12 @@ namespace irr
 		in by defining the IRR_USE_SDL_DEVICE macro in IrrCompileConfig.h */
 		EIDT_SDL,
 
+		//! A device for raw framebuffer access
+		/** Best used with embedded devices and mobile systems.
+		Does not need X11 or other graphical subsystems.
+		May support hw-acceleration via OpenGL-ES for FBDirect */
+		EIDT_FRAMEBUFFER,
+
 		//! A simple text only device supported by all platforms.
 		/** This device allows applications to run from the command line without opening a window.
 		It can render the output of the software drivers to the console as ASCII. It only supports

include/IrrCompileConfig.h

@@ -35,6 +35,7 @@
 //! _IRR_COMPILE_WITH_X11_DEVICE_ for Linux X11 based device
 //! _IRR_COMPILE_WITH_SDL_DEVICE_ for platform independent SDL framework
 //! _IRR_COMPILE_WITH_CONSOLE_DEVICE_ for no windowing system, used as a fallback
+//! _IRR_COMPILE_WITH_FB_DEVICE_ for framebuffer systems
 
 
 //! Uncomment this line to compile with the SDL device

source/Irrlicht/CIrrDeviceFB.h

+// Copyright (C) 2002-2007 Nikolaus Gebhardt
+// Copyright (C) 2007-2009 Christian Stehno
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_IRR_DEVICE_FB_H_INCLUDED__
+#define __C_IRR_DEVICE_FB_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+
+#ifdef _IRR_COMPILE_WITH_FB_DEVICE_
+
+#include "CIrrDeviceStub.h"
+#include "SIrrCreationParameters.h"
+#include "IrrlichtDevice.h"
+#include "IImagePresenter.h"
+#include "ICursorControl.h"
+
+#define KeySym s32
+#include <linux/fb.h>
+#include <linux/kd.h>
+
+namespace irr
+{
+	class CIrrDeviceFB : public CIrrDeviceStub, public video::IImagePresenter
+	{
+	public:
+
+		//! constructor
+		CIrrDeviceFB(const SIrrlichtCreationParameters& params);
+
+		//! destructor
+		virtual ~CIrrDeviceFB();
+
+		//! runs the device. Returns false if device wants to be deleted
+		virtual bool run();
+
+		//! Cause the device to temporarily pause execution and let other processes to run
+		// This should bring down processor usage without major performance loss for Irrlicht
+		virtual void yield();
+
+		//! Pause execution and let other processes to run for a specified amount of time.
+		virtual void sleep(u32 timeMs, bool pauseTimer);
+
+		//! sets the caption of the window
+		virtual void setWindowCaption(const wchar_t* text);
+
+		//! returns if window is active. if not, nothing need to be drawn
+		virtual bool isWindowActive() const;
+
+		//! returns if window has focus
+		virtual bool isWindowFocused() const;
+
+		//! returns if window is minimized
+		virtual bool isWindowMinimized() const;
+
+		//! Minimizes window
+		virtual void minimizeWindow();
+
+		//! Maximizes window
+		virtual void maximizeWindow();
+
+		//! Restores original window size
+		virtual void restoreWindow();
+
+		//! presents a surface in the client area
+		virtual bool present(video::IImage* surface, void* windowId = 0, core::rect<s32>* src=0 );
+
+		//! notifies the device that it should close itself
+		virtual void closeDevice();
+
+		//! Sets if the window should be resizeable in windowed mode.
+		virtual void setResizable(bool resize=false);
+
+		//! Returns the type of this device
+		virtual E_DEVICE_TYPE getType() const;
+
+	private:
+
+		//! create the driver
+		void createDriver();
+
+		bool createWindow(const core::dimension2d<u32>& windowSize, u32 bits);
+
+		//! Implementation of the cursor control
+		class CCursorControl : public gui::ICursorControl
+		{
+		public:
+
+			CCursorControl(CIrrDeviceFB* dev, bool null)
+				: Device(dev), IsVisible(true), Null(null)
+			{
+				Device->grab();
+			}
+
+			~CCursorControl()
+			{
+				Device->drop();
+			}
+
+			//! Changes the visible state of the mouse cursor.
+			virtual void setVisible(bool visible)
+			{
+				IsVisible = visible;
+			}
+
+			//! Returns if the cursor is currently visible.
+			virtual bool isVisible() const
+			{
+				return IsVisible;
+			}
+
+			//! Sets the new position of the cursor.
+			virtual void setPosition(const core::position2d<f32> &pos)
+			{
+				setPosition(pos.X, pos.Y);
+			}
+
+			//! Sets the new position of the cursor.
+			virtual void setPosition(f32 x, f32 y)
+			{
+				setPosition((s32)(x*Device->CreationParams.WindowSize.Width), (s32)(y*Device->CreationParams.WindowSize.Height));
+			}
+
+			//! Sets the new position of the cursor.
+			virtual void setPosition(const core::position2d<s32> &pos)
+			{
+				setPosition(pos.X, pos.Y);
+			}
+
+			//! Sets the new position of the cursor.
+			virtual void setPosition(s32 x, s32 y)
+			{
+			}
+
+			//! Returns the current position of the mouse cursor.
+			virtual const core::position2d<s32>& getPosition()
+			{
+				updateCursorPos();
+				return CursorPos;
+			}
+
+			//! Returns the current position of the mouse cursor.
+			virtual core::position2d<f32> getRelativePosition()
+			{
+				updateCursorPos();
+				return core::position2d<f32>(CursorPos.X / (f32)Device->CreationParams.WindowSize.Width,
+					CursorPos.Y / (f32)Device->CreationParams.WindowSize.Height);
+			}
+
+			virtual void setReferenceRect(core::rect<s32>* rect=0)
+			{
+			}
+
+		private:
+
+			void updateCursorPos()
+			{
+			}
+
+			core::position2d<s32> CursorPos;
+			CIrrDeviceFB* Device;
+			bool IsVisible;
+			bool Null;
+		};
+
+		friend class CCursorControl;
+
+		int Framebuffer;
+		int EventDevice;
+		int KeyboardDevice;
+		struct fb_var_screeninfo fbscreeninfo;
+		struct fb_var_screeninfo oldscreeninfo;
+		long KeyboardMode;
+		u8* SoftwareImage;
+
+		u32 Pitch;
+		video::ECOLOR_FORMAT FBColorFormat;
+		bool Close;
+
+		struct SKeyMap
+		{
+			SKeyMap() {}
+			SKeyMap(s32 x11, s32 win32)
+				: X11Key(x11), Win32Key(win32)
+			{
+			}
+
+			KeySym X11Key;
+			s32 Win32Key;
+
+			bool operator<(const SKeyMap& o) const
+			{
+				return X11Key<o.X11Key;
+			}
+		};
+
+		core::array<SKeyMap> KeyMap;
+	};
+
+
+} // end namespace irr
+
+#endif // _IRR_USE_FB_DEVICE_
+#endif // __C_IRR_DEVICE_FB_H_INCLUDED__
+

source/Irrlicht/Irrlicht.cpp

@@ -34,6 +34,10 @@ static const char* const copyright = "Irrlicht Engine (c) 2002-2009 Nikolaus Geb
 #include "CIrrDeviceSDL.h"
 #endif
 
+#ifdef _IRR_COMPILE_WITH_FB_DEVICE_
+#include "CIrrDeviceFB.h"
+#endif
+
 #ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_
 #include "CIrrDeviceConsole.h"
 #endif
@@ -88,6 +92,11 @@ namespace irr
 		dev = new CIrrDeviceSDL(params);
 #endif
 
+#ifdef _IRR_COMPILE_WITH_FB_DEVICE_
+		if (params.DeviceType == EIDT_FRAMEBUFFER || (!dev && params.DeviceType == EIDT_BEST))
+		dev = new CIrrDeviceFB(params);
+#endif
+
 #ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_
 		if (params.DeviceType == EIDT_CONSOLE || (!dev && params.DeviceType == EIDT_BEST))
 		dev = new CIrrDeviceConsole(params);