Add new events on-hold & on-scroll

Change-Id: I1cc6e6be5d82be3f55bf0169c47ba1655cfe47d6

diff --git a/include/livebox.h b/include/livebox.h
index 2706245..a9cdf4c 100644 (file)
--- a/include/livebox.h
+++ b/include/livebox.h
@@ -59,11 +59,21 @@ enum content_event_type {
        CONTENT_EVENT_KEY_SET           = 0x00000020, /*!< LB Key, start feeding event by master */
        CONTENT_EVENT_KEY_UNSET         = 0x00000040, /*!< LB key, stop feeding event by master */
 
        CONTENT_EVENT_KEY_SET           = 0x00000020, /*!< LB Key, start feeding event by master */
        CONTENT_EVENT_KEY_UNSET         = 0x00000040, /*!< LB key, stop feeding event by master */
 

+       CONTENT_EVENT_ON_SCROLL         = 0x00000080, /*!< LB On scrolling */
+       CONTENT_EVENT_ON_HOLD           = 0x00000100, /*!< LB On holding */
+       CONTENT_EVENT_OFF_SCROLL        = 0x00000200, /*!< LB Stop scrolling */
+       CONTENT_EVENT_OFF_HOLD          = 0x00000400, /*!< LB Stop holding */
+

        CONTENT_EVENT_KEY_MASK          = 0x80000000,
        CONTENT_EVENT_MOUSE_MASK        = 0x20000000,
        CONTENT_EVENT_PD_MASK           = 0x10000000,
        CONTENT_EVENT_LB_MASK           = 0x40000000,
 
        CONTENT_EVENT_KEY_MASK          = 0x80000000,
        CONTENT_EVENT_MOUSE_MASK        = 0x20000000,
        CONTENT_EVENT_PD_MASK           = 0x10000000,
        CONTENT_EVENT_LB_MASK           = 0x40000000,
 

+       LB_MOUSE_ON_SCROLL              = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_ON_SCROLL, /*!< Mouse event occurs while scrolling */
+       LB_MOUSE_ON_HOLD                = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_ON_HOLD, /*!< Mouse event occurs on holding */
+       LB_MOUSE_OFF_SCROLL             = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_OFF_SCROLL, /*!< Scrolling stopped */
+       LB_MOUSE_OFF_HOLD               = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_OFF_HOLD, /*!< Holding stopped */
+

        LB_MOUSE_DOWN                   = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_DOWN, /*!< Mouse down on the livebox */
        LB_MOUSE_UP                     = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_UP, /*!< Mouse up on the livebox */
        LB_MOUSE_MOVE                   = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_MOVE, /*!< Move move on the livebox */
        LB_MOUSE_DOWN                   = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_DOWN, /*!< Mouse down on the livebox */
        LB_MOUSE_UP                     = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_UP, /*!< Mouse up on the livebox */
        LB_MOUSE_MOVE                   = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_MOVE, /*!< Move move on the livebox */


@@ -72,6 +82,11 @@ enum content_event_type {
        LB_MOUSE_SET                    = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_SET, /*!< Mouse event, start feeding event by master */
        LB_MOUSE_UNSET                  = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_UNSET, /*!< Mouse event, stop feeding event by master */
 
        LB_MOUSE_SET                    = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_SET, /*!< Mouse event, start feeding event by master */
        LB_MOUSE_UNSET                  = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_UNSET, /*!< Mouse event, stop feeding event by master */
 

+       PD_MOUSE_ON_SCROLL              = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_ON_SCROLL, /*!< Mouse event occurs while scrolling */
+       PD_MOUSE_ON_HOLD                = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_ON_HOLD, /*!< Mouse event occurs on holding */
+       PD_MOUSE_OFF_SCROLL             = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_OFF_SCROLL, /*!< Scrolling stopped */
+       PD_MOUSE_OFF_HOLD               = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_OFF_HOLD, /*!< Holding stopped */
+

        PD_MOUSE_DOWN                   = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_DOWN, /*!< Mouse down on the PD */
        PD_MOUSE_UP                     = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_UP, /*!< Mouse up on the PD */
        PD_MOUSE_MOVE                   = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_MOVE, /*!< Mouse move on the PD */
        PD_MOUSE_DOWN                   = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_DOWN, /*!< Mouse down on the PD */
        PD_MOUSE_UP                     = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_UP, /*!< Mouse up on the PD */
        PD_MOUSE_MOVE                   = CONTENT_EVENT_PD_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_MOVE, /*!< Mouse move on the PD */

diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec
index 2210ed4..f8462ea 100644 (file)
--- a/packaging/liblivebox-viewer.spec
+++ b/packaging/liblivebox-viewer.spec
@@ -2,7 +2,7 @@
 
 Name: liblivebox-viewer
 Summary: Library for developing the application
 
 Name: liblivebox-viewer
 Summary: Library for developing the application

-Version: 0.30.0
+Version: 0.30.2

 Release: 1
 Group: Web Framework/Libraries
 License: Flora
 Release: 1
 Group: Web Framework/Libraries
 License: Flora

diff --git a/src/livebox.c b/src/livebox.c
index 1d64cf5..1d8b2e3 100644 (file)
--- a/src/livebox.c
+++ b/src/livebox.c
@@ -2671,7 +2671,7 @@ EAPI int livebox_mouse_event(struct livebox *handler, enum content_event_type ty
        }
 
        /*!
        }
 
        /*!

-        * Must be short than 29 bytes.
+        * Must be shorter than 29 bytes.

         */
        switch ((type & ~(CONTENT_EVENT_PD_MASK | CONTENT_EVENT_LB_MASK))) {
        case CONTENT_EVENT_MOUSE_ENTER | CONTENT_EVENT_MOUSE_MASK:
         */
        switch ((type & ~(CONTENT_EVENT_PD_MASK | CONTENT_EVENT_LB_MASK))) {
        case CONTENT_EVENT_MOUSE_ENTER | CONTENT_EVENT_MOUSE_MASK:


@@ -2695,6 +2695,18 @@ EAPI int livebox_mouse_event(struct livebox *handler, enum content_event_type ty
        case CONTENT_EVENT_MOUSE_UNSET | CONTENT_EVENT_MOUSE_MASK:
                strcpy(ptr, "_mouse_unset");
                break;
        case CONTENT_EVENT_MOUSE_UNSET | CONTENT_EVENT_MOUSE_MASK:
                strcpy(ptr, "_mouse_unset");
                break;

+       case CONTENT_EVENT_ON_SCROLL | CONTENT_EVENT_MOUSE_MASK:
+               strcpy(ptr, "_mouse_on_scroll");
+               break;
+       case CONTENT_EVENT_ON_HOLD | CONTENT_EVENT_MOUSE_MASK:
+               strcpy(ptr, "_mouse_on_hold");
+               break;
+       case CONTENT_EVENT_OFF_SCROLL | CONTENT_EVENT_MOUSE_MASK:
+               strcpy(ptr, "_mouse_off_scroll");
+               break;
+       case CONTENT_EVENT_OFF_HOLD | CONTENT_EVENT_MOUSE_MASK:
+               strcpy(ptr, "_mouse_off_hold");
+               break;

        default:
                ErrPrint("Invalid event type\n");
                return LB_STATUS_ERROR_INVALID;
        default:
                ErrPrint("Invalid event type\n");
                return LB_STATUS_ERROR_INVALID;