X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fecore%2Fwayland%2Fwindow-impl-ecore-wl.cpp;h=d0dbdb7c97b9a1bf76be8f19edbb7b10ebd9daae;hb=a6b0ac5016d7c6aa09d2e774529faaad10ae0ce3;hp=5091344cc9406b4679a70ede280af25827af96da;hpb=983d7f36e3ec16d4a1882dac8babea14d8790221;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp index 5091344..d0dbdb7 100644 --- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp @@ -19,6 +19,9 @@ #include // EXTERNAL HEADERS +// Ecore is littered with C style cast +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" #include #include #include @@ -67,6 +70,7 @@ struct Window::EventHandler : mWindow( window ), mWindowPropertyHandler( NULL ), mWindowIconifyStateHandler( NULL ), + mWindowVisibilityStateHandler( NULL ), mWindowFocusInHandler( NULL ), mWindowFocusOutHandler( NULL ), mEcoreWindow( 0 ), @@ -79,7 +83,10 @@ struct Window::EventHandler mNotificationLevelChangeDone( true ), mScreenMode( 0 ), mScreenModeChangeState( 0 ), - mScreenModeChangeDone( true ) + mScreenModeChangeDone( true ), + mBrightness( 0 ), + mBrightnessChangeState( 0 ), + mBrightnessChangeDone( true ) { // store ecore window handle ECore::WindowRenderSurface* wlWindow( dynamic_cast< ECore::WindowRenderSurface * >( mWindow->mSurface ) ); @@ -92,6 +99,7 @@ struct Window::EventHandler if( mWindow->mEcoreEventHander ) { mWindowIconifyStateHandler = ecore_event_handler_add( ECORE_WL_EVENT_WINDOW_ICONIFY_STATE_CHANGE, EcoreEventWindowIconifyStateChanged, this ); + mWindowVisibilityStateHandler = ecore_event_handler_add( ECORE_WL_EVENT_WINDOW_VISIBILITY_CHANGE, EcoreEventWindowVisibilityChanged, this ); mWindowFocusInHandler = ecore_event_handler_add( ECORE_WL_EVENT_FOCUS_IN, EcoreEventWindowFocusIn, this ); mWindowFocusOutHandler = ecore_event_handler_add( ECORE_WL_EVENT_FOCUS_OUT, EcoreEventWindowFocusOut, this ); } @@ -126,18 +134,27 @@ struct Window::EventHandler { ecore_event_handler_del( mWindowPropertyHandler ); } + if ( mWindowIconifyStateHandler ) { ecore_event_handler_del( mWindowIconifyStateHandler ); } + + if ( mWindowVisibilityStateHandler ) + { + ecore_event_handler_del( mWindowVisibilityStateHandler ); + } + if( mWindowFocusInHandler ) { ecore_event_handler_del( mWindowFocusInHandler ); } + if( mWindowFocusOutHandler ) { ecore_event_handler_del( mWindowFocusOutHandler ); } + if( mEventQueue ) { wl_event_queue_destroy( mEventQueue ); @@ -181,6 +198,35 @@ struct Window::EventHandler return handled; } + /// Called when the window visibility is changed. + static Eina_Bool EcoreEventWindowVisibilityChanged( void* data, int type, void* event ) + { + Ecore_Wl_Event_Window_Visibility_Change* visibilityChangedEvent( static_cast< Ecore_Wl_Event_Window_Visibility_Change* >( event ) ); + EventHandler* handler( static_cast< EventHandler* >( data ) ); + Eina_Bool handled( ECORE_CALLBACK_PASS_ON ); + + if ( handler && handler->mWindow ) + { + WindowVisibilityObserver* observer( handler->mWindow->mAdaptor ); + if ( observer && ( visibilityChangedEvent->win == static_cast< unsigned int >( ecore_wl_window_id_get( handler->mEcoreWindow ) ) ) ) + { + if( visibilityChangedEvent->fully_obscured == 1 ) + { + observer->OnWindowHidden(); + DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window (%d) full obscured\n", handler->mEcoreWindow ); + } + else + { + observer->OnWindowShown(); + DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window (%d) Shown\n", handler->mEcoreWindow ); + } + handled = ECORE_CALLBACK_DONE; + } + } + + return handled; + } + /// Called when the window gains focus static Eina_Bool EcoreEventWindowFocusIn( void* data, int type, void* event ) { @@ -313,6 +359,7 @@ struct Window::EventHandler Window* mWindow; Ecore_Event_Handler* mWindowPropertyHandler; Ecore_Event_Handler* mWindowIconifyStateHandler; + Ecore_Event_Handler* mWindowVisibilityStateHandler; Ecore_Event_Handler* mWindowFocusInHandler; Ecore_Event_Handler* mWindowFocusOutHandler; Ecore_Wl_Window* mEcoreWindow; @@ -1364,5 +1411,9 @@ int Window::GetBrightness() } } // Adaptor + } // Internal + } // Dali + +#pragma GCC diagnostic pop