mmi-client: fill out args of each event before sending to app and fix indentation

Change-Id: I59774a1b648f67f49e28e4fdc4b5e0daffbdfa8c
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

diff --git a/src/mmi-client.c b/src/mmi-client.c
index 02e4068..e271793 100644 (file)
--- a/src/mmi-client.c
+++ b/src/mmi-client.c
@@ -564,9 +564,10 @@ client_manager_send_state_change_event(mmi_client *client, state_change_event_ar
                return -1;
        }
 
-       //TODO: fill out event
        rpc_port_state_change_event_set_type(state_change_event_h, ev->type);
        rpc_port_state_change_event_set_timestamp(state_change_event_h, ev->timestamp);
+       rpc_port_state_change_event_set_state(state_change_event_h, ev->state);
+       rpc_port_state_change_event_set_old_state(state_change_event_h, ev->old_state);
 
        r = rpc_port_mmifw_state_change_event_cb_invoke(client->state_change_cb_h, state_change_event_h);
        if (r)
@@ -586,269 +587,276 @@ err:
 int
 client_manager_send_wakeup_event(mmi_client *client, wakeup_event_arg *args)
 {
-        int r;
-        rpc_port_wakeup_event_h wakeup_event_h = NULL;
-        wakeup_event_arg *ev = (wakeup_event_arg *)args;
-
-        if (!client || !args)
-        {
-                LOGE("Invalid client or args was given !\n");
-                return -1;
-        }
-
-        if (!client->wakeup_cb_h)
-        {
-                LOGE("Given client doesn't have wakeup_cb handle !\n");
-                return -1;
-        }
-
-        r = rpc_port_wakeup_event_create(&wakeup_event_h);
-        if (r)
-        {
-                LOGE("Failed to create wakeup_event_h ! (error:%d)\n", r);
-                return -1;
-        }
-
-        //TODO: fill out event
-        rpc_port_wakeup_event_set_type(wakeup_event_h, ev->type);
-        rpc_port_wakeup_event_set_timestamp(wakeup_event_h, ev->timestamp);
-
-        r = rpc_port_mmifw_wakeup_event_cb_invoke(client->wakeup_cb_h, wakeup_event_h);
-        if (r)
-        {
-                LOGE("Failed to invoke wakeup_event_cb ! (error:%d)\n", r);
-                goto err;
-        }
-
-        return 0;
+       int r;
+       rpc_port_wakeup_event_h wakeup_event_h = NULL;
+       wakeup_event_arg *ev = (wakeup_event_arg *)args;
+
+       if (!client || !args)
+       {
+               LOGE("Invalid client or args was given !\n");
+               return -1;
+       }
+
+       if (!client->wakeup_cb_h)
+       {
+               LOGE("Given client doesn't have wakeup_cb handle !\n");
+               return -1;
+       }
+
+       r = rpc_port_wakeup_event_create(&wakeup_event_h);
+       if (r)
+       {
+               LOGE("Failed to create wakeup_event_h ! (error:%d)\n", r);
+               return -1;
+       }
+
+       rpc_port_wakeup_event_set_type(wakeup_event_h, ev->type);
+       rpc_port_wakeup_event_set_timestamp(wakeup_event_h, ev->timestamp);
+       rpc_port_wakeup_event_set_source(wakeup_event_h, ev->source);
+
+       r = rpc_port_mmifw_wakeup_event_cb_invoke(client->wakeup_cb_h, wakeup_event_h);
+       if (r)
+       {
+               LOGE("Failed to invoke wakeup_event_cb ! (error:%d)\n", r);
+               goto err;
+       }
+
+       return 0;
 err:
-        if (wakeup_event_h)
-                rpc_port_wakeup_event_destroy(wakeup_event_h);
+       if (wakeup_event_h)
+               rpc_port_wakeup_event_destroy(wakeup_event_h);
 
-        return -1;
+       return -1;
 }
 
 int
 client_manager_send_key_event(mmi_client *client, key_event_arg *args)
 {
-        int r;
-        rpc_port_key_event_h key_event_h = NULL;
-        key_event_arg *ev = (key_event_arg *)args;
-
-        if (!client || !args)
-        {
-                LOGE("Invalid client or args was given !\n");
-                return -1;
-        }
-
-        if (!client->key_cb_h)
-        {
-                LOGE("Given client doesn't have key_cb handle !\n");
-                return -1;
-        }
-
-        r = rpc_port_key_event_create(&key_event_h);
-        if (r)
-        {
-                LOGE("Failed to create key_event_h ! (error:%d)\n", r);
-                return -1;
-        }
-
-        //TODO: fill out event
-        rpc_port_key_event_set_type(key_event_h, ev->type);
-        rpc_port_key_event_set_timestamp(key_event_h, ev->timestamp);
-
-        r = rpc_port_mmifw_key_event_cb_invoke(client->key_cb_h, key_event_h);
-        if (r)
-        {
-                LOGE("Failed to invoke key_event_cb ! (error:%d)\n", r);
-                goto err;
-        }
-
-        return 0;
+       int r;
+       rpc_port_key_event_h key_event_h = NULL;
+       key_event_arg *ev = (key_event_arg *)args;
+
+       if (!client || !args)
+       {
+               LOGE("Invalid client or args was given !\n");
+               return -1;
+       }
+
+       if (!client->key_cb_h)
+       {
+               LOGE("Given client doesn't have key_cb handle !\n");
+               return -1;
+       }
+
+       r = rpc_port_key_event_create(&key_event_h);
+       if (r)
+       {
+               LOGE("Failed to create key_event_h ! (error:%d)\n", r);
+               return -1;
+       }
+
+       rpc_port_key_event_set_type(key_event_h, ev->type);
+       rpc_port_key_event_set_timestamp(key_event_h, ev->timestamp);
+       rpc_port_key_event_set_key_down(key_event_h, ev->key_down);
+       rpc_port_key_event_set_keycode(key_event_h, ev->keycode);
+       rpc_port_key_event_set_keyname(key_event_h, ev->keyname);
+       rpc_port_key_event_set_source(key_event_h, ev->source);
+
+       r = rpc_port_mmifw_key_event_cb_invoke(client->key_cb_h, key_event_h);
+       if (r)
+       {
+               LOGE("Failed to invoke key_event_cb ! (error:%d)\n", r);
+               goto err;
+       }
+
+       return 0;
 err:
-        if (key_event_h)
-                rpc_port_key_event_destroy(key_event_h);
+       if (key_event_h)
+               rpc_port_key_event_destroy(key_event_h);
 
-        return -1;
+       return -1;
 }
 
 int
 client_manager_send_gesture_event(mmi_client *client, gesture_event_arg *args)
 {
-        int r;
-        rpc_port_gesture_event_h gesture_event_h = NULL;
-        gesture_event_arg *ev = (gesture_event_arg *)args;
-
-        if (!client || !args)
-        {
-                LOGE("Invalid client or args was given !\n");
-                return -1;
-        }
-
-        if (!client->gesture_cb_h)
-        {
-                LOGE("Given client doesn't have gesture_cb handle !\n");
-                return -1;
-        }
-
-        r = rpc_port_gesture_event_create(&gesture_event_h);
-        if (r)
-        {
-                LOGE("Failed to create gesture_event_h ! (error:%d)\n", r);
-                return -1;
-        }
-
-        //TODO: fill out event
-        rpc_port_gesture_event_set_type(gesture_event_h, ev->type);
-        rpc_port_gesture_event_set_timestamp(gesture_event_h, ev->timestamp);
-
-        r = rpc_port_mmifw_gesture_event_cb_invoke(client->gesture_cb_h, gesture_event_h);
-        if (r)
-        {
-                LOGE("Failed to invoke gesture_event_cb ! (error:%d)\n", r);
-                goto err;
-        }
-
-        return 0;
+       int r;
+       rpc_port_gesture_event_h gesture_event_h = NULL;
+       gesture_event_arg *ev = (gesture_event_arg *)args;
+
+       if (!client || !args)
+       {
+               LOGE("Invalid client or args was given !\n");
+               return -1;
+       }
+
+       if (!client->gesture_cb_h)
+       {
+               LOGE("Given client doesn't have gesture_cb handle !\n");
+               return -1;
+       }
+
+       r = rpc_port_gesture_event_create(&gesture_event_h);
+       if (r)
+       {
+               LOGE("Failed to create gesture_event_h ! (error:%d)\n", r);
+               return -1;
+       }
+
+       rpc_port_gesture_event_set_type(gesture_event_h, ev->type);
+       rpc_port_gesture_event_set_timestamp(gesture_event_h, ev->timestamp);
+       rpc_port_gesture_event_set_source(gesture_event_h, ev->source);
+
+       r = rpc_port_mmifw_gesture_event_cb_invoke(client->gesture_cb_h, gesture_event_h);
+       if (r)
+       {
+               LOGE("Failed to invoke gesture_event_cb ! (error:%d)\n", r);
+               goto err;
+       }
+
+       return 0;
 err:
-        if (gesture_event_h)
-                rpc_port_gesture_event_destroy(gesture_event_h);
+       if (gesture_event_h)
+               rpc_port_gesture_event_destroy(gesture_event_h);
 
-        return -1;
+       return -1;
 }
 
 int
 client_manager_send_voice_event(mmi_client *client, voice_event_arg *args)
 {
-        int r;
-        rpc_port_voice_event_h voice_event_h = NULL;
-        voice_event_arg *ev = (voice_event_arg *)args;
-
-        if (!client || !args)
-        {
-                LOGE("Invalid client or args was given !\n");
-                return -1;
-        }
-
-        if (!client->voice_cb_h)
-        {
-                LOGE("Given client doesn't have voice_cb handle !\n");
-                return -1;
-        }
-
-        r = rpc_port_voice_event_create(&voice_event_h);
-        if (r)
-        {
-                LOGE("Failed to create voice_event_h ! (error:%d)\n", r);
-                return -1;
-        }
-
-        //TODO: fill out event
-        rpc_port_voice_event_set_type(voice_event_h, ev->type);
-        rpc_port_voice_event_set_timestamp(voice_event_h, ev->timestamp);
-
-        r = rpc_port_mmifw_voice_event_cb_invoke(client->voice_cb_h, voice_event_h);
-        if (r)
-        {
-                LOGE("Failed to invoke voice_event_cb ! (error:%d)\n", r);
-                goto err;
-        }
-
-        return 0;
+       int r;
+       rpc_port_voice_event_h voice_event_h = NULL;
+       voice_event_arg *ev = (voice_event_arg *)args;
+
+       if (!client || !args)
+       {
+               LOGE("Invalid client or args was given !\n");
+               return -1;
+       }
+
+       if (!client->voice_cb_h)
+       {
+               LOGE("Given client doesn't have voice_cb handle !\n");
+               return -1;
+       }
+
+       r = rpc_port_voice_event_create(&voice_event_h);
+       if (r)
+       {
+               LOGE("Failed to create voice_event_h ! (error:%d)\n", r);
+               return -1;
+       }
+
+       rpc_port_voice_event_set_type(voice_event_h, ev->type);
+       rpc_port_voice_event_set_timestamp(voice_event_h, ev->timestamp);
+       rpc_port_voice_event_set_source(voice_event_h, ev->source);
+
+       r = rpc_port_mmifw_voice_event_cb_invoke(client->voice_cb_h, voice_event_h);
+       if (r)
+       {
+               LOGE("Failed to invoke voice_event_cb ! (error:%d)\n", r);
+               goto err;
+       }
+
+       return 0;
 err:
-        if (voice_event_h)
-                rpc_port_voice_event_destroy(voice_event_h);
+       if (voice_event_h)
+               rpc_port_voice_event_destroy(voice_event_h);
 
-        return -1;
+       return -1;
 }
 
 int
 client_manager_send_action_event(mmi_client *client, action_event_arg *args)
 {
-        int r;
-        rpc_port_action_event_h action_event_h = NULL;
-        action_event_arg *ev = (action_event_arg *)args;
-
-        if (!client || !args)
-        {
-                LOGE("Invalid client or args was given !\n");
-                return -1;
-        }
-
-        if (!client->action_cb_h)
-        {
-                LOGE("Given client doesn't have action_cb handle !\n");
-                return -1;
-        }
-
-        r = rpc_port_action_event_create(&action_event_h);
-        if (r)
-        {
-                LOGE("Failed to create action_event_h ! (error:%d)\n", r);
-                return -1;
-        }
-
-        //TODO: fill out event
-        rpc_port_action_event_set_type(action_event_h, ev->type);
-        rpc_port_action_event_set_timestamp(action_event_h, ev->timestamp);
-
-        r = rpc_port_mmifw_action_event_cb_invoke(client->action_cb_h, action_event_h);
-        if (r)
-        {
-                LOGE("Failed to invoke action_event_cb ! (error:%d)\n", r);
-                goto err;
-        }
-
-        return 0;
+       int r;
+       rpc_port_action_event_h action_event_h = NULL;
+       action_event_arg *ev = (action_event_arg *)args;
+
+       if (!client || !args)
+       {
+               LOGE("Invalid client or args was given !\n");
+               return -1;
+       }
+
+       if (!client->action_cb_h)
+       {
+               LOGE("Given client doesn't have action_cb handle !\n");
+               return -1;
+       }
+
+       r = rpc_port_action_event_create(&action_event_h);
+       if (r)
+       {
+               LOGE("Failed to create action_event_h ! (error:%d)\n", r);
+               return -1;
+       }
+
+       rpc_port_action_event_set_type(action_event_h, ev->type);
+       rpc_port_action_event_set_timestamp(action_event_h, ev->timestamp);
+       rpc_port_action_event_set_cmd(action_event_h, ev->cmd);
+       rpc_port_action_event_set_nargs(action_event_h, ev->nargs);
+       rpc_port_action_event_set_source(action_event_h, ev->source);
+       rpc_port_action_event_set_args(action_event_h, ev->args, ev->nargs);
+
+       r = rpc_port_mmifw_action_event_cb_invoke(client->action_cb_h, action_event_h);
+       if (r)
+       {
+               LOGE("Failed to invoke action_event_cb ! (error:%d)\n", r);
+               goto err;
+       }
+
+       return 0;
 err:
-        if (action_event_h)
-                rpc_port_action_event_destroy(action_event_h);
+       if (action_event_h)
+               rpc_port_action_event_destroy(action_event_h);
 
-        return -1;
+       return -1;
 }
 
 int
 client_manager_send_feedback_event(mmi_client *client, feedback_event_arg *args)
 {
-        int r;
-        rpc_port_feedback_event_h feedback_event_h = NULL;
-        feedback_event_arg *ev = (feedback_event_arg *)args;
-
-        if (!client || !args)
-        {
-                LOGE("Invalid client or args was given !\n");
-                return -1;
-        }
-
-        if (!client->feedback_cb_h)
-        {
-                LOGE("Given client doesn't have feedback_cb handle !\n");
-                return -1;
-        }
-
-        r = rpc_port_feedback_event_create(&feedback_event_h);
-        if (r)
-        {
-                LOGE("Failed to create feedback_event_h ! (error:%d)\n", r);
-                return -1;
-        }
-
-        //TODO: fill out event
-        rpc_port_feedback_event_set_type(feedback_event_h, ev->type);
-        rpc_port_feedback_event_set_timestamp(feedback_event_h, ev->timestamp);
-
-        r = rpc_port_mmifw_feedback_event_cb_invoke(client->feedback_cb_h, feedback_event_h);
-        if (r)
-        {
-                LOGE("Failed to invoke feedback_event_cb ! (error:%d)\n", r);
-                goto err;
-        }
-
-        return 0;
+       int r;
+       rpc_port_feedback_event_h feedback_event_h = NULL;
+       feedback_event_arg *ev = (feedback_event_arg *)args;
+
+       if (!client || !args)
+       {
+               LOGE("Invalid client or args was given !\n");
+               return -1;
+       }
+
+       if (!client->feedback_cb_h)
+       {
+               LOGE("Given client doesn't have feedback_cb handle !\n");
+               return -1;
+       }
+
+       r = rpc_port_feedback_event_create(&feedback_event_h);
+       if (r)
+       {
+               LOGE("Failed to create feedback_event_h ! (error:%d)\n", r);
+               return -1;
+       }
+
+       rpc_port_feedback_event_set_type(feedback_event_h, ev->type);
+       rpc_port_feedback_event_set_timestamp(feedback_event_h, ev->timestamp);
+       rpc_port_feedback_event_set_feedback(feedback_event_h, ev->feedback);
+       rpc_port_feedback_event_set_comment(feedback_event_h, ev->comment);
+
+       r = rpc_port_mmifw_feedback_event_cb_invoke(client->feedback_cb_h, feedback_event_h);
+       if (r)
+       {
+               LOGE("Failed to invoke feedback_event_cb ! (error:%d)\n", r);
+               goto err;
+       }
+
+       return 0;
 err:
-        if (feedback_event_h)
-                rpc_port_feedback_event_destroy(feedback_event_h);
+       if (feedback_event_h)
+               rpc_port_feedback_event_destroy(feedback_event_h);
 
-        return -1;
+       return -1;
 }