aul_open -> aul_launch. scroll access added

Check the parameter.
Even if it is checked before call the function,
We need to guarantees the argument from the receiver function.

Replace the aul_open with aul_launch
To keep the consistency of launching an application with Web.

Update accessibility scroll event.

Change-Id: Ie757bf558cac45e9457f9c06ca3fc469bd74df69

diff --git a/include/livebox.h b/include/livebox.h
index c569180..a08e31a 100644 (file)
--- a/include/livebox.h
+++ b/include/livebox.h
@@ -84,25 +84,31 @@ enum access_event_type {
        ACCESS_EVENT_HIGHLIGHT_NEXT     = 0x00000200, /*!< LB accessibility: Set highlight to next object */
        ACCESS_EVENT_HIGHLIGHT_PREV     = 0x00000400, /*!< LB accessibility: Set highlight to prev object */
        ACCESS_EVENT_ACTIVATE           = 0x00000800, /*!< LB accessibility activate */
-       ACCESS_EVENT_VALUE_CHANGE       = 0x00001000, /*!< LB accessibility up */
-       ACCESS_EVENT_SCROLL             = 0x00002000, /*!< LB accessibility down */
-       ACCESS_EVENT_UNHIGHLIGHT        = 0x00004000, /*!< LB accessibility unhighlight */
+       ACCESS_EVENT_VALUE_CHANGE       = 0x00001000, /*!< LB accessibility value changed */
+       ACCESS_EVENT_UNHIGHLIGHT        = 0x00002000, /*!< LB accessibility unhighlight */
+       ACCESS_EVENT_SCROLL_DOWN        = 0x00004000, /*!< LB accessibility scroll down */
+       ACCESS_EVENT_SCROLL_MOVE        = 0x00008000, /*!< LB accessibility scroll move */
+       ACCESS_EVENT_SCROLL_UP          = 0x00010000, /*!< LB accessibility scroll up */
 
        LB_ACCESS_HIGHLIGHT             = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_HIGHLIGHT,
        LB_ACCESS_HIGHLIGHT_NEXT        = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_HIGHLIGHT_NEXT,
        LB_ACCESS_HIGHLIGHT_PREV        = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_HIGHLIGHT_PREV,
        LB_ACCESS_ACTIVATE              = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_ACTIVATE,
        LB_ACCESS_VALUE_CHANGE          = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_VALUE_CHANGE,
-       LB_ACCESS_SCROLL                = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_SCROLL,
        LB_ACCESS_UNHIGHLIGHT           = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_UNHIGHLIGHT,
+       LB_ACCESS_SCROLL_DOWN           = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_SCROLL_DOWN,
+       LB_ACCESS_SCROLL_MOVE           = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_SCROLL_MOVE,
+       LB_ACCESS_SCROLL_UP             = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_SCROLL_UP,
 
        PD_ACCESS_HIGHLIGHT             = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_HIGHLIGHT,
        PD_ACCESS_HIGHLIGHT_NEXT        = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_HIGHLIGHT_NEXT,
        PD_ACCESS_HIGHLIGHT_PREV        = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_HIGHLIGHT_PREV,
        PD_ACCESS_ACTIVATE              = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_ACTIVATE,
        PD_ACCESS_VALUE_CHANGE          = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_VALUE_CHANGE,
-       PD_ACCESS_SCROLL                = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL,
        PD_ACCESS_UNHIGHLIGHT           = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_UNHIGHLIGHT,
+       PD_ACCESS_SCROLL_DOWN           = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_DOWN,
+       PD_ACCESS_SCROLL_MOVE           = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_MOVE,
+       PD_ACCESS_SCROLL_UP             = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_UP,
 };
 
 /* Exported to user app */

diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec
index 86cabc5..11ffc3e 100644 (file)
--- a/packaging/liblivebox-viewer.spec
+++ b/packaging/liblivebox-viewer.spec
@@ -1,6 +1,6 @@
 Name: liblivebox-viewer
 Summary: Library for developing the application.
-Version: 0.12.2
+Version: 0.12.5
 Release: 1
 Group: HomeTF/Livebox
 License: Flora License

diff --git a/src/livebox.c b/src/livebox.c
index cb698c7..6129bd0 100644 (file)
--- a/src/livebox.c
+++ b/src/livebox.c
@@ -1097,9 +1097,11 @@ EAPI int livebox_click(struct livebox *handler, double x, double y)
                return LB_STATUS_ERROR_INVALID;
        }
 
-       if (handler->lb.auto_launch)
-               if (aul_open_app(handler->lb.auto_launch) < 0)
+       if (handler->lb.auto_launch) {
+               DbgPrint("Auto-launch enabled: %s\n", handler->lb.auto_launch);
+               if (aul_launch_app(handler->lb.auto_launch, NULL) < 0)
                        ErrPrint("Failed to launch app %s\n", handler->lb.auto_launch);
+       }
 
        timestamp = util_timestamp();
        packet = packet_create_noack("clicked", "sssddd", handler->pkgname, handler->id, "clicked", timestamp, x, y);
@@ -1368,12 +1370,18 @@ EAPI int livebox_access_event(struct livebox *handler, enum access_event_type ty
        case ACCESS_EVENT_VALUE_CHANGE:
                strcpy(ptr, "_access_value_change");
                break;
-       case ACCESS_EVENT_SCROLL:
-               strcpy(ptr, "_access_scroll");
-               break;
        case ACCESS_EVENT_UNHIGHLIGHT:
                strcpy(ptr, "_access_unhighlight");
                break;
+       case ACCESS_EVENT_SCROLL_DOWN:
+               strcpy(ptr, "_access_scroll_down");
+               break;
+       case ACCESS_EVENT_SCROLL_MOVE:
+               strcpy(ptr, "_access_scroll_move");
+               break;
+       case ACCESS_EVENT_SCROLL_UP:
+               strcpy(ptr, "_access_scroll_up");
+               break;
        default:
                return LB_STATUS_ERROR_INVALID;
        }

diff --git a/src/util.c b/src/util.c
index b0e7181..03d679f 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -145,6 +145,9 @@ int util_unlink(const char *filename)
        int desclen;
        int ret;
 
+       if (!filename)
+               return LB_STATUS_ERROR_INVALID;
+
        desclen = strlen(filename) + 6; /* .desc */
        descfile = malloc(desclen);
        if (!descfile) {