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

ecore/wayland: Do not use win->id directly. 

Use a getter for it instead, so we don't need to expose the
Ecore_Wl_Window struct just because of it.
This commit is contained in:
Rafael Antognolli 2013-10-31 20:02:40 -02:00
parent e56428f4ad
commit dd18206d86
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,6 +626,8 @@ 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_cursor_default_restore(Ecore_Wl_Window *win);
EAPI void ecore_wl_window_parent_set(Ecore_Wl_Window *win, Ecore_Wl_Window *parent); EAPI void ecore_wl_window_parent_set(Ecore_Wl_Window *win, Ecore_Wl_Window *parent);
EAPI int ecore_wl_window_id_get(Ecore_Wl_Window *win);
/** /**
* Returns a wl_surface with no association to any wl_shell_surface. * Returns a wl_surface with no association to any wl_shell_surface.
* *

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

@ -687,6 +687,17 @@ ecore_wl_window_rotation_get(Ecore_Wl_Window *win)
return win->rotation; return win->rotation;
} }
/* @since 1.8 */
EAPI int
ecore_wl_window_id_get(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!win) return 0;
return win->id;
}
/* local functions */ /* local functions */
static void static void
_ecore_wl_window_cb_ping(void *data EINA_UNUSED, struct wl_shell_surface *shell_surface, unsigned int serial) _ecore_wl_window_cb_ping(void *data EINA_UNUSED, struct wl_shell_surface *shell_surface, unsigned int serial)

2
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
View File

@ -182,7 +182,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent,
wdata->win = wdata->win =
ecore_wl_window_new(p, x, y, w + fw, h + fh, ecore_wl_window_new(p, x, y, w + fw, h + fh,
ECORE_WL_WINDOW_BUFFER_TYPE_EGL_WINDOW); ECORE_WL_WINDOW_BUFFER_TYPE_EGL_WINDOW);
ee->prop.window = wdata->win->id; ee->prop.window = ecore_wl_window_id_get(wdata->win);
ee->evas = evas_new(); ee->evas = evas_new();
evas_data_attach_set(ee->evas, ee); evas_data_attach_set(ee->evas, ee);

2
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
View File

@ -179,7 +179,7 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent,
wdata->win = wdata->win =
ecore_wl_window_new(p, x, y, w + fw, h + fh, ecore_wl_window_new(p, x, y, w + fw, h + fh,
ECORE_WL_WINDOW_BUFFER_TYPE_SHM); ECORE_WL_WINDOW_BUFFER_TYPE_SHM);
ee->prop.window = wdata->win->id; ee->prop.window = ecore_wl_window_id_get(wdata->win);
ee->evas = evas_new(); ee->evas = evas_new();
evas_data_attach_set(ee->evas, ee); evas_data_attach_set(ee->evas, ee);

4
src/modules/ecore_imf/wayland/wayland_imcontext.c
View File

@ -474,8 +474,8 @@ text_input_keysym(void *data,
strcpy((char *)e->key, key); strcpy((char *)e->key, key);
strcpy((char *)e->string, string); strcpy((char *)e->string, string);
e->window = imcontext->window->id; e->window = ecore_wl_window_id_get(imcontext->window);
e->event_window = imcontext->window->id; e->event_window = ecore_wl_window_id_get(imcontext->window);
e->timestamp = time; e->timestamp = time;
e->modifiers = 0; e->modifiers = 0;