aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-05-17 16:02:53 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-05-19 12:41:17 -0400
commit2fe78782350af9da22765ef2494db4a640b87be0 (patch)
tree2564b02f5b2a1d9f257b89a67475f034df87c92c /src/lib/elementary/efl_ui_win.c
parentwayland: send focus in/out events when receiving/losing keyboard focus (diff)
downloadefl-2fe78782350af9da22765ef2494db4a640b87be0.tar.gz
wayland: move pointer-related functions to ecore_wl2_input namespace
windows do not have pointers or cursors under wayland, seats do. due to lack of multiseat support, most components simply use the "default" seat with these functions, but this should make the corresponding code more easily adaptable
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 921767aab7..0d73c15647 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -3128,8 +3128,14 @@ _elm_win_wl_cursor_set(Evas_Object *obj, const char *cursor)
}
if ((sd->wl.win) && (sd->pointer.surf) && (sd->pointer.visible))
- ecore_wl2_window_pointer_set(sd->wl.win, sd->pointer.surf,
- sd->pointer.hot_x, sd->pointer.hot_y);
+ {
+ /* FIXME: multiseat */
+ Ecore_Wl2_Input *input;
+
+ input = ecore_wl2_display_input_find_by_name(ecore_wl2_window_display_get(sd->wl.win), "default");
+ EINA_SAFETY_ON_NULL_RETURN(input);
+ ecore_wl2_input_pointer_set(input, sd->pointer.surf, sd->pointer.hot_x, sd->pointer.hot_y);
+ }
}
#endif
@@ -4080,7 +4086,7 @@ _elm_win_frame_cb_menu(void *data,
if (x < 0) x += wx;
if (y < 0) y += wy;
- input = ecore_wl2_window_input_get(sd->wl.win);
+ input = ecore_wl2_display_input_find_by_name(ecore_wl2_window_display_get(sd->wl.win), "default");
if (sd->wl.win->zxdg_toplevel)
zxdg_toplevel_v6_show_window_menu(sd->wl.win->zxdg_toplevel,