add stamp to vblank objects

[platform/core/uifw/libtdm.git] / client / tdm_client.c

diff --git a/client/tdm_client.c b/client/tdm_client.c
index 04c9d2f..cd74513 100644 (file)
--- a/client/tdm_client.c
+++ b/client/tdm_client.c
@@ -94,6 +94,7 @@ struct _tdm_private_client_vblank {
        unsigned int enable_fake;
 
        unsigned int started;
+       unsigned int stamp;
 
        double last_time;
 
@@ -123,6 +124,16 @@ typedef struct _tdm_client_wait_info {
 } tdm_client_wait_info;
 
 static void
+_tdm_client_vblank_cb_stamp(void *data, struct wl_tdm_vblank *wl_tdm_vblank, uint32_t stamp)
+{
+       tdm_private_client_vblank *private_vblank = data;
+
+       TDM_RETURN_IF_FAIL(private_vblank != NULL);
+
+       private_vblank->stamp = stamp;
+}
+
+static void
 _tdm_client_vblank_cb_done(void *data, struct wl_tdm_vblank *wl_tdm_vblank,
                                                   uint32_t req_id, uint32_t sequence, uint32_t tv_sec,
                                                   uint32_t tv_usec, uint32_t error)
@@ -159,6 +170,7 @@ _tdm_client_vblank_cb_done(void *data, struct wl_tdm_vblank *wl_tdm_vblank,
 }
 
 static const struct wl_tdm_vblank_listener tdm_client_vblank_listener = {
+       _tdm_client_vblank_cb_stamp,
        _tdm_client_vblank_cb_done,
 };
 
@@ -188,7 +200,7 @@ _tdm_client_output_destroy(tdm_private_client_output *private_output)
 
 static void
 _tdm_client_output_cb_mode(void *data, struct wl_tdm_output *wl_tdm_output,
-                                                  uint32_t width, uint32_t height, uint32_t refresh)
+                                                  uint32_t width, uint32_t height, uint32_t refresh, uint32_t error)
 {
        tdm_private_client_output *private_output = (tdm_private_client_output*)data;
 
@@ -198,13 +210,16 @@ _tdm_client_output_cb_mode(void *data, struct wl_tdm_output *wl_tdm_output,
        private_output->height = height;
        private_output->refresh = refresh;
 
+       if (error != TDM_ERROR_NONE)
+               TDM_INFO("mode event error: %d", error);
+
        TDM_DBG("private_output(%p) wl_tbm_output@%d width(%d) height(%d) refresh(%d)",
                        private_output, wl_proxy_get_id((struct wl_proxy*)private_output->output),
                        width, height, refresh);
 }
 
 static void
-_tdm_client_output_cb_connection(void *data, struct wl_tdm_output *wl_tdm_output, uint32_t value)
+_tdm_client_output_cb_connection(void *data, struct wl_tdm_output *wl_tdm_output, uint32_t value, uint32_t error)
 {
        tdm_private_client_output *private_output = (tdm_private_client_output*)data;
        tdm_client_output_handler_info *h = NULL;
@@ -217,6 +232,9 @@ _tdm_client_output_cb_connection(void *data, struct wl_tdm_output *wl_tdm_output
 
        private_output->connection = value;
 
+       if (error != TDM_ERROR_NONE)
+               TDM_INFO("connection event error: %d", error);
+
        TDM_DBG("private_output(%p) wl_tbm_output@%d connection(%d)",
                        private_output,
                        wl_proxy_get_id((struct wl_proxy*)private_output->output),
@@ -230,7 +248,7 @@ _tdm_client_output_cb_connection(void *data, struct wl_tdm_output *wl_tdm_output
 }
 
 static void
-_tdm_client_output_cb_dpms(void *data, struct wl_tdm_output *wl_tdm_output, uint32_t value)
+_tdm_client_output_cb_dpms(void *data, struct wl_tdm_output *wl_tdm_output, uint32_t value, uint32_t error)
 {
        tdm_private_client_output *private_output = (tdm_private_client_output*)data;
        tdm_client_output_handler_info *h = NULL;
@@ -243,6 +261,9 @@ _tdm_client_output_cb_dpms(void *data, struct wl_tdm_output *wl_tdm_output, uint
 
        private_output->dpms = value;
 
+       if (error != TDM_ERROR_NONE)
+               TDM_INFO("dpms event error: %d", error);
+
        TDM_DBG("private_output(%p) wl_tbm_output@%d dpms(%d)",
                        private_output,
                        wl_proxy_get_id((struct wl_proxy*)private_output->output),
@@ -640,6 +661,7 @@ tdm_client_output_get_dpms(tdm_client_output *output, tdm_output_dpms *dpms)
 tdm_client_vblank*
 tdm_client_output_create_vblank(tdm_client_output *output, tdm_error *error)
 {
+       tdm_private_client *private_client;
        tdm_private_client_output *private_output;
        tdm_private_client_vblank *private_vblank;
 
@@ -654,6 +676,14 @@ tdm_client_output_create_vblank(tdm_client_output *output, tdm_error *error)
        }
 
        private_output = (tdm_private_client_output*)output;
+       private_client = private_output->private_client;
+
+       if (!private_client) {
+               TDM_ERR("'!private_client' failed");
+               if (error)
+                       *error = TDM_ERROR_INVALID_PARAMETER;
+               return NULL;
+       }
 
        private_vblank = calloc(1, sizeof *private_vblank);
        if (!private_vblank) {
@@ -684,6 +714,7 @@ tdm_client_output_create_vblank(tdm_client_output *output, tdm_error *error)
 
        wl_tdm_vblank_add_listener(private_vblank->vblank,
                                                           &tdm_client_vblank_listener, private_vblank);
+       wl_display_roundtrip(private_client->display);
 
        return (tdm_client_vblank*)private_vblank;
 }
@@ -824,11 +855,16 @@ tdm_client_vblank_wait(tdm_client_vblank *vblank, unsigned int interval, tdm_cli
        if (!private_vblank->started)
                private_vblank->started = 1;
 
-       if (private_output->watch_output_changes)
-               if (private_output->dpms != TDM_OUTPUT_DPMS_ON && !private_vblank->enable_fake) {
-                       TDM_INFO("dpms off");
+       if (private_output->watch_output_changes && !private_vblank->enable_fake) {
+               if (private_output->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
+                       TDM_ERR("output disconnected");
+                       return TDM_ERROR_OUTPUT_DISCONNECTED;
+               }
+               if (private_output->dpms != TDM_OUTPUT_DPMS_ON) {
+                       TDM_ERR("dpms off");
                        return TDM_ERROR_DPMS_OFF;
                }
+       }
 
        w = calloc(1, sizeof *w);
        if (!w) {
@@ -901,11 +937,16 @@ tdm_client_vblank_wait_seq(tdm_client_vblank *vblank, unsigned int sequence,
        if (!private_vblank->started)
                private_vblank->started = 1;
 
-       if (private_output->watch_output_changes)
-               if (private_output->dpms != TDM_OUTPUT_DPMS_ON && !private_vblank->enable_fake) {
-                       TDM_INFO("dpms off");
+       if (private_output->watch_output_changes && !private_vblank->enable_fake) {
+               if (private_output->connection == TDM_OUTPUT_CONN_STATUS_DISCONNECTED) {
+                       TDM_ERR("output disconnected");
+                       return TDM_ERROR_OUTPUT_DISCONNECTED;
+               }
+               if (private_output->dpms != TDM_OUTPUT_DPMS_ON) {
+                       TDM_ERR("dpms off");
                        return TDM_ERROR_DPMS_OFF;
                }
+       }
 
        w = calloc(1, sizeof *w);
        if (!w) {