Merge branch 'tizen' into sandbox/cyeon/devel

[platform/core/uifw/libtdm.git] / src / tdm_server.c

diff --git a/src/tdm_server.c b/src/tdm_server.c
index 76bae78..a54e482 100644 (file)
--- a/src/tdm_server.c
+++ b/src/tdm_server.c
@@ -72,6 +72,7 @@ typedef struct _tdm_server_voutput_buffer {
        struct list_head link;
        struct wl_resource *wl_buffer;
        tbm_surface_h buffer;
+       int need_reset;
 } tdm_server_voutput_buffer;
 
 typedef struct _tdm_server_voutput_info {
@@ -93,6 +94,7 @@ typedef struct _tdm_server_voutput_info {
        struct list_head buffer_list;
        tdm_server_voutput_buffer *attach_buffer;
        int committing;
+       unsigned int request_commit;
 } tdm_server_voutput_info;
 
 typedef struct _tdm_server_vblank_info {
@@ -146,12 +148,11 @@ _tdm_server_get_process_name(pid_t pid, char *name, unsigned int size)
 
        len = fread(pname, sizeof(char), TDM_NAME_LEN, h);
        if (len == 0) {
-               char *p = strncpy(pname, "NO NAME", sizeof(pname) - 1);
-               len = p - pname;
+               strncpy(pname, "NO NAME", sizeof(pname));
+               pname[sizeof(pname) - 1] = '\0';
        }
-       pname[len - 1] = '\0';
 
-       strncpy(name, pname, size - 1);
+       strncpy(name, pname, size);
        name[size - 1] = '\0';
 
        fclose(h);
@@ -218,9 +219,12 @@ _tdm_server_timeout_timer_cb(void *user_data)
        tv_usec = TDM_TIME_USEC(curr);
 
        LIST_FOR_EACH_ENTRY(wait_info, &keep_private_server->wait_list, link) {
+               if (wait_info->timeout) continue;
+               if (vblank_info != wait_info->vblank_info) continue;
+
                wl_tdm_vblank_send_done(vblank_info->resource, wait_info->req_id,
                                                                0, tv_sec, tv_usec, TDM_ERROR_TIMEOUT);
-               TDM_ERR("tdm_server_vblank(%p) req_id(%d) timeout force send vblank", vblank_info);
+               TDM_ERR("tdm_server_vblank(%p) req_id(%d) timeout force send vblank", vblank_info, wait_info->req_id);
                wait_info->timeout = 1;
        }
 
@@ -866,8 +870,8 @@ _tdm_voutput_cb_set_mode(struct wl_client *client, struct wl_resource *resource,
        tdm_server_voutput_info *voutput_info = NULL;
        tdm_output *output = NULL;
        tdm_output_conn_status status = TDM_OUTPUT_CONN_STATUS_DISCONNECTED;
-       const tdm_output_mode *modes, *mode;
-
+       const tdm_output_mode *modes, *mode, *current_mode;
+       tdm_server_voutput_buffer *vb = NULL, *vbb = NULL;
        int count = 0;
        tdm_error ret;
 
@@ -885,8 +889,21 @@ _tdm_voutput_cb_set_mode(struct wl_client *client, struct wl_resource *resource,
        mode = &modes[index];
        TDM_DBG("mode set request to index:%d (%dx%d, %d)", index, mode->hdisplay, mode->vdisplay, mode->vrefresh);
 
-       ret = tdm_output_set_mode(output, mode);
+       ret = tdm_output_get_mode(output, &current_mode);
        TDM_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
+       if (mode == current_mode) {
+               TDM_DBG("same mode");
+               return;
+       }
+
+       if (current_mode && ((mode->hdisplay != current_mode->hdisplay) || (mode->vdisplay != current_mode->vdisplay))) {
+               LIST_FOR_EACH_ENTRY_SAFE(vb, vbb, &voutput_info->buffer_list, link) {
+                       if (vb->wl_buffer == voutput_info->attach_buffer->wl_buffer)
+                               voutput_info->attach_buffer->need_reset = 1;
+                       else
+                               wl_tdm_voutput_send_destroy_buffer(voutput_info->resource, vb->wl_buffer);
+               }
+       }
 
        tdm_output_request_mode_set(voutput_info->output, index);
 }
@@ -899,9 +916,12 @@ _tdm_voutput_cb_connect(struct wl_client *client, struct wl_resource *resource)
        voutput_info = wl_resource_get_user_data(resource);
        voutput_info->status = TDM_OUTPUT_CONN_STATUS_CONNECTED;
 
+       voutput_info->request_commit = 1;
+
        tdm_voutput_set_physical_size(voutput_info->voutput, voutput_info->mmwidth, voutput_info->mmheight);
        tdm_voutput_set_available_mode(voutput_info->voutput, voutput_info->available_modes.modes, voutput_info->available_modes.count);
        tdm_voutput_connect(voutput_info->voutput);
+       tdm_output_set_voutput_commit(voutput_info->voutput);
 }
 
 static void
@@ -919,11 +939,19 @@ _tdm_voutput_cb_disconnect(struct wl_client *client, struct wl_resource *resourc
        voutput_info->mmwidth = 0;
        voutput_info->mmheight = 0;
 
+       if (voutput_info->request_commit == 1) {
+               tdm_output_unset_voutput_commit(voutput_info->voutput);
+               voutput_info->request_commit = 0;
+       }
+
        if (voutput_info->attach_buffer) {
                tbm_surface_h buffer = voutput_info->attach_buffer->buffer;
                tbm_surface_internal_unref(buffer);
                voutput_info->committing = 0;
+               if (voutput_info->attach_buffer->need_reset)
+                       wl_tdm_voutput_send_destroy_buffer(voutput_info->resource, voutput_info->attach_buffer->wl_buffer);
                voutput_info->attach_buffer = NULL;
+               tdm_voutput_commit_done(voutput_info->voutput);
        }
 
        tdm_voutput_disconnect(voutput_info->voutput);
@@ -944,8 +972,13 @@ _tdm_voutput_cb_commit_done(struct wl_client *client, struct wl_resource *resour
        buffer = voutput_info->attach_buffer->buffer;
        tbm_surface_internal_unref(buffer);
        voutput_info->committing = 0;
+       if (voutput_info->attach_buffer->need_reset)
+               wl_tdm_voutput_send_destroy_buffer(voutput_info->resource, voutput_info->attach_buffer->wl_buffer);
        voutput_info->attach_buffer = NULL;
 
+       if (voutput_info->request_commit == 1)
+               tdm_output_set_voutput_commit(voutput_info->voutput);
+
        tdm_voutput_commit_done(voutput_info->voutput);
 }
 
@@ -1133,7 +1166,6 @@ _tdm_output_get_voutput_buffer(tdm_server_voutput_info *voutput_info, tbm_surfac
 
        LIST_FOR_EACH_ENTRY(vb, &voutput_info->buffer_list, link) {
                if (vb && vb->buffer == buffer) {
-                       tbm_surface_internal_ref(vb->buffer);
                        return vb;
                }
        }
@@ -1214,7 +1246,6 @@ tdm_voutput_commit_buffer(tdm_voutput *voutput)
        TDM_RETURN_VAL_IF_FAIL(voutput_info->attach_buffer != NULL, TDM_ERROR_OPERATION_FAILED);
        TDM_RETURN_VAL_IF_FAIL(voutput_info->committing == 0, TDM_ERROR_OPERATION_FAILED);
 
-       tbm_surface_internal_ref(voutput_info->attach_buffer->buffer);
        voutput_info->committing = 1;
 
        wl_tdm_voutput_send_commit(voutput_info->resource);
@@ -1234,10 +1265,20 @@ tdm_voutput_cb_resource_destroy(struct wl_resource *resource)
 
        voutput = voutput_info->voutput;
 
-       if (voutput)
+       if (voutput_info->request_commit)
+               tdm_output_unset_voutput_commit(voutput_info->voutput);
+
+       if (voutput) {
+               if (voutput_info->request_commit == 1) {
+                       tdm_output_unset_voutput_commit(voutput_info->voutput);
+                       voutput_info->request_commit = 0;
+                       tdm_voutput_disconnect(voutput_info->voutput);
+               }
+
                ret = tdm_voutput_destroy(voutput);
-       if (ret != TDM_ERROR_NONE)
-               TDM_ERR("_tdm_voutput_cb_destroy fail");
+               if (ret != TDM_ERROR_NONE)
+                       TDM_ERR("_tdm_voutput_cb_destroy fail");
+       }
 
        if (voutput_info->attach_buffer) {
                tbm_surface_h buffer = voutput_info->attach_buffer->buffer;
@@ -1275,7 +1316,7 @@ _tdm_server_cb_create_virtual_output(struct wl_client *client, struct wl_resourc
                return;
        }
 
-       voutput = tdm_voutput_create(private_server->private_loop->dpy, name, &ret);
+       voutput = tdm_display_voutput_create(private_server->private_loop->dpy, name, &ret);
        if (!voutput) {
                TDM_ERR("voutput creation fail(%s)(%d).", name, ret);
                wl_resource_post_error(resource, WL_DISPLAY_ERROR_NO_MEMORY,
@@ -1360,7 +1401,9 @@ _tdm_server_cb_debug(struct wl_client *client, struct wl_resource *resource, con
                char buffer[TDM_DEBUG_REPLY_MSG_LEN];
                int copylen = TDM_MIN(size, sizeof(buffer) - 1);
 
-               strncpy(buffer, m, copylen);
+        memcpy(buffer, m, sizeof(buffer));
+               buffer[sizeof(buffer) - 1] = '\0';
+
                m += copylen;
                size -= copylen;