diff options
| author | Li,Limin <liminx.li@intel.com> | 2014-01-08 18:01:31 +0800 |
|---|---|---|
| committer | Li,Limin <liminx.li@intel.com> | 2014-01-08 18:03:38 +0800 |
| commit | 3a86573c836fcbe7cb6072e5607b4216c6c5c133 (patch) | |
| tree | fb2b812369b88727e6c8d2365f3a4f0d831bcbb0 /include/ui-gadget.h | |
| parent | bc0915cd3c899263c1be54730be7df3ecb9b54dd (diff) | |
| download | ui-gadget-1-3a86573c836fcbe7cb6072e5607b4216c6c5c133.tar.gz ui-gadget-1-3a86573c836fcbe7cb6072e5607b4216c6c5c133.tar.bz2 ui-gadget-1-3a86573c836fcbe7cb6072e5607b4216c6c5c133.zip | |
init wayland supportsubmit/tizen/20140110.215645accepted/tizen/mobile/20140113.182040accepted/tizen/ivi/20140110.224049accepted/tizen/generic/20140114.145758accepted/tizen/mobile
The display server based on X or Wayland, is now a choice of different profile in Tizen 3.0.
Basically and consistently, two macros were used "with wayland" and "with x".
Below summarize the combination of the macros:
| wayland | x | meaning
|---------------------------
| 0 | 1 | pure X11 platform(no wayland)
| 1 | 0 | pure wayland platform (no X11)
| 1 | 1 | wayland but X compatibility
| 0 | 0 | no X and no wayland
This method unifies the meaning and usage. Deploy this method to ui-gadget package.
Signed-off-by: Li,Limin <liminx.li@intel.com>
Change-Id: Iceb95b03f824860b2aac74f35c0945380f6cc22a
Diffstat (limited to 'include/ui-gadget.h')
| -rw-r--r--[-rwxr-xr-x] | include/ui-gadget.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/ui-gadget.h b/include/ui-gadget.h index dfa13b4..fbad11d 100755..100644 --- a/include/ui-gadget.h +++ b/include/ui-gadget.h @@ -54,8 +54,10 @@ * @addtogroup UI_Gadget_For_User * @{ */ - +#ifndef WAYLAND #include <X11/Xlib.h> +#endif + #include <app.h> #ifdef __cplusplus @@ -161,9 +163,11 @@ struct ug_cbs { * Easy-to-use macro of ug_init() for EFL * @see ug_init() */ +#ifndef WAYLAND #define UG_INIT_EFL(win, opt) \ ug_init((Display *)ecore_x_display_get(), elm_win_xwindow_get(win), \ win, opt) +#endif /** * Easy-to-use macro of ug_init() for GTK @@ -215,8 +219,9 @@ struct ug_cbs { * ... * \endcode */ +#ifndef WAYLAND int ug_init(Display *disp, Window xid, void *win, enum ug_option opt); - +#endif /** * \par Description: * This function creates a UI gadget |