diff options
author | Semun Lee <sm79.lee@samsung.com> | 2014-02-25 20:06:26 +0900 |
---|---|---|
committer | Semun Lee <sm79.lee@samsung.com> | 2014-02-25 20:06:26 +0900 |
commit | 92210284ef62357b7a08fbd973d291ee1afe04ec (patch) | |
tree | e219cc5a2c18ba8914b427df1f0660cfc264f36e /include | |
parent | f0e0a08562a88cac22640384e1f8cadbec9f4ce1 (diff) | |
parent | c7bb89ae628988e1555a950c8b478c9de85ef2c6 (diff) | |
download | ui-gadget-1-92210284ef62357b7a08fbd973d291ee1afe04ec.tar.gz ui-gadget-1-92210284ef62357b7a08fbd973d291ee1afe04ec.tar.bz2 ui-gadget-1-92210284ef62357b7a08fbd973d291ee1afe04ec.zip |
Merge branches 'HEAD' and 'tizen_2.2' into tizen
Conflicts:
CMakeLists.txt
client/CMakeLists.txt
client/ug-client.c
include/ui-gadget.h
packaging/ui-gadget-1.spec
src/manager.c
ui-gadget-1.manifest
Diffstat (limited to 'include')
-rwxr-xr-x | include/SLP_UI_Gadget_PG.h | 3 | ||||
-rw-r--r-- | include/ug-module.h | 1 | ||||
-rwxr-xr-x | include/ug.h | 9 | ||||
-rwxr-xr-x | include/ui-gadget-engine.h | 5 | ||||
-rw-r--r-- | include/ui-gadget.h | 2 |
5 files changed, 11 insertions, 9 deletions
diff --git a/include/SLP_UI_Gadget_PG.h b/include/SLP_UI_Gadget_PG.h index 70387f2..08f683d 100755 --- a/include/SLP_UI_Gadget_PG.h +++ b/include/SLP_UI_Gadget_PG.h @@ -189,8 +189,6 @@ UG_OPT_INDICATOR_LANDSCAPE_ONLY UG_OPT_INDICATOR_DISABLE // current indicator status will be held UG_OPT_INDICATOR_MANUAL -// Enable indicator overlap -UG_OPT_OVERLAP_ENABLE @endcode \note <b>struct ug_data</b> is a user defined private data structure describing base layout, own UI gadget handler, and whatever you need: @@ -509,7 +507,6 @@ Available options are as following: - UG_OPT_LANDSCAPE_ONLY - UG_OPT_INDICATOR_DISABLE - UG_OPT_INDICATOR_MANUAL -- UG_OPT_OVERLAP_ENABLE And we used UG_OPT_INDICATOR_POTRAIT_ONLY in "helloUG-efl" diff --git a/include/ug-module.h b/include/ug-module.h index 7d7bf5e..2db135f 100644 --- a/include/ug-module.h +++ b/include/ug-module.h @@ -28,6 +28,7 @@ struct ug_module { void *handle; char *module_name; struct ug_module_ops ops; + char *addr; }; struct ug_module *ug_module_load(const char *name); diff --git a/include/ug.h b/include/ug.h index fe3be22..eb2ae64 100755 --- a/include/ug.h +++ b/include/ug.h @@ -22,18 +22,16 @@ #ifndef __UG_H__ #define __UG_H__ -#include <bundle.h> #include "ug-module.h" #include "ui-gadget.h" -struct ug_child; - enum ug_state { UG_STATE_READY = 0x00, UG_STATE_CREATED, UG_STATE_RUNNING, UG_STATE_STOPPED, UG_STATE_DESTROYING, + UG_STATE_PENDING_DESTROY, UG_STATE_DESTROYED, UG_STATE_INVALID, UG_STATE_MAX @@ -50,6 +48,11 @@ enum ug_layout_state { UG_LAYOUT_MAX }; +enum ug_ui_req { + UG_UI_REQ_GET_CONFORMANT = 0x00, + UG_UI_REQ_MAX +}; + struct ui_gadget_s { const char *name; void *layout; diff --git a/include/ui-gadget-engine.h b/include/ui-gadget-engine.h index 13986cf..7581256 100755 --- a/include/ui-gadget-engine.h +++ b/include/ui-gadget-engine.h @@ -38,7 +38,6 @@ * @{ */ -#include <bundle.h> #include "ui-gadget.h" #ifdef __cplusplus @@ -54,8 +53,10 @@ struct ug_engine_ops { void *(*create)(void *win, ui_gadget_h ug, void(*show_end_cb)(void *data)); /** destroy operation */ void (*destroy)(ui_gadget_h ug, ui_gadget_h fv_top, void(*hide_end_cb)(void *data)); + /** request operation */ + void *(*request)(void *data, ui_gadget_h ug, int req); /** reserved operations */ - void *reserved[4]; + void *reserved[3]; }; #ifdef __cplusplus diff --git a/include/ui-gadget.h b/include/ui-gadget.h index fbad11d..41f5637 100644 --- a/include/ui-gadget.h +++ b/include/ui-gadget.h @@ -131,7 +131,7 @@ enum ug_option { /**< Indicator option: Indicator will be handled manually */ UG_OPT_OVERLAP_ENABLE = 0x08, - /**< Overlap option: Enable indicator overlap */ + /**< Overlap option: Enable indicator overlap */ UG_OPT_MAX }; |