dpiHorizontal = dpiVertical = 96;
};
+int TestRenderSurface::GetOrientation() const
+{
+ return 0;
+};
+
void TestRenderSurface::InitializeGraphics()
{
}
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical );
/**
+ * @copydoc Dali::Integration::RenderSurface::GetOrientation
+ */
+ virtual int GetOrientation() const;
+
+ /**
* @copydoc Dali::Integration::RenderSurface::InitializeGraphics
*/
virtual void InitializeGraphics();
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) = 0;
/**
+ * @brief Return the orientation of the surface.
+ * @return The orientation
+ */
+ virtual int GetOrientation() const = 0;
+
+ /**
* @brief InitializeGraphics the platform specific graphics surface interfaces
*/
virtual void InitializeGraphics() = 0;
OnSurfaceSet( surface );
}
-void SceneHolder::SurfaceResized()
+void SceneHolder::SurfaceResized( bool forceUpdate )
{
- mScene.SurfaceResized();
+ mScene.SurfaceResized( forceUpdate );
}
Dali::RenderSurfaceInterface* SceneHolder::GetSurface() const
/**
* @brief Called when the surface set is resized.
*/
- void SurfaceResized();
+ void SurfaceResized( bool forceUpdate );
/**
* @brief Get the render surface
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) = 0;
/**
+ * @brief Return the orientation of the surface.
+ * @return The orientation
+ */
+ virtual int GetOrientation() const = 0;
+
+ /**
* @brief Get the screen rotation angle of the window
*/
virtual int GetScreenRotationAngle() = 0;
*/
virtual void SetWindowRotationAngle( int degree ) = 0;
+ /**
+ * @brief Get the rotation angle of the window
+ */
+ virtual int GetWindowRotationAngle() = 0;
+
/**
* @brief Inform the window rotation is completed
*/
{
Uint16Pair newSize( newRect.width, newRect.height );
- SurfaceResized();
+ bool forceUpdate = false;
+ if( mWindowBase->IsEglWindowRotationSupported() )
+ {
+ forceUpdate = true;
+ }
+
+ SurfaceResized( forceUpdate );
mAdaptor->SurfaceResizePrepare( mSurface.get(), newSize );
{
Uint16Pair newSize( newRect.width, newRect.height );
- SurfaceResized();
+ bool forceUpdate = false;
+ if( mWindowBase->IsEglWindowRotationSupported() )
+ {
+ forceUpdate = true;
+ }
+
+ SurfaceResized( forceUpdate );
mAdaptor->SurfaceResizePrepare( mSurface.get(), newSize );
void Window::OnOutputTransformed()
{
+ bool forceUpdate = false;
+ if( mWindowBase->IsEglWindowRotationSupported() )
+ {
+ forceUpdate = true;
+ }
PositionSize positionSize = mSurface->GetPositionSize();
- SurfaceResized();
+ SurfaceResized( forceUpdate );
mAdaptor->SurfaceResizePrepare( mSurface.get(), Adaptor::SurfaceSize( positionSize.width, positionSize.height ) );
mAdaptor->SurfaceResizeComplete( mSurface.get(), Adaptor::SurfaceSize( positionSize.width, positionSize.height ) );
}
mWindowSurface->RequestRotation( mRotationAngle, mWindowWidth, mWindowHeight );
- SurfaceResized();
+ bool forceUpdate = false;
+ if( mWindowBase->IsEglWindowRotationSupported() )
+ {
+ forceUpdate = true;
+ }
+
+ SurfaceResized( forceUpdate );
mAdaptor->SurfaceResizePrepare( mSurface.get(), Adaptor::SurfaceSize( mRotationAngle, mWindowHeight ) );
if( mScreenRotationAngle != 0 )
{
mScreenRotationFinished = false;
+ mResizeFinished = false;
}
}
void WindowRenderSurface::RequestRotation( int angle, int width, int height )
{
- if( !mRotationSupported )
- {
- DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::Rotate: Rotation is not supported!\n" );
- return;
- }
-
if( !mRotationTrigger )
{
TriggerEventFactoryInterface& triggerFactory = Internal::Adaptor::Adaptor::GetImplementation( Adaptor::Get() ).GetTriggerEventFactoryInterface();
dpiVertical = mDpiVertical;
}
+int WindowRenderSurface::GetOrientation() const
+{
+ return mWindowBase->GetOrientation();
+}
+
void WindowRenderSurface::InitializeGraphics()
{
if( resizingSurface )
{
+ int totalAngle = (mRotationAngle + mScreenRotationAngle) % 360;
+
// Window rotate or screen rotate
if( !mRotationFinished || !mScreenRotationFinished )
{
- int totalAngle = (mRotationAngle + mScreenRotationAngle) % 360;
-
mWindowBase->SetEglWindowRotation( totalAngle );
mWindowBase->SetEglWindowBufferTransform( totalAngle );
}
// Resize case
- if( !mResizeFinished )
+ if ( !mResizeFinished )
{
- mWindowBase->ResizeEglWindow( mPositionSize );
+ Dali::PositionSize positionSize;
+ positionSize.x = mPositionSize.x;
+ positionSize.y = mPositionSize.y;
+ if( totalAngle == 0 || totalAngle == 180 )
+ {
+ positionSize.width = mPositionSize.width;
+ positionSize.height = mPositionSize.height;
+ }
+ else
+ {
+ positionSize.width = mPositionSize.height;
+ positionSize.height = mPositionSize.width;
+ }
+
+ mWindowBase->ResizeEglWindow( positionSize );
mResizeFinished = true;
DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::PreRender: Set resize\n" );
{
mScreenRotationAngle = screenRotationAngle;
mScreenRotationFinished = false;
+ mResizeFinished = false;
mOutputTransformedSignal.Emit();
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
+ * @brief Return the orientation of the surface.
+ * @return The orientation
+ */
+ virtual int GetOrientation() const override;
+
+ /**
* @copydoc Dali::Integration::RenderSurface::InitializeGraphics()
*/
virtual void InitializeGraphics() override;
mBrightness( 0 ),
mBrightnessChangeState( 0 ),
mBrightnessChangeDone( true ),
- mOwnSurface( false )
+ mOwnSurface( false ),
+ mWindowRotationAngle( 0 ),
+ mScreenRotationAngle( 0 ),
+ mSupportedPreProtation( 0 )
#ifdef DALI_ELDBUS_AVAILABLE
, mSystemConnection( NULL )
#endif
wl_egl_window_capability capability = static_cast< wl_egl_window_capability >( wl_egl_window_get_capabilities( mEglWindow ) );
if( capability == WL_EGL_WINDOW_CAPABILITY_ROTATION_SUPPORTED )
{
+ mSupportedPreProtation = true;
return true;
}
-
+ mSupportedPreProtation = false;
return false;
}
dpiVertical = int( yres + 0.5f );
}
+int WindowBaseEcoreWl::GetOrientation() const
+{
+ int orientation = (mScreenRotationAngle + mWindowRotationAngle) % 360;
+ if( mSupportedPreProtation )
+ {
+ orientation = 0;
+ }
+ return orientation;
+}
+
int WindowBaseEcoreWl::GetScreenRotationAngle()
{
int transform = 0;
transform = ecore_wl_output_transform_get( ecore_wl_window_output_find( mEcoreWindow ) );
}
- return transform * 90;
+ mScreenRotationAngle = transform * 90;
+ return mScreenRotationAngle;
}
void WindowBaseEcoreWl::SetWindowRotationAngle( int degree )
{
+ mWindowRotationAngle = degree;
ecore_wl_window_rotation_set( mEcoreWindow, degree );
}
+int WindowBaseEcoreWl::GetWindowRotationAngle()
+{
+ return mWindowRotationAngle;
+}
+
void WindowBaseEcoreWl::WindowRotationCompleted( int degree, int width, int height )
{
ecore_wl_window_rotation_change_done_send( mEcoreWindow );
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
+ * @brief Return the orientation of the surface.
+ * @return The orientation
+ */
+ virtual int GetOrientation() const override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle()
*/
virtual int GetScreenRotationAngle() override;
virtual void SetWindowRotationAngle( int degree ) override;
/**
+ * @copydoc Dali::Internal::Adaptor::WindowBase::GetWindowRotationAngle()
+ */
+ virtual int GetWindowRotationAngle() override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted()
*/
virtual void WindowRotationCompleted( int degree, int width, int height ) override;
bool mOwnSurface;
+ int mWindowRotationAngle;
+ int mScreenRotationAngle;
+ int mSupportedPreProtation;
#ifdef DALI_ELDBUS_AVAILABLE
Eldbus_Connection* mSystemConnection;
#endif // DALI_ELDBUS_AVAILABLE
mBrightnessChangeDone( true ),
mOwnSurface( false ),
mMoveResizeSerial( 0 ),
- mLastSubmittedMoveResizeSerial( 0 )
+ mLastSubmittedMoveResizeSerial( 0 ),
+ mWindowRotationAngle( 0 ),
+ mScreenRotationAngle( 0 ),
+ mSupportedPreProtation( 0 )
#ifdef DALI_ELDBUS_AVAILABLE
, mSystemConnection( NULL )
#endif
if( ev->win == static_cast< unsigned int >( ecore_wl2_window_id_get( mEcoreWindow ) ) )
{
- DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::OnRotation\n" );
+ DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl2::OnRotation\n" );
RotationEvent rotationEvent;
rotationEvent.angle = ev->angle;
mTouchEventSignal.Emit( point, touchEvent->timestamp );
- DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnMouseButtonCancel\n" );
+ DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnMouseButtonCancel\n" );
}
}
if( mouseWheelEvent->window == static_cast< unsigned int >( ecore_wl2_window_id_get( mEcoreWindow ) ) )
{
- DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnMouseWheel: direction: %d, modifiers: %d, x: %d, y: %d, z: %d\n", mouseWheelEvent->direction, mouseWheelEvent->modifiers, mouseWheelEvent->x, mouseWheelEvent->y, mouseWheelEvent->z );
+ DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnMouseWheel: direction: %d, modifiers: %d, x: %d, y: %d, z: %d\n", mouseWheelEvent->direction, mouseWheelEvent->modifiers, mouseWheelEvent->x, mouseWheelEvent->y, mouseWheelEvent->z );
WheelEvent wheelEvent( WheelEvent::MOUSE_WHEEL, mouseWheelEvent->direction, mouseWheelEvent->modifiers, Vector2( mouseWheelEvent->x, mouseWheelEvent->y ), mouseWheelEvent->z, mouseWheelEvent->timestamp );
{
Ecore_Event_Detent_Rotate* detentEvent = static_cast< Ecore_Event_Detent_Rotate* >( event );
- DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::OnDetentRotation\n" );
+ DALI_LOG_INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl2::OnDetentRotation\n" );
int direction = ( detentEvent->direction == ECORE_DETENT_DIRECTION_CLOCKWISE ) ? 1 : -1;
int timeStamp = detentEvent->timestamp;
if( keyEvent->window == static_cast< unsigned int >( ecore_wl2_window_id_get( mEcoreWindow ) ) )
{
- DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyDown\n" );
+ DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnKeyDown\n" );
std::string keyName( keyEvent->keyname );
std::string logicalKey( "" );
if( keyEvent->window == static_cast< unsigned int >( ecore_wl2_window_id_get( mEcoreWindow ) ) )
{
- DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" );
+ DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnKeyUp\n" );
std::string keyName( keyEvent->keyname );
std::string logicalKey( "" );
wl_egl_window_tizen_capability capability = static_cast< wl_egl_window_tizen_capability >( wl_egl_window_tizen_get_capabilities( mEglWindow ) );
if( capability == WL_EGL_WINDOW_TIZEN_CAPABILITY_ROTATION_SUPPORTED )
{
+ mSupportedPreProtation = true;
return true;
}
-
+ mSupportedPreProtation = false;
return false;
}
dpiVertical = int( yres + 0.5f );
}
+int WindowBaseEcoreWl2::GetOrientation() const
+{
+ int orientation = (mScreenRotationAngle + mWindowRotationAngle) % 360;
+ if( mSupportedPreProtation )
+ {
+ orientation = 0;
+ }
+ return orientation;
+}
+
int WindowBaseEcoreWl2::GetScreenRotationAngle()
{
int transform = 0;
{
transform = ecore_wl2_output_transform_get( ecore_wl2_window_output_find( mEcoreWindow ) );
}
-
- return transform * 90;
+ mScreenRotationAngle = transform * 90;
+ return mScreenRotationAngle;
}
void WindowBaseEcoreWl2::SetWindowRotationAngle( int degree )
{
+ mWindowRotationAngle = degree;
ecore_wl2_window_rotation_set( mEcoreWindow, degree );
}
+int WindowBaseEcoreWl2::GetWindowRotationAngle()
+{
+ return mWindowRotationAngle;
+}
+
void WindowBaseEcoreWl2::WindowRotationCompleted( int degree, int width, int height )
{
ecore_wl2_window_rotation_change_done_send( mEcoreWindow, degree, width, height );
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
+ * @brief Return the orientation of the surface.
+ * @return The orientation
+ */
+ virtual int GetOrientation() const override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle()
*/
virtual int GetScreenRotationAngle() override;
virtual void SetWindowRotationAngle( int degree ) override;
/**
+ * @copydoc Dali::Internal::Adaptor::WindowBase::GetWindowRotationAngle()
+ */
+ virtual int GetWindowRotationAngle() override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted()
*/
virtual void WindowRotationCompleted( int degree, int width, int height ) override;
volatile uint32_t mMoveResizeSerial;
uint32_t mLastSubmittedMoveResizeSerial;
+ int mWindowRotationAngle;
+ int mScreenRotationAngle;
+ int mSupportedPreProtation;
#ifdef DALI_ELDBUS_AVAILABLE
Eldbus_Connection* mSystemConnection;
#endif // DALI_ELDBUS_AVAILABLE
dpiVertical = int( yres + 0.5f );
}
+int NativeRenderSurfaceEcoreWl::GetOrientation() const
+{
+ return 0;
+}
+
void NativeRenderSurfaceEcoreWl::InitializeGraphics()
{
DALI_LOG_TRACE_METHOD( gNativeSurfaceLogFilter );
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
+ * @brief Return the orientation of the surface.
+ * @return The orientation
+ */
+ virtual int GetOrientation() const override;
+
+ /**
* @copydoc Dali::Integration::RenderSurface::InitializeGraphics()
*/
virtual void InitializeGraphics() override;
dpiVertical = int( yres + 0.5f );
}
+int PixmapRenderSurfaceEcoreX::GetOrientation() const
+{
+ return 0;
+}
+
void PixmapRenderSurfaceEcoreX::InitializeGraphics()
{
mGraphics = &mAdaptor->GetGraphicsInterface();
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
+ * @brief Return the orientation of the surface.
+ * @return The orientation
+ */
+ virtual int GetOrientation() const override;
+
+ /**
* @copydoc Dali::Integration::RenderSurface::InitializeGraphics()
*/
virtual void InitializeGraphics() override;
dpiVertical = ecore_x_dpi_get();
}
+int WindowBaseEcoreX::GetOrientation() const
+{
+ return 0;
+}
+
int WindowBaseEcoreX::GetScreenRotationAngle()
{
return 0;
{
}
+int WindowBaseEcoreX::GetWindowRotationAngle()
+{
+ return 0;
+}
+
void WindowBaseEcoreX::WindowRotationCompleted( int degree, int width, int height )
{
}
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
+ * @brief Return the orientation of the surface.
+ * @return The orientation
+ */
+ virtual int GetOrientation() const override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle()
*/
virtual int GetScreenRotationAngle() override;
virtual void SetWindowRotationAngle( int degree ) override;
/**
+ * @copydoc Dali::Internal::Adaptor::WindowBase::GetWindowRotationAngle()
+ */
+ virtual int GetWindowRotationAngle() override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted()
*/
virtual void WindowRotationCompleted( int degree, int width, int height ) override;
-/*\r
-* Copyright (c) 2018 Samsung Electronics Co., Ltd.\r
-*\r
-* Licensed under the Apache License, Version 2.0 (the "License");\r
-* you may not use this file except in compliance with the License.\r
-* You may obtain a copy of the License at\r
-*\r
-* http://www.apache.org/licenses/LICENSE-2.0\r
-*\r
-* Unless required by applicable law or agreed to in writing, software\r
-* distributed under the License is distributed on an "AS IS" BASIS,\r
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-* See the License for the specific language governing permissions and\r
-* limitations under the License.\r
-*\r
-*/\r
-\r
-// CLASS HEADER\r
-#include <dali/internal/window-system/windows/platform-implement-win.h>\r
-\r
-// EXTERNAL INCLUDES\r
-#include <windows.h>\r
-\r
-// INTERNAL INCLUDES\r
-#include <dali/internal/window-system/windows/event-system-win.h>\r
-\r
-static constexpr float INCH = 25.4;\r
-\r
-using namespace std;\r
-\r
+/*
+* Copyright (c) 2018 Samsung Electronics Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+// CLASS HEADER
+#include <dali/internal/window-system/windows/platform-implement-win.h>
+
+// EXTERNAL INCLUDES
+#include <windows.h>
+
+// INTERNAL INCLUDES
+#include <dali/internal/window-system/windows/event-system-win.h>
+
+static constexpr float INCH = 25.4;
+
+using namespace std;
+
namespace Dali
{
namespace Adaptor
{
-\r
-namespace WindowsPlatformImplementation\r
-{\r
-\r
-void RunLoop()\r
-{\r
- MSG nMsg = { 0 };\r
-\r
- while( GetMessage( &nMsg, 0, NULL, NULL ) )\r
- {\r
- if( WIN_CALLBACK_EVENT == nMsg.message )\r
- {\r
- Dali::CallbackBase *callback = ( Dali::CallbackBase* )nMsg.wParam;\r
- Dali::CallbackBase::Execute( *callback );\r
- }\r
-\r
- TranslateMessage( &nMsg );\r
- DispatchMessage( &nMsg );\r
-\r
- if( WM_CLOSE == nMsg.message )\r
- {\r
- break;\r
- }\r
- }\r
-}\r
-\r
-void GetDPI( uint64_t hWnd, float &xDpi, float &yDpi )\r
-{\r
- HDC hdcScreen = GetDC( reinterpret_cast<HWND>( hWnd ) );\r
-\r
- int32_t iX = GetDeviceCaps( hdcScreen, HORZRES ); // pixel\r
- int32_t iY = GetDeviceCaps( hdcScreen, VERTRES ); // pixel\r
- int32_t iPhsX = GetDeviceCaps( hdcScreen, HORZSIZE ); // mm\r
- int32_t iPhsY = GetDeviceCaps( hdcScreen, VERTSIZE ); // mm\r
-\r
- xDpi = static_cast<float>( iX ) / static_cast<float>( iPhsX ) * INCH;\r
- yDpi = static_cast<float>( iY ) / static_cast<float>( iPhsY ) * INCH;\r
-}\r
-\r
-CallbackBase *listener = NULL;\r
-\r
-LRESULT CALLBACK WinProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)\r
-{\r
- if( NULL != listener )\r
- {\r
- TWinEventInfo eventInfo( reinterpret_cast<uint64_t>( hWnd ), uMsg, wParam, lParam);\r
- CallbackBase::Execute( *listener, &eventInfo );\r
- }\r
-\r
- LRESULT ret = DefWindowProc( hWnd, uMsg, wParam, lParam );\r
- return ret;\r
-}\r
-\r
-DWORD windowStyle = WS_OVERLAPPED;\r
-\r
-int32_t GetEdgeWidth()\r
-{\r
- switch( windowStyle )\r
- {\r
- case WS_OVERLAPPED:\r
- {\r
- return 8;\r
- }\r
- default:\r
- {\r
- return 0;\r
- }\r
- }\r
-}\r
-\r
-int32_t GetEdgeHeight()\r
-{\r
- switch( windowStyle )\r
- {\r
- case WS_OVERLAPPED:\r
- {\r
- return 18;\r
- }\r
- default:\r
- {\r
- return 0;\r
- }\r
- }\r
-}\r
-\r
-class WindowsDisplayInfo\r
-{\r
-public:\r
- static int GetColorDepth()\r
- {\r
- DALI_ASSERT_DEBUG(colorDepth >= 0 && "HWND hasn't been created, no color depth");\r
- return colorDepth;\r
- }\r
-\r
- static void SetHWND( HWND inHWnd )\r
- {\r
- if( hWnd != inHWnd )\r
- {\r
- hWnd = inHWnd;\r
- hdc = GetDC( hWnd );\r
- colorDepth = GetDeviceCaps( WindowsDisplayInfo::hdc, BITSPIXEL ) * GetDeviceCaps( WindowsDisplayInfo::hdc, PLANES );\r
- }\r
- }\r
-\r
-private:\r
- static int colorDepth;\r
- static HWND hWnd;\r
- static HDC hdc;\r
-};\r
-\r
-int WindowsDisplayInfo::colorDepth = -1;\r
-HWND WindowsDisplayInfo::hWnd = NULL;\r
-HDC WindowsDisplayInfo::hdc = NULL;\r
-\r
-int GetColorDepth()\r
-{\r
- return WindowsDisplayInfo::GetColorDepth();\r
-}\r
-\r
-uint64_t CreateHwnd(\r
- _In_opt_ const char *lpClassName,\r
- _In_opt_ const char *lpWindowName,\r
- _In_ int X,\r
- _In_ int Y,\r
- _In_ int nWidth,\r
- _In_ int nHeight,\r
- _In_opt_ uint64_t parent)\r
-{\r
- WNDCLASS cs = { 0 };\r
- cs.cbClsExtra = 0;\r
- cs.cbWndExtra = 0;\r
- cs.hbrBackground = (HBRUSH)( COLOR_WINDOW + 2 );\r
- cs.hCursor = NULL;\r
- cs.hIcon = NULL;\r
- cs.hInstance = GetModuleHandle( NULL );\r
- cs.lpfnWndProc = (WNDPROC)WinProc;\r
- cs.lpszClassName = lpClassName;\r
- cs.lpszMenuName = NULL;\r
- cs.style = CS_VREDRAW | CS_HREDRAW;\r
- RegisterClass( &cs );\r
-\r
- HWND hWnd = CreateWindow( lpClassName, lpWindowName, windowStyle, X, Y, nWidth + 2 * GetEdgeWidth(), nHeight + 2 * GetEdgeHeight(), NULL, NULL, cs.hInstance, NULL );\r
- ShowWindow( hWnd, SW_SHOW );\r
-\r
- WindowsDisplayInfo::SetHWND( hWnd );\r
-\r
- return reinterpret_cast<uint64_t>( hWnd );\r
-}\r
-\r
-void SetListener( CallbackBase *callback )\r
-{\r
- listener = callback;\r
-}\r
-\r
-bool PostWinMessage(\r
- _In_ uint32_t Msg,\r
- _In_ uint32_t wParam,\r
- _In_ uint64_t lParam,\r
- _In_ uint64_t hWnd)\r
-{\r
- return (bool)PostMessage( reinterpret_cast<HWND>( hWnd ), Msg, wParam, lParam );\r
-}\r
-\r
-bool PostWinThreadMessage(\r
- _In_ uint32_t Msg,\r
- _In_ uint32_t wParam,\r
- _In_ uint64_t lParam,\r
- _In_ uint64_t threadID/* = -1*/ )\r
-{\r
- if( -1 == threadID )\r
- {\r
- threadID = GetCurrentThreadId();\r
- }\r
-\r
- return (bool)PostThreadMessage( threadID, Msg, wParam, lParam );\r
-}\r
-\r
-void ShowWindow( uint64_t hWnd)\r
-{\r
- ::ShowWindow( reinterpret_cast<HWND>( hWnd ), SW_SHOW);\r
-}\r
-\r
-void HideWindow( uint64_t hWnd)\r
-{\r
- ::ShowWindow( reinterpret_cast<HWND>( hWnd ), SW_HIDE);\r
-}\r
-\r
-struct TTimerCallbackInfo\r
-{\r
- void *data;\r
- timerCallback callback;\r
- HWND hWnd;\r
-};\r
-\r
-void CALLBACK TimerProc(HWND hWnd, UINT nMsg, UINT_PTR nTimerid, DWORD dwTime)\r
-{\r
- TTimerCallbackInfo *info = (TTimerCallbackInfo*)nTimerid;\r
- info->callback( info->data );\r
-}\r
-\r
-int SetTimer(int interval, timerCallback callback, void *data)\r
-{\r
- TTimerCallbackInfo *callbackInfo = new TTimerCallbackInfo;\r
- callbackInfo->data = data;\r
- callbackInfo->callback = callback;\r
- callbackInfo->hWnd = ::GetActiveWindow();\r
-\r
- UINT_PTR timerID = (UINT_PTR)callbackInfo;\r
- ::SetTimer( callbackInfo->hWnd, timerID, interval, TimerProc );\r
-\r
- return timerID;\r
-}\r
-\r
-void KillTimer(int id)\r
-{\r
- TTimerCallbackInfo *info = (TTimerCallbackInfo*)id;\r
- ::KillTimer( info->hWnd, id );\r
- delete info;\r
-}\r
-\r
-const char* GetKeyName( int keyCode )\r
-{\r
- switch( keyCode )\r
- {\r
- case VK_BACK:\r
- {\r
- return "Backspace";\r
- }\r
- case VK_TAB:\r
- {\r
- return "Tab";\r
- }\r
- case VK_RETURN:\r
- {\r
- return "Return";\r
- }\r
- case VK_ESCAPE:\r
- {\r
- return "Escape";\r
- }\r
- case VK_SPACE:\r
- {\r
- return "Space";\r
- }\r
- case VK_LEFT:\r
- {\r
- return "Left";\r
- }\r
- case VK_UP:\r
- {\r
- return "Up";\r
- }\r
- case VK_RIGHT:\r
- {\r
- return "Right";\r
- }\r
- case VK_DOWN:\r
- {\r
- return "Down";\r
- }\r
- case 48:\r
- {\r
- return "0";\r
- }\r
- case 49:\r
- {\r
- return "1";\r
- }\r
- case 50:\r
- {\r
- return "2";\r
- }\r
- case 51:\r
- {\r
- return "3";\r
- }\r
- case 52:\r
- {\r
- return "4";\r
- }\r
- case 53:\r
- {\r
- return "5";\r
- }\r
- case 54:\r
- {\r
- return "6";\r
- }\r
- case 55:\r
- {\r
- return "7";\r
- }\r
- case 56:\r
- {\r
- return "8";\r
- }\r
- case 57:\r
- {\r
- return "9";\r
- }\r
- default:\r
- {\r
- break;\r
- }\r
- }\r
-\r
- return "";\r
-}\r
-
-static LARGE_INTEGER cpuFrequency;\r
-static LARGE_INTEGER *pCpuFrequency = NULL;\r
-\r
-uint64_t GetCurrentThreadId()\r
-{\r
- return ::GetCurrentThreadId();\r
-}\r
-\r
-void GetNanoseconds( uint64_t& timeInNanoseconds )\r
-{\r
- if( NULL == pCpuFrequency )\r
- {\r
- pCpuFrequency = &cpuFrequency;\r
- QueryPerformanceFrequency( pCpuFrequency );\r
- }\r
-\r
- LARGE_INTEGER curTime;\r
- QueryPerformanceCounter( &curTime );\r
-\r
- timeInNanoseconds = static_cast<double>(curTime.QuadPart) / static_cast<double>(pCpuFrequency->QuadPart) * 1000000000;\r
-}\r
-\r
-unsigned int GetCurrentMilliSeconds( void )\r
-{\r
- if( NULL == pCpuFrequency )\r
- {\r
- pCpuFrequency = &cpuFrequency;\r
- QueryPerformanceFrequency( pCpuFrequency );\r
- }\r
-\r
- LARGE_INTEGER curTime;\r
- QueryPerformanceCounter( &curTime );\r
-\r
- return curTime.QuadPart * 1000 / pCpuFrequency->QuadPart;\r
-}\r
+
+namespace WindowsPlatformImplementation
+{
+
+void RunLoop()
+{
+ MSG nMsg = { 0 };
+
+ while( GetMessage( &nMsg, 0, NULL, NULL ) )
+ {
+ if( WIN_CALLBACK_EVENT == nMsg.message )
+ {
+ Dali::CallbackBase *callback = ( Dali::CallbackBase* )nMsg.wParam;
+ Dali::CallbackBase::Execute( *callback );
+ }
+
+ TranslateMessage( &nMsg );
+ DispatchMessage( &nMsg );
+
+ if( WM_CLOSE == nMsg.message )
+ {
+ break;
+ }
+ }
+}
+
+void GetDPI( uint64_t hWnd, float &xDpi, float &yDpi )
+{
+ HDC hdcScreen = GetDC( reinterpret_cast<HWND>( hWnd ) );
+
+ int32_t iX = GetDeviceCaps( hdcScreen, HORZRES ); // pixel
+ int32_t iY = GetDeviceCaps( hdcScreen, VERTRES ); // pixel
+ int32_t iPhsX = GetDeviceCaps( hdcScreen, HORZSIZE ); // mm
+ int32_t iPhsY = GetDeviceCaps( hdcScreen, VERTSIZE ); // mm
+
+ xDpi = static_cast<float>( iX ) / static_cast<float>( iPhsX ) * INCH;
+ yDpi = static_cast<float>( iY ) / static_cast<float>( iPhsY ) * INCH;
+}
+
+int GetOrientation()
+{
+ return 0;
+}
+
+CallbackBase *listener = NULL;
+
+LRESULT CALLBACK WinProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+ if( NULL != listener )
+ {
+ TWinEventInfo eventInfo( reinterpret_cast<uint64_t>( hWnd ), uMsg, wParam, lParam);
+ CallbackBase::Execute( *listener, &eventInfo );
+ }
+
+ LRESULT ret = DefWindowProc( hWnd, uMsg, wParam, lParam );
+ return ret;
+}
+
+DWORD windowStyle = WS_OVERLAPPED;
+
+int32_t GetEdgeWidth()
+{
+ switch( windowStyle )
+ {
+ case WS_OVERLAPPED:
+ {
+ return 8;
+ }
+ default:
+ {
+ return 0;
+ }
+ }
+}
+
+int32_t GetEdgeHeight()
+{
+ switch( windowStyle )
+ {
+ case WS_OVERLAPPED:
+ {
+ return 18;
+ }
+ default:
+ {
+ return 0;
+ }
+ }
+}
+
+class WindowsDisplayInfo
+{
+public:
+ static int GetColorDepth()
+ {
+ DALI_ASSERT_DEBUG(colorDepth >= 0 && "HWND hasn't been created, no color depth");
+ return colorDepth;
+ }
+
+ static void SetHWND( HWND inHWnd )
+ {
+ if( hWnd != inHWnd )
+ {
+ hWnd = inHWnd;
+ hdc = GetDC( hWnd );
+ colorDepth = GetDeviceCaps( WindowsDisplayInfo::hdc, BITSPIXEL ) * GetDeviceCaps( WindowsDisplayInfo::hdc, PLANES );
+ }
+ }
+
+private:
+ static int colorDepth;
+ static HWND hWnd;
+ static HDC hdc;
+};
+
+int WindowsDisplayInfo::colorDepth = -1;
+HWND WindowsDisplayInfo::hWnd = NULL;
+HDC WindowsDisplayInfo::hdc = NULL;
+
+int GetColorDepth()
+{
+ return WindowsDisplayInfo::GetColorDepth();
+}
+
+uint64_t CreateHwnd(
+ _In_opt_ const char *lpClassName,
+ _In_opt_ const char *lpWindowName,
+ _In_ int X,
+ _In_ int Y,
+ _In_ int nWidth,
+ _In_ int nHeight,
+ _In_opt_ uint64_t parent)
+{
+ WNDCLASS cs = { 0 };
+ cs.cbClsExtra = 0;
+ cs.cbWndExtra = 0;
+ cs.hbrBackground = (HBRUSH)( COLOR_WINDOW + 2 );
+ cs.hCursor = NULL;
+ cs.hIcon = NULL;
+ cs.hInstance = GetModuleHandle( NULL );
+ cs.lpfnWndProc = (WNDPROC)WinProc;
+ cs.lpszClassName = lpClassName;
+ cs.lpszMenuName = NULL;
+ cs.style = CS_VREDRAW | CS_HREDRAW;
+ RegisterClass( &cs );
+
+ HWND hWnd = CreateWindow( lpClassName, lpWindowName, windowStyle, X, Y, nWidth + 2 * GetEdgeWidth(), nHeight + 2 * GetEdgeHeight(), NULL, NULL, cs.hInstance, NULL );
+ ShowWindow( hWnd, SW_SHOW );
+
+ WindowsDisplayInfo::SetHWND( hWnd );
+
+ return reinterpret_cast<uint64_t>( hWnd );
+}
+
+void SetListener( CallbackBase *callback )
+{
+ listener = callback;
+}
+
+bool PostWinMessage(
+ _In_ uint32_t Msg,
+ _In_ uint32_t wParam,
+ _In_ uint64_t lParam,
+ _In_ uint64_t hWnd)
+{
+ return (bool)PostMessage( reinterpret_cast<HWND>( hWnd ), Msg, wParam, lParam );
+}
+
+bool PostWinThreadMessage(
+ _In_ uint32_t Msg,
+ _In_ uint32_t wParam,
+ _In_ uint64_t lParam,
+ _In_ uint64_t threadID/* = -1*/ )
+{
+ if( -1 == threadID )
+ {
+ threadID = GetCurrentThreadId();
+ }
+
+ return (bool)PostThreadMessage( threadID, Msg, wParam, lParam );
+}
+
+void ShowWindow( uint64_t hWnd)
+{
+ ::ShowWindow( reinterpret_cast<HWND>( hWnd ), SW_SHOW);
+}
+
+void HideWindow( uint64_t hWnd)
+{
+ ::ShowWindow( reinterpret_cast<HWND>( hWnd ), SW_HIDE);
+}
+
+struct TTimerCallbackInfo
+{
+ void *data;
+ timerCallback callback;
+ HWND hWnd;
+};
+
+void CALLBACK TimerProc(HWND hWnd, UINT nMsg, UINT_PTR nTimerid, DWORD dwTime)
+{
+ TTimerCallbackInfo *info = (TTimerCallbackInfo*)nTimerid;
+ info->callback( info->data );
+}
+
+int SetTimer(int interval, timerCallback callback, void *data)
+{
+ TTimerCallbackInfo *callbackInfo = new TTimerCallbackInfo;
+ callbackInfo->data = data;
+ callbackInfo->callback = callback;
+ callbackInfo->hWnd = ::GetActiveWindow();
+
+ UINT_PTR timerID = (UINT_PTR)callbackInfo;
+ ::SetTimer( callbackInfo->hWnd, timerID, interval, TimerProc );
+
+ return timerID;
+}
+
+void KillTimer(int id)
+{
+ TTimerCallbackInfo *info = (TTimerCallbackInfo*)id;
+ ::KillTimer( info->hWnd, id );
+ delete info;
+}
+
+const char* GetKeyName( int keyCode )
+{
+ switch( keyCode )
+ {
+ case VK_BACK:
+ {
+ return "Backspace";
+ }
+ case VK_TAB:
+ {
+ return "Tab";
+ }
+ case VK_RETURN:
+ {
+ return "Return";
+ }
+ case VK_ESCAPE:
+ {
+ return "Escape";
+ }
+ case VK_SPACE:
+ {
+ return "Space";
+ }
+ case VK_LEFT:
+ {
+ return "Left";
+ }
+ case VK_UP:
+ {
+ return "Up";
+ }
+ case VK_RIGHT:
+ {
+ return "Right";
+ }
+ case VK_DOWN:
+ {
+ return "Down";
+ }
+ case 48:
+ {
+ return "0";
+ }
+ case 49:
+ {
+ return "1";
+ }
+ case 50:
+ {
+ return "2";
+ }
+ case 51:
+ {
+ return "3";
+ }
+ case 52:
+ {
+ return "4";
+ }
+ case 53:
+ {
+ return "5";
+ }
+ case 54:
+ {
+ return "6";
+ }
+ case 55:
+ {
+ return "7";
+ }
+ case 56:
+ {
+ return "8";
+ }
+ case 57:
+ {
+ return "9";
+ }
+ default:
+ {
+ break;
+ }
+ }
+
+ return "";
+}
+
+static LARGE_INTEGER cpuFrequency;
+static LARGE_INTEGER *pCpuFrequency = NULL;
+
+uint64_t GetCurrentThreadId()
+{
+ return ::GetCurrentThreadId();
+}
+
+void GetNanoseconds( uint64_t& timeInNanoseconds )
+{
+ if( NULL == pCpuFrequency )
+ {
+ pCpuFrequency = &cpuFrequency;
+ QueryPerformanceFrequency( pCpuFrequency );
+ }
+
+ LARGE_INTEGER curTime;
+ QueryPerformanceCounter( &curTime );
+
+ timeInNanoseconds = static_cast<double>(curTime.QuadPart) / static_cast<double>(pCpuFrequency->QuadPart) * 1000000000;
+}
+
+unsigned int GetCurrentMilliSeconds( void )
+{
+ if( NULL == pCpuFrequency )
+ {
+ pCpuFrequency = &cpuFrequency;
+ QueryPerformanceFrequency( pCpuFrequency );
+ }
+
+ LARGE_INTEGER curTime;
+ QueryPerformanceCounter( &curTime );
+
+ return curTime.QuadPart * 1000 / pCpuFrequency->QuadPart;
+}
} // namespace WindowsPlatformImplement
} // namespace internal
-} // namespace Dali\r
+} // namespace Dali
#ifndef PLATFORM_IMPLEMENT_WIN_INCLUDE\r
#define PLATFORM_IMPLEMENT_WIN_INCLUDE\r
\r
-/*
-* Copyright (c) 2018 Samsung Electronics Co., Ltd.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*
+/*\r
+* Copyright (c) 2018 Samsung Electronics Co., Ltd.\r
+*\r
+* Licensed under the Apache License, Version 2.0 (the "License");\r
+* you may not use this file except in compliance with the License.\r
+* You may obtain a copy of the License at\r
+*\r
+* http://www.apache.org/licenses/LICENSE-2.0\r
+*\r
+* Unless required by applicable law or agreed to in writing, software\r
+* distributed under the License is distributed on an "AS IS" BASIS,\r
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+* See the License for the specific language governing permissions and\r
+* limitations under the License.\r
+*\r
*/\r
\r
// EXTERNAL_HEADERS\r
typedef uint64_t WinWindowHandle;\r
typedef uint64_t WinPixmap;\r
\r
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace Adaptor
-{
+namespace Dali\r
+{\r
+\r
+namespace Internal\r
+{\r
+\r
+namespace Adaptor\r
+{\r
\r
namespace WindowsPlatformImplementation\r
{\r
\r
void GetDPI( uint64_t hWnd, float &xDpi, float &yDpi );\r
\r
+int GetOrientation() const;\r
+\r
const char* GetKeyName( int keyCode );\r
\r
uint64_t GetCurrentThreadId();\r
\r
unsigned int GetCurrentMilliSeconds( void );\r
\r
-} // namespace WindowsPlatformImplement
-
-} // namespace Adaptor
-
-} // namespace internal
-
-} // namespace Dali
-
+} // namespace WindowsPlatformImplement\r
+\r
+} // namespace Adaptor\r
+\r
+} // namespace internal\r
+\r
+} // namespace Dali\r
+\r
#endif // WIN32_WINDOWS_SYSTEM_INCLUDE\r
{
}
+int WindowBaseWin::GetWindowRotationAngle()
+{
+}
+
void WindowBaseWin::WindowRotationCompleted( int degree, int width, int height )
{
}
{
}
+int WindowBaseWin::GetOrientation() const
+{
+}
+
unsigned int WindowBaseWin::GetSurfaceId( Any surface ) const
{
unsigned int surfaceId = 0;
virtual void SetWindowRotationAngle( int degree ) override;
/**
+ * @copydoc Dali::Internal::Adaptor::WindowBase::GetWindowRotationAngle()
+ */
+ virtual void GetWindowRotationAngle() override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted()
*/
virtual void WindowRotationCompleted( int degree, int width, int height ) override;
virtual void SetTransparency( bool transparent ) override;
/**
+ * @brief Return the orientation of the surface.
+ * @return The orientation
+ */
+ virtual int GetOrientation() const override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetParent()
*/
virtual void SetParent( Any parent ) override;
projects / platform / core / uifw / dali-adaptor.git / commitdiff