EventHandler( Window* window )
: mWindow( window ),
mWindowPropertyHandler( NULL ),
- mWindowIconifyStateHandler( NULL ),
+ mClientMessageHandler( NULL ),
mEcoreWindow( 0 )
{
// store ecore window handle
mEcoreWindow = wlWindow->GetWlWindow();
}
DALI_ASSERT_ALWAYS( mEcoreWindow != 0 && "There is no ecore Wl window");
-
-#ifndef DALI_PROFILE_UBUNTU
- if( mWindow->mEcoreEventHander )
- {
- mWindowIconifyStateHandler = ecore_event_handler_add( ECORE_WL_EVENT_WINDOW_ICONIFY_STATE_CHANGE, EcoreEventWindowIconifyStateChanged, this );
- }
-#endif
-
}
/**
{
ecore_event_handler_del( mWindowPropertyHandler );
}
- if ( mWindowIconifyStateHandler )
+ if ( mClientMessageHandler )
{
- ecore_event_handler_del( mWindowIconifyStateHandler );
+ ecore_event_handler_del( mClientMessageHandler );
}
}
return EINA_FALSE;
}
-#ifndef DALI_PROFILE_UBUNTU
- /// Called when the window iconify state is changed.
- static Eina_Bool EcoreEventWindowIconifyStateChanged( void* data, int type, void* event )
+ /// Called when the window properties are changed.
+ static Eina_Bool EcoreEventClientMessage( void* data, int type, void* event )
{
- Ecore_Wl_Event_Window_Iconify_State_Change* iconifyChangedEvent( (Ecore_Wl_Event_Window_Iconify_State_Change*)event );
- EventHandler* handler( (EventHandler*)data );
- Eina_Bool handled( ECORE_CALLBACK_PASS_ON );
-
- if ( handler && handler->mWindow )
- {
- WindowVisibilityObserver* observer( handler->mWindow->mAdaptor );
- if ( observer && ( iconifyChangedEvent->win == (unsigned int) ecore_wl_window_id_get( handler->mEcoreWindow ) ) )
- {
- if( iconifyChangedEvent->iconified == EINA_TRUE )
- {
- observer->OnWindowHidden();
- DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window (%d) Iconfied\n", handler->mEcoreWindow );
- }
- else
- {
- observer->OnWindowShown();
- DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window (%d) Shown\n", handler->mEcoreWindow );
- }
- handled = ECORE_CALLBACK_DONE;
- }
- }
-
- return handled;
+ return EINA_FALSE;
}
-#endif
// Data
Window* mWindow;
Ecore_Event_Handler* mWindowPropertyHandler;
- Ecore_Event_Handler* mWindowIconifyStateHandler;
+ Ecore_Event_Handler* mClientMessageHandler;
Ecore_Wl_Window* mEcoreWindow;
};
const std::string& name,
bool isTransparent)
: EcoreWlRenderSurface( positionSize, surface, name, isTransparent ),
- mEglWindow( NULL )
+ mWlWindow( NULL ),
+ mEglWindow( NULL ),
+ mNeedToApproveDeiconify( false )
{
DALI_LOG_INFO( gRenderSurfaceLogFilter, Debug::Verbose, "Creating Window\n" );
Init( surface );
return mWlWindow;
}
+void WindowRenderSurface::RequestToApproveDeiconify()
+{
+ mNeedToApproveDeiconify = true;
+}
+
void WindowRenderSurface::InitializeEgl( EglInterface& eglIf )
{
DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
{
mRenderNotification->Trigger();
}
+
+ // When the window is deiconified, it approves the deiconify operation to window manager after rendering
+ if(mNeedToApproveDeiconify)
+ {
+ // SwapBuffer is desychronized. So make sure to sychronize when window is deiconified.
+ glAbstraction.Finish();
+
+ //FIXME
+
+ mNeedToApproveDeiconify = false;
+ }
}
void WindowRenderSurface::StopRender()
virtual Ecore_Wl_Window* GetDrawable();
/**
+ * Request to approve deiconify operation
+ * If it is requested, it will send ECORE_X_ATOM_E_DEICONIFY_APPROVE event to window manager after rendering
+ */
+ void RequestToApproveDeiconify();
+
+ /**
* Map window
*/
virtual void Map();
Ecore_Wl_Window* mWlWindow; ///< Wayland-Window
wl_egl_window* mEglWindow;
+ bool mNeedToApproveDeiconify; ///< Whether need to send ECORE_X_ATOM_E_DEICONIFY_APPROVE event
}; // class WindowRenderSurface
} // namespace Dali
-#endif // __DALI_INTERNAL_ECORE_WL_WINDOW_RENDER_SURFACE_H__
+#endif // __DALI_INTERNAL_ECORE_X_WINDOW_RENDER_SURFACE_H__