cleanup debug log messages

Change-Id: I5b6939669a61e249b571e2ef1d41418cba8ea2f5
Signed-off-by: Masayuki Sasaki <masayuki.sasaki@mail.toyota-td.jp>

diff --git a/lib/system-controller/CicoSCCommand.cpp b/lib/system-controller/CicoSCCommand.cpp
index 358e88b..9e5d991 100644 (file)
--- a/lib/system-controller/CicoSCCommand.cpp
+++ b/lib/system-controller/CicoSCCommand.cpp
@@ -127,7 +127,7 @@ CicoSCCommand::parseMessage(const char *message)
 void
 CicoSCCommand::dump(void)
 {
-    ICO_INF("Command: cmdid=0x%08X appid=%s pid=%d", cmdid, appid.c_str(), pid);
+    ICO_INF("Command: cmdid=0x%08x appid=%s pid=%d", cmdid, appid.c_str(), pid);
     if (NULL != this->opt) {
         this->opt->dump();
     }

diff --git a/lib/system-controller/CicoSCCommand.h b/lib/system-controller/CicoSCCommand.h
index 4ac0073..1a21d55 100644 (file)
--- a/lib/system-controller/CicoSCCommand.h
+++ b/lib/system-controller/CicoSCCommand.h
@@ -63,7 +63,7 @@ public:
     void dump(void)
     {
         ICO_DBG("WinCtrlOpt: "
-                "surfaceid=%08X layerid=%d nodeid=%d zone=%s "
+                "surfaceid=%08x layerid=%d nodeid=%d zone=%s "
                 "animation=%s animaType=%x animaTime=%d "
                 "x=%d y=%d w=%d h=%d raise=%d "
                 "visible=%d active=%d framerate=%d stride=%d format=%d",
@@ -114,7 +114,7 @@ public:
     void dump(void)
     {
         ICO_DBG("InputCtrlOpt: "
-                "device=%s input=%d surfaceid=0x%08X deviceno=%d "
+                "device=%s input=%d surfaceid=%08x deviceno=%d "
                 "fix=%d keycode=%d evtype=%d evtime=%d evcode=%d evvalue=%d",
                 device.c_str(), input, surfaceid, deviceno,
                 fix, keycode, evtype, evtime, evcode, evvalue);
@@ -183,7 +183,7 @@ public:
     void dump(void)
     {
         ICO_DBG("ResCtrlOpt: "
-                "diapres=%s dispzone=%s layerid=%d winname=%s srufaceid=0x%08X "
+                "diapres=%s dispzone=%s layerid=%d winname=%s srufaceid=%08x "
                 "animation=%s animatime=%d soundres=%s soundzone=%s"
                 "soundname=%s soundid=%d adjust=%d inputres=%s "
                 "device=%s input=%d type=%d",

diff --git a/lib/system-controller/CicoSCInputController.cpp b/lib/system-controller/CicoSCInputController.cpp
index 46d1527..6f06309 100644 (file)
--- a/lib/system-controller/CicoSCInputController.cpp
+++ b/lib/system-controller/CicoSCInputController.cpp
@@ -100,7 +100,7 @@ void
 CicoSCInputController::handleCommand(const CicoSCCommand *cmd)
 {
     ICO_TRA("CicoSCInputController::handleCommand Enter"
-            "(cmdid=0x%08X)", cmd->cmdid);
+            "(cmdid=0x%08x)", cmd->cmdid);
 
     CicoSCCmdInputDevCtrlOpt *opt;
     CicoSCCmdInputDevSettingOpt *set_opt; 
@@ -129,7 +129,7 @@ CicoSCInputController::handleCommand(const CicoSCCommand *cmd)
                          set_opt->width, set_opt->height);
         break;
     default:
-        ICO_WRN("Unknown Command(0x%08X)", cmd->cmdid);
+        ICO_WRN("Unknown Command(0x%08x)", cmd->cmdid);
         break;
     }
 

diff --git a/lib/system-controller/CicoSCPolicyManager.cpp b/lib/system-controller/CicoSCPolicyManager.cpp
index abc70ea..24e3b19 100644 (file)
--- a/lib/system-controller/CicoSCPolicyManager.cpp
+++ b/lib/system-controller/CicoSCPolicyManager.cpp
@@ -468,7 +468,7 @@ bool
 CicoSCPolicyManager::acquireDisplayResource(int type, int zoneid, int priority)
 {
     ICO_TRA("CicoSCPolicyManager::acquireDisplayResource Enter"
-            "(type=0x%08X zoneid=%d priority=%d)", type, zoneid, priority);
+            "(type=0x%08x zoneid=%d priority=%d)", type, zoneid, priority);
 
     bool chg = false;
 
@@ -542,7 +542,7 @@ bool
 CicoSCPolicyManager::acquireSoundResource(int type, int zoneid, int priority)
 {
     ICO_TRA("CicoSCPolicyManager::acquireSoundResource Enter"
-            "(type=0x%08X zoneid=%d priority=%d)", type, zoneid, priority);
+            "(type=0x%08x zoneid=%d priority=%d)", type, zoneid, priority);
 
     bool chg = false;
 

diff --git a/lib/system-controller/CicoSCResourceManager.cpp b/lib/system-controller/CicoSCResourceManager.cpp
index 39e4016..9e97a1d 100644 (file)
--- a/lib/system-controller/CicoSCResourceManager.cpp
+++ b/lib/system-controller/CicoSCResourceManager.cpp
@@ -211,7 +211,7 @@ CicoSCResourceManager::handleCommand(const CicoSCCommand &cmd,
                                      bool internal)
 {
     ICO_TRA("CicoSCResourceManager::handleCommand Enter"
-            "(cmdid=0x%08X internal=%s)",
+            "(cmdid=0x%08x internal=%s)",
             cmd.cmdid, internal ? "true" : "false");
 
     CicoSCCmdResCtrlOpt *opt = (CicoSCCmdResCtrlOpt*)cmd.opt;
@@ -626,7 +626,7 @@ CicoSCResourceManager::acquireSoundResource(resource_request_t *newreq)
     // is change zone?
     CompSoundResourceRequest comp(req);
     if (true == comp(m_curSoundResReq[req->soundzoneid])) {
-        ICO_DBG("already acquired appid=%s pid=%d soundid=0x%08X",
+        ICO_DBG("already acquired appid=%s pid=%d soundid=0x%08x",
                 req->appid, req->pid, req->soundid);
         ICO_TRA("CicoSCResourceManager::acquireSoundResource Leave(true)");
         // free new request
@@ -739,7 +739,7 @@ CicoSCResourceManager::acquireInputResource(resource_request_t *newreq)
     // is change zone?
     CompInputResourceRequest comp(req);
     if (true == comp(m_curInputResReq[req->input])) {
-        ICO_DBG("already acquired appid=%s pid=%d input=0x%08X",
+        ICO_DBG("already acquired appid=%s pid=%d input=0x%08x",
                 req->appid, req->pid, req->input);
         ICO_TRA("CicoSCResourceManager::acquireInputResource Leave(true)");
         // free new request
@@ -999,7 +999,7 @@ CicoSCResourceManager::updateDisplayResource(resource_request_t *req,
     if ((m_curDispResOwerReq.end() != itr) && (NULL != itr->second)) {
         // already ower
         if (itr->second == req) {
-            ICO_DBG("already ower appid=%s pid=%d surfaceid=0x%08X",
+            ICO_DBG("already ower appid=%s pid=%d surfaceid=%08x",
                     req->appid, req->pid, req->surfaceid);
             // show request window
             m_winCtrl->show(req->surfaceid, req->animation, req->animationTime);
@@ -1751,7 +1751,7 @@ CicoSCResourceManager::updateDispResRegulationPreProc(resource_request_t *req)
     }
 
     if (req->surfaceid != surfaceid) {
-        ICO_WRN("req->surfaceid(0x%08X) != displayedsurfaceid(0x%08X)",
+        ICO_WRN("req->surfaceid(%08x) != displayedsurfaceid(%08x)",
                 req->surfaceid, surfaceid);
     }
 

diff --git a/lib/system-controller/CicoSCUserManager.cpp b/lib/system-controller/CicoSCUserManager.cpp
index e66c17a..c3a4acf 100644 (file)
--- a/lib/system-controller/CicoSCUserManager.cpp
+++ b/lib/system-controller/CicoSCUserManager.cpp
@@ -208,7 +208,7 @@ CicoSCUserManager::handleCommand(const CicoSCCommand * cmd)
         setLastInfo(cmd->appid, opt->lastinfo);
         break;
     default:
-        ICO_WRN("Unknown Command(0x%08X)", cmd->cmdid);
+        ICO_WRN("Unknown Command(0x%08x)", cmd->cmdid);
         break;
     }
 

diff --git a/lib/system-controller/CicoSCWindow.cpp b/lib/system-controller/CicoSCWindow.cpp
index 41a95f7..bb36f50 100644 (file)
--- a/lib/system-controller/CicoSCWindow.cpp
+++ b/lib/system-controller/CicoSCWindow.cpp
@@ -57,7 +57,7 @@ CicoSCWindow::~CicoSCWindow()
 void
 CicoSCWindow::dump(void)
 {
-    ICO_DBG("CicoSCWindow: surfaceid=0x%08X name=%s appid=%s pid=%d "
+    ICO_DBG("CicoSCWindow: surfaceid=%08x name=%s appid=%s pid=%d "
             "nodeid=%d displayid=%d layerid=%d zone=%s zoneid=%d "
             "subwindow=%d eventmask=%d x=%d y=%d width=%d height=%d "
             "visible=%s raise=%s active=%s",

diff --git a/lib/system-controller/CicoSCWindowController.cpp b/lib/system-controller/CicoSCWindowController.cpp
index cb0c2b5..af34d90 100644 (file)
--- a/lib/system-controller/CicoSCWindowController.cpp
+++ b/lib/system-controller/CicoSCWindowController.cpp
@@ -215,7 +215,7 @@ CicoSCWindowController::show(int        surfaceid,
         CicoSCLayer *layer = findLayer(window->displayid, window->layerid);
         if ((NULL != layer) && (layer->type == ICO_LAYER_TYPE_APPLICATION)) {
             ICO_DBG("Entry display zone[%d] current displayed window"
-                    "(0x%08X:\"%s\")",
+                    "(%08x:\"%s\")",
                     zone->zoneid, window->surfaceid, window->appid.c_str());
             zone->displayedWindow = window;
         }
@@ -358,7 +358,7 @@ CicoSCWindowController::hide(int        surfaceid,
         if ((NULL != layer) && (layer->type == ICO_LAYER_TYPE_APPLICATION) &&
             (getDisplayedWindow(zone->zoneid) == surfaceid)) {
             ICO_DBG("Exit  display zone[%d] current displayed window"
-                    "(0x%08X:\"%s\")",
+                    "(%08x:\"%s\")",
                     zone->zoneid, window->surfaceid, window->appid.c_str());
             zone->displayedWindow = NULL;
         }
@@ -738,7 +738,7 @@ CicoSCWindowController::setGeometry(int        surfaceid,
                                     int        moveAnimationTime)
 {
     ICO_TRA("CicoSCWindowController::setGeometry Enter"
-            "(surfaceid=0x%08X zone=%s layerid=%d "
+            "(surfaceid=%08x zone=%s layerid=%d "
             "resizeAnimation=%s resizeAnimationTime=%d "
             "moveAnimation=%s moveAnimationTime=%d)",
             surfaceid, zone, layerid,
@@ -792,7 +792,7 @@ CicoSCWindowController::setGeometry(int        surfaceid,
                 (layer->type == ICO_LAYER_TYPE_APPLICATION) &&
                 (getDisplayedWindow(olddispzone->zoneid) == surfaceid)) {
                 ICO_DBG("Exit display zone[%d] current displayed window"
-                        "(0x%08X:\"%s\")",
+                        "(%08x:\"%s\")",
                         olddispzone->zoneid, window->surfaceid,
                         window->appid.c_str());
                 olddispzone->displayedWindow = NULL;
@@ -802,7 +802,7 @@ CicoSCWindowController::setGeometry(int        surfaceid,
         CicoSCLayer *layer = findLayer(displayno, window->layerid);
         if ((NULL != layer) && (layer->type == ICO_LAYER_TYPE_APPLICATION)) {
             ICO_DBG("Entry display zone[%d] current displayed window"
-                    "(0x%08X:\"%s\")",
+                    "(%08x:\"%s\")",
                     dispzone->zoneid, window->surfaceid, window->appid.c_str());
             dispzone->displayedWindow = window;
         }
@@ -903,7 +903,7 @@ CicoSCWindowController::setWindowAnimation(int surfaceid, int type,
     CicoSCWindow *window = NULL;
 
     ICO_TRA("CicoSCWindowController::setWindowAnimation Enter"
-            "(surfaceid=%08X, type=%x, animation=<%s>, time=%d)",
+            "(surfaceid=%08x, type=%x, animation=<%s>, time=%d)",
             surfaceid, type, animation ? animation : "(null)", time);
 
     // find window information in window list
@@ -941,7 +941,7 @@ int
 CicoSCWindowController::setWindowLayer(int surfaceid, int layerid)
 {
     ICO_TRA("CicoSCWindowController::setWindowLayer Enter"
-            "(surfaceid=0x%08X layerid=%x)", surfaceid, layerid);
+            "(surfaceid=%08x layerid=%x)", surfaceid, layerid);
 
     // find window information in window list
     CicoSCWindow* window = findWindow(surfaceid);
@@ -1112,7 +1112,7 @@ CicoSCWindowController::active(int surfaceid, int target)
     CicoSCWindow *window = NULL;
 
     ICO_TRA("CicoSCWindowController::active Enter"
-            "(surfaceid=0x%08X, target=%08X)", surfaceid, target);
+            "(surfaceid=%08x, target=%08x)", surfaceid, target);
 
     // find window information in window list
     if (surfaceid) {
@@ -1201,7 +1201,7 @@ CicoSCWindowController::setmapGet(int surfaceid, const char *filepath)
 int
 CicoSCWindowController::mapSurface(int surfaceid, int framerate, const char *filepath)
 {
-    ICO_TRA("CicoSCWindowController::mapSurface Enter(0x%08x,%d,%s)",
+    ICO_TRA("CicoSCWindowController::mapSurface Enter(%08x,%d,%s)",
             surfaceid, framerate, filepath ? filepath : "(null)");
 
     // find window information in window list
@@ -1234,7 +1234,7 @@ CicoSCWindowController::mapSurface(int surfaceid, int framerate, const char *fil
 int
 CicoSCWindowController::unmapSurface(int surfaceid)
 {
-    ICO_TRA("CicoSCWindowController::unmapSurface Enter(0x%08x)", surfaceid);
+    ICO_TRA("CicoSCWindowController::unmapSurface Enter(%08x)", surfaceid);
 
     // find window information in window list
     CicoSCWindow *window = findWindow(surfaceid);
@@ -1290,7 +1290,7 @@ int
 CicoSCWindowController::setAttributes(int surfaceid)
 {
     ICO_TRA("CicoSCWindowController::setAttributes Enter"
-            "(surfaceid=0x%08X)", surfaceid);
+            "(surfaceid=%08x)", surfaceid);
 
     // find window information in window list
     CicoSCWindow *window = findWindow(surfaceid);
@@ -1346,7 +1346,7 @@ CicoSCWindowController::activeCB(void                  *data,
                                  int32_t               select)
 {
     ICO_TRA("CicoSCWindowController::activeCB Enter"
-            "(surfaceid=0x%08X select=%d)", surfaceid, select);
+            "(surfaceid=%08x select=%d)", surfaceid, select);
 
     CicoSCWindow *window = findWindow(surfaceid);
     if (NULL == window) {
@@ -1776,7 +1776,7 @@ CicoSCWindowController::createSurfaceCB(void *data,
     struct ilmSurfaceProperties SurfaceProperties;
 
     ICO_TRA("CicoSCWindowController::createSurfaceCB Enter"
-            "(surfaceid=0x%08x)", id_surface);
+            "(surfaceid=%08x)", id_surface);
 
     if (ilm_getPropertiesOfSurface(id_surface, &SurfaceProperties) != ILM_SUCCESS)  {
         ICO_ERR("CicoSCWindowController::createSurfaceCB: ilm_getPropertiesOfSurface(%x) Error",
@@ -2170,7 +2170,7 @@ CicoSCWindowController::findWindow(int surfaceid)
     map<unsigned int, CicoSCWindow*>::iterator itr;
     itr = m_windowList.find(surfaceid);
     if (m_windowList.end() == itr) {
-        ICO_TRA("not found window object. surfaceid=0x%08X", surfaceid);
+        ICO_TRA("not found window object. surfaceid=%08x", surfaceid);
         return NULL;
     }
 
@@ -2321,7 +2321,7 @@ CicoSCWindowController::handleCommand(const CicoSCCommand * cmd)
         (void)hideLayer(opt->displayid, opt->layerid);
         break;
     default:
-        ICO_WRN("command: Unknown(0x%08X)", cmd->cmdid);
+        ICO_WRN("command: Unknown(0x%08x)", cmd->cmdid);
         break;
     }
 
@@ -2336,7 +2336,7 @@ CicoSCWindowController::notifyResourceManager(int        surfaceid,
                                               int        animationTime)
 {
     ICO_TRA("CicoSCWindowController::notifyResourceManager Enter"
-            "(surfaceid=0x%08X zone=%s layerid=%d "
+            "(surfaceid=%08x zone=%s layerid=%d "
             "animation=%s animationTime=%d)",
             surfaceid, zone, layerid, animation, animationTime);
 

diff --git a/lib/system-controller/CicoSCWlWinMgrIF.cpp b/lib/system-controller/CicoSCWlWinMgrIF.cpp
index e0bfce4..60698a2 100644 (file)
--- a/lib/system-controller/CicoSCWlWinMgrIF.cpp
+++ b/lib/system-controller/CicoSCWlWinMgrIF.cpp
@@ -202,7 +202,7 @@ CicoSCWlWinMgrIF::setWindowLayer(uint32_t surfaceid, uint32_t layer, uint32_t ol
 {
     // set window layer request to Multi Window Manager
     ICO_DBG("CicoSCWlWinMgrIF::setWindowLayer: "
-            "surfaceid=0x%08X layer=%d->%d", surfaceid, oldlayer, layer);
+            "surfaceid=%08x layer=%d->%d", surfaceid, oldlayer, layer);
 
     if (oldlayer == layer)  {
         ICO_DBG("CicoSCWlWinMgrIF::setWindowLayer: new layer same as old, NOP");
@@ -255,7 +255,7 @@ CicoSCWlWinMgrIF::setPositionsize(uint32_t surfaceid, uint32_t node,
 {
     // set position size request to Multi Window Manager
     ICO_DBG("called: ilm_surfaceSetDestinationRectangle"
-            "(surfaceid=0x%08X node=%d x=%d y=%d w=%d h=%d)",
+            "(surfaceid=%08x node=%d x=%d y=%d w=%d h=%d)",
             surfaceid, node, x, y, width, height);
 
     if (ilm_surfaceSetDestinationRectangle(surfaceid, x, y, width, height)
@@ -285,7 +285,7 @@ void
 CicoSCWlWinMgrIF::setVisible(uint32_t surfaceid, int32_t visible)
 {
     // set visible request to Multi Window Manager
-    ICO_DBG("called: ilm_surfaceSetVisibility(surfaceid=0x%08X visible=%d)",
+    ICO_DBG("called: ilm_surfaceSetVisibility(surfaceid=%08x visible=%d)",
             surfaceid, visible);
     if ((visible == ICO_SYC_WIN_VISIBLE_SHOW) || (visible == ICO_SYC_WIN_VISIBLE_HIDE)) {
         ilm_surfaceSetVisibility(surfaceid, visible);
@@ -310,7 +310,7 @@ CicoSCWlWinMgrIF::setAnimation(uint32_t surfaceid, int32_t type,
                                const char *animation, int32_t time)
 {
     ICO_DBG("called: ico_window_mgr_set_animation"
-            "(surfaceid=0x%08X type=%d anima=%s time=%d)",
+            "(surfaceid=%08x type=%d anima=%s time=%d)",
             surfaceid, type, animation, time);
     ico_window_mgr_set_animation(m_winmgr, surfaceid, type, animation, time);
     // need wayland flush for GENIVI layer management
@@ -329,7 +329,7 @@ void
 CicoSCWlWinMgrIF::setActive(uint32_t surfaceid, int32_t active)
 {
     ICO_DBG("called: ilm_SetKeyboardFocusOn"
-            "(surfaceid=0x%08X active=%d)", surfaceid, active);
+            "(surfaceid=%08x active=%d)", surfaceid, active);
     if ((ilm_SetKeyboardFocusOn(surfaceid) != ILM_SUCCESS) ||
         (ilm_commitChanges() != ILM_SUCCESS))   {
         ICO_ERR("CicoSCWlWinMgrIF::setActive ilm_SetKeyboardFocusOn(%08x) Error", surfaceid);
@@ -368,7 +368,7 @@ CicoSCWlWinMgrIF::setLayerVisible(uint32_t layer, int32_t visible)
 void
 CicoSCWlWinMgrIF::setmapGet(int surfaceid, const char *filepath)
 {
-    ICO_DBG("called: ilm_takeSurfaceScreenshot(filepath=%s,, surface=0x%08x)",
+    ICO_DBG("called: ilm_takeSurfaceScreenshot(filepath=%s,, surface=%08x)",
             filepath ? filepath : "(null)", surfaceid);
     if ((ilm_takeSurfaceScreenshot(filepath, surfaceid) != ILM_SUCCESS) ||
         (ilm_commitChanges() != ILM_SUCCESS))   {
@@ -389,7 +389,7 @@ CicoSCWlWinMgrIF::setmapGet(int surfaceid, const char *filepath)
 void
 CicoSCWlWinMgrIF::mapSurface(uint32_t surfaceid, int32_t framerate, const char *filepath)
 {
-    ICO_DBG("called: ico_window_mgr_map_surface(surfaceid=0x%08X framerate=%d file=%s)",
+    ICO_DBG("called: ico_window_mgr_map_surface(surfaceid=%08x framerate=%d file=%s)",
             surfaceid, framerate, filepath ? filepath : "(null)");
     // currently GENIVI genivi-shell not support contents change, so use ico_window_mgr
     if ((filepath != NULL) && (*filepath != 0) && (*filepath != ' '))   {
@@ -411,7 +411,7 @@ void
 CicoSCWlWinMgrIF::unmapSurface(uint32_t surfaceid)
 {
     ICO_DBG("called: ico_window_mgr_unmap_surface"
-            "(surfaceid=0x%08X)", surfaceid);
+            "(surfaceid=%08x)", surfaceid);
     // currently GENIVI genivi-shell not support contents change, so use ico_window_mgr
     ico_window_mgr_unmap_surface(m_winmgr, surfaceid);
 }

diff --git a/src/homescreen/CicoHSAppControl.cpp b/src/homescreen/CicoHSAppControl.cpp
index cad7f3c..56a66b8 100644 (file)
--- a/src/homescreen/CicoHSAppControl.cpp
+++ b/src/homescreen/CicoHSAppControl.cpp
@@ -119,7 +119,7 @@ CicoHSAppControl::handleCommand(const CicoHSCommand * cmd)
         WinChgControl(opt->arg);
         break;
     default:
-        ICO_WRN("Unknown Command(0x%08X)", cmd->cmdid);
+        ICO_WRN("Unknown Command(0x%08x)", cmd->cmdid);
         break;
     }
     ICO_TRA("CicoHSAppControl::handleCommand Leave");

diff --git a/src/homescreen/CicoHSCommand.cpp b/src/homescreen/CicoHSCommand.cpp
index 688d520..458a1be 100644 (file)
--- a/src/homescreen/CicoHSCommand.cpp
+++ b/src/homescreen/CicoHSCommand.cpp
@@ -118,7 +118,7 @@ CicoHSCommand::parseMessage(const char *message)
 void
 CicoHSCommand::dump(void)
 {
-    ICO_INF("Command: cmdid=0x%08X appid=%s pid=%d seq_no=%d", cmdid, appid.c_str(), pid, seq_no);
+    ICO_INF("Command: cmdid=0x%08x appid=%s pid=%d seq_no=%d", cmdid, appid.c_str(), pid, seq_no);
 
     if (NULL != this->opt) {
 //        this->opt->dump(); 

diff --git a/src/homescreen/CicoHSSwipeTouch.cpp b/src/homescreen/CicoHSSwipeTouch.cpp
index b23b318..5e83791 100644 (file)
--- a/src/homescreen/CicoHSSwipeTouch.cpp
+++ b/src/homescreen/CicoHSSwipeTouch.cpp
@@ -443,15 +443,10 @@ CicoHSSwipeTouch::TouchMoveSwipe(void *data, Evas *evas, Evas_Object *obj, void
         touch_state_b_y = touch_state_a_y;
         ICO_DBG("TouchMoveSwipe: save x/y=%d/%d", touch_state_b_x, touch_state_b_y);
     }
-
+#if 0       /* too many log */
     ICO_DBG("TouchMoveSwipe: Swipe Move (%d,%d)->(%d,%d) Button=%x",
             info->cur.output.x, info->cur.output.y,
             touch_state_a_x, touch_state_a_y, info->buttons);
-
-    /* long push    */
-    if(touch_down == 0) {
-        ICO_DBG("TouchMoveSwipe: no TouchDown, Skip");
-        return;
-    }
+#endif
 }
 // vim: set expandtab ts=4 sw=4:

diff --git a/src/homescreen/CicoHSSwipeTouch.h b/src/homescreen/CicoHSSwipeTouch.h
index e1665ef..553c757 100644 (file)
--- a/src/homescreen/CicoHSSwipeTouch.h
+++ b/src/homescreen/CicoHSSwipeTouch.h
@@ -25,11 +25,9 @@
 
 #define ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH 80
 #define ICO_HS_SWIPE_TOUCH_SWIPE_HEIGHT 80
-#define ICO_HS_SWIPE_TOUCH_DISTANCE_XY1 80
+#define ICO_HS_SWIPE_TOUCH_DISTANCE_XY1 (-40)
 #define ICO_HS_SWIPE_TOUCH_DISTANCE_XY2 100
-#define ICO_HS_SWIPE_TOUCH_SWIPE_THREASHOLD_DISTANCE 80
-#define ICO_HS_SWIPE_TOUCH_SWIPE_THREASHOLD_MOVE_Y 80
-#define ICO_HS_SWIPE_TOUCH_LONG_PUSH_THREASHOLD_TIME_SECONDS 2.0d
+#define ICO_HS_SWIPE_TOUCH_SWIPE_THREASHOLD_DISTANCE 60
 #define ICO_HS_SWIPE_TOUCH_SWIPE_ANIMA_TIME 300
 
 #define ICO_HS_MAX_SWIPEWINDOWS 4

diff --git a/src/homescreen/CicoHomeScreen.cpp b/src/homescreen/CicoHomeScreen.cpp
index 62d2aff..5121767 100644 (file)
--- a/src/homescreen/CicoHomeScreen.cpp
+++ b/src/homescreen/CicoHomeScreen.cpp
@@ -804,7 +804,7 @@ CicoHomeScreen::EventCallBack(const ico_syc_ev_e event,
     if (event == ICO_SYC_EV_WIN_CREATE) {
         ico_syc_win_info_t *win_info =
             reinterpret_cast<ico_syc_win_info_t*>(const_cast<void*>(detail));
-        ICO_DBG("Event:ICO_SYC_EV_WIN_CREATE(appid=%s surface=0x%08x)",
+        ICO_DBG("Event:ICO_SYC_EV_WIN_CREATE(appid=%s surface=%08x)",
                 win_info->appid, win_info->surface);
         /*only save information*/
         if (strncmp(win_info->appid, hs_instance->GetHsPackageName(),
@@ -896,7 +896,7 @@ CicoHomeScreen::EventCallBack(const ico_syc_ev_e event,
     else if (event == ICO_SYC_EV_WIN_NAME) {
         ico_syc_win_info_t *win_info =
             reinterpret_cast<ico_syc_win_info_t*>(const_cast<void*>(detail));
-        ICO_DBG("Event:ICO_SYC_EV_WIN_NAME(appid=%s surface=0x%08x name=%s)",
+        ICO_DBG("Event:ICO_SYC_EV_WIN_NAME(appid=%s surface=%08x name=%s)",
                 win_info->appid, win_info->surface, win_info->name);
 
         if (strncmp(win_info->appid, hs_instance->GetHsPackageName(),
@@ -952,7 +952,7 @@ CicoHomeScreen::EventCallBack(const ico_syc_ev_e event,
     else if (event == ICO_SYC_EV_WIN_DESTROY) {
         ico_syc_win_info_t *win_info =
             reinterpret_cast<ico_syc_win_info_t*>(const_cast<void*>(detail));
-        ICO_DBG("Event:ICO_SYC_EV_WIN_DESTROY(appid=%s surface=0x%08x)",
+        ICO_DBG("Event:ICO_SYC_EV_WIN_DESTROY(appid=%s surface=%08x)",
                 win_info->appid, win_info->surface);
         /*only save information*/
         if (strncmp(win_info->appid, hs_instance->GetHsPackageName(),
@@ -995,14 +995,14 @@ CicoHomeScreen::EventCallBack(const ico_syc_ev_e event,
     else if (event == ICO_SYC_EV_WIN_ACTIVE) {
         ico_syc_win_info_t *win_info =
             reinterpret_cast<ico_syc_win_info_t*>(const_cast<void*>(detail));
-        ICO_DBG("Event:ICO_SYC_EV_WIN_ACTIVE(appid=%s surface=0x%08x)",
+        ICO_DBG("Event:ICO_SYC_EV_WIN_ACTIVE(appid=%s surface=%08x)",
                 win_info->appid, win_info->surface);
         hs_instance->ChangeActive(win_info->appid, win_info->surface);
     }
     else if (event == ICO_SYC_EV_WIN_ATTR_CHANGE)   {
         ico_syc_win_attr_t *win_attr =
             reinterpret_cast<ico_syc_win_attr_t*>(const_cast<void*>(detail));
-        ICO_DBG("Event:ICO_SYC_EV_WIN_ATTR_CHANGE(appid=%s surface=0x%08x)",
+        ICO_DBG("Event:ICO_SYC_EV_WIN_ATTR_CHANGE(appid=%s surface=%08x)",
                 win_attr->appid, win_attr->surface);
         if (strncmp(win_attr->appid, hs_instance->GetHsPackageName(),
                     ICO_HS_MAX_PROCESS_NAME) == 0)  {
@@ -1544,7 +1544,8 @@ CicoHomeScreen::CreateSwipeInputWindow(void)
             CreateSwipeInputWindow(ICO_HS_WINDOW_POS_X,
                                    full_height / 2 + ICO_HS_SWIPE_TOUCH_DISTANCE_XY1,
                                    ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH,
-                                   full_height / 2 - (ICO_HS_SWIPE_TOUCH_DISTANCE_XY2*2),
+                                   full_height / 2 - ICO_HS_SWIPE_TOUCH_DISTANCE_XY1
+                                                   - ICO_HS_SWIPE_TOUCH_DISTANCE_XY2,
                                    "left");
     swipe_input_windows[0]->ShowWindow();
 
@@ -1554,7 +1555,8 @@ CicoHomeScreen::CreateSwipeInputWindow(void)
             CreateSwipeInputWindow(full_width - ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH,
                                    full_height / 2 + ICO_HS_SWIPE_TOUCH_DISTANCE_XY1,
                                    ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH,
-                                   full_height / 2 - (ICO_HS_SWIPE_TOUCH_DISTANCE_XY2*2),
+                                   full_height / 2 - ICO_HS_SWIPE_TOUCH_DISTANCE_XY1
+                                                   - ICO_HS_SWIPE_TOUCH_DISTANCE_XY2,
                                    "right");
     swipe_input_windows[1]->ShowWindow();