Replace "struct dynamicbox *" with "dynamicbox_h"

[model] Redwood,Kiran,B3(Wearable)
[binary_type] AP
[customer] Docomo/Orange/ATT/Open
[issue#] N/A
[problem]
[cause]
[solution]
[team] HomeTF
[request]
[horizontal_expansion]

Change-Id: I74aa2b5652edea766736fac2287c270b7aefe141

diff --git a/include/dynamicbox.h b/include/dynamicbox.h
index 513f8de..0f4bdf8 100644 (file)
--- a/include/dynamicbox.h
+++ b/include/dynamicbox.h
@@ -37,7 +37,7 @@ extern "C" {
  * @brief Structure definition for a Dynamic Box instance.
  * @since_tizen 2.3
  */
-struct dynamicbox;
+typedef struct dynamicbox *dynamicbox_h;
 
 /**
  * @internal
@@ -314,20 +314,20 @@ struct dynamicbox_key_event_info {
  * @since_tizen 2.3
  */
 struct dynamicbox_script_operators {
-       int (*update_begin)(struct dynamicbox *handle); /**< Content parser is started */
-       int (*update_end)(struct dynamicbox *handle); /**< Content parser is finished */
+       int (*update_begin)(dynamicbox_h handle); /**< Content parser is started */
+       int (*update_end)(dynamicbox_h handle); /**< Content parser is finished */
 
        /* Listed functions will be called when parser meets each typed content */
-       int (*update_text)(struct dynamicbox *handle, const char *id, const char *part, const char *data); /**< Update text content */
-       int (*update_image)(struct dynamicbox *handle, const char *id, const char *part, const char *data, const char *option); /**< Update image content */
-       int (*update_script)(struct dynamicbox *handle, const char *id, const char *new_id, const char *part, const char *file, const char *group); /**< Update script content */
-       int (*update_signal)(struct dynamicbox *handle, const char *id, const char *emission, const char *signal); /**< Update signal */
-       int (*update_drag)(struct dynamicbox *handle, const char *id, const char *part, double dx, double dy); /**< Update drag info */
-       int (*update_info_size)(struct dynamicbox *handle, const char *id, int w, int h); /**< Update content size */
-       int (*update_info_category)(struct dynamicbox *handle, const char *id, const char *category); /**< Update content category info */
-       int (*update_access)(struct dynamicbox *handle, const char *id, const char *part, const char *text, const char *option); /**< Update access information */
-       int (*operate_access)(struct dynamicbox *handle, const char *id, const char *part, const char *operation, const char *option); /**< Update access operation */
-       int (*update_color)(struct dynamicbox *handle, const char *id, const char *part, const char *data); /**< Update color */
+       int (*update_text)(dynamicbox_h handle, const char *id, const char *part, const char *data); /**< Update text content */
+       int (*update_image)(dynamicbox_h handle, const char *id, const char *part, const char *data, const char *option); /**< Update image content */
+       int (*update_script)(dynamicbox_h handle, const char *id, const char *new_id, const char *part, const char *file, const char *group); /**< Update script content */
+       int (*update_signal)(dynamicbox_h handle, const char *id, const char *emission, const char *signal); /**< Update signal */
+       int (*update_drag)(dynamicbox_h handle, const char *id, const char *part, double dx, double dy); /**< Update drag info */
+       int (*update_info_size)(dynamicbox_h handle, const char *id, int w, int h); /**< Update content size */
+       int (*update_info_category)(dynamicbox_h handle, const char *id, const char *category); /**< Update content category info */
+       int (*update_access)(dynamicbox_h handle, const char *id, const char *part, const char *text, const char *option); /**< Update access information */
+       int (*operate_access)(dynamicbox_h handle, const char *id, const char *part, const char *operation, const char *option); /**< Update access operation */
+       int (*update_color)(dynamicbox_h handle, const char *id, const char *part, const char *data); /**< Update color */
 };
 
 /**
@@ -353,7 +353,7 @@ struct dynamicbox_script_operators {
  * @see dynamicbox_acquire_resource_id()
  * @see dynamicbox_set_update_mode()
  */
-typedef void (*dynamicbox_ret_cb_t)(struct dynamicbox *handle, int ret, void *data);
+typedef void (*dynamicbox_ret_cb_t)(dynamicbox_h handle, int ret, void *data);
 
 /**
  * @internal
@@ -463,7 +463,7 @@ extern int dynamicbox_viewer_set_resumed(void);
  * @retval @c NULL if it fails to create a handle
  * @see dynamicbox_ret_cb_t
  */
-extern struct dynamicbox *dynamicbox_add(const char *pkgname, const char *content, const char *cluster, const char *category, double period, int type, dynamicbox_ret_cb_t cb, void *data);
+extern dynamicbox_h dynamicbox_add(const char *pkgname, const char *content, const char *cluster, const char *category, double period, int type, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -484,7 +484,7 @@ extern struct dynamicbox *dynamicbox_add(const char *pkgname, const char *conten
  * @retval #DBOX_STATUS_ERROR_NONE Successfully sent, return callack will be called
  * @see dynamicbox_ret_cb_t
  */
-extern int dynamicbox_del(struct dynamicbox *handler, int type, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_del(dynamicbox_h handler, int type, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -501,7 +501,7 @@ extern int dynamicbox_del(struct dynamicbox *handler, int type, dynamicbox_ret_c
  * @retval #DBOX_STATUS_ERROR_OUT_OF_MEMORY Not enough memory
  * @see dynamicbox_unset_event_handler()
  */
-extern int dynamicbox_set_event_handler(int (*cb)(struct dynamicbox *handler, enum dynamicbox_event_type event, void *data), void *data);
+extern int dynamicbox_set_event_handler(int (*cb)(dynamicbox_h handler, enum dynamicbox_event_type event, void *data), void *data);
 
 /**
  * @internal
@@ -512,7 +512,7 @@ extern int dynamicbox_set_event_handler(int (*cb)(struct dynamicbox *handler, en
  * @retval pointer Pointer of 'data' which is used with the dynamicbox_set_event_handler
  * @see dynamicbox_set_event_handler()
  */
-extern void *dynamicbox_unset_event_handler(int (*cb)(struct dynamicbox *handler, enum dynamicbox_event_type event, void *data));
+extern void *dynamicbox_unset_event_handler(int (*cb)(dynamicbox_h handler, enum dynamicbox_event_type event, void *data));
 
 /**
  * @internal
@@ -600,7 +600,7 @@ extern int dynamicbox_activate(const char *pkgname, dynamicbox_ret_cb_t cb, void
  * @retval #DBOX_STATUS_ERROR_FAULT Failed to make a request
  * @see dynamicbox_ret_cb_t
  */
-extern int dynamicbox_resize(struct dynamicbox *handler, int type, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_resize(dynamicbox_h handler, int type, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -616,7 +616,7 @@ extern int dynamicbox_resize(struct dynamicbox *handler, int type, dynamicbox_re
  * @retval #DBOX_STATUS_ERROR_FAULT Unrecoverable error occurred
  * @retval #DBOX_STATUS_ERROR_NONE Successfully done
  */
-extern int dynamicbox_click(struct dynamicbox *handler, double x, double y);
+extern int dynamicbox_click(dynamicbox_h handler, double x, double y);
 
 /**
  * @internal
@@ -637,7 +637,7 @@ extern int dynamicbox_click(struct dynamicbox *handler, double x, double y);
  * @retval #DBOX_STATUS_ERROR_FAULT Failed to make a request
  * @see dynamicbox_ret_cb_t
  */
-extern int dynamicbox_set_group(struct dynamicbox *handler, const char *cluster, const char *category, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_set_group(dynamicbox_h handler, const char *cluster, const char *category, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -652,7 +652,7 @@ extern int dynamicbox_set_group(struct dynamicbox *handler, const char *cluster,
  * @retval #DBOX_STATUS_ERROR_INVALID_PARAMETER Invalid argument
  * @retval #DBOX_STATUS_ERROR_NONE Successfully done
  */
-extern int dynamicbox_get_group(struct dynamicbox *handler, const char **cluster, const char **category);
+extern int dynamicbox_get_group(dynamicbox_h handler, const char **cluster, const char **category);
 
 /**
  * @internal
@@ -665,7 +665,7 @@ extern int dynamicbox_get_group(struct dynamicbox *handler, const char **cluster
  * @retval Current update period of a dynamicbox
  * @retval 0.0f This means the box has no update period or the handles is not valid
  */
-extern double dynamicbox_period(struct dynamicbox *handler);
+extern double dynamicbox_period(dynamicbox_h handler);
 
 /**
  * @internal
@@ -685,7 +685,7 @@ extern double dynamicbox_period(struct dynamicbox *handler);
  * @retval #DBOX_STATUS_ERROR_FAULT Unrecoverable error occurred
  * @see dynamicbox_ret_cb_t
  */
-extern int dynamicbox_set_period(struct dynamicbox *handler, double period, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_set_period(dynamicbox_h handler, double period, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -701,7 +701,7 @@ extern int dynamicbox_set_period(struct dynamicbox *handler, double period, dyna
  * @retval #DBOX_TYPE_INVALID Invalid type
  * @see dynamicbox_type()
  */
-extern enum dynamicbox_type dynamicbox_type(struct dynamicbox *handler, int gbar);
+extern enum dynamicbox_type dynamicbox_type(dynamicbox_h handler, int gbar);
 
 /**
  * @internal
@@ -716,7 +716,7 @@ extern enum dynamicbox_type dynamicbox_type(struct dynamicbox *handler, int gbar
  * @see dynamicbox_add()
  * @see dynamicbox_set_event_handler()
  */
-extern int dynamicbox_is_created_by_user(struct dynamicbox *handler);
+extern int dynamicbox_is_created_by_user(dynamicbox_h handler);
 
 /**
  * @internal
@@ -727,7 +727,7 @@ extern int dynamicbox_is_created_by_user(struct dynamicbox *handler);
  * @retval content_info Dynamicbox content info that can be used again via content_info argument of dynamicbox_add()
  * @see dynamicbox_add()
  */
-extern const char *dynamicbox_content(struct dynamicbox *handler);
+extern const char *dynamicbox_content(dynamicbox_h handler);
 
 /**
  * @internal
@@ -744,7 +744,7 @@ extern const char *dynamicbox_content(struct dynamicbox *handler);
  * @retval sub Cluster name
  * @retval @c NULL
  */
-extern const char *dynamicbox_title(struct dynamicbox *handler);
+extern const char *dynamicbox_title(dynamicbox_h handler);
 
 /**
  * @internal
@@ -756,7 +756,7 @@ extern const char *dynamicbox_title(struct dynamicbox *handler);
  * @retval filename If the dynamicbox type is image this function will give you a abs-path of an image file (content is rendered)
  * @retval @c NULL If this has no image file or type is not image file.
  */
-extern const char *dynamicbox_filename(struct dynamicbox *handler);
+extern const char *dynamicbox_filename(dynamicbox_h handler);
 
 /**
  * @internal
@@ -767,7 +767,7 @@ extern const char *dynamicbox_filename(struct dynamicbox *handler);
  * @retval pkgname Package name
  * @retval @c NULL If the handler is not valid
  */
-extern const char *dynamicbox_pkgname(struct dynamicbox *handler);
+extern const char *dynamicbox_pkgname(dynamicbox_h handler);
 
 /**
  * @internal
@@ -779,7 +779,7 @@ extern const char *dynamicbox_pkgname(struct dynamicbox *handler);
  * @retval -1.0f Handler is not valid (not yet initialized)
  * @retval real Number between 0.0 and 1.0
  */
-extern double dynamicbox_priority(struct dynamicbox *handler);
+extern double dynamicbox_priority(dynamicbox_h handler);
 
 /**
  * @internal
@@ -793,7 +793,7 @@ extern double dynamicbox_priority(struct dynamicbox *handler);
  * @retval address Address of a Frame Buffer
  * @retval @c NULL If it fails to get fb address
  */
-extern void *dynamicbox_acquire_fb(struct dynamicbox *handler, int gbar);
+extern void *dynamicbox_acquire_fb(dynamicbox_h handler, int gbar);
 
 /**
  * @internal
@@ -830,7 +830,7 @@ extern int dynamicbox_fb_refcnt(void *buffer);
  * @retval #DBOX_SIZE_TYPE_NxM
  * @retval #DBOX_SIZE_TYPE_INVALID Invalid parameters are used
  */
-extern int dynamicbox_size(struct dynamicbox *handler);
+extern int dynamicbox_size(dynamicbox_h handler);
 
 /**
  * @internal
@@ -843,7 +843,7 @@ extern int dynamicbox_size(struct dynamicbox *handler);
  * @retval #DBOX_STATUS_ERROR_INVALID_PARAMETER Invalid parameters are used
  * @retval #DBOX_STATUS_ERROR_NONE Successfully done
  */
-extern int dynamicbox_get_glance_bar_size(struct dynamicbox *handler, int *w, int *h);
+extern int dynamicbox_get_glance_bar_size(dynamicbox_h handler, int *w, int *h);
 
 /**
  * @internal
@@ -856,7 +856,7 @@ extern int dynamicbox_get_glance_bar_size(struct dynamicbox *handler, int *w, in
  * @retval #DBOX_STATUS_ERROR_INVALID_PARAMETER Invalid argument
  * @retval #DBOX_STATUS_ERROR_NONE Successfully done
  */
-extern int dynamicbox_get_supported_sizes(struct dynamicbox *handler, int *cnt, int *size_list);
+extern int dynamicbox_get_supported_sizes(dynamicbox_h handler, int *cnt, int *size_list);
 
 /**
  * @internal
@@ -868,7 +868,7 @@ extern int dynamicbox_get_supported_sizes(struct dynamicbox *handler, int *cnt,
  * @retval #DBOX_STATUS_ERROR_INVALID_PARAMETER Invalid argument
  * @retval size Size of dynamicbox buffer
  */
-extern int dynamicbox_fb_bufsz(struct dynamicbox *handler, int gbar);
+extern int dynamicbox_fb_bufsz(dynamicbox_h handler, int gbar);
 
 /**
  * @internal
@@ -888,7 +888,7 @@ extern int dynamicbox_fb_bufsz(struct dynamicbox *handler, int gbar);
  * @see dynamicbox_feed_access_event()
  * @see dynamicbox_feed_key_event()
  */
-extern int dynamicbox_feed_mouse_event(struct dynamicbox *handler, enum dynamicbox_mouse_event_type type, struct dynamicbox_mouse_event_info *info);
+extern int dynamicbox_feed_mouse_event(dynamicbox_h handler, enum dynamicbox_mouse_event_type type, struct dynamicbox_mouse_event_info *info);
 
 /**
  * @internal
@@ -910,7 +910,7 @@ extern int dynamicbox_feed_mouse_event(struct dynamicbox *handler, enum dynamicb
  * @see dynamicbox_feed_mouse_event()
  * @see dynamicbox_feed_key_event()
  */
-extern int dynamicbox_feed_access_event(struct dynamicbox *handler, enum dynamicbox_access_event_type type, struct dynamicbox_access_event_info *info, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_feed_access_event(dynamicbox_h handler, enum dynamicbox_access_event_type type, struct dynamicbox_access_event_info *info, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -931,7 +931,7 @@ extern int dynamicbox_feed_access_event(struct dynamicbox *handler, enum dynamic
  * @see dynamicbox_feed_mouse_event()
  * @see dynamicbox_feed_access_event()
  */
-extern int dynamicbox_feed_key_event(struct dynamicbox *handler, enum dynamicbox_key_event_type type, struct dynamicbox_key_event_info *info, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_feed_key_event(dynamicbox_h handler, enum dynamicbox_key_event_type type, struct dynamicbox_key_event_info *info, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -953,7 +953,7 @@ extern int dynamicbox_feed_key_event(struct dynamicbox *handler, enum dynamicbox
  * @see dynamicbox_set_visibility()
  * @see dynamicbox_is_pinned_up()
  */
-extern int dynamicbox_set_pinup(struct dynamicbox *handler, int flag, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_set_pinup(dynamicbox_h handler, int flag, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -966,7 +966,7 @@ extern int dynamicbox_set_pinup(struct dynamicbox *handler, int flag, dynamicbox
  * @retval 0 Box is not pinned up
  * @see dynamicbox_set_pinup()
  */
-extern int dynamicbox_is_pinned_up(struct dynamicbox *handler);
+extern int dynamicbox_is_pinned_up(dynamicbox_h handler);
 
 /**
  * @internal
@@ -980,7 +980,7 @@ extern int dynamicbox_is_pinned_up(struct dynamicbox *handler);
  * @see dynamicbox_is_pinned_up()
  * @see dynamicbox_set_pinup()
  */
-extern int dynamicbox_has_pinup(struct dynamicbox *handler);
+extern int dynamicbox_has_pinup(dynamicbox_h handler);
 
 /**
  * @internal
@@ -992,7 +992,7 @@ extern int dynamicbox_has_pinup(struct dynamicbox *handler);
  * @retval 1 If the box support the Glance Bar
  * @retval 0 If the box has no Glance Bar
  */
-extern int dynamicbox_has_glance_bar(struct dynamicbox *handler);
+extern int dynamicbox_has_glance_bar(dynamicbox_h handler);
 
 /**
  * @internal
@@ -1014,7 +1014,7 @@ extern int dynamicbox_has_glance_bar(struct dynamicbox *handler);
  * @see dynamicbox_destroy_glance_bar()
  * @see dynamicbox_move_glance_bar()
  */
-extern int dynamicbox_create_glance_bar(struct dynamicbox *handler, double x, double y, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_create_glance_bar(dynamicbox_h handler, double x, double y, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -1030,7 +1030,7 @@ extern int dynamicbox_create_glance_bar(struct dynamicbox *handler, double x, do
  * @retval #DBOX_STATUS_ERROR_FAULT Unrecoverable error occurred
  * @retval #DBOX_STATUS_ERROR_INVALID_PARAMETER Invalid argument
  */
-extern int dynamicbox_move_glance_bar(struct dynamicbox *handler, double x, double y);
+extern int dynamicbox_move_glance_bar(dynamicbox_h handler, double x, double y);
 
 /**
  * @internal
@@ -1047,7 +1047,7 @@ extern int dynamicbox_move_glance_bar(struct dynamicbox *handler, double x, doub
  * @retval #DBOX_STATUS_ERROR_NONE Successfully done
  * @see dynamicbox_ret_cb_t
  */
-extern int dynamicbox_destroy_glance_bar(struct dynamicbox *handler, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_destroy_glance_bar(dynamicbox_h handler, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -1059,7 +1059,7 @@ extern int dynamicbox_destroy_glance_bar(struct dynamicbox *handler, dynamicbox_
  * @retval 0 Glance Bar is not created
  * @retval 1 Glance Bar is created
  */
-extern int dynamicbox_glance_bar_is_created(struct dynamicbox *handler);
+extern int dynamicbox_glance_bar_is_created(dynamicbox_h handler);
 
 /**
  * @internal
@@ -1073,7 +1073,7 @@ extern int dynamicbox_glance_bar_is_created(struct dynamicbox *handler);
  * @retval #DBOX_STATUS_ERROR_INVALID_PARAMETER Invalid argument
  * @see dynamicbox_set_gbar_text_handler()
  */
-extern int dynamicbox_set_text_handler(struct dynamicbox *handler, int gbar, struct dynamicbox_script_operators *ops);
+extern int dynamicbox_set_text_handler(dynamicbox_h handler, int gbar, struct dynamicbox_script_operators *ops);
 
 /**
  * @internal
@@ -1096,7 +1096,7 @@ extern int dynamicbox_set_text_handler(struct dynamicbox *handler, int gbar, str
  * @retval #DBOX_STATUS_ERROR_NONE Successfully emitted
  * @see dynamicbox_ret_cb_t
  */
-extern int dynamicbox_emit_text_signal(struct dynamicbox *handler, const char *emission, const char *source, double sx, double sy, double ex, double ey, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_emit_text_signal(dynamicbox_h handler, const char *emission, const char *source, double sx, double sy, double ex, double ey, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -1109,7 +1109,7 @@ extern int dynamicbox_emit_text_signal(struct dynamicbox *handler, const char *e
  * @retval #DBOX_STATUS_ERROR_INVALID_PARAMETER Invalid argument
  * @see dynamicbox_get_data()
  */
-extern int dynamicbox_set_data(struct dynamicbox *handler, void *data);
+extern int dynamicbox_set_data(dynamicbox_h handler, void *data);
 
 /**
  * @internal
@@ -1121,7 +1121,7 @@ extern int dynamicbox_set_data(struct dynamicbox *handler, void *data);
  * @retval @c NULL If there is no data
  * @see dynamicbox_set_data()
  */
-extern void *dynamicbox_data(struct dynamicbox *handler);
+extern void *dynamicbox_data(dynamicbox_h handler);
 
 /**
  * @internal
@@ -1190,7 +1190,7 @@ extern int dynamicbox_refresh_group(const char *cluster, const char *category, i
  * @retval #DBOX_STATUS_ERROR_NONE Successfully requested
  * @see dynamicbox_refresh_group()
  */
-extern int dynamicbox_refresh(struct dynamicbox *handler, int force);
+extern int dynamicbox_refresh(dynamicbox_h handler, int force);
 
 /**
  * @internal
@@ -1206,7 +1206,7 @@ extern int dynamicbox_refresh(struct dynamicbox *handler, int force);
  * @retval ResourceId Resource Id
  * @see dynamicbox_resource_id()
  */
-extern unsigned int dynamicbox_resource_id(const struct dynamicbox *handler, int gbar);
+extern unsigned int dynamicbox_resource_id(const dynamicbox_h handler, int gbar);
 
 /**
  * @internal
@@ -1229,7 +1229,7 @@ extern unsigned int dynamicbox_resource_id(const struct dynamicbox *handler, int
  * @see dynamicbox_release_resource_id()
  * @see dynamicbox_ret_cb_t
  */
-extern unsigned int dynamicbox_acquire_resource_id(struct dynamicbox *handler, int gbar, dynamicbox_ret_cb_t cb, void *data);
+extern unsigned int dynamicbox_acquire_resource_id(dynamicbox_h handler, int gbar, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -1249,7 +1249,7 @@ extern unsigned int dynamicbox_acquire_resource_id(struct dynamicbox *handler, i
  * @pre The Resource Id should be acquired by dynamicbox_acquire_resource_id
  * @see dynamicbox_acquire_resource_id()
  */
-extern int dynamicbox_release_resource_id(struct dynamicbox *handler, int gbar, unsigned int resource_id);
+extern int dynamicbox_release_resource_id(dynamicbox_h handler, int gbar, unsigned int resource_id);
 
 /**
  * @internal
@@ -1267,7 +1267,7 @@ extern int dynamicbox_release_resource_id(struct dynamicbox *handler, int gbar,
  * @retval #DBOX_STATUS_ERROR_FAULT Unrecoverable error occurred
  * @retval #DBOX_STATUS_ERROR_NONE Successfully done
  */
-extern int dynamicbox_set_visibility(struct dynamicbox *handler, enum dynamicbox_visible_state state);
+extern int dynamicbox_set_visibility(dynamicbox_h handler, enum dynamicbox_visible_state state);
 
 /**
  * @internal
@@ -1281,7 +1281,7 @@ extern int dynamicbox_set_visibility(struct dynamicbox *handler, enum dynamicbox
  * @retval #DBOX_HIDE_WITH_PAUSE Dynamicbox is hidden, it will pause the update timer, but if a dynamicbox updates its contents, update event will occur
  * @retval #DBOX_VISIBLE_ERROR To enlarge the size of this enumeration type
  */
-extern enum dynamicbox_visible_state dynamicbox_visibility(struct dynamicbox *handler);
+extern enum dynamicbox_visible_state dynamicbox_visibility(dynamicbox_h handler);
 
 /**
  * @internal
@@ -1305,7 +1305,7 @@ extern enum dynamicbox_visible_state dynamicbox_visibility(struct dynamicbox *ha
  * @retval #DBOX_STATUS_ERROR_NONE Successfully done
  * @see dynamicbox_ret_cb_t
  */
-extern int dynamicbox_set_update_mode(struct dynamicbox *handler, int active_update, dynamicbox_ret_cb_t cb, void *data);
+extern int dynamicbox_set_update_mode(dynamicbox_h handler, int active_update, dynamicbox_ret_cb_t cb, void *data);
 
 /**
  * @internal
@@ -1316,7 +1316,7 @@ extern int dynamicbox_set_update_mode(struct dynamicbox *handler, int active_upd
  * @retval 0 If passive mode
  * @retval 1 If active mode or error code
  */
-extern int dynamicbox_is_active_update(struct dynamicbox *handler);
+extern int dynamicbox_is_active_update(dynamicbox_h handler);
 
 /**
  * @internal
@@ -1332,7 +1332,7 @@ extern int dynamicbox_is_active_update(struct dynamicbox *handler);
  * @see dynamicbox_set_manual_sync()
  * @see dynamicbox_manual_sync()
  */
-extern int dynamicbox_sync_fb(struct dynamicbox *handler, int gbar);
+extern int dynamicbox_sync_fb(dynamicbox_h handler, int gbar);
 
 /**
  * @internal
@@ -1345,7 +1345,7 @@ extern int dynamicbox_sync_fb(struct dynamicbox *handler, int gbar);
  * @retval @c NULL Dynamicbox has no alternative icon file
  * @see dynamicbox_alt_name()
  */
-extern const char *dynamicbox_alt_icon(struct dynamicbox *handler);
+extern const char *dynamicbox_alt_icon(dynamicbox_h handler);
 
 /**
  * @internal
@@ -1358,7 +1358,7 @@ extern const char *dynamicbox_alt_icon(struct dynamicbox *handler);
  * @retval @c NULL Dynamicbox has no alternative name
  * @see dynamicbox_alt_icon()
  */
-extern const char *dynamicbox_alt_name(struct dynamicbox *handler);
+extern const char *dynamicbox_alt_name(dynamicbox_h handler);
 
 /**
  * @internal
@@ -1376,7 +1376,7 @@ extern const char *dynamicbox_alt_name(struct dynamicbox *handler);
  * @retval #DBOX_STATUS_ERROR_NONE Successfully done
  * @see dynamicbox_release_fb_lock()
  */
-extern int dynamicbox_acquire_fb_lock(struct dynamicbox *handler, int gbar);
+extern int dynamicbox_acquire_fb_lock(dynamicbox_h handler, int gbar);
 
 /**
  * @internal
@@ -1393,7 +1393,7 @@ extern int dynamicbox_acquire_fb_lock(struct dynamicbox *handler, int gbar);
  * @retval #DBOX_STATUS_ERROR_NONE Successfully done
  * @see dynamicbox_acquire_fb_lock()
  */
-extern int dynamicbox_release_fb_lock(struct dynamicbox *handler, int gbar);
+extern int dynamicbox_release_fb_lock(dynamicbox_h handler, int gbar);
 
 /**
  * @internal
@@ -1447,7 +1447,7 @@ extern int dynamicbox_option(enum dynamicbox_option_type option);
  * @return int type
  * @retval #DBOX_STATUS_ERROR_NONE Succeed to set new handler. there is no other cases
  */
-extern int dynamicbox_set_auto_launch_handler(int (*launch_handler)(struct dynamicbox *handler, const char *appid, void *data), void *data);
+extern int dynamicbox_set_auto_launch_handler(int (*launch_handler)(dynamicbox_h handler, const char *appid, void *data), void *data);
 
 /**
  * @}

diff --git a/src/client.c b/src/client.c
index 268152e..7ec6268 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -86,7 +86,7 @@ static struct packet *master_fault_package(pid_t pid, int handle, const struct p
 static struct packet *master_hold_scroll(pid_t pid, int handle, const struct packet *packet)
 {
        struct dynamicbox_common *common;
-       struct dynamicbox *dynamicbox;
+       dynamicbox_h dynamicbox;
        const char *pkgname;
        const char *id;
        int seize;
@@ -120,7 +120,7 @@ static struct packet *master_pinup(pid_t pid, int handle, const struct packet *p
        const char *pkgname;
        const char *id;
        const char *content;
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dlist *l;
        struct dlist *n;
        struct dynamicbox_common *common;
@@ -182,7 +182,7 @@ static struct packet *master_deleted(pid_t pid, int handle, const struct packet
        const char *pkgname;
        const char *id;
        double timestamp;
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        struct dlist *l;
        struct dlist *n;
@@ -289,7 +289,7 @@ out:
 
 static struct packet *master_dbox_update_begin(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        const char *pkgname;
        const char *id;
@@ -350,7 +350,7 @@ out:
 
 static struct packet *master_gbar_update_begin(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        const char *pkgname;
        const char *id;
@@ -396,7 +396,7 @@ out:
 
 static struct packet *master_dbox_update_end(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        const char *pkgname;
        const char *id;
@@ -434,7 +434,7 @@ out:
 
 static struct packet *master_key_status(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        struct dlist *l;
        const char *pkgname;
@@ -483,7 +483,7 @@ out:
 
 static struct packet *master_request_close_gbar(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        struct dlist *l;
        const char *pkgname;
@@ -524,7 +524,7 @@ out:
 
 static struct packet *master_access_status(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        struct dlist *l;
        const char *pkgname;
@@ -570,7 +570,7 @@ out:
 
 static struct packet *master_gbar_update_end(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        const char *pkgname;
        const char *id;
@@ -617,7 +617,7 @@ static struct packet *master_extra_info(pid_t pid, int handle, const struct pack
        const char *name;
        double priority;
        int ret;
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        struct dlist *l;
        struct dlist *n;
@@ -667,7 +667,7 @@ static struct packet *master_dbox_updated(pid_t pid, int handle, const struct pa
        const char *id;
        const char *fbfile;
        const char *safe_file;
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        int dbox_w;
        int dbox_h;
@@ -751,7 +751,7 @@ out:
 
 static struct packet *master_gbar_created(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        const char *pkgname;
        const char *id;
@@ -852,7 +852,7 @@ out:
 
 static struct packet *master_gbar_destroyed(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dlist *l;
        struct dynamicbox_common *common;
        const char *pkgname;
@@ -943,7 +943,7 @@ static struct packet *master_gbar_updated(pid_t pid, int handle, const struct pa
        const char *descfile;
        const char *fbfile;
        int ret;
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        struct dlist *l;
        int gbar_w;
@@ -1010,7 +1010,7 @@ out:
 
 static struct packet *master_update_mode(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        struct dlist *l;
        struct dlist *n;
@@ -1070,7 +1070,7 @@ out:
 
 static struct packet *master_size_changed(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        const char *pkgname;
        const char *id;
@@ -1175,7 +1175,7 @@ out:
 
 static struct packet *master_period_changed(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        struct dlist *l;
        struct dlist *n;
@@ -1231,7 +1231,7 @@ out:
 
 static struct packet *master_group_changed(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        struct dlist *l;
        struct dlist *n;
@@ -1293,7 +1293,7 @@ out:
 
 static struct packet *master_created(pid_t pid, int handle, const struct packet *packet)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        struct dynamicbox_common *common;
        struct dlist *l;
 
@@ -1647,7 +1647,7 @@ static struct method s_table[] = {
        },
 };
 
-static void acquire_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void acquire_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        if (!result) {
                DbgPrint("Result packet is not valid\n");

diff --git a/src/desc_parser.c b/src/desc_parser.c
index 8ee565b..d0be33d 100644 (file)
--- a/src/desc_parser.c
+++ b/src/desc_parser.c
@@ -100,7 +100,7 @@ struct block {
        const char *filename;
 };
 
-static int update_text(struct dynamicbox *handle, struct block *block, int is_gbar)
+static int update_text(dynamicbox_h handle, struct block *block, int is_gbar)
 {
        struct dynamicbox_script_operators *ops;
 
@@ -117,7 +117,7 @@ static int update_text(struct dynamicbox *handle, struct block *block, int is_gb
        return 0;
 }
 
-static int update_image(struct dynamicbox *handle, struct block *block, int is_gbar)
+static int update_image(dynamicbox_h handle, struct block *block, int is_gbar)
 {
        struct dynamicbox_script_operators *ops;
 
@@ -134,7 +134,7 @@ static int update_image(struct dynamicbox *handle, struct block *block, int is_g
        return 0;
 }
 
-static int update_script(struct dynamicbox *handle, struct block *block, int is_gbar)
+static int update_script(dynamicbox_h handle, struct block *block, int is_gbar)
 {
        struct dynamicbox_script_operators *ops;
 
@@ -151,7 +151,7 @@ static int update_script(struct dynamicbox *handle, struct block *block, int is_
        return 0;
 }
 
-static int update_signal(struct dynamicbox *handle, struct block *block, int is_gbar)
+static int update_signal(dynamicbox_h handle, struct block *block, int is_gbar)
 {
        struct dynamicbox_script_operators *ops;
 
@@ -168,7 +168,7 @@ static int update_signal(struct dynamicbox *handle, struct block *block, int is_
        return 0;
 }
 
-static int update_drag(struct dynamicbox *handle, struct block *block, int is_gbar)
+static int update_drag(dynamicbox_h handle, struct block *block, int is_gbar)
 {
        double dx, dy;
        struct dynamicbox_script_operators *ops;
@@ -191,7 +191,7 @@ static int update_drag(struct dynamicbox *handle, struct block *block, int is_gb
        return 0;
 }
 
-static int update_info(struct dynamicbox *handle, struct block *block, int is_gbar)
+static int update_info(dynamicbox_h handle, struct block *block, int is_gbar)
 {
        struct dynamicbox_script_operators *ops;
 
@@ -221,7 +221,7 @@ static int update_info(struct dynamicbox *handle, struct block *block, int is_gb
        return 0;
 }
 
-static int update_access(struct dynamicbox *handle, struct block *block, int is_gbar)
+static int update_access(dynamicbox_h handle, struct block *block, int is_gbar)
 {
        struct dynamicbox_script_operators *ops;
 
@@ -238,7 +238,7 @@ static int update_access(struct dynamicbox *handle, struct block *block, int is_
        return 0;
 }
 
-static int operate_access(struct dynamicbox *handle, struct block *block, int is_gbar)
+static int operate_access(dynamicbox_h handle, struct block *block, int is_gbar)
 {
        struct dynamicbox_script_operators *ops;
 
@@ -255,7 +255,7 @@ static int operate_access(struct dynamicbox *handle, struct block *block, int is
        return 0;
 }
 
-static int update_color(struct dynamicbox *handle, struct block *block, int is_gbar)
+static int update_color(dynamicbox_h handle, struct block *block, int is_gbar)
 {
        struct dynamicbox_script_operators *ops;
 
@@ -272,7 +272,7 @@ static int update_color(struct dynamicbox *handle, struct block *block, int is_g
        return 0;
 }
 
-static inline int update_begin(struct dynamicbox *handle, int is_gbar)
+static inline int update_begin(dynamicbox_h handle, int is_gbar)
 {
        struct dynamicbox_script_operators *ops;
 
@@ -284,7 +284,7 @@ static inline int update_begin(struct dynamicbox *handle, int is_gbar)
        return 0;
 }
 
-static inline int update_end(struct dynamicbox *handle, int is_gbar)
+static inline int update_end(dynamicbox_h handle, int is_gbar)
 {
        struct dynamicbox_script_operators *ops;
 
@@ -302,9 +302,9 @@ static inline void delete_block(struct block *block)
        free(block);
 }
 
-static inline void consuming_parsed_block(struct dynamicbox *handle, int is_gbar, struct block *block)
+static inline void consuming_parsed_block(dynamicbox_h handle, int is_gbar, struct block *block)
 {
-       typedef int (*update_function_t)(struct dynamicbox *handle, struct block *block, int is_gbar);
+       typedef int (*update_function_t)(dynamicbox_h handle, struct block *block, int is_gbar);
        static update_function_t updators[] = {
                update_access,
                operate_access,
@@ -404,7 +404,7 @@ int parse_desc(struct dynamicbox_common *common, const char *filename, int is_gb
        struct dlist *l;
        struct dlist *n;
        struct dlist *handle_iterator;
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        enum state {
                BEGIN,
                FIELD,

diff --git a/src/dynamicbox.c b/src/dynamicbox.c
index ce1de33..4959630 100644 (file)
--- a/src/dynamicbox.c
+++ b/src/dynamicbox.c
@@ -52,7 +52,7 @@ FILE *__file_log_fp;
 
 #define EAPI __attribute__((visibility("default")))
 
-static int default_launch_handler(struct dynamicbox *handler, const char *appid, void *data);
+static int default_launch_handler(dynamicbox_h handler, const char *appid, void *data);
 
 static struct info {
        int init_count;
@@ -61,7 +61,7 @@ static struct info {
        struct dlist *job_list;
 
        struct launch {
-               int (*handler)(struct dynamicbox *handler, const char *appid, void *data);
+               int (*handler)(dynamicbox_h handler, const char *appid, void *data);
                void *data;
        } launch;
 } s_info = {
@@ -75,10 +75,10 @@ static struct info {
        },
 };
 
-static void dbox_pixmap_acquired_cb(struct dynamicbox *handler, const struct packet *result, void *data);
-static void gbar_pixmap_acquired_cb(struct dynamicbox *handler, const struct packet *result, void *data);
+static void dbox_pixmap_acquired_cb(dynamicbox_h handler, const struct packet *result, void *data);
+static void gbar_pixmap_acquired_cb(dynamicbox_h handler, const struct packet *result, void *data);
 
-static int default_launch_handler(struct dynamicbox *handler, const char *appid, void *data)
+static int default_launch_handler(dynamicbox_h handler, const char *appid, void *data)
 {
        int ret;
 
@@ -105,57 +105,57 @@ static int default_launch_handler(struct dynamicbox *handler, const char *appid,
        return ret > 0 ? DBOX_STATUS_ERROR_NONE : DBOX_STATUS_ERROR_FAULT;
 }
 
-static inline void default_create_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_create_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default created event handler: %d\n", ret);
 }
 
-static inline void default_pinup_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_pinup_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default pinup event handler: %d\n", ret);
 }
 
-static inline void default_group_changed_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_group_changed_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default group changed event handler: %d\n", ret);
 }
 
-static inline void default_period_changed_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_period_changed_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default period changed event handler: %d\n", ret);
 }
 
-static inline void default_gbar_created_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_gbar_created_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default GBAR created event handler: %d\n", ret);
 }
 
-static inline void default_gbar_destroyed_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_gbar_destroyed_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default GBAR destroyed event handler: %d\n", ret);
 }
 
-static inline void default_dbox_size_changed_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_dbox_size_changed_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default DBOX size changed event handler: %d\n", ret);
 }
 
-static inline void default_update_mode_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_update_mode_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default update mode set event handler: %d\n", ret);
 }
 
-static inline void default_access_event_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_access_event_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default access event handler: %d\n", ret);
 }
 
-static inline void default_key_event_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_key_event_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default key event handler: %d\n", ret);
 }
 
-static void update_mode_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void update_mode_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
 
@@ -187,7 +187,7 @@ errout:
        }
 }
 
-static void resize_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void resize_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
 
@@ -228,7 +228,7 @@ errout:
        }
 }
 
-static void text_signal_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void text_signal_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
        void *cbdata;
@@ -252,7 +252,7 @@ static void text_signal_cb(struct dynamicbox *handler, const struct packet *resu
        return;
 }
 
-static void set_group_ret_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void set_group_ret_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
 
@@ -283,7 +283,7 @@ errout:
        }
 }
 
-static void period_ret_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void period_ret_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
 
@@ -314,7 +314,7 @@ errout:
        }
 }
 
-static void gbar_create_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void gbar_create_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
 
@@ -345,7 +345,7 @@ errout:
        }
 }
 
-static void activated_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void activated_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
        struct cb_info *info = data;
@@ -368,7 +368,7 @@ static void activated_cb(struct dynamicbox *handler, const struct packet *result
        }
 }
 
-static void gbar_destroy_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void gbar_destroy_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
        dynamicbox_ret_cb_t cb;
@@ -400,7 +400,7 @@ static void gbar_destroy_cb(struct dynamicbox *handler, const struct packet *res
        }
 }
 
-static void delete_cluster_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void delete_cluster_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        struct cb_info *info = data;
        int ret;
@@ -422,7 +422,7 @@ static void delete_cluster_cb(struct dynamicbox *handler, const struct packet *r
        }
 }
 
-static void delete_category_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void delete_category_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        struct cb_info *info = data;
        int ret;
@@ -444,7 +444,7 @@ static void delete_category_cb(struct dynamicbox *handler, const struct packet *
        }
 }
 
-static int dbox_acquire_dbox_pixmap(struct dynamicbox *handler, dynamicbox_ret_cb_t cb, void *data)
+static int dbox_acquire_dbox_pixmap(dynamicbox_h handler, dynamicbox_ret_cb_t cb, void *data)
 {
        struct packet *packet;
        struct cb_info *cbinfo;
@@ -477,7 +477,7 @@ static int dbox_acquire_dbox_pixmap(struct dynamicbox *handler, dynamicbox_ret_c
        return ret;
 }
 
-static void dbox_pixmap_acquired_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void dbox_pixmap_acquired_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int pixmap;
        int ret = DBOX_STATUS_ERROR_INVALID_PARAMETER;
@@ -513,7 +513,7 @@ static void dbox_pixmap_acquired_cb(struct dynamicbox *handler, const struct pac
        }
 }
 
-static int dbox_acquire_gbar_pixmap(struct dynamicbox *handler, dynamicbox_ret_cb_t cb, void *data)
+static int dbox_acquire_gbar_pixmap(dynamicbox_h handler, dynamicbox_ret_cb_t cb, void *data)
 {
        struct packet *packet;
        struct cb_info *cbinfo;
@@ -550,7 +550,7 @@ static int dbox_acquire_gbar_pixmap(struct dynamicbox *handler, dynamicbox_ret_c
        return ret;
 }
 
-static void gbar_pixmap_acquired_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void gbar_pixmap_acquired_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int pixmap;
        int ret;
@@ -588,7 +588,7 @@ static void gbar_pixmap_acquired_cb(struct dynamicbox *handler, const struct pac
        }
 }
 
-static void pinup_done_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void pinup_done_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
 
@@ -617,7 +617,7 @@ errout:
        }
 }
 
-static void key_ret_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void key_ret_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
 
@@ -648,7 +648,7 @@ errout:
        }
 }
 
-static void access_ret_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void access_ret_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
 
@@ -680,7 +680,7 @@ errout:
        }
 }
 
-static int send_access_event(struct dynamicbox *handler, const char *event, int x, int y, int type)
+static int send_access_event(dynamicbox_h handler, const char *event, int x, int y, int type)
 {
        struct packet *packet;
        double timestamp;
@@ -696,7 +696,7 @@ static int send_access_event(struct dynamicbox *handler, const char *event, int
        return master_rpc_async_request(handler, packet, 0, access_ret_cb, NULL);
 }
 
-static int send_key_event(struct dynamicbox *handler, const char *event, unsigned int keycode)
+static int send_key_event(dynamicbox_h handler, const char *event, unsigned int keycode)
 {
        struct packet *packet;
        double timestamp;
@@ -711,7 +711,7 @@ static int send_key_event(struct dynamicbox *handler, const char *event, unsigne
        return master_rpc_async_request(handler, packet, 0, key_ret_cb, NULL);
 }
 
-static int send_mouse_event(struct dynamicbox *handler, const char *event, int x, int y)
+static int send_mouse_event(dynamicbox_h handler, const char *event, int x, int y)
 {
        struct packet *packet;
        double timestamp;
@@ -794,7 +794,7 @@ static gboolean job_execute_cb(void *data)
        return TRUE;
 }
 
-static int job_add(struct dynamicbox *handle, dynamicbox_ret_cb_t job_cb, int ret, void *data)
+static int job_add(dynamicbox_h handle, dynamicbox_ret_cb_t job_cb, int ret, void *data)
 {
        struct job_item *item;
 
@@ -826,7 +826,7 @@ static int job_add(struct dynamicbox *handle, dynamicbox_ret_cb_t job_cb, int re
        return DBOX_STATUS_ERROR_NONE;
 }
 
-static void new_ret_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void new_ret_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        int ret;
        struct cb_info *info = data;
@@ -865,7 +865,7 @@ static void new_ret_cb(struct dynamicbox *handler, const struct packet *result,
        dbox_unref(handler, 1);
 }
 
-static int create_real_instance(struct dynamicbox *handler, dynamicbox_ret_cb_t cb, void *data)
+static int create_real_instance(dynamicbox_h handler, dynamicbox_ret_cb_t cb, void *data)
 {
        struct cb_info *cbinfo;
        struct packet *packet;
@@ -906,7 +906,7 @@ static int create_real_instance(struct dynamicbox *handler, dynamicbox_ret_cb_t
        return DBOX_STATUS_ERROR_NONE;
 }
 
-static void create_cb(struct dynamicbox *handle, int ret, void *data)
+static void create_cb(dynamicbox_h handle, int ret, void *data)
 {
        struct cb_info *cbinfo = data;
 
@@ -923,7 +923,7 @@ static void create_cb(struct dynamicbox *handle, int ret, void *data)
        dbox_invoke_event_handler(handle, DBOX_EVENT_DBOX_UPDATED);
 }
 
-static int create_fake_instance(struct dynamicbox *handler, dynamicbox_ret_cb_t cb, void *data)
+static int create_fake_instance(dynamicbox_h handler, dynamicbox_ret_cb_t cb, void *data)
 {
        struct cb_info *cbinfo;
 
@@ -940,7 +940,7 @@ static int create_fake_instance(struct dynamicbox *handler, dynamicbox_ret_cb_t
        return DBOX_STATUS_ERROR_NONE;
 }
 
-static void refresh_for_paused_updating_cb(struct dynamicbox *handle, int ret, void *data)
+static void refresh_for_paused_updating_cb(dynamicbox_h handle, int ret, void *data)
 {
        if (handle->paused_updating == 0) {
                DbgPrint("Paused updates are cleared\n");
@@ -951,7 +951,7 @@ static void refresh_for_paused_updating_cb(struct dynamicbox *handle, int ret, v
        dbox_invoke_event_handler(handle, DBOX_EVENT_DBOX_UPDATED);
 }
 
-static int dbox_set_visibility(struct dynamicbox *handler, enum dynamicbox_visible_state state)
+static int dbox_set_visibility(dynamicbox_h handler, enum dynamicbox_visible_state state)
 {
        struct packet *packet;
        int need_to_add_job = 0;
@@ -1001,7 +1001,7 @@ static int dbox_set_visibility(struct dynamicbox *handler, enum dynamicbox_visib
 
 static void dbox_update_visibility(struct dynamicbox_common *old_common)
 {
-       struct dynamicbox *item;
+       dynamicbox_h item;
 
        item = dbox_find_dbox_in_show(old_common);
        if (!item) {
@@ -1021,7 +1021,7 @@ static void dbox_update_visibility(struct dynamicbox_common *old_common)
  * The second parameter should be the "return value",
  * But in this case, we will use it for "type of deleting instance".
  */
-static void job_del_cb(struct dynamicbox *handle, int type, void *data)
+static void job_del_cb(dynamicbox_h handle, int type, void *data)
 {
        struct cb_info *cbinfo = data;
        dynamicbox_ret_cb_t cb;
@@ -1074,7 +1074,7 @@ static void job_del_cb(struct dynamicbox *handle, int type, void *data)
        }
 }
 
-static void resize_job_cb(struct dynamicbox *handler, int ret, void *data)
+static void resize_job_cb(dynamicbox_h handler, int ret, void *data)
 {
        struct cb_info *info = data;
 
@@ -1091,7 +1091,7 @@ static void resize_job_cb(struct dynamicbox *handler, int ret, void *data)
        dbox_invoke_event_handler(handler, DBOX_EVENT_DBOX_UPDATED);
 }
 
-static void turn_off_gbar_destroyed_flag_cb(struct dynamicbox *handler, int ret, void *data)
+static void turn_off_gbar_destroyed_flag_cb(dynamicbox_h handler, int ret, void *data)
 {
        if (handler->common->request.gbar_destroyed) {
                dynamicbox_ret_cb_t cb;
@@ -1110,7 +1110,7 @@ static void turn_off_gbar_destroyed_flag_cb(struct dynamicbox *handler, int ret,
        }
 }
 
-static void turn_off_gbar_created_flag_cb(struct dynamicbox *handler, int ret, void *data)
+static void turn_off_gbar_created_flag_cb(dynamicbox_h handler, int ret, void *data)
 {
        if (handler->common->request.gbar_created) {
                dynamicbox_ret_cb_t cb;
@@ -1166,10 +1166,10 @@ EAPI int dynamicbox_fini(void)
        return DBOX_STATUS_ERROR_NONE;
 }
 
-EAPI struct dynamicbox *dynamicbox_add(const char *pkgname, const char *content, const char *cluster, const char *category, double period, int type, dynamicbox_ret_cb_t cb, void *data)
+EAPI dynamicbox_h dynamicbox_add(const char *pkgname, const char *content, const char *cluster, const char *category, double period, int type, dynamicbox_ret_cb_t cb, void *data)
 {
        char *dboxid;
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
        int w = 0;
        int h = 0;
 
@@ -1283,7 +1283,7 @@ EAPI struct dynamicbox *dynamicbox_add(const char *pkgname, const char *content,
        return handler;
 }
 
-EAPI double dynamicbox_period(struct dynamicbox *handler)
+EAPI double dynamicbox_period(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is not valid\n");
@@ -1303,7 +1303,7 @@ EAPI double dynamicbox_period(struct dynamicbox *handler)
        return handler->common->dbox.period;
 }
 
-EAPI int dynamicbox_set_period(struct dynamicbox *handler, double period, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_set_period(dynamicbox_h handler, double period, dynamicbox_ret_cb_t cb, void *data)
 {
        struct packet *packet;
        unsigned int cmd = CMD_SET_PERIOD;
@@ -1359,7 +1359,7 @@ EAPI int dynamicbox_set_period(struct dynamicbox *handler, double period, dynami
        return ret;
 }
 
-EAPI int dynamicbox_del(struct dynamicbox *handler, int type, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_del(dynamicbox_h handler, int type, dynamicbox_ret_cb_t cb, void *data)
 {
        struct cb_info *cbinfo;
 
@@ -1408,7 +1408,7 @@ EAPI void *dynamicbox_unset_fault_handler(int (*dbox_cb)(enum dynamicbox_fault_t
        return dbox_remove_fault_handler(dbox_cb);
 }
 
-EAPI int dynamicbox_set_event_handler(int (*dbox_cb)(struct dynamicbox *, enum dynamicbox_event_type, void *), void *data)
+EAPI int dynamicbox_set_event_handler(int (*dbox_cb)(dynamicbox_h , enum dynamicbox_event_type, void *), void *data)
 {
        if (!dbox_cb) {
                ErrPrint("Invalid argument dbox_cb is nil\n");
@@ -1418,7 +1418,7 @@ EAPI int dynamicbox_set_event_handler(int (*dbox_cb)(struct dynamicbox *, enum d
        return dbox_add_event_handler(dbox_cb, data);
 }
 
-EAPI void *dynamicbox_unset_event_handler(int (*dbox_cb)(struct dynamicbox *, enum dynamicbox_event_type, void *))
+EAPI void *dynamicbox_unset_event_handler(int (*dbox_cb)(dynamicbox_h , enum dynamicbox_event_type, void *))
 {
        if (!dbox_cb) {
                return NULL;
@@ -1427,7 +1427,7 @@ EAPI void *dynamicbox_unset_event_handler(int (*dbox_cb)(struct dynamicbox *, en
        return dbox_remove_event_handler(dbox_cb);
 }
 
-EAPI int dynamicbox_set_update_mode(struct dynamicbox *handler, int active_update, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_set_update_mode(dynamicbox_h handler, int active_update, dynamicbox_ret_cb_t cb, void *data)
 {
        struct packet *packet;
        unsigned int cmd = CMD_UPDATE_MODE;
@@ -1480,7 +1480,7 @@ EAPI int dynamicbox_set_update_mode(struct dynamicbox *handler, int active_updat
        return ret;
 }
 
-EAPI int dynamicbox_is_active_update(struct dynamicbox *handler)
+EAPI int dynamicbox_is_active_update(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is Invalid\n");
@@ -1499,7 +1499,7 @@ EAPI int dynamicbox_is_active_update(struct dynamicbox *handler)
        return handler->common->is_active_update;
 }
 
-EAPI int dynamicbox_resize(struct dynamicbox *handler, int type, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_resize(dynamicbox_h handler, int type, dynamicbox_ret_cb_t cb, void *data)
 {
        struct dynamicbox_common *common;
        int w;
@@ -1675,7 +1675,7 @@ EAPI int dynamicbox_resize(struct dynamicbox *handler, int type, dynamicbox_ret_
        return ret;
 }
 
-EAPI int dynamicbox_click(struct dynamicbox *handler, double x, double y)
+EAPI int dynamicbox_click(dynamicbox_h handler, double x, double y)
 {
        struct packet *packet;
        double timestamp;
@@ -1743,7 +1743,7 @@ EAPI int dynamicbox_click(struct dynamicbox *handler, double x, double y)
        return ret;
 }
 
-EAPI int dynamicbox_has_gbar(struct dynamicbox *handler)
+EAPI int dynamicbox_has_gbar(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -1763,7 +1763,7 @@ EAPI int dynamicbox_has_gbar(struct dynamicbox *handler)
        return !!handler->common->gbar.fb;
 }
 
-EAPI int dynamicbox_glance_bar_is_created(struct dynamicbox *handler)
+EAPI int dynamicbox_glance_bar_is_created(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -1783,7 +1783,7 @@ EAPI int dynamicbox_glance_bar_is_created(struct dynamicbox *handler)
        return handler->common->is_gbar_created;
 }
 
-EAPI int dynamicbox_create_glance_bar(struct dynamicbox *handler, double x, double y, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_create_glance_bar(dynamicbox_h handler, double x, double y, dynamicbox_ret_cb_t cb, void *data)
 {
        struct packet *packet;
        unsigned int cmd = CMD_CREATE_GBAR;
@@ -1849,7 +1849,7 @@ EAPI int dynamicbox_create_glance_bar(struct dynamicbox *handler, double x, doub
        return ret;
 }
 
-EAPI int dynamicbox_move_glance_bar(struct dynamicbox *handler, double x, double y)
+EAPI int dynamicbox_move_glance_bar(dynamicbox_h handler, double x, double y)
 {
        struct packet *packet;
        unsigned int cmd = CMD_GBAR_MOVE;
@@ -1915,7 +1915,7 @@ EAPI int dynamicbox_activate(const char *pkgname, dynamicbox_ret_cb_t cb, void *
        return ret;
 }
 
-EAPI int dynamicbox_destroy_glance_bar(struct dynamicbox *handler, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_destroy_glance_bar(dynamicbox_h handler, dynamicbox_ret_cb_t cb, void *data)
 {
        struct packet *packet;
        struct cb_info *cbinfo;
@@ -1991,7 +1991,7 @@ EAPI int dynamicbox_destroy_glance_bar(struct dynamicbox *handler, dynamicbox_re
        return ret;
 }
 
-EAPI int dynamicbox_feed_access_event(struct dynamicbox *handler, enum dynamicbox_access_event_type type, struct dynamicbox_access_event_info *info, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_feed_access_event(dynamicbox_h handler, enum dynamicbox_access_event_type type, struct dynamicbox_access_event_info *info, dynamicbox_ret_cb_t cb, void *data)
 {
        int w = 1;
        int h = 1;
@@ -2128,7 +2128,7 @@ EAPI int dynamicbox_feed_access_event(struct dynamicbox *handler, enum dynamicbo
        return ret;
 }
 
-EAPI int dynamicbox_feed_mouse_event(struct dynamicbox *handler, enum dynamicbox_mouse_event_type type, struct dynamicbox_mouse_event_info *info)
+EAPI int dynamicbox_feed_mouse_event(dynamicbox_h handler, enum dynamicbox_mouse_event_type type, struct dynamicbox_mouse_event_info *info)
 {
        int w = 1;
        int h = 1;
@@ -2294,7 +2294,7 @@ EAPI int dynamicbox_feed_mouse_event(struct dynamicbox *handler, enum dynamicbox
        return send_mouse_event(handler, (const char *)&cmd, info->x * w, info->y * h);
 }
 
-EAPI int dynamicbox_feed_key_event(struct dynamicbox *handler, enum dynamicbox_key_event_type type, struct dynamicbox_key_event_info *info, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_feed_key_event(dynamicbox_h handler, enum dynamicbox_key_event_type type, struct dynamicbox_key_event_info *info, dynamicbox_ret_cb_t cb, void *data)
 {
        int ret;
        unsigned int cmd;
@@ -2437,7 +2437,7 @@ EAPI int dynamicbox_feed_key_event(struct dynamicbox *handler, enum dynamicbox_k
        return ret;
 }
 
-EAPI const char *dynamicbox_filename(struct dynamicbox *handler)
+EAPI const char *dynamicbox_filename(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -2462,7 +2462,7 @@ EAPI const char *dynamicbox_filename(struct dynamicbox *handler)
        return util_uri_to_path(handler->common->id);
 }
 
-EAPI int dynamicbox_get_glance_bar_size(struct dynamicbox *handler, int *w, int *h)
+EAPI int dynamicbox_get_glance_bar_size(dynamicbox_h handler, int *w, int *h)
 {
        int _w;
        int _h;
@@ -2500,7 +2500,7 @@ EAPI int dynamicbox_get_glance_bar_size(struct dynamicbox *handler, int *w, int
        return DBOX_STATUS_ERROR_NONE;
 }
 
-EAPI int dynamicbox_size(struct dynamicbox *handler)
+EAPI int dynamicbox_size(dynamicbox_h handler)
 {
        int w;
        int h;
@@ -2538,7 +2538,7 @@ EAPI int dynamicbox_size(struct dynamicbox *handler)
        return dynamicbox_service_size_type(w, h);
 }
 
-EAPI int dynamicbox_set_group(struct dynamicbox *handler, const char *cluster, const char *category, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_set_group(dynamicbox_h handler, const char *cluster, const char *category, dynamicbox_ret_cb_t cb, void *data)
 {
        struct packet *packet;
        unsigned int cmd = CMD_CHANGE_GROUP;
@@ -2599,7 +2599,7 @@ EAPI int dynamicbox_set_group(struct dynamicbox *handler, const char *cluster, c
        return ret;
 }
 
-EAPI int dynamicbox_get_group(struct dynamicbox *handler, const char **cluster, const char **category)
+EAPI int dynamicbox_get_group(dynamicbox_h handler, const char **cluster, const char **category)
 {
        if (!handler) {
                ErrPrint("Handler is NIL\n");
@@ -2626,7 +2626,7 @@ EAPI int dynamicbox_get_group(struct dynamicbox *handler, const char **cluster,
        return DBOX_STATUS_ERROR_NONE;
 }
 
-EAPI int dynamicbox_get_supported_sizes(struct dynamicbox *handler, int *cnt, int *size_list)
+EAPI int dynamicbox_get_supported_sizes(dynamicbox_h handler, int *cnt, int *size_list)
 {
        register int i;
        register int j;
@@ -2665,7 +2665,7 @@ EAPI int dynamicbox_get_supported_sizes(struct dynamicbox *handler, int *cnt, in
        return DBOX_STATUS_ERROR_NONE;
 }
 
-EAPI const char *dynamicbox_pkgname(struct dynamicbox *handler)
+EAPI const char *dynamicbox_pkgname(dynamicbox_h handler)
 {
        if (!handler) {
                ErrPrint("Handler is NIL\n");
@@ -2685,7 +2685,7 @@ EAPI const char *dynamicbox_pkgname(struct dynamicbox *handler)
        return handler->common->pkgname;
 }
 
-EAPI double dynamicbox_priority(struct dynamicbox *handler)
+EAPI double dynamicbox_priority(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -2759,7 +2759,7 @@ EAPI int dynamicbox_delete_category(const char *cluster, const char *category, d
        return ret;
 }
 
-EAPI enum dynamicbox_type dynamicbox_type(struct dynamicbox *handler, int gbar)
+EAPI enum dynamicbox_type dynamicbox_type(dynamicbox_h handler, int gbar)
 {
        enum dynamicbox_type type;
 
@@ -2827,7 +2827,7 @@ EAPI enum dynamicbox_type dynamicbox_type(struct dynamicbox *handler, int gbar)
        return type;
 }
 
-EAPI int dynamicbox_set_text_handler(struct dynamicbox *handler, int gbar, struct dynamicbox_script_operators *ops)
+EAPI int dynamicbox_set_text_handler(dynamicbox_h handler, int gbar, struct dynamicbox_script_operators *ops)
 {
        if (!handler) {
                ErrPrint("Handler is NIL\n");
@@ -2848,7 +2848,7 @@ EAPI int dynamicbox_set_text_handler(struct dynamicbox *handler, int gbar, struc
        return DBOX_STATUS_ERROR_NONE;
 }
 
-EAPI unsigned int dynamicbox_acquire_resource_id(struct dynamicbox *handler, int gbar, dynamicbox_ret_cb_t cb, void *data)
+EAPI unsigned int dynamicbox_acquire_resource_id(dynamicbox_h handler, int gbar, dynamicbox_ret_cb_t cb, void *data)
 {
        if (gbar) {
                if (!handler || handler->state != CREATE) {
@@ -2905,7 +2905,7 @@ EAPI unsigned int dynamicbox_acquire_resource_id(struct dynamicbox *handler, int
  * if this function check the state of handles,
  * user cannot release the pixmap.
  */
-EAPI int dynamicbox_release_resource_id(struct dynamicbox *handler, int gbar, unsigned int resource_id)
+EAPI int dynamicbox_release_resource_id(dynamicbox_h handler, int gbar, unsigned int resource_id)
 {
        struct packet *packet;
        const char *pkgname;
@@ -3008,7 +3008,7 @@ EAPI int dynamicbox_release_resource_id(struct dynamicbox *handler, int gbar, un
        return master_rpc_request_only(handler, packet);
 }
 
-EAPI unsigned int dynamicbox_resource_id(const struct dynamicbox *handler, int gbar)
+EAPI unsigned int dynamicbox_resource_id(const dynamicbox_h handler, int gbar)
 {
        const char *id;
        int pixmap = 0;
@@ -3071,7 +3071,7 @@ EAPI unsigned int dynamicbox_resource_id(const struct dynamicbox *handler, int g
        return pixmap;
 }
 
-EAPI void *dynamicbox_acquire_fb(struct dynamicbox *handler, int gbar)
+EAPI void *dynamicbox_acquire_fb(dynamicbox_h handler, int gbar)
 {
        if (gbar) {
                if (!handler || handler->state != CREATE) {
@@ -3130,7 +3130,7 @@ EAPI int dynamicbox_fb_refcnt(void *buffer)
        return fb_refcnt(buffer);
 }
 
-EAPI int dynamicbox_fb_bufsz(struct dynamicbox *handler, int gbar)
+EAPI int dynamicbox_fb_bufsz(dynamicbox_h handler, int gbar)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -3154,7 +3154,7 @@ EAPI int dynamicbox_fb_bufsz(struct dynamicbox *handler, int gbar)
        }
 }
 
-EAPI int dynamicbox_is_created_by_user(struct dynamicbox *handler)
+EAPI int dynamicbox_is_created_by_user(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -3174,7 +3174,7 @@ EAPI int dynamicbox_is_created_by_user(struct dynamicbox *handler)
        return handler->common->is_user;
 }
 
-EAPI int dynamicbox_set_pinup(struct dynamicbox *handler, int flag, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_set_pinup(dynamicbox_h handler, int flag, dynamicbox_ret_cb_t cb, void *data)
 {
        struct packet *packet;
        unsigned int cmd = CMD_PINUP_CHANGED;
@@ -3225,7 +3225,7 @@ EAPI int dynamicbox_set_pinup(struct dynamicbox *handler, int flag, dynamicbox_r
        return ret;
 }
 
-EAPI int dynamicbox_is_pinned_up(struct dynamicbox *handler)
+EAPI int dynamicbox_is_pinned_up(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -3245,7 +3245,7 @@ EAPI int dynamicbox_is_pinned_up(struct dynamicbox *handler)
        return handler->common->is_pinned_up;
 }
 
-EAPI int dynamicbox_has_pinup(struct dynamicbox *handler)
+EAPI int dynamicbox_has_pinup(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -3265,7 +3265,7 @@ EAPI int dynamicbox_has_pinup(struct dynamicbox *handler)
        return handler->common->dbox.pinup_supported;
 }
 
-EAPI int dynamicbox_set_data(struct dynamicbox *handler, void *data)
+EAPI int dynamicbox_set_data(dynamicbox_h handler, void *data)
 {
        if (!handler) {
                ErrPrint("Handler is NIL\n");
@@ -3281,7 +3281,7 @@ EAPI int dynamicbox_set_data(struct dynamicbox *handler, void *data)
        return DBOX_STATUS_ERROR_NONE;
 }
 
-EAPI void *dynamicbox_data(struct dynamicbox *handler)
+EAPI void *dynamicbox_data(dynamicbox_h handler)
 {
        if (!handler) {
                ErrPrint("Handler is NIL\n");
@@ -3296,7 +3296,7 @@ EAPI void *dynamicbox_data(struct dynamicbox *handler)
        return handler->data;
 }
 
-EAPI const char *dynamicbox_content(struct dynamicbox *handler)
+EAPI const char *dynamicbox_content(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -3311,7 +3311,7 @@ EAPI const char *dynamicbox_content(struct dynamicbox *handler)
        return handler->common->content;
 }
 
-EAPI const char *dynamicbox_title(struct dynamicbox *handler)
+EAPI const char *dynamicbox_title(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -3326,7 +3326,7 @@ EAPI const char *dynamicbox_title(struct dynamicbox *handler)
        return handler->common->title;
 }
 
-EAPI int dynamicbox_emit_text_signal(struct dynamicbox *handler, const char *emission, const char *source, double sx, double sy, double ex, double ey, dynamicbox_ret_cb_t cb, void *data)
+EAPI int dynamicbox_emit_text_signal(dynamicbox_h handler, const char *emission, const char *source, double sx, double sy, double ex, double ey, dynamicbox_ret_cb_t cb, void *data)
 {
        struct packet *packet;
        struct cb_info *cbinfo;
@@ -3418,7 +3418,7 @@ EAPI int dynamicbox_unsubscribe_group(const char *cluster, const char *category)
        return master_rpc_request_only(NULL, packet);
 }
 
-EAPI int dynamicbox_refresh(struct dynamicbox *handler, int force)
+EAPI int dynamicbox_refresh(dynamicbox_h handler, int force)
 {
        struct packet *packet;
        unsigned int cmd = CMD_UPDATE;
@@ -3466,7 +3466,7 @@ EAPI int dynamicbox_refresh_group(const char *cluster, const char *category, int
        return master_rpc_request_only(NULL, packet);
 }
 
-EAPI int dynamicbox_set_visibility(struct dynamicbox *handler, enum dynamicbox_visible_state state)
+EAPI int dynamicbox_set_visibility(dynamicbox_h handler, enum dynamicbox_visible_state state)
 {
        int old_state;
        int ret;
@@ -3510,7 +3510,7 @@ EAPI int dynamicbox_set_visibility(struct dynamicbox *handler, enum dynamicbox_v
        return ret;
 }
 
-EAPI enum dynamicbox_visible_state dynamicbox_visibility(struct dynamicbox *handler)
+EAPI enum dynamicbox_visible_state dynamicbox_visibility(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is invalid\n");
@@ -3558,7 +3558,7 @@ EAPI int dynamicbox_viewer_set_resumed(void)
        return master_rpc_request_only(NULL, packet);
 }
 
-EAPI int dynamicbox_sync_fb(struct dynamicbox *handler, int gbar)
+EAPI int dynamicbox_sync_fb(dynamicbox_h handler, int gbar)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Invalid handle\n");
@@ -3582,7 +3582,7 @@ EAPI int dynamicbox_sync_fb(struct dynamicbox *handler, int gbar)
        }
 }
 
-EAPI const char *dynamicbox_alt_icon(struct dynamicbox *handler)
+EAPI const char *dynamicbox_alt_icon(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is not valid[%p]\n", handler);
@@ -3597,7 +3597,7 @@ EAPI const char *dynamicbox_alt_icon(struct dynamicbox *handler)
        return handler->common->alt.icon;
 }
 
-EAPI const char *dynamicbox_alt_name(struct dynamicbox *handler)
+EAPI const char *dynamicbox_alt_name(dynamicbox_h handler)
 {
        if (!handler || handler->state != CREATE) {
                ErrPrint("Handler is not valid[%p]\n", handler);
@@ -3612,7 +3612,7 @@ EAPI const char *dynamicbox_alt_name(struct dynamicbox *handler)
        return handler->common->alt.name;
 }
 
-EAPI int dynamicbox_acquire_fb_lock(struct dynamicbox *handler, int is_gbar)
+EAPI int dynamicbox_acquire_fb_lock(dynamicbox_h handler, int is_gbar)
 {
        int ret = DBOX_STATUS_ERROR_NONE;
        int fd;
@@ -3661,7 +3661,7 @@ EAPI int dynamicbox_acquire_fb_lock(struct dynamicbox *handler, int is_gbar)
        return ret == 0 ? DBOX_STATUS_ERROR_NONE : DBOX_STATUS_ERROR_FAULT;
 }
 
-EAPI int dynamicbox_release_fb_lock(struct dynamicbox *handler, int is_gbar)
+EAPI int dynamicbox_release_fb_lock(dynamicbox_h handler, int is_gbar)
 {
        int ret = DBOX_STATUS_ERROR_NONE;
        int fd;
@@ -3763,7 +3763,7 @@ EAPI int dynamicbox_option(enum dynamicbox_option_type option)
        return ret;
 }
 
-EAPI int dynamicbox_set_auto_launch_handler(int (*dbox_launch_handler)(struct dynamicbox *handler, const char *appid, void *data), void *data)
+EAPI int dynamicbox_set_auto_launch_handler(int (*dbox_launch_handler)(dynamicbox_h handler, const char *appid, void *data), void *data)
 {
        s_info.launch.handler = dbox_launch_handler;
        s_info.launch.data = data;

diff --git a/src/dynamicbox_internal.c b/src/dynamicbox_internal.c
index 9f2c17b..a6b1b1b 100644 (file)
--- a/src/dynamicbox_internal.c
+++ b/src/dynamicbox_internal.c
@@ -30,7 +30,7 @@ enum event_state {
 
 struct event_info {
        int is_deleted;
-       int (*handler)(struct dynamicbox *handler, enum dynamicbox_event_type event, void *data);
+       int (*handler)(dynamicbox_h handler, enum dynamicbox_event_type event, void *data);
        void *user_data;
 };
 
@@ -56,12 +56,12 @@ static struct info {
        .fault_state = INFO_STATE_CALLBACK_IN_IDLE,
 };
 
-static inline void default_delete_cb(struct dynamicbox *handler, int ret, void *data)
+static inline void default_delete_cb(dynamicbox_h handler, int ret, void *data)
 {
        DbgPrint("Default deleted event handler: %d\n", ret);
 }
 
-static void del_ret_cb(struct dynamicbox *handler, const struct packet *result, void *data)
+static void del_ret_cb(dynamicbox_h handler, const struct packet *result, void *data)
 {
        struct cb_info *info = data;
        int ret;
@@ -174,7 +174,7 @@ int dbox_create_lock_file(struct dynamicbox_common *common, int is_gbar)
        return DBOX_STATUS_ERROR_NONE;
 }
 
-struct dynamicbox_common *dbox_create_common_handle(struct dynamicbox *handle, const char *pkgname, const char *cluster, const char *category)
+struct dynamicbox_common *dbox_create_common_handle(dynamicbox_h handle, const char *pkgname, const char *cluster, const char *category)
 {
        struct dynamicbox_common *common;
 
@@ -264,7 +264,7 @@ int dbox_destroy_common_handle(struct dynamicbox_common *common)
        return 0;
 }
 
-int dbox_common_ref(struct dynamicbox_common *common, struct dynamicbox *handle)
+int dbox_common_ref(struct dynamicbox_common *common, dynamicbox_h handle)
 {
        common->dynamicbox_list = dlist_append(common->dynamicbox_list, handle);
        common->refcnt++;
@@ -272,7 +272,7 @@ int dbox_common_ref(struct dynamicbox_common *common, struct dynamicbox *handle)
        return common->refcnt;
 }
 
-int dbox_common_unref(struct dynamicbox_common *common, struct dynamicbox *handle)
+int dbox_common_unref(struct dynamicbox_common *common, dynamicbox_h handle)
 {
        int refcnt;
        dlist_remove_data(common->dynamicbox_list, handle);
@@ -369,7 +369,7 @@ void dbox_invoke_fault_handler(enum dynamicbox_fault_type event, const char *pkg
        s_info.fault_state &= ~INFO_STATE_CALLBACK_IN_PROCESSING;
 }
 
-void dbox_invoke_event_handler(struct dynamicbox *handler, enum dynamicbox_event_type event)
+void dbox_invoke_event_handler(dynamicbox_h handler, enum dynamicbox_event_type event)
 {
        struct dlist *l;
        struct dlist *n;
@@ -434,9 +434,9 @@ struct dynamicbox_common *dbox_find_common_handle_by_timestamp(double timestamp)
        return NULL;
 }
 
-struct dynamicbox *dbox_new_dynamicbox(const char *pkgname, const char *id, double timestamp, const char *cluster, const char *category)
+dynamicbox_h dbox_new_dynamicbox(const char *pkgname, const char *id, double timestamp, const char *cluster, const char *category)
 {
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
 
        handler = calloc(1, sizeof(*handler));
        if (!handler) {
@@ -465,7 +465,7 @@ int dbox_delete_all(void)
 {
        struct dlist *l;
        struct dlist *n;
-       struct dynamicbox *handler;
+       dynamicbox_h handler;
 
        dlist_foreach_safe(s_info.dynamicbox_list, l, n, handler) {
                dbox_invoke_event_handler(handler, DBOX_EVENT_DELETED);
@@ -721,7 +721,7 @@ void dbox_set_period(struct dynamicbox_common *common, double period)
        common->dbox.period = period;
 }
 
-struct dynamicbox *dbox_ref(struct dynamicbox *handler)
+dynamicbox_h dbox_ref(dynamicbox_h handler)
 {
        if (!handler) {
                return NULL;
@@ -731,7 +731,7 @@ struct dynamicbox *dbox_ref(struct dynamicbox *handler)
        return handler;
 }
 
-struct dynamicbox *dbox_unref(struct dynamicbox *handler, int destroy_common)
+dynamicbox_h dbox_unref(dynamicbox_h handler, int destroy_common)
 {
        if (!handler) {
                return NULL;
@@ -826,7 +826,7 @@ struct dynamicbox *dbox_unref(struct dynamicbox *handler, int destroy_common)
        return NULL;
 }
 
-int dbox_send_delete(struct dynamicbox *handler, int type, dynamicbox_ret_cb_t cb, void *data)
+int dbox_send_delete(dynamicbox_h handler, int type, dynamicbox_ret_cb_t cb, void *data)
 {
        struct packet *packet;
        struct cb_info *cbinfo;
@@ -1034,10 +1034,10 @@ struct dynamicbox_common *dbox_find_sharable_common_handle(const char *pkgname,
        return NULL;
 }
 
-struct dynamicbox *dbox_find_dbox_in_show(struct dynamicbox_common *common)
+dynamicbox_h dbox_find_dbox_in_show(struct dynamicbox_common *common)
 {
        struct dlist *l;
-       struct dynamicbox *item;
+       dynamicbox_h item;
 
        dlist_foreach(common->dynamicbox_list, l, item) {
                if (item->visible == DBOX_SHOW) {
@@ -1049,9 +1049,9 @@ struct dynamicbox *dbox_find_dbox_in_show(struct dynamicbox_common *common)
        return NULL;
 }
 
-struct dynamicbox *dbox_get_dbox_nth(struct dynamicbox_common *common, int nth)
+dynamicbox_h dbox_get_dbox_nth(struct dynamicbox_common *common, int nth)
 {
-       struct dynamicbox *item;
+       dynamicbox_h item;
        struct dlist *l;
 
        l = dlist_nth(common->dynamicbox_list, nth);
@@ -1060,7 +1060,7 @@ struct dynamicbox *dbox_get_dbox_nth(struct dynamicbox_common *common, int nth)
        return item;
 }
 
-int dbox_add_event_handler(int (*dbox_cb)(struct dynamicbox *, enum dynamicbox_event_type, void *), void *data)
+int dbox_add_event_handler(int (*dbox_cb)(dynamicbox_h , enum dynamicbox_event_type, void *), void *data)
 {
        struct event_info *info;
        info = malloc(sizeof(*info));
@@ -1077,7 +1077,7 @@ int dbox_add_event_handler(int (*dbox_cb)(struct dynamicbox *, enum dynamicbox_e
        return DBOX_STATUS_ERROR_NONE;
 }
 
-void *dbox_remove_event_handler(int (*dbox_cb)(struct dynamicbox *, enum dynamicbox_event_type, void *))
+void *dbox_remove_event_handler(int (*dbox_cb)(dynamicbox_h , enum dynamicbox_event_type, void *))
 {
        struct event_info *info;
        struct dlist *l;

diff --git a/src/master_rpc.c b/src/master_rpc.c
index 15fb703..5e182a0 100644 (file)
--- a/src/master_rpc.c
+++ b/src/master_rpc.c
@@ -41,8 +41,8 @@
 struct command {
        int ttl;
        struct packet *packet;
-       struct dynamicbox *handler;
-       void (*ret_cb)(struct dynamicbox *handler, const struct packet *result, void *data);
+       dynamicbox_h handler;
+       void (*ret_cb)(dynamicbox_h handler, const struct packet *result, void *data);
        void *data;
        enum {
                TYPE_ACK,
@@ -77,7 +77,7 @@ static inline struct command *pop_command(void)
        return command;
 }
 
-static inline struct command *create_command(struct dynamicbox *handler, struct packet *packet)
+static inline struct command *create_command(dynamicbox_h handler, struct packet *packet)
 {
        struct command *command;
 
@@ -198,7 +198,7 @@ static inline void push_command(struct command *command)
  * \note
  * "handler" could be NULL
  */
-int master_rpc_async_request(struct dynamicbox *handler, struct packet *packet, int urgent, void (*ret_cb)(struct dynamicbox *handler, const struct packet *result, void *data), void *data)
+int master_rpc_async_request(dynamicbox_h handler, struct packet *packet, int urgent, void (*ret_cb)(dynamicbox_h handler, const struct packet *result, void *data), void *data)
 {
        struct command *command;
 
@@ -224,7 +224,7 @@ int master_rpc_async_request(struct dynamicbox *handler, struct packet *packet,
        return DBOX_STATUS_ERROR_NONE;
 }
 
-int master_rpc_request_only(struct dynamicbox *handler, struct packet *packet)
+int master_rpc_request_only(dynamicbox_h handler, struct packet *packet)
 {
        struct command *command;