Change of the application thubnail indication of the menu screen and Correction with... 99/8799/3 submit/tizen/20130828.211623
authorNakamura Hayato <hayato.nakamura@mail.toyota-td.jp>
Tue, 27 Aug 2013 07:57:08 +0000 (16:57 +0900)
committerNakamura Hayato <hayato.nakamura@mail.toyota-td.jp>
Tue, 27 Aug 2013 10:31:15 +0000 (19:31 +0900)
Change-Id: Ica828cc4013b52239984948941fb34c6455b62b5
Signed-off-by: Nakamura Hayato <hayato.nakamura@mail.toyota-td.jp>
16 files changed:
apps_controller/ico_syc_apc_control.c
configure.ac
ico-app-framework/ico_uxf_conf_sys.c
ico-app-framework/ico_uxf_init.c
ico-app-framework/ico_uxf_launcher.c
ico-app-framework/ico_uxf_private.h
ico-app-framework/ico_uxf_window.c
include/ico_uxf_proto.h
kill_homescreen
packaging/ico-uxf-homescreen.changes
packaging/ico-uxf-homescreen.spec
res/config/system.conf.VERTICAL [new file with mode: 0644]
src/home_screen_main.c
src/on_screen.c
src/status_bar.c
start_homescreen

index 8c739f7..4a1d9f9 100644 (file)
@@ -2840,7 +2840,6 @@ ico_syc_apc_init(ico_apc_resource_control_t display, ico_apc_resource_control_t
     if (ret != ICO_APF_E_NONE)  {
         ico_apps_controller_init = 0;
         apfw_error("ico_syc_apc_init: Leave(ico_apf_ecore_init_server Error<%d>)", ret);
-        return ICO_SYC_ENOSYS;
     }
 
     /* regist callback for application resource request */
@@ -2850,7 +2849,6 @@ ico_syc_apc_init(ico_apc_resource_control_t display, ico_apc_resource_control_t
         apfw_error("ico_syc_apc_init: Leave(ico_apf_resource_set_event_cb Error<%d>)",
                    ret);
         ico_apf_resource_term_server();
-        return ICO_SYC_ENOSYS;
     }
 
     /* initialize regulation controller    */
@@ -2860,7 +2858,6 @@ ico_syc_apc_init(ico_apc_resource_control_t display, ico_apc_resource_control_t
         apfw_error("ico_syc_apc_init: Leave(ico_syc_apc_regulation_init Error<%d>)",
                    ret);
         ico_apf_resource_term_server();
-        return ICO_SYC_ENOSYS;
     }
 
     ico_syc_apc_regulation_listener(regulation_listener, NULL);
@@ -2878,7 +2875,6 @@ ico_syc_apc_init(ico_apc_resource_control_t display, ico_apc_resource_control_t
     if (ret != ICO_APF_RESOURCE_E_NONE) {
         apfw_error("ico_syc_apc_init: Leave(ico_apf_resource_send_to_soundctl Error<%d>)",
                    ret);
-        return ICO_SYC_ENOSYS;
     }
 
     apfw_trace("ico_syc_apc_init: Leave(EOK)");
index 3335906..9092a04 100644 (file)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([org.tizen.ico.homescreen], [0.7.01], [])
+AC_INIT([org.tizen.ico.homescreen], [0.7.03], [])
 AM_INIT_AUTOMAKE([foreign 1.11])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS([config.h])
index 3f9f3e1..b7413c0 100644 (file)
@@ -345,7 +345,7 @@ reloadSysConfig(void)
                                 ico_uxf_conf_appendStr(key,".priority"), &error);
         ico_uxf_conf_checkGerror(&error);
 
-        apfw_trace("Categry.%d id = %d name = %s view = %d sound = %d input = %d prio = %d",
+        apfw_trace("Categry.%d id=%d name=%s view=%d sound=%d input=%d prio=%d",
                    i, _ico_sys_config->category[i].id, _ico_sys_config->category[i].name,
                    _ico_sys_config->category[i].view, _ico_sys_config->category[i].sound,
                    _ico_sys_config->category[i].input,
@@ -396,7 +396,7 @@ reloadSysConfig(void)
             g_key_file_free(keyfile);
             return NULL;
         }
-        apfw_trace("Kind.%d id = %d name = %s privilege = %d",
+        apfw_trace("Kind.%d id=%d name=%s privilege=%d",
                    i, _ico_sys_config->kind[i].id, _ico_sys_config->kind[i].name,
                    _ico_sys_config->kind[i].priv);
     }
@@ -446,7 +446,7 @@ reloadSysConfig(void)
             g_key_file_get_string(keyfile, g,
                                   ico_uxf_conf_appendStr(key, ".homescreen"), &error);
         ico_uxf_conf_checkGerror(&error);
-        apfw_trace("Host.%d: Id = %d Name = %s Type = %d Ip = %s HomeScreen = %s",
+        apfw_trace("Host.%d: Id=%d Name=%s Type=%d Ip=%s HomeScreen=%s",
             i, _ico_sys_config->host[i].id, (char *)_ico_sys_config->host[i].name,
             _ico_sys_config->host[i].type, (char *)_ico_sys_config->host[i].address,
             _ico_sys_config->host[i].homescreen);
@@ -640,7 +640,7 @@ reloadSysConfig(void)
             g_key_file_get_integer(keyfile,g,ico_uxf_conf_appendStr(key,".inch"),&error);
         ico_uxf_conf_checkGerror(&error);
 
-        apfw_trace("Display.%d Id = %d Name = %s Host = %d DispNo = %d W/H = %d/%d Wayland = %s inch = %d",
+        apfw_trace("Display.%d Id=%d Name=%s Host=%d DispNo=%d W/H=%d/%d Wayland=%s inch=%d",
                    i, display->id, (char *)display->name, display->hostId,
                    display->displayno, display->width, display->height,
                    display->wayland, display->inch);
@@ -675,7 +675,7 @@ reloadSysConfig(void)
                         display->layer[j].menuoverlap = 1;
                     }
                 }
-                apfw_trace("Display.%d Layer.%d id = %d name = %s overlap=%d", i, j,
+                apfw_trace("Display.%d Layer.%d id=%d name=%s overlap=%d", i, j,
                            display->layer[j].id, display->layer[j].name,
                            display->layer[j].menuoverlap);
             }
@@ -801,7 +801,7 @@ reloadSysConfig(void)
             g_clear_error(&error);
         }
 
-        apfw_trace("Sound.%d Id = %d Name = %s Host = %d SoundNo = %d",
+        apfw_trace("Sound.%d Id=%d Name=%s Host=%d SoundNo=%d",
                    i, sound->id, (char *)sound->name, sound->hostId, sound->soundno);
 
         /* sound zone           */
@@ -870,7 +870,7 @@ reloadSysConfig(void)
         for (j = 0; j < sound_length; j++)  {
             if (zonelists[j])   g_strfreev(zonelists[j]);
             zone = &(sound->zone[j]);
-            apfw_trace("Sound.%d zone.%d(%s) over = %d.%d %d %d %d %d",
+            apfw_trace("Sound.%d zone.%d(%s) over=%d.%d %d %d %d %d",
                        i, j, zone->name,
                        zone->overlapNum, zone->overlap[0], zone->overlap[1],
                        zone->overlap[2], zone->overlap[3], zone->overlap[4]);
@@ -928,7 +928,7 @@ reloadSysConfig(void)
                 }
             }
             g_strfreev(swlist);
-            uifw_trace("Input %s.%s app = %s key=%d",
+            uifw_trace("Input %s.%s app=%s key=%d",
                        inputdev->name,
                        inputdev->inputsw[j].name ? inputdev->inputsw[j].name : " ",
                        inputdev->inputsw[j].appid ? inputdev->inputsw[j].appid : " ",
@@ -967,8 +967,8 @@ reloadSysConfig(void)
                         g_key_file_get_string(keyfile, "default", "inputsw", &error));
     ico_uxf_conf_checkGerror(&error);
 
-    apfw_trace("Default host = %d kind = %d category = %d disp = %d layer = %d dispzone = %d "
-               "sound = %d soundzone = %d input = %d/%d",
+    apfw_trace("Default host=%d kind=%d category=%d disp=%d layer=%d dispzone=%d "
+               "sound=%d soundzone=%d input=%d/%d",
                _ico_sys_config->misc.default_hostId,
                _ico_sys_config->misc.default_kindId,
                _ico_sys_config->misc.default_categoryId,
index af3c964..3b2fc10 100644 (file)
@@ -874,8 +874,12 @@ ico_uxf_window_createdcb(void *data, struct ico_window_mgr *ico_window_mgr,
     uifw_trace("ico_uxf_window_createdcb: Enter(surf=%08x name=%s pid=%d appid=%s myapp=%s)",
                (int)surfaceid, winname, pid, appid, gIco_Uxf_Api_Mng.MyProcess);
 
-    prc = ico_uxf_mng_process(appid, 0);
+    prc = ico_uxf_mng_process_find(appid, pid);
     if (prc)    {
+        /* set window(surface) attrinutes   */
+        ico_window_mgr_set_attributes(gIco_Uxf_Api_Mng.Wayland_WindowMgr, surfaceid,
+                                      ICO_WINDOW_MGR_ATTR_FIXED_ASPECT);
+
         /* set window animation     */
         if (prc->appconf != NULL)   {
             if (((Ico_Uxf_conf_application *)prc->appconf)->animation)  {
@@ -897,7 +901,7 @@ ico_uxf_window_createdcb(void *data, struct ico_window_mgr *ico_window_mgr,
         if (prc->attr.mainwin.window <= 0)  {
             uifw_trace("ico_uxf_window_createdcb: Set Main Window, Config Data");
             prc->attr.mainwin.window = surfaceid;
-            ico_uxf_create_window(surfaceid, appid, prc->attr.mainwin.node,
+            ico_uxf_create_window(surfaceid, prc->attr.process, prc->attr.mainwin.node,
                                   prc->attr.mainwin.layer, prc->attr.mainwin.x,
                                   prc->attr.mainwin.y, prc->attr.mainwin.w,
                                   prc->attr.mainwin.h);
@@ -908,7 +912,7 @@ ico_uxf_window_createdcb(void *data, struct ico_window_mgr *ico_window_mgr,
         }
         else    {
             uifw_trace("ico_uxf_window_createdcb: Sub Window, Dummy Data");
-            ico_uxf_create_window(surfaceid, appid, prc->attr.mainwin.node,
+            ico_uxf_create_window(surfaceid, prc->attr.process, prc->attr.mainwin.node,
                                   prc->attr.mainwin.layer, ICO_UXF_MAX_COORDINATE,
                                   ICO_UXF_MAX_COORDINATE, 1, 1);
             ppwin = (Ico_Uxf_Mng_ProcWin *)malloc(sizeof(Ico_Uxf_Mng_ProcWin));
@@ -1734,8 +1738,7 @@ ico_uxf_timer_wake(const int msec)
                                                    ICO_WINDOW_MGR_VISIBLE_SHOW,
                                                    ICO_WINDOW_MGR_V_NOCHANGE,
                                                    (proc->showmode != 0) ?
-                                                     ICO_WINDOW_MGR_ANIMATION_ANIMATION :
-                                                     ICO_WINDOW_MGR_ANIMATION_NOANIMATION);
+                                                     ICO_WINDOW_MGR_FLAGS_ANIMATION : 0);
                         wl_display_flush(gIco_Uxf_Api_Mng.Wayland_Display);
                     }
                 }
@@ -2126,7 +2129,7 @@ ico_uxf_mng_process(const char *process, const int create)
     hash = ICO_UXF_MISC_HASHBYNAME(process);
     p = gIco_Uxf_Api_Mng.Hash_ProcessId[hash];
     while (p)  {
-        if(strncmp(p->attr.process, process, ICO_UXF_MAX_PROCESS_NAME) == 0) break;
+        if (strncmp(p->attr.process, process, ICO_UXF_MAX_PROCESS_NAME) == 0)   break;
         plast = p;
         p = p->nextidhash;
     }
@@ -2152,6 +2155,35 @@ ico_uxf_mng_process(const char *process, const int create)
 
 /*--------------------------------------------------------------------------*/
 /**
+ * @brief   ico_uxf_mng_process_find: get process management table(internal function)
+ *
+ * @param[in]   process     application Id
+ * @param[in]   pid         processid
+ * @return      process management table address
+ * @retval      !=NULL      process management table address
+ * @retval      ==NULL      process dose not exist(parameter 'create' only 0)
+ */
+/*--------------------------------------------------------------------------*/
+Ico_Uxf_Mng_Process *
+ico_uxf_mng_process_find(const char *process, const int pid)
+{
+    Ico_Uxf_Mng_Process *p;
+    int                 hash;
+
+    for (hash = 0; hash < ICO_UXF_MISC_HASHSIZE; hash++) {
+        p = gIco_Uxf_Api_Mng.Hash_ProcessId[hash];
+        while (p)   {
+            if (p->attr.internalid == pid)              break;
+            if (strcmp(p->attr.process, process) == 0)  break;
+            p = p->nextidhash;
+        }
+        if (p) break;
+    }
+    return p;
+}
+
+/*--------------------------------------------------------------------------*/
+/**
  * @brief   ico_uxf_update_procwin: update a process management table
  *
  * @param[in]   appid       application id
index 117e2d7..58c19b8 100644 (file)
@@ -65,7 +65,7 @@ ico_uxf_process_execute(const char *name)
     }
 
     if (! proc) {
-        uifw_warn("ico_uxf_process_execute: Leave(ENOENT)");
+        uifw_warn("ico_uxf_process_execute: Leave(%s ENOENT)", name);
         return ICO_UXF_ENOENT;
     }
 
@@ -73,7 +73,7 @@ ico_uxf_process_execute(const char *name)
 
     if (proc->attr.status != ICO_UXF_PROCSTATUS_STOP)   {
         ico_uxf_leave_critical();           /* leave critical section           */
-        uifw_warn("ico_uxf_process_execute: Leave(EBUSY)");
+        uifw_warn("ico_uxf_process_execute: Leave(%s EBUSY)", name);
         return ICO_UXF_EBUSY;
     }
 
@@ -84,8 +84,8 @@ ico_uxf_process_execute(const char *name)
     /* execute program                      */
     proc->attr.internalid = aul_launch_app(name , NULL);
     if (proc->attr.internalid < 0)  {
-        uifw_error("ico_uxf_process_execute: Leave(ENOSYS), Launch App Error(%d)",
-                   proc->attr.internalid);
+        uifw_error("ico_uxf_process_execute: Leave(%s ENOSYS), Launch App Error(%d)",
+                   name, proc->attr.internalid);
         proc->attr.status = ICO_UXF_PROCSTATUS_STOP;
         return ICO_UXF_ENOSYS;
     }
index 6963166..1d4f734 100644 (file)
@@ -188,6 +188,8 @@ Ico_Uxf_Mng_Window *ico_uxf_mng_window(const int window, const int create);
                                             /* get a window management table        */
 Ico_Uxf_Mng_Process *ico_uxf_mng_process(const char *process, const int create);
                                             /* get a process management table       */
+Ico_Uxf_Mng_Process *ico_uxf_mng_process_find(const char *process, const int pid);
+                                            /* get a process management table       */
 void ico_uxf_update_procwin(const char *appid, int type);
                                             /* update a process management table    */
 void ico_uxf_free_procwin(Ico_Uxf_Mng_Process *prc);
index 82343a2..2fc21ec 100644 (file)
@@ -64,8 +64,7 @@ ico_uxf_window_visible_control(Ico_Uxf_Mng_Window *winmng, const int show, const
                     (raise == ICO_WINDOW_MGR_RAISE_LOWER))  {
                     ico_window_mgr_set_visible(gIco_Uxf_Api_Mng.Wayland_WindowMgr,
                                                winmng->attr.window,
-                                               ICO_WINDOW_MGR_V_NOCHANGE, raise,
-                                               ICO_WINDOW_MGR_ANIMATION_NOANIMATION);
+                                               ICO_WINDOW_MGR_V_NOCHANGE, raise, 0);
                     if ((show & 0x00010000) == 0)   {
                         wl_display_flush(gIco_Uxf_Api_Mng.Wayland_Display);
                     }
@@ -83,8 +82,7 @@ ico_uxf_window_visible_control(Ico_Uxf_Mng_Window *winmng, const int show, const
     ico_window_mgr_set_visible(gIco_Uxf_Api_Mng.Wayland_WindowMgr,
                                winmng->attr.window, showshow & (~ICO_UXF_WITHANIMA), raise,
                                (showshow & ICO_UXF_WITHANIMA) ?
-                                 ICO_WINDOW_MGR_ANIMATION_ANIMATION :
-                                 ICO_WINDOW_MGR_ANIMATION_NOANIMATION);
+                                 ICO_WINDOW_MGR_FLAGS_ANIMATION : 0);
     if ((show & 0x00010000) == 0)   {
         wl_display_flush(gIco_Uxf_Api_Mng.Wayland_Display);
     }
@@ -194,11 +192,12 @@ ico_uxf_layer_visible(const int display, const int layer, const int visible)
 
 /*--------------------------------------------------------------------------*/
 /**
- * @brief   ico_uxf_window_resize: resize window(surface) size
+ * @brief   ico_uxf_window_resize_flag: resize window(surface) size
  *
  * @param[in]   window          window Id(same as ico_window_mgr surface Id)
  * @param[in]   w               window width
  * @param[in]   h               window height
+ * @param[in]   flag            0=send resize event to client/1=no send
  * @return      result
  * @retval      ICO_UXF_EOK     success
  * @retval      ICO_UXF_ESRCH   error(not initialized)
@@ -206,11 +205,11 @@ ico_uxf_layer_visible(const int display, const int layer, const int visible)
  */
 /*--------------------------------------------------------------------------*/
 ICO_APF_API int
-ico_uxf_window_resize(const int window, const int w, const int h)
+ico_uxf_window_resize_flag(const int window, const int w, const int h, const int flag)
 {
     Ico_Uxf_Mng_Window  *winmng;
 
-    uifw_trace("ico_uxf_window_resize: Enter(%08x,%d,%d)", window, w, h);
+    uifw_trace("ico_uxf_window_resize: Enter(%08x,%d,%d,%d)", window, w, h, flag);
 
     if (gIco_Uxf_Api_Mng.Initialized <= 0) {
         uifw_warn("ico_uxf_window_resize: Leave(ESRCH)");
@@ -236,7 +235,7 @@ ico_uxf_window_resize(const int window, const int w, const int h)
                                     winmng->attr.node,
                                     ICO_WINDOW_MGR_V_NOCHANGE, ICO_WINDOW_MGR_V_NOCHANGE,
                                     winmng->attr.w, winmng->attr.h,
-                                    ICO_WINDOW_MGR_ANIMATION_NOANIMATION);
+                                      (flag ? ICO_WINDOW_MGR_FLAGS_NO_CONFIGURE : 0));
     wl_display_flush(gIco_Uxf_Api_Mng.Wayland_Display);
 
     uifw_trace("ico_uxf_window_resize: Leave(EOK)");
@@ -245,6 +244,25 @@ ico_uxf_window_resize(const int window, const int w, const int h)
 
 /*--------------------------------------------------------------------------*/
 /**
+ * @brief   ico_uxf_window_resize: resize window(surface) size
+ *
+ * @param[in]   window          window Id(same as ico_window_mgr surface Id)
+ * @param[in]   w               window width
+ * @param[in]   h               window height
+ * @return      result
+ * @retval      ICO_UXF_EOK     success
+ * @retval      ICO_UXF_ESRCH   error(not initialized)
+ * @retval      ICO_UXF_ENOENT  error(layer dose not exist)
+ */
+/*--------------------------------------------------------------------------*/
+ICO_APF_API int
+ico_uxf_window_resize(const int window, const int w, const int h)
+{
+    return ico_uxf_window_resize_flag(window, w, h, 0);
+}
+
+/*--------------------------------------------------------------------------*/
+/**
  * @brief   ico_uxf_window_move: move window(surface) geometry
  *
  * @param[in]   window          window Id(same as ico_window_mgr surface Id)
@@ -281,9 +299,8 @@ ico_uxf_window_move(const int window, const int x, const int y, const int animat
     ico_window_mgr_set_positionsize(gIco_Uxf_Api_Mng.Wayland_WindowMgr, window,
                                     winmng->attr.node, winmng->attr.x, winmng->attr.y,
                                     ICO_WINDOW_MGR_V_NOCHANGE, ICO_WINDOW_MGR_V_NOCHANGE,
-                                    (animation == 0) ?
-                                      ICO_WINDOW_MGR_ANIMATION_NOANIMATION :
-                                      ICO_WINDOW_MGR_ANIMATION_ANIMATION);
+                                    ICO_WINDOW_MGR_FLAGS_NO_CONFIGURE |
+                                    ((animation != 0) ? ICO_WINDOW_MGR_FLAGS_ANIMATION : 0));
     wl_display_flush(gIco_Uxf_Api_Mng.Wayland_Display);
 
     uifw_trace("ico_uxf_window_move: Leave(EOK)");
@@ -651,14 +668,18 @@ ico_uxf_window_control(const char *appid, const int winidx,
     else    {
         /* get current application status       */
         if (winidx >= 0)    {
-            nwin = ico_uxf_process_window_get_one(appid, procattr, winidx);
-            if (nwin == 0)  nwin = 1;
+            if (ico_uxf_process_window_get_one(appid, procattr, winidx) == ICO_UXF_EOK) {
+                nwin = 1;
+            }
+            else    {
+                nwin = 0;
+            }
         }
         else    {
             /* all window           */
             nwin = ico_uxf_process_window_get(appid, procattr, MAX_APP_WINDOWS);
         }
-        if (nwin == ICO_UXF_E2BIG)  nwin = MAX_APP_WINDOWS;
+        if ((nwin == ICO_UXF_E2BIG) || (nwin > MAX_APP_WINDOWS))  nwin = MAX_APP_WINDOWS;
         if (nwin < 0)  {
             uifw_trace("ico_uxf_window_control: Leave(Unknown appid(%s))", appid);
             return ICO_UXF_ENOENT;
index abd8e6c..8565a83 100644 (file)
@@ -71,6 +71,8 @@ int ico_uxf_window_visible_raise(const int window,
                                         /* Set window show/hide and raise/lower */
 int ico_uxf_window_resize(const int window, const int w, const int h);
                                         /* Resize window size                   */
+int ico_uxf_window_resize_flag(const int window, const int w, const int h, const int flag);
+                                        /* Resize window size (with option)     */
 int ico_uxf_window_move(const int window, const int x, const int y, const int anima);
                                         /* Move window                          */
 int ico_uxf_window_raise(const int window);
@@ -128,14 +130,6 @@ int ico_uxf_wl_display_fd(void);
                                         /* Get wayland connect file descriptor  */
 struct wl_display *ico_uxf_wl_display(void);
                                         /* Get wayland display                  */
-struct wl_compositor *ico_uxf_wl_compositor(void);
-                                        /* Get wayland compositor               */
-struct wl_egl_window *ico_uxf_wl_egl_window(const int window);
-                                        /* Get EGL window(surface)              */
-struct wl_surface *ico_uxf_wayland_surface(const int window);
-                                        /* Get wayland surface                  */
-int ico_uxf_wl_display_fd(void);
-                                        /* Get wayland connect file descriptor  */
 #ifdef __cplusplus
 }
 #endif
index 4336cbe..facbd8e 100755 (executable)
@@ -23,4 +23,9 @@ killall -9 dialer 2> /dev/null
 killall -9 calculator 2> /dev/null
 killall -9 memo 2> /dev/null
 killall -9 smartsearch 2> /dev/null
-
+killall -9 WebProcess 2> /dev/null
+kill -9 `ps ax | grep wrt_launchpad_daemon_candidate | grep -v grep | cut -c1-6` 2> /dev/null
+killall -9 WebProcess 2> /dev/null
+kill -9 `ps ax | grep wrt_launchpad_daemon_candidate | grep -v grep | cut -c1-6` 2> /dev/null
+killall -9 WebProcess 2> /dev/null
+kill -9 `ps ax | grep wrt_launchpad_daemon_candidate | grep -v grep | cut -c1-6` 2> /dev/null
index 4546f4a..7a0031d 100644 (file)
@@ -1,4 +1,12 @@
+* Tue Aug 27 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> submit/tizen/20130823.170014@f9ac279
+- 0.7.03 release.
+-- Correction with the interface change of ico-uxf-weston-plugin.
+-- Change of the application thumbnail indication of the menu screen.
+-- Fix for TIVI-1669 - Homescreen fails to launch webruntime apps.
+-- It became the error to acquire appid from pid(aul_app_get_appid_bypid) before start completion of Web Application.
+
 * Wed Aug 21 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/2.0alpha-wayland/20130612.174826@ce96c7c
+- 0.7.02 release
 - Add LICENSE.
 - Fix spec file.
 -- Corrected license field.
index a7f47aa..2079a1c 100644 (file)
@@ -1,6 +1,6 @@
 Name:       ico-uxf-homescreen
 Summary:    Sample homescreen
-Version:    0.7.02
+Version:    0.7.03
 Release:    1.1
 Group:      Graphics & UI Framework/Automotive UI
 License:    Apache-2.0
@@ -9,7 +9,7 @@ Source0:    %{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig(wayland-client) >= 1.2
 BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: ico-uxf-weston-plugin-devel >= 0.7
+BuildRequires: ico-uxf-weston-plugin-devel >= 0.7.03
 BuildRequires: pkgconfig(eina)
 BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(eina)
diff --git a/res/config/system.conf.VERTICAL b/res/config/system.conf.VERTICAL
new file mode 100644 (file)
index 0000000..e174d20
--- /dev/null
@@ -0,0 +1,213 @@
+## OpenPF System Configurations
+##  /usr/apps/org.tizen.ico.homescreen/res/config/system.conf
+##     May-15-2013
+
+## System ECUs
+[host]
+##      Center Display ECU
+# ECU name
+0=Center
+# ECU type
+0.type=Center
+# IP address(if environment valiable'SYSHOSTIP0' NOT defined)
+0.ip=127.0.0.1
+# This ECU has HomeScreen(null:no, not null:applicationId of HomeScreen)
+0.homescreen=org.tizen.ico.homescreen
+#
+
+## Displays
+[display]
+## Center Display
+# Display name
+0=Center
+# ECU name
+0.host=Center
+# Display Number
+0.displayno=0
+# Wayland connection name(ex.'wayland-0')
+0.wayland=wayland-0
+# Display Type
+0.type=Center
+# Display Size
+0.width=1080
+0.height=1920
+# number of Layers
+0.layer=5
+# inch (in 0.1 inchs)
+0.inch=101
+# Display Layer
+0.layer.0=BackGround
+0.layer.1=HomeScreen
+0.layer.2=Application
+0.layer.3=SoftKeyboard
+0.layer.4=InterruptApp
+0.layer.5=Touch
+0.layer.6=OnScreen;menuoverlap
+# Display Zone
+## id=name;x;y;width;height[;overlap-zone;overlap-zone;...]
+##   if 'id=name', size is all of display, no overlap
+0.zone.0=Base
+0.zone.1=Full;0;64;dispw;disph-64;Upper;Lower;UpperLeft;UpperRight;LowerLeft;LowerRight
+0.zone.2=Upper;0;64;dispw;disph-64/2;Full;UpperLeft;UpperRight
+0.zone.3=Lower;0;heigh-64/2+64;dispw;disph-64/2;Full;LowerLeft;LowerRight
+0.zone.4=UpperLeft;0;64;dispw/2;disph-64/2;Full;Upper
+0.zone.5=UpperRight;dispw/2;64;dispw/2;disph-64/2;Full;Upper
+0.zone.6=LowerLeft;0;heigh-64/2+64;dispw/2;disph-64/2;Full;Lower
+0.zone.7=LowerRight;dispw/2;heigh-64/2+64;dispw/2;disph-64/2;Full;Lower
+0.zone.8=SysApp;0;64;dispw;disph-64
+0.zone.9=SysApp.Left;0;64;dispw/2-140;disph-64
+0.zone.10=SysApp.Right;dispw/2+140;64;dispw/2-140;disph-64
+#
+## Sound
+[sound]
+## Center ECU
+# Sound device name
+0=Center
+# ECU name
+0.host=Center
+# Device Number
+0.soundno=0
+# Sound Zone
+## id=name[;overlap;overlap-zone;overlap-zone;...]
+0.zone.0=Base
+0.zone.1=Full
+0.zone.2=Driver
+
+## Port Numbers
+[port]
+# AppsController Port Number
+appscontrollerport=18081
+# PulseAudio UIFW-PlugIn Port Number
+soundpluginport=8088
+
+## Application Category name
+[category]
+0=Menu
+0.type=system
+0.view=always
+0.sound=always
+0.input=always
+0.priority=4
+1=Message
+1.type=message
+1.view=always
+1.sound=always
+1.input=always
+1.priority=5
+2=Map
+2.type=map
+2.view=always
+2.sound=always
+2.input=always
+2.priority=3
+3=Driving
+3.type=maker
+3.view=run
+3.sound=run
+3.input=run
+3.priority=2
+4=CarSetting
+4.type=maker
+4.view=shift_park
+4.sound=shift_park
+4.input=shift_park
+4.priority=2
+5=Camera.Back
+5.type=maker
+5.view=shift_back
+5.sound=shift_back
+5.input=shift_back
+5.priority=6
+6=Camera.Left
+6.type=maker
+6.view=blinker_left
+6.sound=blinker_left
+6.input=blinker_left
+6.priority=6
+7=Camera.Right
+7.type=maker
+7.view=blinker_right
+7.sound=blinker_right
+7.input=blinker_right
+7.priority=6
+8=Entertainment
+8.type=unknown
+8.view=parked
+8.sound=parked
+8.input=parked
+8.priority=0
+9=Entertainment.audio
+9.type=unknown
+9.view=parked
+9.sound=always
+9.input=always
+9.priority=0
+10=Entertainment.visual
+10.type=unknown
+10.view=always
+10.sound=parked
+10.input=always
+10.priority=0
+#
+## Application Kind
+[kind]
+0=Almighty
+0.privilege=almighty
+0.priority=5
+1=HomeScreen
+1.privilege=system
+1.priority=4
+2=SysApp
+2.privilege=system
+2.priority=3
+3=SysApp.audio
+3.privilege=system.audio
+3.priority=3
+4=SysApp.visual
+4.privilege=system.visible
+4.priority=3
+5=Maker
+5.privilege=maker
+5.priority=2
+6=Certificate
+6.privilege=certificate
+6.priority=1
+7=UnKnown
+7.privilege=none
+7.priority=0
+#
+## Fixed Input Sw
+[input]
+#-.sw.-=switch-name:appid[;keycode]
+0=DrivingForceGT
+0.sw.0=JS_UpDown
+0.sw.1=JS_LR
+0.sw.2=JS_Cross;org.tizen.ico.app-soundsample
+0.sw.3=JS_Square;org.tizen.ico.homescreen;0x0a
+0.sw.4=JS_Circle;org.tizen.ico.app-soundsample
+0.sw.5=JS_Triangle;org.tizen.ico.homescreen
+#
+## Default target
+[default]
+host=Center
+kind=UnKnown
+category=Entertainment.audio
+display=Center
+layer=Application
+displayzone=Full
+sound=Center
+soundzone=Full
+inputdev=DrivingForceGT
+inputsw=JS_UpDown
+#
+## default transition
+[transition]
+transition=none
+#
+## Log
+[log]
+# loglevel:ERROR=4,CRITICAL=8,WARNING=16,INFO=64,DEBUG=128
+loglevel=128
+# log flush on log output
+logflush=yes
+
index f753082..6628ca6 100644 (file)
@@ -195,6 +195,8 @@ hs_uxf_event(int ev, Ico_Uxf_EventDetail dd, int arg)
             else {
                 /* other normal application */
                 if (hs_is_special_app(winAttr.process) == FALSE) {
+                    /* set max window size for event to application */
+                    hs_set_appscreen(winAttr.process);
                     if (hs_is_noicon_app(winAttr.process) != FALSE) {
                         hs_set_appscreen(winAttr.process);
                         if (hs_stat_touch == ICO_HS_TOUCH_IN_SHOW) {
@@ -967,7 +969,7 @@ hs_tile_show_screen(void)
                        tinfo->size_x, tinfo->size_y, tinfo->coord_x, tinfo->coord_y);
             /* move application window to HomeScreen layer  */
             ico_uxf_window_layer(window.window, HS_LAYER_HOMESCREEN);
-            ico_uxf_window_resize(window.window, tinfo->size_x, tinfo->size_y);
+            ico_uxf_window_resize_flag(window.window, tinfo->size_x, tinfo->size_y, 1);
             ico_uxf_window_move(window.window, tinfo->coord_x, tinfo->coord_y, 0);
             ico_uxf_window_visible_raise(window.window, 1, 1);
         }
index 9781202..9647c0f 100644 (file)
@@ -693,7 +693,7 @@ int
 main(int argc, char *argv[])
 {
     int width, height;
-    int orientation = ICO_ONS_HORIZONTAL;
+    int orientation = -1;
     int ret;
     bundle *b;
     const char *val;
@@ -724,9 +724,21 @@ main(int argc, char *argv[])
         ons_ws_port = hs_conf_get_integer(ICO_HS_CONFIG_ONSCREEN,
                                          ICO_HS_CONFIG_WS_PORT,
                                          ICO_HS_WS_PORT);
-        orientation = hs_conf_get_integer(ICO_HS_CONFIG_ONSCREEN,
-                                          ICO_HS_CONFIG_ORIENTAION,
-                                          orientation);
+        if (orientation < 0)    {
+            orientation = hs_conf_get_integer(ICO_HS_CONFIG_ONSCREEN,
+                                              ICO_HS_CONFIG_ORIENTAION,
+                                              -1);
+            if (orientation < 0)    {
+                Ico_Uxf_Sys_Config  *sysconf;
+                sysconf = (Ico_Uxf_Sys_Config *)ico_uxf_getSysConfig();
+                if (sysconf->display[0].width >= sysconf->display[0].height)    {
+                    orientation = ICO_ONS_HORIZONTAL;
+                }
+                else    {
+                    orientation = ICO_ONS_VERTICAL;
+                }
+            }
+        }
     }
     ons_load_config();
     hs_snd_init();
index 0c92fee..c35d57e 100644 (file)
@@ -726,7 +726,7 @@ main(int argc, char *argv[])
     char file[ICO_SB_BUF_SIZE];
     int width, height;
     int moveH = 0;
-    int orientation = ICO_SB_HORIZONTAL;
+    int orientation = -1;
     int ii;
     int ret;
     static Ecore_Evas *ee;
@@ -763,9 +763,22 @@ main(int argc, char *argv[])
         sb_ws_port = hs_conf_get_integer(ICO_HS_CONFIG_STATUBAR,
                                          ICO_HS_CONFIG_WS_PORT,
                                          ICO_HS_WS_PORT);
-        orientation = hs_conf_get_integer(ICO_HS_CONFIG_STATUBAR,
-                                          ICO_HS_CONFIG_ORIENTAION,
-                                          orientation);
+        if (orientation <= 0)   {
+            orientation = hs_conf_get_integer(ICO_HS_CONFIG_STATUBAR,
+                                              ICO_HS_CONFIG_ORIENTAION,
+                                              -1);
+            if (orientation < 0)    {
+                Ico_Uxf_Sys_Config  *sysconf;
+    
+                sysconf = (Ico_Uxf_Sys_Config *)ico_uxf_getSysConfig();
+                if (sysconf->display[0].width >= sysconf->display[0].height)    {
+                    orientation = ICO_SB_HORIZONTAL;
+                }
+                else    {
+                    orientation = ICO_SB_VERTICAL;
+                }
+            }
+        }
     }
     hs_snd_init();
 
index 5c51e3a..462f865 100755 (executable)
@@ -12,7 +12,7 @@
 sleep 0.3
 
 # 3. Start Weston
-/usr/bin/weston-launch -- -i0 --log=/var/log/ico/weston.log &
+/usr/bin/weston-launch --user app -- -i0 --log=/var/log/ico/weston.log &
 sync;sync
 #sleep 0.8
 #if [ -e $XDG_RUNTIME_DIR/wayland-0 ] ; then