Ecore_Wl2_Window *wl_win;
struct wl_surface *surface;
- struct wl_input_panel *ip;
+ struct zwp_input_panel_v1 *ip;
struct wl_output *output;
- struct wl_input_panel_surface *ips;
+ struct zwp_input_panel_surface_v1 *ips;
};
struct WaylandKeyboard wlkb = {0};
EINA_ITERATOR_FOREACH(globals, global)
{
- if (strcmp(global->interface, "wl_input_panel") == 0)
- wlkb->ip = (wl_input_panel *)wl_registry_bind(registry, global->id, &wl_input_panel_interface, 1);
+ if (strcmp(global->interface, "zwp_input_panel_v1") == 0)
+ wlkb->ip = (zwp_input_panel_v1 *)wl_registry_bind(registry, global->id, &zwp_input_panel_v1_interface, 1);
else if (strcmp(global->interface, "wl_output") == 0)
wlkb->output = (wl_output *)wl_registry_bind(registry, global->id, &wl_output_interface, 1);
}
return false;
}
- wlkb->ips = wl_input_panel_get_input_panel_surface(wlkb->ip, wlkb->surface);
+ wlkb->ips = zwp_input_panel_v1_get_input_panel_surface(wlkb->ip, wlkb->surface);
if (!wlkb->ips) {
LOGW("Couldn't get input panel surface\n");
return false;
}
- wl_input_panel_surface_set_toplevel(wlkb->ips, wlkb->output, WL_INPUT_PANEL_SURFACE_POSITION_CENTER_BOTTOM);
+ zwp_input_panel_surface_v1_set_toplevel(wlkb->ips, wlkb->output, ZWP_INPUT_PANEL_SURFACE_V1_POSITION_CENTER_BOTTOM);
return true;
}
#ifdef WAYLAND
static void _render_pre_cb(void *data, Evas *e, void *event_info)
{
- LOGD("_render_pre_cb() called, now invoking wl_input_panel_surface_set_ready()");
+ LOGD("_render_pre_cb() called, now invoking zwp_input_panel_surface_v1_set_ready()");
- wl_input_panel_surface_set_ready(wlkb.ips, 1);
+ zwp_input_panel_surface_v1_set_ready(wlkb.ips, 1);
Evas_Object *main_window = NATIVE_WINDOW_CAST(data);
evas_event_callback_del_full(evas_object_evas_get(main_window),