Fixed Logs

Change-Id: I8737f3d8fe58bb30a8c42c0a0c5b0329fa3dfc22
Signed-off-by: Choi Munseok <ms47.choi@samsung.com>

diff --git a/src/ui/FUi_ControlManager.cpp b/src/ui/FUi_ControlManager.cpp
index 648ecc3..fb993d6 100644 (file)
--- a/src/ui/FUi_ControlManager.cpp
+++ b/src/ui/FUi_ControlManager.cpp
@@ -997,7 +997,7 @@ _ControlManager::GetScreenRotation(void) const
                SysLog(NID_UI, "It's failed to get the flag of auto-rotate.");
        }
 
-       SysLog(NID_UI, "[Window Manager Rotation] AUTO_ROTATION = %d", autoRotate);
+       SysLog(NID_UI, "[WM ROTATION] AUTO_ROTATION = %d", autoRotate);
 
        if (autoRotate == false)
        {
@@ -1035,7 +1035,7 @@ _ControlManager::GetScreenRotation(void) const
                                                _EcoreEvas* pEcoreEvas = ::GetEcoreEvasMgr()->GetEcoreEvas();
                                                if (pEcoreEvas)
                                                {
-                                                       SysLog(NID_UI, "[Window Manager Rotation] ROTATION_UNKNOWN");
+                                                       SysLog(NID_UI, "[WM ROTATION] ROTATION_UNKNOWN");
                                                        device_rotation = pEcoreEvas->GetWindowRotation(*pCurrentFrame);
                                                }
                                        }
@@ -1045,11 +1045,11 @@ _ControlManager::GetScreenRotation(void) const
                                break;
                        }
 
-                       SysLog(NID_UI, "[Window Manager Rotation] device_rotation = %d", device_rotation);
+                       SysLog(NID_UI, "[WM ROTATION] device_rotation = %d", device_rotation);
                }
                else
                {
-                       SysLog(NID_UI, "[Window Manager Rotation] device_rotation = error");
+                       SysLog(NID_UI, "[WM ROTATION] device_rotation = error");
                }
 
                return ::Convert(device_rotation);

diff --git a/src/ui/FUi_EcoreEvas.cpp b/src/ui/FUi_EcoreEvas.cpp
index 7d4546b..9a3fceb 100644 (file)
--- a/src/ui/FUi_EcoreEvas.cpp
+++ b/src/ui/FUi_EcoreEvas.cpp
@@ -109,7 +109,7 @@ OnWindowStateChanged(Ecore_Evas* pEcoreEvas)
 
        Ecore_X_Window targetWin = (Ecore_X_Window) ecore_evas_window_get(pEcoreEvas);
 
-       SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x] OnWindowStateChanged is called.", targetWin);
+       SysLog(NID_UI, "[WM ROTATION][WIN 0x%x] OnWindowStateChanged is called.", targetWin);
 
        int winCount = pControlManager->GetAllWindowCount();
        for (int i = 0; i < winCount; i++)
@@ -1201,7 +1201,7 @@ _EcoreEvas::_EcoreEvas(void)
        , __openClipboard(false)
 {
        int ret = appcore_unset_rotation_cb();
-       SysLog(NID_UI, "[Window Manager Rotation] appcore_unset_rotation_cb = %d", ret);
+       SysLog(NID_UI, "[WM ROTATION] appcore_unset_rotation_cb = %d", ret);
 
        __pWindowVisibilityChanged = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE, OnWindowVisibilityChanged, (void*) this);
        SysTryReturnVoidResult(NID_UI, __pWindowVisibilityChanged, E_SYSTEM, "[E_SYSTEM] A system error occurred.");
@@ -1380,7 +1380,7 @@ _EcoreEvas::RotateWindow(const _Window& window, int orientation, bool rotateEvas
                                evas_object_resize(pWinObj, rootH, rootW);
                        }
 
-                       SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x, FULL SCREEN] Rotate bounds(rot = %d).", win, orientation);
+                       SysLog(NID_UI, "[WM ROTATION][WIN 0x%x, FULL SCREEN] Rotate bounds(ROT %d).", win, orientation);
                }
        }
        else
@@ -1426,11 +1426,11 @@ _EcoreEvas::RotateWindow(const _Window& window, int orientation, bool rotateEvas
                if (ret == EINA_FALSE)
                {
                        evas_object_resize(pWinObj, winBounds.width, winBounds.height);
-                       SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x, PARTIAL SCREEN] Rotate bounds(rot = %d, %d, %d, %d, %d).", win, orientation, winX, winY, winBounds.width, winBounds.height);
+                       SysLog(NID_UI, "[WM ROTATION][WIN 0x%x, PARTIAL SCREEN] Rotate bounds(ROT %d, %d, %d, %d, %d).", win, orientation, winX, winY, winBounds.width, winBounds.height);
                }
                else
                {
-                       SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x, PARTIAL SCREEN] Rotate bounds(rot = %d, %d, %d) ONLY MOVE.", win, orientation, winX, winY);
+                       SysLog(NID_UI, "[WM ROTATION][WIN 0x%x, PARTIAL SCREEN] Rotate bounds(ROT %d, %d, %d) ONLY MOVE.", win, orientation, winX, winY);
                }
        }
 }
@@ -1544,7 +1544,7 @@ _EcoreEvas::SetOwner(NativeWindowHandle ownee, NativeWindowHandle owner)
        {
                ecore_x_icccm_transient_for_unset(ownee);
                ecore_x_icccm_transient_for_set(ownee, owner);
-               SysLog(NID_UI, "[Window Order Group][Window : 0x%x] transient_for_set -> 0x%x", ownee, owner);
+               SysLog(NID_UI, "[WIN ORDER][WIN 0x%x] transient_for_set -> 0x%x", ownee, owner);
        }
 }
 
@@ -2282,20 +2282,24 @@ _EcoreEvas::SetWindowLevel(const _Window& window, _WindowLevel level)
 
        Ecore_X_Window win = (Ecore_X_Window) ecore_evas_window_get(pEcoreEvas);
        ecore_x_icccm_transient_for_unset(win);
+       SysLog(NID_UI, "[WIN ORDER][WIN 0x%x] transient_for_unset", win);
 
        if (level == _WINDOW_LEVEL_NORMAL)
        {
                ecore_x_netwm_window_type_set(win, ECORE_X_WINDOW_TYPE_NORMAL);
+               SysLog(NID_UI, "[WIN ORDER][WIN 0x%x] set : ECORE_X_WINDOW_TYPE_NORMAL", win);
        }
        else if (level == _WINDOW_LEVEL_NOTIFICATION_HIGH)
        {
                ecore_x_netwm_window_type_set(win, ECORE_X_WINDOW_TYPE_NOTIFICATION);
                utilx_set_system_notification_level((Display*)ecore_x_display_get(), win, UTILX_NOTIFICATION_LEVEL_HIGH);
+               SysLog(NID_UI, "[WIN ORDER][WIN 0x%x] set : ECORE_X_WINDOW_TYPE_NOTIFICATION, UTILX_NOTIFICATION_LEVEL_HIGH", win);
        }
        else if (level == _WINDOW_LEVEL_NOTIFICATION_MIDDLE)
        {
                ecore_x_netwm_window_type_set(win, ECORE_X_WINDOW_TYPE_NOTIFICATION);
                utilx_set_system_notification_level((Display*)ecore_x_display_get(), win, UTILX_NOTIFICATION_LEVEL_NORMAL);
+               SysLog(NID_UI, "[WIN ORDER][WIN 0x%x] set : ECORE_X_WINDOW_TYPE_NOTIFICATION, UTILX_NOTIFICATION_LEVEL_NORMAL", win);
        }
 
        SetLastResult(E_SUCCESS);
@@ -2416,11 +2420,11 @@ _EcoreEvas::SetWindowBounds(const _Window& window, const Rectangle& bounds)
        if (ret == EINA_FALSE)
        {
                evas_object_resize(pWinObject, winBounds.width, winBounds.height);
-               SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x] Set bounds(rot = %d, %d, %d, %d, %d).", win, rotate, winX, winY, winBounds.width, winBounds.height);
+               SysLog(NID_UI, "[WM ROTATION][WIN 0x%x] Set bounds(ROT %d, %d, %d, %d, %d).", win, rotate, winX, winY, winBounds.width, winBounds.height);
        }
        else
        {
-               SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x] Set bounds(rot = %d, %d, %d) ONLY MOVE.", win, rotate, winX, winY);
+               SysLog(NID_UI, "[WM ROTATION][WIN 0x%x] Set bounds(ROT %d, %d, %d) ONLY MOVE.", win, rotate, winX, winY);
        }
 
        SetLastResult(E_SUCCESS);
@@ -2504,11 +2508,11 @@ _EcoreEvas::SetWindowBounds(const _Window& window, const FloatRectangle& bounds)
        if (ret == EINA_FALSE)
        {
                evas_object_resize(pWinObject, winBounds.width, winBounds.height);
-               SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x] Set bounds(rot = %d, %d, %d, %d, %d).", win, rotate, winX, winY, winBounds.width, winBounds.height);
+               SysLog(NID_UI, "[WM ROTATION][WIN 0x%x] Set bounds(ROT %d, %d, %d, %d, %d).", win, rotate, winX, winY, winBounds.width, winBounds.height);
        }
        else
        {
-               SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x] Set bounds(rot = %d, %d, %d) ONLY MOVE.", win, rotate, winX, winY);
+               SysLog(NID_UI, "[WM ROTATION][WIN 0x%x] Set bounds(ROT %d, %d, %d) ONLY MOVE.", win, rotate, winX, winY);
        }
 
        SetLastResult(E_SUCCESS);
@@ -2552,12 +2556,12 @@ _EcoreEvas::SetOwner(const _Window& ownee, const _Control& owner)
                {
                        ecore_x_icccm_transient_for_unset(owneeWin);
                        ecore_x_icccm_transient_for_set(owneeWin, ownerWin);
-                       SysLog(NID_UI, "[Window Order Group][Window : 0x%x] transient_for_set -> 0x%x", owneeWin, ownerWin);
+                       SysLog(NID_UI, "[WIN ORDER][WIN 0x%x] transient_for_set -> 0x%x", owneeWin, ownerWin);
                }
        }
        else
        {
-               SysLog(NID_UI, "[Window Order Group][Window : 0x%x] Skip to transient_for_set", owneeWin);
+               SysLog(NID_UI, "[WIN ORDER][WIN 0x%x] Skip to transient_for_set", owneeWin);
        }
 
        // Ownee window
@@ -2628,7 +2632,7 @@ _EcoreEvas::SetWindowPreferredRotation(const _Window& window, int rotation, bool
        {
                ecore_x_e_window_rotation_app_set(win, EINA_TRUE);
        }
-       SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x] Set window preferred rotation(%d).", win, rotation);
+       SysLog(NID_UI, "[WM ROTATION][WIN 0x%x] Set window preferred rotation(%d).", win, rotation);
        ecore_evas_wm_rotation_preferred_rotation_set(pLayer->GetEcoreEvas(), rotation);
 
        _Window* pWindow = const_cast<_Window*>(&window);
@@ -2677,7 +2681,7 @@ _EcoreEvas::SetWindowAvailabledRotation(const _Window& window, int* rotations, u
                ecore_x_e_window_rotation_app_set(win, EINA_TRUE);
        }
 
-       SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x] Set window available rotation(%d).", win, count);
+       SysLog(NID_UI, "[WM ROTATION][WIN 0x%x] Set window available rotation(%d).", win, count);
        ecore_evas_wm_rotation_available_rotations_set(pLayer->GetEcoreEvas(), rotations, count);
 }
 
@@ -2705,7 +2709,7 @@ _EcoreEvas::SetWindowRotationBounds(const _Window& window, int rotation, const T
        Rectangle winBounds = _CoordinateSystemUtils::Transform(bounds);
 
        Ecore_X_Window win = (Ecore_X_Window) ecore_evas_window_get(pLayer->GetEcoreEvas());
-       SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x] Set rotation bounds(rot = %d, %d, %d, %d, %d).", win, rotation, winBounds.x, winBounds.y, winBounds.width, winBounds.height);
+       SysLog(NID_UI, "[WM ROTATION][WIN 0x%x] Set rotation bounds(ROT %d, %d, %d, %d, %d).", win, rotation, winBounds.x, winBounds.y, winBounds.width, winBounds.height);
        ecore_x_e_window_rotation_geometry_set(win, rotation, winBounds.x, winBounds.y, winBounds.width, winBounds.height);
 }
 
@@ -2722,7 +2726,7 @@ _EcoreEvas::SetWindowRotationBounds(const _Window& window, int rotation, const T
        Rectangle winBounds = _CoordinateSystemUtils::ConvertToInteger(winBoundsF);
 
        Ecore_X_Window win = (Ecore_X_Window) ecore_evas_window_get(pLayer->GetEcoreEvas());
-       SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x] Set rotation bounds(rot = %d, %d, %d, %d, %d).", win, rotation, winBounds.x, winBounds.y, winBounds.width, winBounds.height);
+       SysLog(NID_UI, "[WM ROTATION][WIN 0x%x] Set rotation bounds(ROT %d, %d, %d, %d, %d).", win, rotation, winBounds.x, winBounds.y, winBounds.width, winBounds.height);
        ecore_x_e_window_rotation_geometry_set(win, rotation, winBounds.x, winBounds.y, winBounds.width, winBounds.height);
 }
 

diff --git a/src/ui/FUi_OrientationAgent.cpp b/src/ui/FUi_OrientationAgent.cpp
index 690d85a..7b677f0 100644 (file)
--- a/src/ui/FUi_OrientationAgent.cpp
+++ b/src/ui/FUi_OrientationAgent.cpp
@@ -153,7 +153,7 @@ _OrientationAgent::Update(bool draw)
        // Request rotation to window manager -> async -> Update VEs
        // Window(not rotation) -> sync -> UpdateVEs
 
-       SysLog(NID_UI, "[Window Manager Rotation] ---------- Update : START ----------");
+       SysLog(NID_UI, "[WM ROTATION][AGENT 0x%x] ---------- Update : START ----------", this);
 
        _ControlImplManager* pImplManager = _ControlImplManager::GetInstance();
        SysAssert(pImplManager);
@@ -194,7 +194,7 @@ _OrientationAgent::Update(bool draw)
                }
 
                OrientationStatus status = pImplManager->GetOrientationStatus(__mode);
-               SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x] Update : __mode(%d) -> status(%d)", handle, __mode, status);
+               SysLog(NID_UI, "[WM ROTATION][AGENT 0x%x][WIN 0x%x] Update : __mode(%d) -> status(%d)", this, handle, __mode, status);
 
                if (__updateStatus == true)
                {
@@ -251,7 +251,7 @@ _OrientationAgent::Update(bool draw)
                __draw = draw;
 //     }
 
-       SysLog(NID_UI, "[Window Manager Rotation] ---------- Update : END ----------");
+       SysLog(NID_UI, "[WM ROTATION][AGENT 0x%x] ---------- Update : END ----------", this);
 }
 
 void
@@ -263,7 +263,7 @@ _OrientationAgent::UpdateOrientation(void)
        // Update window bounds
        // Invalidate
 
-       SysLog(NID_UI, "[Window Manager Rotation] ---------- UpdateOrientation : START ----------");
+       SysLog(NID_UI, "[WM ROTATION][AGENT 0x%x] ---------- UpdateOrientation : START ----------", this);
 
        _EcoreEvas* pEcoreEvas = GetEcoreEvasMgr()->GetEcoreEvas();
        if (!pEcoreEvas)
@@ -348,9 +348,9 @@ _OrientationAgent::UpdateOrientation(void)
        pImpl->Invalidate(true);
 
        Rectangle bounds = pRootWindow->GetBounds();
-       SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x, rot = %d, %d, %d, %d, %d] Update Orientation.", pRootWindow->GetNativeHandle(), rotation, bounds.x, bounds.y, bounds.width, bounds.height);
+       SysLog(NID_UI, "[WM ROTATION][AGENT 0x%x][WIN 0x%x, ROT %d, %d, %d, %d, %d] Update Orientation.", this, pRootWindow->GetNativeHandle(), rotation, bounds.x, bounds.y, bounds.width, bounds.height);
 
-       SysLog(NID_UI, "[Window Manager Rotation] ---------- UpdateOrientation : END ----------");
+       SysLog(NID_UI, "[WM ROTATION][AGENT 0x%x] ---------- UpdateOrientation : END ----------", this);
 }
 
 void

diff --git a/src/ui/FUi_PublicOrientationEvent.cpp b/src/ui/FUi_PublicOrientationEvent.cpp
index 3973a93..216da0c 100644 (file)
--- a/src/ui/FUi_PublicOrientationEvent.cpp
+++ b/src/ui/FUi_PublicOrientationEvent.cpp
@@ -132,7 +132,7 @@ _PublicOrientationEvent::FireImpl(IEventListener& listener, const IEventArg& arg
        const _PublicOrientationEventArg* pArg = dynamic_cast <const _PublicOrientationEventArg*>(&arg);
        SysTryReturnVoidResult(NID_UI, pArg, E_INVALID_ARG, "[E_INVALID_ARG] A specified input parameter is invalid.");
 
-       SysLog(NID_UI, "[Window Manager Rotation] Fire the public orientation event with %d -> 0x%x", pArg->GetOrientationStatus(), __pSource);
+       SysLog(NID_UI, "[WM ROTATION] Fire the public orientation event with %d -> 0x%x", pArg->GetOrientationStatus(), __pSource);
 
        pEventListener->OnOrientationChanged(*__pSource, (OrientationStatus)(pArg->GetOrientationStatus()));
 

diff --git a/src/ui/FUi_Window.cpp b/src/ui/FUi_Window.cpp
index ac9160c..3d3a2d4 100644 (file)
--- a/src/ui/FUi_Window.cpp
+++ b/src/ui/FUi_Window.cpp
@@ -336,12 +336,12 @@ _Window::CreateRootVisualElement(_WindowType windowType)
 
        if (__type == _WINDOW_TYPE_MAIN)
        {
-               SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x, BASIC] Create.", GetNativeHandle());
+               SysLog(NID_UI, "[WM ROTATION][WIN 0x%x, BASIC] Create.", GetNativeHandle());
        }
        else
        {
                pEcoreEvas->SetWindowType(*this, _WINDOW_TYPE_SUB);
-               SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x, UTILITY] Create.", GetNativeHandle());
+               SysLog(NID_UI, "[WM ROTATION][WIN 0x%x, UTILITY] Create.", GetNativeHandle());
        }
 
        return E_SUCCESS;
@@ -660,7 +660,7 @@ _Window::OnWindowStateChanged(void)
        int rotation = pEcoreEvas->GetWindowRotation(*this);
 
        Rectangle winBounds = GetBounds();
-       SysLog(NID_UI, "[Window Manager Rotation][Window : 0x%x, %d, %d, %d, %d] OnWindowStateChanged : prev rot = %d, cur rot = %d", GetNativeHandle(), winBounds.x, winBounds.y, winBounds.width, winBounds.height, __rotation, rotation);
+       SysLog(NID_UI, "[WM ROTATION][WIN 0x%x, %d, %d, %d, %d] OnWindowStateChanged : prev ROT %d, cur ROT %d", GetNativeHandle(), winBounds.x, winBounds.y, winBounds.width, winBounds.height, __rotation, rotation);
 
        if (rotation == __rotation)
        {
@@ -705,7 +705,7 @@ _Window::OnWindowStateChanged(void)
        }
 
        // <3>
-       SysLog(NID_UI, "[Window Manager Rotation] ---------- Update Ownee Window : START ----------");
+       SysLog(NID_UI, "[WM ROTATION] ---------- Update Ownee Window : START ----------");
 
        _ControlOrientation controlOrientation = (rotation == 0 || rotation == 180) ? _CONTROL_ORIENTATION_PORTRAIT : _CONTROL_ORIENTATION_LANDSCAPE;
        ChangeLayout(controlOrientation, false);
@@ -734,7 +734,7 @@ _Window::OnWindowStateChanged(void)
 
        Invalidate(true);
 
-       SysLog(NID_UI, "[Window Manager Rotation] ---------- Update Ownee Window : END ----------");
+       SysLog(NID_UI, "[WM ROTATION] ---------- Update Ownee Window : END ----------");
        SetOrientationCallbackModeEnabled(false);
 }