kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'devs/devilhorns/xdg_shell' 

Summary: This commit merges in changes to update EFL wayland support
to work with the new xdg shell protocol version (version 4)

@feature
This commit is contained in:
Chris Michael 2014-10-01 16:17:23 -04:00
parent fae337469e a0a4257018
commit 2873debbc2
8 changed files with 988 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile_Ecore_Wayland.am
View File

@ -19,8 +19,9 @@ lib/ecore_wayland/ecore_wl_private.h \
lib/ecore_wayland/subsurface-protocol.c \
lib/ecore_wayland/subsurface-client-protocol.h \
lib/ecore_wayland/ivi-application-protocol.c \
lib/ecore_wayland/ivi-application-client-protocol.h
lib/ecore_wayland/ivi-application-client-protocol.h \
lib/ecore_wayland/xdg-shell-client-protocol.h \
lib/ecore_wayland/xdg-shell-protocol.c
lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WAYLAND_CFLAGS@
lib_ecore_wayland_libecore_wayland_la_LIBADD = @ECORE_WAYLAND_LIBS@

12
src/lib/ecore_wayland/Ecore_Wayland.h
View File

@ -567,6 +567,7 @@ EAPI void ecore_wl_window_update_size(Ecore_Wl_Window *win, int w, int h);
EAPI void ecore_wl_window_update_location(Ecore_Wl_Window *win, int x, int y);
EAPI struct wl_surface *ecore_wl_window_surface_get(Ecore_Wl_Window *win);
EAPI struct wl_shell_surface *ecore_wl_window_shell_surface_get(Ecore_Wl_Window *win);
EAPI struct xdg_surface *ecore_wl_window_xdg_surface_get(Ecore_Wl_Window *win);
EAPI Ecore_Wl_Window *ecore_wl_window_find(unsigned int id);
EAPI void ecore_wl_window_type_set(Ecore_Wl_Window *win, Ecore_Wl_Window_Type type);
EAPI void ecore_wl_window_pointer_set(Ecore_Wl_Window *win, struct wl_surface *surface, int hot_x, int hot_y);
@ -574,6 +575,17 @@ EAPI void ecore_wl_window_cursor_from_name_set(Ecore_Wl_Window *win, const char
EAPI void ecore_wl_window_cursor_default_restore(Ecore_Wl_Window *win);
EAPI void ecore_wl_window_parent_set(Ecore_Wl_Window *win, Ecore_Wl_Window *parent);
/**
* Iconify a window
*
* @param win The window to iconifiy
*
* @ingroup Ecore_Wl_Window_Group
* @since 1.12
*/
EAPI void ecore_wl_window_iconified_set(Ecore_Wl_Window *win, Eina_Bool iconified);
EAPI Eina_Bool ecore_wl_window_iconified_get(Ecore_Wl_Window *win);
EAPI int ecore_wl_window_id_get(Ecore_Wl_Window *win);
EAPI void ecore_wl_window_title_set(Ecore_Wl_Window *win, const char *title);

43
src/lib/ecore_wayland/ecore_wl.c
View File

@ -16,6 +16,9 @@
# include <subsurface-client-protocol.h>
#endif
#include "xdg-shell-client-protocol.h"
#define XDG_VERSION 4
/* local function prototypes */
static Eina_Bool _ecore_wl_shutdown(Eina_Bool close);
static Eina_Bool _ecore_wl_cb_idle_enterer(void *data);
@ -61,6 +64,17 @@ static const struct wl_callback_listener _ecore_wl_anim_listener =
_ecore_wl_animator_callback
};
static void
xdg_shell_ping(void *data EINA_UNUSED, struct xdg_shell *shell, uint32_t serial)
{
xdg_shell_pong(shell, serial);
}
static const struct xdg_shell_listener xdg_shell_listener =
{
xdg_shell_ping,
};
/* external variables */
int _ecore_wl_log_dom = -1;
Ecore_Wl_Display *_ecore_wl_disp = NULL;
@ -165,7 +179,8 @@ ecore_wl_init(const char *name)
_ecore_wl_disp->fd = wl_display_get_fd(_ecore_wl_disp->wl.display);
_ecore_wl_disp->fd_hdl =
ecore_main_fd_handler_add(_ecore_wl_disp->fd, ECORE_FD_READ | ECORE_FD_WRITE | ECORE_FD_ERROR,
ecore_main_fd_handler_add(_ecore_wl_disp->fd,
ECORE_FD_READ | ECORE_FD_WRITE | ECORE_FD_ERROR,
_ecore_wl_cb_handle_data, _ecore_wl_disp,
NULL, NULL);
@ -459,8 +474,9 @@ _ecore_wl_shutdown(Eina_Bool close)
EINA_INLIST_FOREACH_SAFE(_ecore_wl_disp->globals, tmp, global)
{
_ecore_wl_disp->globals = eina_inlist_remove
(_ecore_wl_disp->globals, EINA_INLIST_GET(global));
_ecore_wl_disp->globals =
eina_inlist_remove(_ecore_wl_disp->globals,
EINA_INLIST_GET(global));
free(global->interface);
free(global);
}
@ -471,6 +487,8 @@ _ecore_wl_shutdown(Eina_Bool close)
if (_ecore_wl_disp->wl.ivi_application)
ivi_application_destroy(_ecore_wl_disp->wl.ivi_application);
#endif
if (_ecore_wl_disp->wl.xdg_shell)
xdg_shell_destroy(_ecore_wl_disp->wl.xdg_shell);
if (_ecore_wl_disp->wl.shell)
wl_shell_destroy(_ecore_wl_disp->wl.shell);
if (_ecore_wl_disp->wl.shm) wl_shm_destroy(_ecore_wl_disp->wl.shm);
@ -591,7 +609,7 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned in
ewd = data;
global = calloc(1, sizeof(Ecore_Wl_Global));
if (!(global = calloc(1, sizeof(Ecore_Wl_Global)))) return;
global->id = id;
global->interface = strdup(interface);
@ -619,6 +637,14 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned in
wl_registry_bind(registry, id, &ivi_application_interface, 1);
}
#endif
else if (!strcmp(interface, "xdg_shell"))
{
ewd->wl.xdg_shell =
wl_registry_bind(registry, id, &xdg_shell_interface, 1);
xdg_shell_use_unstable_version(ewd->wl.xdg_shell, XDG_VERSION);
xdg_shell_add_listener(ewd->wl.xdg_shell, &xdg_shell_listener,
ewd->wl.display);
}
else if (!strcmp(interface, "wl_shell"))
{
ewd->wl.shell =
@ -647,7 +673,8 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned in
wl_registry_bind(registry, id, &wl_data_device_manager_interface, 1);
}
if ((ewd->wl.compositor) && (ewd->wl.shm) && (ewd->wl.shell))
if ((ewd->wl.compositor) && (ewd->wl.shm) &&
((ewd->wl.shell) || (ewd->wl.xdg_shell)))
{
Ecore_Wl_Event_Interfaces_Bound *ev;
@ -656,7 +683,7 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned in
ev->compositor = (ewd->wl.compositor != NULL);
ev->shm = (ewd->wl.shm != NULL);
ev->shell = (ewd->wl.shell != NULL);
ev->shell = ((ewd->wl.shell != NULL) || (ewd->wl.xdg_shell != NULL));
ev->output = (ewd->output != NULL);
ev->seat = (ewd->input != NULL);
ev->data_device_manager = (ewd->wl.data_device_manager != NULL);
@ -680,8 +707,8 @@ _ecore_wl_cb_handle_global_remove(void *data, struct wl_registry *registry EINA_
EINA_INLIST_FOREACH_SAFE(ewd->globals, tmp, global)
{
if (global->id != id) continue;
ewd->globals = eina_inlist_remove(ewd->globals,
EINA_INLIST_GET(global));
ewd->globals =
eina_inlist_remove(ewd->globals, EINA_INLIST_GET(global));
free(global->interface);
free(global);
}

10
src/lib/ecore_wayland/ecore_wl_private.h
View File

@ -69,6 +69,7 @@ struct _Ecore_Wl_Display
struct wl_compositor *compositor;
struct wl_subcompositor *subcompositor;
struct wl_shell *shell;
struct xdg_shell *xdg_shell;
struct wl_shell *desktop_shell;
# ifdef USE_IVI_SHELL
struct ivi_application *ivi_application;
@ -116,6 +117,15 @@ struct _Ecore_Wl_Window
int ivi_surface_id;
# endif
struct xdg_surface *xdg_surface;
struct xdg_popup *xdg_popup;
Eina_Bool focused : 1;
Eina_Bool resizing : 1;
Eina_Bool fullscreen : 1;
Eina_Bool maximized : 1;
Eina_Bool minimized : 1;
struct
{
struct wl_surface *surface;

378
src/lib/ecore_wayland/ecore_wl_window.c
View File

@ -3,6 +3,7 @@
#endif
#include "ecore_wl_private.h"
#include "xdg-shell-client-protocol.h"
/* local function prototypes */
static void _ecore_wl_window_cb_ping(void *data EINA_UNUSED, struct wl_shell_surface *shell_surface, unsigned int serial);
@ -12,6 +13,9 @@ static void _ecore_wl_window_cb_surface_enter(void *data, struct wl_surface *sur
static void _ecore_wl_window_cb_surface_leave(void *data, struct wl_surface *surface, struct wl_output *output EINA_UNUSED);
static void _ecore_wl_window_configure_send(Ecore_Wl_Window *win, int w, int h, int edges);
static char *_ecore_wl_window_id_str_get(unsigned int win_id);
static void _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface, int32_t width, int32_t height,struct wl_array *states, uint32_t serial);
static void _ecore_xdg_handle_surface_delete(void *data, struct xdg_surface *xdg_surface);
static void _ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup, unsigned int serial);
/* local variables */
static Eina_Hash *_windows = NULL;
@ -30,6 +34,17 @@ static const struct wl_shell_surface_listener _ecore_wl_shell_surface_listener =
_ecore_wl_window_cb_popup_done
};
static const struct xdg_surface_listener _ecore_xdg_surface_listener =
{
_ecore_xdg_handle_surface_configure,
_ecore_xdg_handle_surface_delete,
};
static const struct xdg_popup_listener _ecore_xdg_popup_listener =
{
_ecore_xdg_handle_popup_done,
};
/* internal functions */
void
_ecore_wl_window_init(void)
@ -121,6 +136,11 @@ ecore_wl_window_free(Ecore_Wl_Window *win)
if (win->ivi_surface) ivi_surface_destroy(win->ivi_surface);
win->ivi_surface = NULL;
#endif
if (win->xdg_surface) xdg_surface_destroy(win->xdg_surface);
win->xdg_surface = NULL;
if (win->xdg_popup) xdg_popup_destroy(win->xdg_popup);
win->xdg_popup = NULL;
if (win->shell_surface) wl_shell_surface_destroy(win->shell_surface);
win->shell_surface = NULL;
if (win->surface) wl_surface_destroy(win->surface);
@ -136,61 +156,62 @@ ecore_wl_window_free(Ecore_Wl_Window *win)
EAPI void
ecore_wl_window_move(Ecore_Wl_Window *win, int x, int y)
{
Ecore_Wl_Input *input;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return;
input = win->keyboard_device;
ecore_wl_window_update_location(win, x, y);
if (win->shell_surface)
if ((!input) && (win->parent))
{
Ecore_Wl_Input *input;
if (!(input = win->keyboard_device))
{
if (win->parent)
{
if (!(input = win->parent->keyboard_device))
input = win->parent->pointer_device;
}
}
if ((!input) || (!input->seat)) return;
_ecore_wl_input_grab_release(input, win);
wl_shell_surface_move(win->shell_surface, input->seat,
input->display->serial);
input = win->parent->keyboard_device;
if (!(input = win->parent->keyboard_device))
input = win->parent->pointer_device;
}
if ((!input) || (!input->seat)) return;
_ecore_wl_input_grab_release(input, win);
if (win->xdg_surface)
xdg_surface_move(win->xdg_surface, input->seat, input->display->serial);
else if (win->shell_surface)
wl_shell_surface_move(win->shell_surface, input->seat,
input->display->serial);
}
EAPI void
ecore_wl_window_resize(Ecore_Wl_Window *win, int w, int h, int location)
{
Ecore_Wl_Input *input;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return;
input = win->keyboard_device;
ecore_wl_window_update_size(win, w, h);
if (win->shell_surface)
if ((!input) && (win->parent))
{
Ecore_Wl_Input *input;
if (!(input = win->keyboard_device))
{
if (win->parent)
{
if (!(input = win->parent->keyboard_device))
input = win->parent->pointer_device;
}
}
if ((!input) || (!input->seat)) return;
_ecore_wl_input_grab_release(input, win);
wl_shell_surface_resize(win->shell_surface, input->seat,
input->display->serial, location);
if (!(input = win->parent->keyboard_device))
input = win->parent->pointer_device;
}
if ((!input) || (!input->seat)) return;
_ecore_wl_input_grab_release(input, win);
if (win->xdg_surface)
xdg_surface_resize(win->xdg_surface, input->seat,
input->display->serial, location);
else if (win->shell_surface)
wl_shell_surface_resize(win->shell_surface, input->seat,
input->display->serial, location);
}
EAPI void
@ -244,6 +265,8 @@ ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, in
EAPI struct wl_surface*
ecore_wl_window_surface_create(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return NULL;
if (win->surface) return win->surface;
win->surface = wl_compositor_create_surface(_ecore_wl_compositor_get());
@ -281,56 +304,97 @@ ecore_wl_window_show(Ecore_Wl_Window *win)
ivi_application_surface_create(_ecore_wl_disp->wl.ivi_application,
win->ivi_surface_id, win->surface);
}
if (!win->ivi_surface) {
#endif
if ((!win->shell_surface) && (_ecore_wl_disp->wl.shell))
if (!win->ivi_surface)
{
win->shell_surface =
wl_shell_get_shell_surface(_ecore_wl_disp->wl.shell,
win->surface);
if (!win->shell_surface) return;
#endif
if ((!win->xdg_surface) && (_ecore_wl_disp->wl.xdg_shell))
{
win->xdg_surface =
xdg_shell_get_xdg_surface(_ecore_wl_disp->wl.xdg_shell,
win->surface);
if (!win->xdg_surface) return;
xdg_surface_set_user_data(win->xdg_surface, win);
xdg_surface_add_listener(win->xdg_surface,
&_ecore_xdg_surface_listener, win);
}
else if ((!win->shell_surface) && (_ecore_wl_disp->wl.shell))
{
win->shell_surface =
wl_shell_get_shell_surface(_ecore_wl_disp->wl.shell,
win->surface);
if (!win->shell_surface) return;
if (win->title)
wl_shell_surface_set_title(win->shell_surface, win->title);
if (win->class_name)
wl_shell_surface_set_class(win->shell_surface, win->class_name);
}
if (win->title)
wl_shell_surface_set_title(win->shell_surface, win->title);
if (win->shell_surface)
wl_shell_surface_add_listener(win->shell_surface,
&_ecore_wl_shell_surface_listener, win);
if (win->class_name)
wl_shell_surface_set_class(win->shell_surface, win->class_name);
}
if (win->shell_surface)
wl_shell_surface_add_listener(win->shell_surface,
&_ecore_wl_shell_surface_listener, win);
#ifdef USE_IVI_SHELL
}
}
#endif
}
/* trap for valid shell surface */
if (!win->shell_surface) return;
if ((!win->xdg_surface) && (!win->shell_surface)) return;
switch (win->type)
{
case ECORE_WL_WINDOW_TYPE_FULLSCREEN:
wl_shell_surface_set_fullscreen(win->shell_surface,
WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
0, NULL);
if (win->xdg_surface)
xdg_surface_set_fullscreen(win->xdg_surface, NULL);
else if (win->shell_surface)
wl_shell_surface_set_fullscreen(win->shell_surface,
WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
0, NULL);
break;
case ECORE_WL_WINDOW_TYPE_MAXIMIZED:
wl_shell_surface_set_maximized(win->shell_surface, NULL);
if (win->xdg_surface)
xdg_surface_set_maximized(win->xdg_surface);
else if (win->shell_surface)
wl_shell_surface_set_maximized(win->shell_surface, NULL);
break;
case ECORE_WL_WINDOW_TYPE_TRANSIENT:
wl_shell_surface_set_transient(win->shell_surface,
win->parent->surface,
win->allocation.x, win->allocation.y, 0);
if (win->xdg_surface)
xdg_surface_set_parent(win->xdg_surface, win->parent->surface);
else if (win->shell_surface)
wl_shell_surface_set_transient(win->shell_surface,
win->parent->surface,
win->allocation.x,
win->allocation.y, 0);
break;
case ECORE_WL_WINDOW_TYPE_MENU:
wl_shell_surface_set_popup(win->shell_surface,
_ecore_wl_disp->input->seat,
_ecore_wl_disp->serial,
win->parent->surface,
win->allocation.x, win->allocation.y, 0);
if (win->xdg_surface)
{
win->xdg_popup =
xdg_shell_get_xdg_popup(_ecore_wl_disp->wl.xdg_shell,
win->surface,
win->parent->surface,
_ecore_wl_disp->input->seat,
_ecore_wl_disp->serial,
win->allocation.x,
win->allocation.y, 0);
xdg_popup_set_user_data(win->xdg_popup, win);
xdg_popup_add_listener(win->xdg_popup,
&_ecore_xdg_popup_listener, win);
}
else if (win->shell_surface)
wl_shell_surface_set_popup(win->shell_surface,
_ecore_wl_disp->input->seat,
_ecore_wl_disp->serial,
win->parent->surface,
win->allocation.x, win->allocation.y, 0);
break;
case ECORE_WL_WINDOW_TYPE_TOPLEVEL:
wl_shell_surface_set_toplevel(win->shell_surface);
if (win->xdg_surface)
xdg_surface_set_parent(win->xdg_surface, NULL);
else if (win->shell_surface)
wl_shell_surface_set_toplevel(win->shell_surface);
break;
default:
break;
@ -343,8 +407,16 @@ ecore_wl_window_hide(Ecore_Wl_Window *win)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return;
if (win->xdg_surface) xdg_surface_destroy(win->xdg_surface);
win->xdg_surface = NULL;
if (win->xdg_popup) xdg_popup_destroy(win->xdg_popup);
win->xdg_popup = NULL;
if (win->shell_surface) wl_shell_surface_destroy(win->shell_surface);
win->shell_surface = NULL;
if (win->surface) wl_surface_destroy(win->surface);
win->surface = NULL;
}
@ -355,6 +427,7 @@ ecore_wl_window_raise(Ecore_Wl_Window *win)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return;
/* FIXME: This should raise the xdg surface also */
if (win->shell_surface)
wl_shell_surface_set_toplevel(win->shell_surface);
}
@ -367,20 +440,37 @@ ecore_wl_window_maximized_set(Ecore_Wl_Window *win, Eina_Bool maximized)
if (!win) return;
if ((win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED) == maximized) return;
if (win->type == ECORE_WL_WINDOW_TYPE_TOPLEVEL)
{
win->saved.w = win->allocation.w;
win->saved.h = win->allocation.h;
if (win->shell_surface)
wl_shell_surface_set_maximized(win->shell_surface, NULL);
win->type = ECORE_WL_WINDOW_TYPE_MAXIMIZED;
if (win->xdg_surface)
{
xdg_surface_set_maximized(win->xdg_surface);
win->type = ECORE_WL_WINDOW_TYPE_MAXIMIZED;
}
else if (win->shell_surface)
{
wl_shell_surface_set_maximized(win->shell_surface, NULL);
win->type = ECORE_WL_WINDOW_TYPE_MAXIMIZED;
}
}
else if (win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED)
{
if (win->shell_surface)
wl_shell_surface_set_toplevel(win->shell_surface);
win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
_ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
if (win->xdg_surface)
{
xdg_surface_unset_maximized(win->xdg_surface);
win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
_ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
}
else if (win->shell_surface)
{
wl_shell_surface_set_toplevel(win->shell_surface);
win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
_ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
}
}
}
@ -409,6 +499,10 @@ ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win, Eina_Bool fullscreen)
win->type = ECORE_WL_WINDOW_TYPE_FULLSCREEN;
win->saved.w = win->allocation.w;
win->saved.h = win->allocation.h;
if (win->xdg_surface)
xdg_surface_set_fullscreen(win->xdg_surface, NULL);
if (win->shell_surface)
wl_shell_surface_set_fullscreen(win->shell_surface,
WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
@ -416,8 +510,11 @@ ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win, Eina_Bool fullscreen)
}
else
{
if (win->shell_surface)
if (win->xdg_surface)
xdg_surface_unset_fullscreen(win->xdg_surface);
else if (win->shell_surface)
wl_shell_surface_set_toplevel(win->shell_surface);
win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
_ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
}
@ -523,6 +620,16 @@ ecore_wl_window_shell_surface_get(Ecore_Wl_Window *win)
return win->shell_surface;
}
/* @since 1.11 */
EAPI struct xdg_surface *
ecore_wl_window_xdg_surface_get(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return NULL;
return win->xdg_surface;
}
EAPI Ecore_Wl_Window *
ecore_wl_window_find(unsigned int id)
{
@ -604,6 +711,52 @@ ecore_wl_window_parent_set(Ecore_Wl_Window *win, Ecore_Wl_Window *parent)
win->parent = parent;
}
/* @since 1.12 */
EAPI void
ecore_wl_window_iconified_set(Ecore_Wl_Window *win, Eina_Bool iconified)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return;
if (iconified)
{
if (win->xdg_surface)
{
xdg_surface_set_minimized(win->xdg_surface);
win->minimized = iconified;
}
else if (win->shell_surface)
{
/* TODO: handle case of iconifying a wl_shell surface */
}
}
else
{
if (win->xdg_surface)
{
/* TODO: Handle case of UnIconifying an xdg_surface
*
* NB: This will be needed for Enlightenment IBox scenario */
}
else if (win->shell_surface)
{
wl_shell_surface_set_toplevel(win->shell_surface);
win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
_ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
}
}
}
EAPI Eina_Bool
ecore_wl_window_iconified_get(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return EINA_FALSE;
return win->minimized;
}
EAPI Ecore_Wl_Window *
ecore_wl_window_surface_find(struct wl_surface *surface)
{
@ -765,7 +918,9 @@ ecore_wl_window_title_set(Ecore_Wl_Window *win, const char *title)
if (!win) return;
eina_stringshare_replace(&win->title, title);
if ((win->shell_surface) && (win->title))
if ((win->xdg_surface) && (win->title))
xdg_surface_set_title(win->xdg_surface, win->title);
else if ((win->shell_surface) && (win->title))
wl_shell_surface_set_title(win->shell_surface, win->title);
}
@ -778,7 +933,9 @@ ecore_wl_window_class_name_set(Ecore_Wl_Window *win, const char *class_name)
if (!win) return;
eina_stringshare_replace(&win->class_name, class_name);
if ((win->shell_surface) && (win->class_name))
if ((win->xdg_surface) && (win->class_name))
xdg_surface_set_app_id(win->xdg_surface, win->class_name);
else if ((win->shell_surface) && (win->class_name))
wl_shell_surface_set_class(win->shell_surface, win->class_name);
}
@ -814,13 +971,70 @@ _ecore_wl_window_cb_configure(void *data, struct wl_shell_surface *shell_surface
if ((w <= 0) || (h <= 0)) return;
if ((win->allocation.w != w) || (win->allocation.h != h))
_ecore_wl_window_configure_send(win, w, h, edges);
}
static void
_ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface EINA_UNUSED, int32_t width, int32_t height, struct wl_array *states, uint32_t serial)
{
Ecore_Wl_Window *win;
uint32_t *p;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!(win = data)) return;
win->maximized = EINA_FALSE;
win->fullscreen = EINA_FALSE;
win->resizing = EINA_FALSE;
win->focused = EINA_FALSE;
wl_array_for_each(p, states)
{
_ecore_wl_window_configure_send(win, w, h, edges);
uint32_t state = *p;
switch (state)
{
case XDG_SURFACE_STATE_MAXIMIZED:
win->maximized = EINA_TRUE;
break;
case XDG_SURFACE_STATE_FULLSCREEN:
win->fullscreen = EINA_TRUE;
break;
case XDG_SURFACE_STATE_RESIZING:
win->resizing = EINA_TRUE;
break;
case XDG_SURFACE_STATE_ACTIVATED:
win->focused = EINA_TRUE;
win->minimized = EINA_FALSE;
break;
default:
break;
}
}
if ((width > 0) && (height > 0))
_ecore_wl_window_configure_send(win, width, height, 0);
else
{
if ((win->saved.w != 1) || (win->saved.h != 1))
_ecore_wl_window_configure_send(win, win->saved.w, win->saved.h, 0);
}
xdg_surface_ack_configure(win->xdg_surface, serial);
}
static void
_ecore_wl_window_cb_popup_done(void *data, struct wl_shell_surface *shell_surface EINA_UNUSED)
_ecore_xdg_handle_surface_delete(void *data, struct xdg_surface *xdg_surface EINA_UNUSED)
{
Ecore_Wl_Window *win;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!(win = data)) return;
ecore_wl_window_free(win);
}
static void
_ecore_wl_window_cb_popup_done(void *data, struct wl_shell_surface *shell_surface)
{
Ecore_Wl_Window *win;
@ -831,6 +1045,18 @@ _ecore_wl_window_cb_popup_done(void *data, struct wl_shell_surface *shell_surfac
ecore_wl_input_ungrab(win->pointer_device);
}
static void
_ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup, unsigned int serial EINA_UNUSED)
{
Ecore_Wl_Window *win;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!xdg_popup) return;
if (!(win = data)) return;
ecore_wl_input_ungrab(win->pointer_device);
}
static void
_ecore_wl_window_cb_surface_enter(void *data, struct wl_surface *surface, struct wl_output *output EINA_UNUSED)
{

496
src/lib/ecore_wayland/xdg-shell-client-protocol.h Normal file
View File

@ -0,0 +1,496 @@
/*
* Copyright © 2008-2013 Kristian Høgsberg
* Copyright © 2013 Rafael Antognolli
* Copyright © 2013 Jasper St. Pierre
* Copyright © 2010-2013 Intel Corporation
*
* Permission to use, copy, modify, distribute, and sell this
* software and its documentation for any purpose is hereby granted
* without fee, provided that the above copyright notice appear in
* all copies and that both that copyright notice and this permission
* notice appear in supporting documentation, and that the name of
* the copyright holders not be used in advertising or publicity
* pertaining to distribution of the software without specific,
* written prior permission. The copyright holders make no
* representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied
* warranty.
*
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
* SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
* SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
#ifndef XDG_SHELL_CLIENT_PROTOCOL_H
#define XDG_SHELL_CLIENT_PROTOCOL_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h>
#include <stddef.h>
#include "wayland-client.h"
struct wl_client;
struct wl_resource;
struct xdg_shell;
struct xdg_surface;
struct xdg_popup;
extern const struct wl_interface xdg_shell_interface;
extern const struct wl_interface xdg_surface_interface;
extern const struct wl_interface xdg_popup_interface;
#ifndef XDG_SHELL_VERSION_ENUM
#define XDG_SHELL_VERSION_ENUM
/**
* xdg_shell_version - latest protocol version
* @XDG_SHELL_VERSION_CURRENT: Always the latest version
*
* The 'current' member of this enum gives the version of the protocol.
* Implementations can compare this to the version they implement using
* static_assert to ensure the protocol and implementation versions match.
*/
enum xdg_shell_version {
XDG_SHELL_VERSION_CURRENT = 4,
};
#endif /* XDG_SHELL_VERSION_ENUM */
/**
* xdg_shell - create desktop-style surfaces
* @ping: check if the client is alive
*
* This interface is implemented by servers that provide desktop-style
* user interfaces.
*
* It allows clients to associate a xdg_surface with a basic surface.
*/
struct xdg_shell_listener {
/**
* ping - check if the client is alive
* @serial: pass this to the callback
*
* The ping event asks the client if it's still alive. Pass the
* serial specified in the event back to the compositor by sending
* a "pong" request back with the specified serial.
*
* Compositors can use this to determine if the client is still
* alive. It's unspecified what will happen if the client doesn't
* respond to the ping request, or in what timeframe. Clients
* should try to respond in a reasonable amount of time.
*/
void (*ping)(void *data,
struct xdg_shell *xdg_shell,
uint32_t serial);
};
static inline int
xdg_shell_add_listener(struct xdg_shell *xdg_shell,
const struct xdg_shell_listener *listener, void *data)
{
return wl_proxy_add_listener((struct wl_proxy *) xdg_shell,
(void (**)(void)) listener, data);
}
#define XDG_SHELL_USE_UNSTABLE_VERSION 0
#define XDG_SHELL_GET_XDG_SURFACE 1
#define XDG_SHELL_GET_XDG_POPUP 2
#define XDG_SHELL_PONG 3
static inline void
xdg_shell_set_user_data(struct xdg_shell *xdg_shell, void *user_data)
{
wl_proxy_set_user_data((struct wl_proxy *) xdg_shell, user_data);
}
static inline void *
xdg_shell_get_user_data(struct xdg_shell *xdg_shell)
{
return wl_proxy_get_user_data((struct wl_proxy *) xdg_shell);
}
static inline void
xdg_shell_destroy(struct xdg_shell *xdg_shell)
{
wl_proxy_destroy((struct wl_proxy *) xdg_shell);
}
static inline void
xdg_shell_use_unstable_version(struct xdg_shell *xdg_shell, int32_t version)
{
wl_proxy_marshal((struct wl_proxy *) xdg_shell,
XDG_SHELL_USE_UNSTABLE_VERSION, version);
}
static inline struct xdg_surface *
xdg_shell_get_xdg_surface(struct xdg_shell *xdg_shell, struct wl_surface *surface)
{
struct wl_proxy *id;
id = wl_proxy_marshal_constructor((struct wl_proxy *) xdg_shell,
XDG_SHELL_GET_XDG_SURFACE, &xdg_surface_interface, NULL, surface);
return (struct xdg_surface *) id;
}
static inline struct xdg_popup *
xdg_shell_get_xdg_popup(struct xdg_shell *xdg_shell, struct wl_surface *surface, struct wl_surface *parent, struct wl_seat *seat, uint32_t serial, int32_t x, int32_t y, uint32_t flags)
{
struct wl_proxy *id;
id = wl_proxy_marshal_constructor((struct wl_proxy *) xdg_shell,
XDG_SHELL_GET_XDG_POPUP, &xdg_popup_interface, NULL, surface, parent, seat, serial, x, y, flags);
return (struct xdg_popup *) id;
}
static inline void
xdg_shell_pong(struct xdg_shell *xdg_shell, uint32_t serial)
{
wl_proxy_marshal((struct wl_proxy *) xdg_shell,
XDG_SHELL_PONG, serial);
}
#ifndef XDG_SURFACE_RESIZE_EDGE_ENUM
#define XDG_SURFACE_RESIZE_EDGE_ENUM
/**
* xdg_surface_resize_edge - edge values for resizing
* @XDG_SURFACE_RESIZE_EDGE_NONE: (none)
* @XDG_SURFACE_RESIZE_EDGE_TOP: (none)
* @XDG_SURFACE_RESIZE_EDGE_BOTTOM: (none)
* @XDG_SURFACE_RESIZE_EDGE_LEFT: (none)
* @XDG_SURFACE_RESIZE_EDGE_TOP_LEFT: (none)
* @XDG_SURFACE_RESIZE_EDGE_BOTTOM_LEFT: (none)
* @XDG_SURFACE_RESIZE_EDGE_RIGHT: (none)
* @XDG_SURFACE_RESIZE_EDGE_TOP_RIGHT: (none)
* @XDG_SURFACE_RESIZE_EDGE_BOTTOM_RIGHT: (none)
*
* These values are used to indicate which edge of a surface is being
* dragged in a resize operation. The server may use this information to
* adapt its behavior, e.g. choose an appropriate cursor image.
*/
enum xdg_surface_resize_edge {
XDG_SURFACE_RESIZE_EDGE_NONE = 0,
XDG_SURFACE_RESIZE_EDGE_TOP = 1,
XDG_SURFACE_RESIZE_EDGE_BOTTOM = 2,
XDG_SURFACE_RESIZE_EDGE_LEFT = 4,
XDG_SURFACE_RESIZE_EDGE_TOP_LEFT = 5,
XDG_SURFACE_RESIZE_EDGE_BOTTOM_LEFT = 6,
XDG_SURFACE_RESIZE_EDGE_RIGHT = 8,
XDG_SURFACE_RESIZE_EDGE_TOP_RIGHT = 9,
XDG_SURFACE_RESIZE_EDGE_BOTTOM_RIGHT = 10,
};
#endif /* XDG_SURFACE_RESIZE_EDGE_ENUM */
#ifndef XDG_SURFACE_STATE_ENUM
#define XDG_SURFACE_STATE_ENUM
/**
* xdg_surface_state - types of state on the surface
* @XDG_SURFACE_STATE_MAXIMIZED: the surface is maximized
* @XDG_SURFACE_STATE_FULLSCREEN: the surface is fullscreen
* @XDG_SURFACE_STATE_RESIZING: (none)
* @XDG_SURFACE_STATE_ACTIVATED: (none)
*
* The different state values used on the surface. This is designed for
* state values like maximized, fullscreen. It is paired with the configure
* event to ensure that both the client and the compositor setting the
* state can be synchronized.
*
* States set in this way are double-buffered. They will get applied on the
* next commit.
*
* Desktop environments may extend this enum by taking up a range of values
* and documenting the range they chose in this description. They are not
* required to document the values for the range that they chose. Ideally,
* any good extensions from a desktop environment should make its way into
* standardization into this enum.
*
* The current reserved ranges are:
*
* 0x0000 - 0x0FFF: xdg-shell core values, documented below. 0x1000 -
* 0x1FFF: GNOME
*/
enum xdg_surface_state {
XDG_SURFACE_STATE_MAXIMIZED = 1,
XDG_SURFACE_STATE_FULLSCREEN = 2,
XDG_SURFACE_STATE_RESIZING = 3,
XDG_SURFACE_STATE_ACTIVATED = 4,
};
#endif /* XDG_SURFACE_STATE_ENUM */
/**
* xdg_surface - desktop-style metadata interface
* @configure: suggest a surface change
* @close: surface wants to be closed
*
* An interface that may be implemented by a wl_surface, for
* implementations that provide a desktop-style user interface.
*
* It provides requests to treat surfaces like windows, allowing to set
* properties like maximized, fullscreen, minimized, and to move and resize
* them, and associate metadata like title and app id.
*
* On the server side the object is automatically destroyed when the
* related wl_surface is destroyed. On client side, xdg_surface.destroy()
* must be called before destroying the wl_surface object.
*/
struct xdg_surface_listener {
/**
* configure - suggest a surface change
* @width: (none)
* @height: (none)
* @states: (none)
* @serial: (none)
*
* The configure event asks the client to resize its surface.
*
* The width and height arguments specify a hint to the window
* about how its surface should be resized in window geometry
* coordinates. The states listed in the event specify how the
* width/height arguments should be interpreted.
*
* A client should arrange a new surface, and then send a
* ack_configure request with the serial sent in this configure
* event before attaching a new surface.
*
* If the client receives multiple configure events before it can
* respond to one, it is free to discard all but the last event it
* received.
*/
void (*configure)(void *data,
struct xdg_surface *xdg_surface,
int32_t width,
int32_t height,
struct wl_array *states,
uint32_t serial);
/**
* close - surface wants to be closed
*
* The close event is sent by the compositor when the user wants
* the surface to be closed. This should be equivalent to the user
* clicking the close button in client-side decorations, if your
* application has any...
*
* This is only a request that the user intends to close your
* window. The client may choose to ignore this request, or show a
* dialog to ask the user to save their data...
*/
void (*close)(void *data,
struct xdg_surface *xdg_surface);
};
static inline int
xdg_surface_add_listener(struct xdg_surface *xdg_surface,
const struct xdg_surface_listener *listener, void *data)
{
return wl_proxy_add_listener((struct wl_proxy *) xdg_surface,
(void (**)(void)) listener, data);
}
#define XDG_SURFACE_DESTROY 0
#define XDG_SURFACE_SET_PARENT 1
#define XDG_SURFACE_SET_TITLE 2
#define XDG_SURFACE_SET_APP_ID 3
#define XDG_SURFACE_SHOW_WINDOW_MENU 4
#define XDG_SURFACE_MOVE 5
#define XDG_SURFACE_RESIZE 6
#define XDG_SURFACE_ACK_CONFIGURE 7
#define XDG_SURFACE_SET_WINDOW_GEOMETRY 8
#define XDG_SURFACE_SET_MAXIMIZED 9
#define XDG_SURFACE_UNSET_MAXIMIZED 10
#define XDG_SURFACE_SET_FULLSCREEN 11
#define XDG_SURFACE_UNSET_FULLSCREEN 12
#define XDG_SURFACE_SET_MINIMIZED 13
static inline void
xdg_surface_set_user_data(struct xdg_surface *xdg_surface, void *user_data)
{
wl_proxy_set_user_data((struct wl_proxy *) xdg_surface, user_data);
}
static inline void *
xdg_surface_get_user_data(struct xdg_surface *xdg_surface)
{
return wl_proxy_get_user_data((struct wl_proxy *) xdg_surface);
}
static inline void
xdg_surface_destroy(struct xdg_surface *xdg_surface)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_DESTROY);
wl_proxy_destroy((struct wl_proxy *) xdg_surface);
}
static inline void
xdg_surface_set_parent(struct xdg_surface *xdg_surface, struct wl_surface *parent)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_SET_PARENT, parent);
}
static inline void
xdg_surface_set_title(struct xdg_surface *xdg_surface, const char *title)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_SET_TITLE, title);
}
static inline void
xdg_surface_set_app_id(struct xdg_surface *xdg_surface, const char *app_id)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_SET_APP_ID, app_id);
}
static inline void
xdg_surface_show_window_menu(struct xdg_surface *xdg_surface, struct wl_seat *seat, uint32_t serial, int32_t x, int32_t y)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_SHOW_WINDOW_MENU, seat, serial, x, y);
}
static inline void
xdg_surface_move(struct xdg_surface *xdg_surface, struct wl_seat *seat, uint32_t serial)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_MOVE, seat, serial);
}
static inline void
xdg_surface_resize(struct xdg_surface *xdg_surface, struct wl_seat *seat, uint32_t serial, uint32_t edges)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_RESIZE, seat, serial, edges);
}
static inline void
xdg_surface_ack_configure(struct xdg_surface *xdg_surface, uint32_t serial)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_ACK_CONFIGURE, serial);
}
static inline void
xdg_surface_set_window_geometry(struct xdg_surface *xdg_surface, int32_t x, int32_t y, int32_t width, int32_t height)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_SET_WINDOW_GEOMETRY, x, y, width, height);
}
static inline void
xdg_surface_set_maximized(struct xdg_surface *xdg_surface)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_SET_MAXIMIZED);
}
static inline void
xdg_surface_unset_maximized(struct xdg_surface *xdg_surface)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_UNSET_MAXIMIZED);
}
static inline void
xdg_surface_set_fullscreen(struct xdg_surface *xdg_surface, struct wl_output *output)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_SET_FULLSCREEN, output);
}
static inline void
xdg_surface_unset_fullscreen(struct xdg_surface *xdg_surface)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_UNSET_FULLSCREEN);
}
static inline void
xdg_surface_set_minimized(struct xdg_surface *xdg_surface)
{
wl_proxy_marshal((struct wl_proxy *) xdg_surface,
XDG_SURFACE_SET_MINIMIZED);
}
/**
* xdg_popup - desktop-style metadata interface
* @popup_done: popup interaction is done
*
* An interface that may be implemented by a wl_surface, for
* implementations that provide a desktop-style popups/menus. A popup
* surface is a transient surface with an added pointer grab.
*
* An existing implicit grab will be changed to owner-events mode, and the
* popup grab will continue after the implicit grab ends (i.e. releasing
* the mouse button does not cause the popup to be unmapped).
*
* The popup grab continues until the window is destroyed or a mouse button
* is pressed in any other clients window. A click in any of the clients
* surfaces is reported as normal, however, clicks in other clients
* surfaces will be discarded and trigger the callback.
*
* The x and y arguments specify the locations of the upper left corner of
* the surface relative to the upper left corner of the parent surface, in
* surface local coordinates.
*
* xdg_popup surfaces are always transient for another surface.
*/
struct xdg_popup_listener {
/**
* popup_done - popup interaction is done
* @serial: serial of the implicit grab on the pointer
*
* The popup_done event is sent out when a popup grab is broken,
* that is, when the users clicks a surface that doesn't belong to
* the client owning the popup surface.
*/
void (*popup_done)(void *data,
struct xdg_popup *xdg_popup,
uint32_t serial);
};
static inline int
xdg_popup_add_listener(struct xdg_popup *xdg_popup,
const struct xdg_popup_listener *listener, void *data)
{
return wl_proxy_add_listener((struct wl_proxy *) xdg_popup,
(void (**)(void)) listener, data);
}
#define XDG_POPUP_DESTROY 0
static inline void
xdg_popup_set_user_data(struct xdg_popup *xdg_popup, void *user_data)
{
wl_proxy_set_user_data((struct wl_proxy *) xdg_popup, user_data);
}
static inline void *
xdg_popup_get_user_data(struct xdg_popup *xdg_popup)
{
return wl_proxy_get_user_data((struct wl_proxy *) xdg_popup);
}
static inline void
xdg_popup_destroy(struct xdg_popup *xdg_popup)
{
wl_proxy_marshal((struct wl_proxy *) xdg_popup,
XDG_POPUP_DESTROY);
wl_proxy_destroy((struct wl_proxy *) xdg_popup);
}
#ifdef __cplusplus
}
#endif
#endif

125
src/lib/ecore_wayland/xdg-shell-protocol.c Normal file
View File

@ -0,0 +1,125 @@
/*
* Copyright © 2008-2013 Kristian Høgsberg
* Copyright © 2013 Rafael Antognolli
* Copyright © 2013 Jasper St. Pierre
* Copyright © 2010-2013 Intel Corporation
*
* Permission to use, copy, modify, distribute, and sell this
* software and its documentation for any purpose is hereby granted
* without fee, provided that the above copyright notice appear in
* all copies and that both that copyright notice and this permission
* notice appear in supporting documentation, and that the name of
* the copyright holders not be used in advertising or publicity
* pertaining to distribution of the software without specific,
* written prior permission. The copyright holders make no
* representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied
* warranty.
*
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
* SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
* SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
#include <stdlib.h>
#include <stdint.h>
#include "wayland-util.h"
extern const struct wl_interface wl_output_interface;
extern const struct wl_interface wl_seat_interface;
extern const struct wl_interface wl_surface_interface;
extern const struct wl_interface xdg_popup_interface;
extern const struct wl_interface xdg_surface_interface;
static const struct wl_interface *types[] = {
NULL,
NULL,
NULL,
NULL,
&xdg_surface_interface,
&wl_surface_interface,
&xdg_popup_interface,
&wl_surface_interface,
&wl_surface_interface,
&wl_seat_interface,
NULL,
NULL,
NULL,
NULL,
&wl_surface_interface,
&wl_seat_interface,
NULL,
NULL,
NULL,
&wl_seat_interface,
NULL,
&wl_seat_interface,
NULL,
NULL,
&wl_output_interface,
};
static const struct wl_message xdg_shell_requests[] = {
{ "use_unstable_version", "i", types + 0 },
{ "get_xdg_surface", "no", types + 4 },
{ "get_xdg_popup", "nooouiiu", types + 6 },
{ "pong", "u", types + 0 },
};
static const struct wl_message xdg_shell_events[] = {
{ "ping", "u", types + 0 },
};
WL_EXPORT const struct wl_interface xdg_shell_interface = {
"xdg_shell", 1,
4, xdg_shell_requests,
1, xdg_shell_events,
};
static const struct wl_message xdg_surface_requests[] = {
{ "destroy", "", types + 0 },
{ "set_parent", "?o", types + 14 },
{ "set_title", "s", types + 0 },
{ "set_app_id", "s", types + 0 },
{ "show_window_menu", "ouii", types + 15 },
{ "move", "ou", types + 19 },
{ "resize", "ouu", types + 21 },
{ "ack_configure", "u", types + 0 },
{ "set_window_geometry", "iiii", types + 0 },
{ "set_maximized", "", types + 0 },
{ "unset_maximized", "", types + 0 },
{ "set_fullscreen", "?o", types + 24 },
{ "unset_fullscreen", "", types + 0 },
{ "set_minimized", "", types + 0 },
};
static const struct wl_message xdg_surface_events[] = {
{ "configure", "iiau", types + 0 },
{ "close", "", types + 0 },
};
WL_EXPORT const struct wl_interface xdg_surface_interface = {
"xdg_surface", 1,
14, xdg_surface_requests,
2, xdg_surface_events,
};
static const struct wl_message xdg_popup_requests[] = {
{ "destroy", "", types + 0 },
};
static const struct wl_message xdg_popup_events[] = {
{ "popup_done", "u", types + 0 },
};
WL_EXPORT const struct wl_interface xdg_popup_interface = {
"xdg_popup", 1,
1, xdg_popup_requests,
1, xdg_popup_events,
};

7
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -1239,12 +1239,15 @@ _ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer)
void
_ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
if (ee->prop.iconified == on) return;
ee->prop.iconified = on;
/* FIXME: Implement this in Wayland someshow */
wdata = ee->engine.data;
ecore_wl_window_iconified_set(wdata->win, on);
}
static void