From 34e7ad56a0a573a99b118021e820062dfee3465c Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Tue, 12 Aug 2014 23:08:42 +0900 Subject: [PATCH] Add new accessibility event types Change-Id: I5981b60b0c64b6c5b1ad6df8ec136a278620c0ab --- include/livebox.h | 2 +- packaging/liblivebox-viewer.spec | 2 +- src/livebox.c | 27 +++++++++++++-------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/include/livebox.h b/include/livebox.h index 36d46d5..d5f6de0 100644 --- a/include/livebox.h +++ b/include/livebox.h @@ -168,7 +168,7 @@ enum access_event_type { PD_ACCESS_ACTION_UP = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_ACTION_UP, /**< Access event - up */ PD_ACCESS_SCROLL_DOWN = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_DOWN, /**< Access event - scroll down */ PD_ACCESS_SCROLL_MOVE = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_MOVE, /**< Access event - scroll move */ - PD_ACCESS_SCROLL_UP = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_UP /**< Access event - scroll up */ + PD_ACCESS_SCROLL_UP = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_UP, /**< Access event - scroll up */ PD_ACCESS_VALUE_CHANGE = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_VALUE_CHANGE, /**< Access event - value change */ PD_ACCESS_MOUSE = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_MOUSE, /**< Access event - mouse */ PD_ACCESS_BACK = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_BACK, /**< Access event - back */ diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec index 75c262a..dfc74b7 100644 --- a/packaging/liblivebox-viewer.spec +++ b/packaging/liblivebox-viewer.spec @@ -2,7 +2,7 @@ Name: liblivebox-viewer Summary: Library for developing the application -Version: 0.31.4 +Version: 0.31.5 Release: 1 Group: HomeTF/Livebox License: Flora diff --git a/src/livebox.c b/src/livebox.c index 7eb37cb..d913fee 100644 --- a/src/livebox.c +++ b/src/livebox.c @@ -2494,8 +2494,7 @@ EAPI int livebox_access_event(struct livebox *handler, enum access_event_type ty int h = 1; char cmd[32] = { '\0', }; char *ptr = cmd; - int ret; - int type = 0; + int ret = 0; /* re-used for sending event type */ if (!handler || handler->state != CREATE) { ErrPrint("Handler is invalid\n"); @@ -2539,42 +2538,42 @@ EAPI int livebox_access_event(struct livebox *handler, enum access_event_type ty switch (type & ~(ACCESS_EVENT_PD_MASK | ACCESS_EVENT_LB_MASK)) { case ACCESS_EVENT_HIGHLIGHT: strcpy(ptr, "_access_hl"); - type = ACCESS_TYPE_CUR; + ret = ACCESS_TYPE_CUR; break; case ACCESS_EVENT_HIGHLIGHT_NEXT: strcpy(ptr, "_access_hl"); - type = ACCESS_TYPE_NEXT; + ret = ACCESS_TYPE_NEXT; break; case ACCESS_EVENT_HIGHLIGHT_PREV: strcpy(ptr, "_access_hl"); - type = ACCESS_TYPE_PREV; + ret = ACCESS_TYPE_PREV; break; case ACCESS_EVENT_UNHIGHLIGHT: strcpy(ptr, "_access_hl"); - type = ACCESS_TYPE_OFF; + ret = ACCESS_TYPE_OFF; break; case ACCESS_EVENT_ACTIVATE: strcpy(ptr, "_access_activate"); break; case ACCESS_EVENT_ACTION_DOWN: strcpy(ptr, "_access_action"); - type = ACCESS_TYPE_DOWN; + ret = ACCESS_TYPE_DOWN; break; case ACCESS_EVENT_ACTION_UP: strcpy(ptr, "_access_action"); - type = ACCESS_TYPE_UP; + ret = ACCESS_TYPE_UP; break; case ACCESS_EVENT_SCROLL_DOWN: strcpy(ptr, "_access_scroll"); - type = ACCESS_TYPE_DOWN; + ret = ACCESS_TYPE_DOWN; break; case ACCESS_EVENT_SCROLL_MOVE: strcpy(ptr, "_access_scroll"); - type = ACCESS_TYPE_MOVE; + ret = ACCESS_TYPE_MOVE; break; case ACCESS_EVENT_SCROLL_UP: strcpy(ptr, "_access_scroll"); - type = ACCESS_TYPE_UP; + ret = ACCESS_TYPE_UP; break; case ACCESS_EVENT_VALUE_CHANGE: strcpy(ptr, "_access_value_change"); @@ -2593,11 +2592,11 @@ EAPI int livebox_access_event(struct livebox *handler, enum access_event_type ty break; case ACCESS_EVENT_ENABLE: strcpy(ptr, "_access_enable"); - type = 1; + ret = 1; break; case ACCESS_EVENT_DISABLE: strcpy(ptr, "_access_enable"); - type = 0; + ret = 0; break; default: return LB_STATUS_ERROR_INVALID; @@ -2607,7 +2606,7 @@ EAPI int livebox_access_event(struct livebox *handler, enum access_event_type ty cb = default_access_event_cb; } - ret = send_access_event(handler, cmd, x * w, y * h, type); + ret = send_access_event(handler, cmd, x * w, y * h, ret); if (ret == (int)LB_STATUS_SUCCESS) { handler->cbs.access_event.cb = cb; handler->cbs.access_event.data = data; -- 2.7.4