From f9158592e1478b2013afc7041d9ed041cf2d2f4a Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 13 Jan 2014 19:47:58 +1000 Subject: Update Irrlicht to 1.8.1. Include actual change markers this time. lol --- .../irrlicht-1.8/source/Irrlicht/CIrrDeviceLinux.h | 452 --------------------- 1 file changed, 452 deletions(-) delete mode 100644 libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceLinux.h (limited to 'libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceLinux.h') diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceLinux.h b/libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceLinux.h deleted file mode 100644 index 624bc95..0000000 --- a/libraries/irrlicht-1.8/source/Irrlicht/CIrrDeviceLinux.h +++ /dev/null @@ -1,452 +0,0 @@ -// Copyright (C) 2002-2012 Nikolaus Gebhardt -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h - -#ifndef __C_IRR_DEVICE_LINUX_H_INCLUDED__ -#define __C_IRR_DEVICE_LINUX_H_INCLUDED__ - -#include "IrrCompileConfig.h" - -#ifdef _IRR_COMPILE_WITH_X11_DEVICE_ - -#include "CIrrDeviceStub.h" -#include "IrrlichtDevice.h" -#include "IImagePresenter.h" -#include "ICursorControl.h" -#include "os.h" - -#ifdef _IRR_COMPILE_WITH_X11_ - -#ifdef _IRR_COMPILE_WITH_OPENGL_ -#include -#define GLX_GLXEXT_LEGACY 1 -#include -#ifdef _IRR_OPENGL_USE_EXTPOINTER_ -#include "glxext.h" -#endif -#endif - -#include -#include -#include -#ifdef _IRR_LINUX_X11_VIDMODE_ -#include -#endif -#ifdef _IRR_LINUX_X11_RANDR_ -#include -#endif -#include - -#else -#define KeySym s32 -#endif - -namespace irr -{ - - class CIrrDeviceLinux : public CIrrDeviceStub, public video::IImagePresenter - { - public: - - //! constructor - CIrrDeviceLinux(const SIrrlichtCreationParameters& param); - - //! destructor - virtual ~CIrrDeviceLinux(); - - //! 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; - - //! returns color format of the window. - virtual video::ECOLOR_FORMAT getColorFormat() const; - - //! presents a surface in the client area - virtual bool present(video::IImage* surface, void* windowId=0, core::rect* src=0 ); - - //! notifies the device that it should close itself - virtual void closeDevice(); - - //! \return Returns a pointer to a list with all video modes - //! supported by the gfx adapter. - video::IVideoModeList* getVideoModeList(); - - //! Sets if the window should be resizable in windowed mode. - virtual void setResizable(bool resize=false); - - //! Minimizes the window. - virtual void minimizeWindow(); - - //! Maximizes the window. - virtual void maximizeWindow(); - - //! Restores the window size. - virtual void restoreWindow(); - - //! Activate any joysticks, and generate events for them. - virtual bool activateJoysticks(core::array & joystickInfo); - - //! Set the current Gamma Value for the Display - virtual bool setGammaRamp( f32 red, f32 green, f32 blue, f32 brightness, f32 contrast ); - - //! Get the current Gamma Value for the Display - virtual bool getGammaRamp( f32 &red, f32 &green, f32 &blue, f32 &brightness, f32 &contrast ); - - //! gets text from the clipboard - //! \return Returns 0 if no string is in there. - virtual const c8* getTextFromClipboard() const; - - //! copies text to the clipboard - //! This sets the clipboard selection and _not_ the primary selection which you have on X on the middle mouse button. - virtual void copyToClipboard(const c8* text) const; - - //! Remove all messages pending in the system message loop - virtual void clearSystemMessages(); - - //! Get the device type - virtual E_DEVICE_TYPE getType() const - { - return EIDT_X11; - } - -#ifdef _IRR_COMPILE_WITH_X11_ - // convert an Irrlicht texture to a X11 cursor - Cursor TextureToCursor(irr::video::ITexture * tex, const core::rect& sourceRect, const core::position2d &hotspot); - Cursor TextureToMonochromeCursor(irr::video::ITexture * tex, const core::rect& sourceRect, const core::position2d &hotspot); -#ifdef _IRR_LINUX_XCURSOR_ - Cursor TextureToARGBCursor(irr::video::ITexture * tex, const core::rect& sourceRect, const core::position2d &hotspot); -#endif -#endif - - private: - - //! create the driver - void createDriver(); - - bool createWindow(); - - void createKeyMap(); - - void pollJoysticks(); - - void initXAtoms(); - - bool switchToFullscreen(bool reset=false); - - //! Implementation of the linux cursor control - class CCursorControl : public gui::ICursorControl - { - public: - - CCursorControl(CIrrDeviceLinux* dev, bool null); - - ~CCursorControl(); - - //! Changes the visible state of the mouse cursor. - virtual void setVisible(bool visible) - { - if (visible==IsVisible) - return; - IsVisible = visible; -#ifdef _IRR_COMPILE_WITH_X11_ - if (!Null) - { - if ( !IsVisible ) - XDefineCursor( Device->display, Device->window, invisCursor ); - else - XUndefineCursor( Device->display, Device->window ); - } -#endif - } - - //! 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 &pos) - { - setPosition(pos.X, pos.Y); - } - - //! Sets the new position of the cursor. - virtual void setPosition(f32 x, f32 y) - { - setPosition((s32)(x*Device->Width), (s32)(y*Device->Height)); - } - - //! Sets the new position of the cursor. - virtual void setPosition(const core::position2d &pos) - { - setPosition(pos.X, pos.Y); - } - - //! Sets the new position of the cursor. - virtual void setPosition(s32 x, s32 y) - { -#ifdef _IRR_COMPILE_WITH_X11_ - - if (!Null) - { - if (UseReferenceRect) - { - XWarpPointer(Device->display, - None, - Device->window, 0, 0, - Device->Width, - Device->Height, - ReferenceRect.UpperLeftCorner.X + x, - ReferenceRect.UpperLeftCorner.Y + y); - - } - else - { - XWarpPointer(Device->display, - None, - Device->window, 0, 0, - Device->Width, - Device->Height, x, y); - } - XFlush(Device->display); - } -#endif - CursorPos.X = x; - CursorPos.Y = y; - } - - //! Returns the current position of the mouse cursor. - virtual const core::position2d& getPosition() - { - updateCursorPos(); - return CursorPos; - } - - //! Returns the current position of the mouse cursor. - virtual core::position2d getRelativePosition() - { - updateCursorPos(); - - if (!UseReferenceRect) - { - return core::position2d(CursorPos.X / (f32)Device->Width, - CursorPos.Y / (f32)Device->Height); - } - - return core::position2d(CursorPos.X / (f32)ReferenceRect.getWidth(), - CursorPos.Y / (f32)ReferenceRect.getHeight()); - } - - virtual void setReferenceRect(core::rect* rect=0) - { - if (rect) - { - ReferenceRect = *rect; - UseReferenceRect = true; - - // prevent division through zero and uneven sizes - - if (!ReferenceRect.getHeight() || ReferenceRect.getHeight()%2) - ReferenceRect.LowerRightCorner.Y += 1; - - if (!ReferenceRect.getWidth() || ReferenceRect.getWidth()%2) - ReferenceRect.LowerRightCorner.X += 1; - } - else - UseReferenceRect = false; - } - - //! Sets the active cursor icon - virtual void setActiveIcon(gui::ECURSOR_ICON iconId); - - //! Gets the currently active icon - virtual gui::ECURSOR_ICON getActiveIcon() const - { - return ActiveIcon; - } - - //! Add a custom sprite as cursor icon. - virtual gui::ECURSOR_ICON addIcon(const gui::SCursorSprite& icon); - - //! replace the given cursor icon. - virtual void changeIcon(gui::ECURSOR_ICON iconId, const gui::SCursorSprite& icon); - - //! Return a system-specific size which is supported for cursors. Larger icons will fail, smaller icons might work. - virtual core::dimension2di getSupportedIconSize() const; - -#ifdef _IRR_COMPILE_WITH_X11_ - //! Set platform specific behavior flags. - virtual void setPlatformBehavior(gui::ECURSOR_PLATFORM_BEHAVIOR behavior) {PlatformBehavior = behavior; } - - //! Return platform specific behavior. - virtual gui::ECURSOR_PLATFORM_BEHAVIOR getPlatformBehavior() const { return PlatformBehavior; } - - void update(); - void clearCursors(); -#endif - private: - - void updateCursorPos() - { -#ifdef _IRR_COMPILE_WITH_X11_ - if (Null) - return; - - if ( PlatformBehavior&gui::ECPB_X11_CACHE_UPDATES && !os::Timer::isStopped() ) - { - u32 now = os::Timer::getTime(); - if (now <= lastQuery) - return; - lastQuery = now; - } - - Window tmp; - int itmp1, itmp2; - unsigned int maskreturn; - XQueryPointer(Device->display, Device->window, - &tmp, &tmp, - &itmp1, &itmp2, - &CursorPos.X, &CursorPos.Y, &maskreturn); - - if (CursorPos.X < 0) - CursorPos.X = 0; - if (CursorPos.X > (s32) Device->Width) - CursorPos.X = Device->Width; - if (CursorPos.Y < 0) - CursorPos.Y = 0; - if (CursorPos.Y > (s32) Device->Height) - CursorPos.Y = Device->Height; -#endif - } - - CIrrDeviceLinux* Device; - core::position2d CursorPos; - core::rect ReferenceRect; -#ifdef _IRR_COMPILE_WITH_X11_ - gui::ECURSOR_PLATFORM_BEHAVIOR PlatformBehavior; - u32 lastQuery; - Cursor invisCursor; - - struct CursorFrameX11 - { - CursorFrameX11() : IconHW(0) {} - CursorFrameX11(Cursor icon) : IconHW(icon) {} - - Cursor IconHW; // hardware cursor - }; - - struct CursorX11 - { - CursorX11() {} - explicit CursorX11(Cursor iconHw, u32 frameTime=0) : FrameTime(frameTime) - { - Frames.push_back( CursorFrameX11(iconHw) ); - } - core::array Frames; - u32 FrameTime; - }; - - core::array Cursors; - - void initCursors(); -#endif - bool IsVisible; - bool Null; - bool UseReferenceRect; - gui::ECURSOR_ICON ActiveIcon; - u32 ActiveIconStartTime; - }; - - friend class CCursorControl; - -#ifdef _IRR_COMPILE_WITH_X11_ - friend class COpenGLDriver; - - Display *display; - XVisualInfo* visual; - int screennr; - Window window; - XSetWindowAttributes attributes; - XSizeHints* StdHints; - XImage* SoftwareImage; - mutable core::stringc Clipboard; - #ifdef _IRR_LINUX_X11_VIDMODE_ - XF86VidModeModeInfo oldVideoMode; - #endif - #ifdef _IRR_LINUX_X11_RANDR_ - SizeID oldRandrMode; - Rotation oldRandrRotation; - #endif - #ifdef _IRR_COMPILE_WITH_OPENGL_ - GLXWindow glxWin; - GLXContext Context; - #endif -#endif - u32 Width, Height; - bool WindowHasFocus; - bool WindowMinimized; - bool UseXVidMode; - bool UseXRandR; - bool UseGLXWindow; - bool ExternalWindow; - int AutorepeatSupport; - - struct SKeyMap - { - SKeyMap() {} - SKeyMap(s32 x11, s32 win32) - : X11Key(x11), Win32Key(win32) - { - } - - KeySym X11Key; - s32 Win32Key; - - bool operator<(const SKeyMap& o) const - { - return X11Key KeyMap; - -#if defined(_IRR_COMPILE_WITH_JOYSTICK_EVENTS_) - struct JoystickInfo - { - int fd; - int axes; - int buttons; - - SEvent persistentData; - - JoystickInfo() : fd(-1), axes(0), buttons(0) { } - }; - core::array ActiveJoysticks; -#endif - }; - - -} // end namespace irr - -#endif // _IRR_COMPILE_WITH_X11_DEVICE_ -#endif // __C_IRR_DEVICE_LINUX_H_INCLUDED__ - -- cgit v1.1