X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fvirtual_window.c;h=7c2a77eb3a6451c3bafac6635bc96004ee198dd5;hb=4d2dca0e7fc702f76da305de48e4016adf7454dd;hp=58217f53a1cd1737123e473ec3c9bf21a9e998ad;hpb=b50ec832e34f8eb6cd7d4f28b9daa40a3ab75fd0;p=apps%2Fnative%2Fwidget%2Fwidget.git diff --git a/src/virtual_window.c b/src/virtual_window.c index 58217f5..7c2a77e 100755 --- a/src/virtual_window.c +++ b/src/virtual_window.c @@ -33,7 +33,7 @@ #include #include "widget.h" -#include "internal/widget.h" +#include "widget_internal.h" #include "debug.h" #define IS_GBAR 1 @@ -573,18 +573,18 @@ static Ecore_X_Pixmap alloc_pixmap_cb(void *data, Ecore_X_Window parent, int w, DbgPrint("Size of ee is updated: %dx%d - %d (info: %p)\n", info->w, info->h, depth, info); depth >>= 3; - if (widget_resource_id(info->handle, WIDGET_PRIMARY_BUFFER) == 0u) { + if (widget_viewer_get_resource_id(info->handle, WIDGET_PRIMARY_BUFFER) == 0u) { /** * @note * Need to allocate a primary buffer */ - widget_acquire_buffer(info->handle, WIDGET_PRIMARY_BUFFER, info->w, info->h, depth); + widget_viewer_acquire_buffer(info->handle, WIDGET_PRIMARY_BUFFER, info->w, info->h, depth); if (!info->handle) { ErrPrint("Failed to get the buffer\n"); return 0u; } - pixmap = (Ecore_X_Pixmap)widget_resource_id(info->handle, WIDGET_PRIMARY_BUFFER); + pixmap = (Ecore_X_Pixmap)widget_viewer_get_resource_id(info->handle, WIDGET_PRIMARY_BUFFER); } else if (WIDGET_CONF_EXTRA_BUFFER_COUNT > 0) { int idx; @@ -609,12 +609,12 @@ static Ecore_X_Pixmap alloc_pixmap_cb(void *data, Ecore_X_Window parent, int w, } } - if (widget_acquire_buffer(info->handle, idx, info->w, info->h, depth) < 0) { + if (widget_viewer_acquire_buffer(info->handle, idx, info->w, info->h, depth) < 0) { ErrPrint("Failed to acquire a buffer for %d\n", idx); return 0u; } - info->resource_array[idx] = widget_resource_id(info->handle, idx); + info->resource_array[idx] = widget_viewer_get_resource_id(info->handle, idx); if (info->resource_array[idx] == 0u) { ErrPrint("Failed to allocate pixmap\n"); } @@ -646,8 +646,8 @@ static void free_pixmap_cb(void *data, Ecore_X_Pixmap pixmap) ErrPrint("Impossible\n"); } - if (widget_resource_id(info->handle, WIDGET_PRIMARY_BUFFER) == pixmap) { - if (widget_release_buffer(info->handle, WIDGET_PRIMARY_BUFFER) < 0) { + if (widget_viewer_get_resource_id(info->handle, WIDGET_PRIMARY_BUFFER) == pixmap) { + if (widget_viewer_release_buffer(info->handle, WIDGET_PRIMARY_BUFFER) < 0) { DbgPrint("Failed to release buffer\n"); } info->resource_cnt--; @@ -660,7 +660,7 @@ static void free_pixmap_cb(void *data, Ecore_X_Pixmap pixmap) * Find a index to release it */ if (info->resource_array[idx] == pixmap) { - if (widget_release_buffer(info->handle, idx) < 0) { + if (widget_viewer_release_buffer(info->handle, idx) < 0) { DbgPrint("Failed to release buffer\n"); } info->resource_array[idx] = 0u; @@ -695,7 +695,7 @@ static void *alloc_fb(void *data, int size) return NULL; } - if (widget_acquire_buffer(info->handle, WIDGET_PRIMARY_BUFFER, info->w, info->h, sizeof(int)) < 0) { + if (widget_viewer_acquire_buffer(info->handle, WIDGET_PRIMARY_BUFFER, info->w, info->h, sizeof(int)) < 0) { ErrPrint("Failed to acquire buffer\n"); return NULL; } @@ -768,7 +768,7 @@ static void free_fb(void *data, void *ptr) ErrPrint("Unable to reach to here\n"); } - if (widget_release_buffer(info->handle, WIDGET_PRIMARY_BUFFER) < 0) { + if (widget_viewer_release_buffer(info->handle, WIDGET_PRIMARY_BUFFER) < 0) { ErrPrint("Failed to release buffer\n"); } @@ -849,14 +849,14 @@ static void post_render_cb(void *data, Evas *e, void *event_info) if (idx == WIDGET_CONF_EXTRA_BUFFER_COUNT) { /* Send updated event for PRIMARY BUFFER */ - if (front_resource_id == widget_resource_id(info->handle, WIDGET_PRIMARY_BUFFER)) { + if (front_resource_id == widget_viewer_get_resource_id(info->handle, WIDGET_PRIMARY_BUFFER)) { widget_send_updated_by_idx(info->handle, WIDGET_PRIMARY_BUFFER); } else { - DbgPrint("Unable to send updated: %u (%u)\n", front_resource_id, widget_resource_id(info->handle, WIDGET_PRIMARY_BUFFER)); + DbgPrint("Unable to send updated: %u (%u)\n", front_resource_id, widget_viewer_get_resource_id(info->handle, WIDGET_PRIMARY_BUFFER)); } } } else if (info->type == VWIN_SW_BUF) { - widget_sync_buffer(info->handle); + widget_viewer_sync_buffer(info->handle); } }