forked from enlightenment/efl
Ecore_Wayland: Don't need to use display_dispatch_pending here, and
fix the data_handler callback so we receive events from the weston compositor. Signed-off-by: Christopher Michael <cp.michael@samsung.com> SVN revision: 78055
This commit is contained in:
parent
b90b94709a
commit
d8301202a0
|
@ -152,8 +152,6 @@ ecore_wl_init(const char *name)
|
|||
|
||||
wl_display_dispatch(_ecore_wl_disp->wl.display);
|
||||
|
||||
/* TODO: create pointer surfaces */
|
||||
|
||||
if (!_ecore_wl_xkb_init(_ecore_wl_disp))
|
||||
{
|
||||
ERR("Could not initialize XKB");
|
||||
|
@ -408,6 +406,8 @@ _ecore_wl_cb_handle_data(void *data, Ecore_Fd_Handler *hdl)
|
|||
|
||||
/* FIXME: This should also catch ECORE_FD_ERROR and exit */
|
||||
|
||||
/* wl_display_dispatch_pending(ewd->wl.display); */
|
||||
|
||||
if (ecore_main_fd_handler_active_get(hdl, ECORE_FD_READ))
|
||||
wl_display_dispatch(ewd->wl.display);
|
||||
else if (ecore_main_fd_handler_active_get(hdl, ECORE_FD_WRITE))
|
||||
|
@ -421,7 +421,7 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned in
|
|||
{
|
||||
Ecore_Wl_Display *ewd;
|
||||
|
||||
// LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
||||
LOGFN(__FILE__, __LINE__, __FUNCTION__);
|
||||
|
||||
ewd = data;
|
||||
|
||||
|
|
Loading…
Reference in New Issue