support expanded tizen_gesture protocols

  - add select / deselect palm cover
  - add a activate gesture
  - add a error not supported

Change-Id: If747e0d1ab95a0374e3f7aee5a8e96adb707f10a

diff --git a/src/e_mod_gesture_events.c b/src/e_mod_gesture_events.c
index 0822a2a..d1afb28 100644 (file)
--- a/src/e_mod_gesture_events.c
+++ b/src/e_mod_gesture_events.c
@@ -1360,6 +1360,7 @@ _e_gesture_send_palm_cover(void)
    int cx = 0, cy = 0;
    unsigned int size = 0;
    wl_fixed_t pressure;
+   struct wl_resource *surface = NULL;
 
    time = (int)(ecore_time_get()*1000);
 
@@ -1384,8 +1385,8 @@ _e_gesture_send_palm_cover(void)
 
    pressure = wl_fixed_from_double(0.0);
 
-   tizen_gesture_send_palm_cover(palm_covers->client_info.res, TIZEN_GESTURE_MODE_BEGIN, duration, size, pressure, cx, cy);
-   tizen_gesture_send_palm_cover(palm_covers->client_info.res, TIZEN_GESTURE_MODE_END, duration, size, pressure, cx, cy);
+   tizen_gesture_send_palm_cover(palm_covers->client_info.res, surface, TIZEN_GESTURE_MODE_BEGIN, duration, size, pressure, cx, cy);
+   tizen_gesture_send_palm_cover(palm_covers->client_info.res, surface, TIZEN_GESTURE_MODE_END, duration, size, pressure, cx, cy);
 
    gesture->event_state = E_GESTURE_EVENT_STATE_IGNORE;
    gesture->gesture_events.recognized_gesture |= E_GESTURE_TYPE_PALM_COVER;

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 68b8ad2..a682874 100644 (file)
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -677,6 +677,34 @@ notify:
 }
 
 static void
+_e_gesture_cb_grab_edge_drag(struct wl_client *client,
+                        struct wl_resource *resouce,
+                        uint32_t fingers, uint32_t edge, uint32_t edge_size,
+                        uint32_t start_point, uint32_t end_point)
+{
+   int ret = TIZEN_GESTURE_ERROR_NONE;
+
+   ret = TIZEN_GESTURE_ERROR_NOT_SUPPORTED;
+
+   tizen_gesture_send_grab_edge_swipe_notify(resouce, fingers, edge, edge_size, start_point, end_point, ret);
+}
+
+static void
+_e_gesture_cb_ungrab_edge_drag(struct wl_client *client,
+                          struct wl_resource *resouce,
+                          uint32_t fingers, uint32_t edge, uint32_t edge_size,
+                          uint32_t start_point, uint32_t end_point)
+{
+   int ret = TIZEN_GESTURE_ERROR_NONE;
+
+   ret = TIZEN_GESTURE_ERROR_NOT_SUPPORTED;
+
+   tizen_gesture_send_grab_edge_swipe_notify(resouce, fingers, edge, edge_size, start_point, end_point, ret);
+}
+
+
+
+static void
 _e_gesture_cb_grab_tap(struct wl_client *client,
                    struct wl_resource *resource,
                    uint32_t fingers, uint32_t repeats)
@@ -774,7 +802,7 @@ _e_gesture_cb_grab_palm_cover(struct wl_client *client,
 
    ret = _e_gesture_grab_palm_cover(client, resource);
 
-   tizen_gesture_send_palm_cover_notify(resource, ret);
+   tizen_gesture_send_palm_cover_notify(resource, NULL, ret);
 }
 
 static void
@@ -785,16 +813,58 @@ _e_gesture_cb_ungrab_palm_cover(struct wl_client *client,
 
    ret = _e_gesture_ungrab_palm_cover(client, resource);
 
-   tizen_gesture_send_palm_cover_notify(resource, ret);
+   tizen_gesture_send_palm_cover_notify(resource, NULL, ret);
+}
+
+static void
+_e_gesture_cb_select_palm_cover(struct wl_client *client,
+                                struct wl_resource *resource,
+                                struct wl_resource *surface)
+{
+   int ret = TIZEN_GESTURE_ERROR_NONE;
+
+   ret = TIZEN_GESTURE_ERROR_NOT_SUPPORTED;
+
+   tizen_gesture_send_palm_cover_notify(resource, surface, ret);
+}
+
+static void
+_e_gesture_cb_deselect_palm_cover(struct wl_client *client,
+                                struct wl_resource *resource,
+                                struct wl_resource *surface)
+{
+   int ret = TIZEN_GESTURE_ERROR_NONE;
+
+   ret = TIZEN_GESTURE_ERROR_NOT_SUPPORTED;
+
+   tizen_gesture_send_palm_cover_notify(resource, surface, ret);
+}
+
+static void
+_e_gesture_cb_activate_set(struct wl_client *client,
+                           struct wl_resource *resource,
+                           struct wl_resource *surface,
+                           uint32_t type, uint32_t active)
+{
+   int ret = TIZEN_GESTURE_ERROR_NONE;
+
+   ret = TIZEN_GESTURE_ERROR_NOT_SUPPORTED;
+
+   tizen_gesture_send_activate_notify(resource, surface, type, active, ret);
 }
 
 static const struct tizen_gesture_interface _e_gesture_implementation = {
    _e_gesture_cb_grab_edge_swipe,
    _e_gesture_cb_ungrab_edge_swipe,
+   _e_gesture_cb_grab_edge_drag,
+   _e_gesture_cb_ungrab_edge_drag,
    _e_gesture_cb_grab_tap,
    _e_gesture_cb_ungrab_tap,
    _e_gesture_cb_grab_palm_cover,
-   _e_gesture_cb_ungrab_palm_cover
+   _e_gesture_cb_ungrab_palm_cover,
+   _e_gesture_cb_select_palm_cover,
+   _e_gesture_cb_deselect_palm_cover,
+   _e_gesture_cb_activate_set,
 };
 
 /* tizen_gesture global object destroy function */

diff --git a/src/e_mod_main.h b/src/e_mod_main.h
index 8e40744..0d0b21f 100644 (file)
--- a/src/e_mod_main.h
+++ b/src/e_mod_main.h
@@ -12,6 +12,7 @@
 #define GTDBG(msg, ARG...) DBG("[tizen_gesture][%s:%d] "msg, __FUNCTION__, __LINE__, ##ARG)
 
 #define E_GESTURE_TYPE_EDGE_SWIPE TIZEN_GESTURE_TYPE_EDGE_SWIPE
+#define E_GESTURE_TYPE_EDGE_DRAG TIZEN_GESTURE_TYPE_EDGE_DRAG
 #define E_GESTURE_TYPE_TAP TIZEN_GESTURE_TYPE_TAP
 #define E_GESTURE_TYPE_PALM_COVER TIZEN_GESTURE_TYPE_PALM_COVER
 #define E_GESTURE_TYPE_PAN (TIZEN_GESTURE_TYPE_PALM_COVER << 1)
@@ -19,7 +20,7 @@
 
 #define E_GESTURE_FINGER_MAX 3
 #define E_GESTURE_TYPE_MAX (E_GESTURE_TYPE_PINCH + 1)
-#define E_GESTURE_TYPE_ALL (E_GESTURE_TYPE_EDGE_SWIPE | E_GESTURE_TYPE_TAP | E_GESTURE_TYPE_PAN | E_GESTURE_TYPE_PINCH | E_GESTURE_TYPE_PALM_COVER)
+#define E_GESTURE_TYPE_ALL (E_GESTURE_TYPE_EDGE_SWIPE | E_GESTURE_TYPE_EDGE_DRAG | E_GESTURE_TYPE_TAP | E_GESTURE_TYPE_PAN | E_GESTURE_TYPE_PINCH | E_GESTURE_TYPE_PALM_COVER)
 #define E_GESTURE_KEYBOARD_NAME "Gesture Keyboard"
 #define E_GESTURE_AUX_HINT_GESTURE_DISABLE "wm.policy.win.gesture.disable"