forked from enlightenment/enlightenment
remove wayland function usage from grabinput methods
these never did anythng useful and no longer even compile
This commit is contained in:
parent
2381280cc2
commit
ed51a3ea61
|
@ -35,17 +35,6 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win)
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
||||||
ecore_x_pointer_ungrab();
|
ecore_x_pointer_ungrab();
|
||||||
#else
|
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
|
|
||||||
{
|
|
||||||
Ecore_Wl2_Window *wl_win;
|
|
||||||
|
|
||||||
wl_win =
|
|
||||||
ecore_wl2_display_window_find(e_comp_wl->ewd, grab_mouse_win);
|
|
||||||
if (wl_win)
|
|
||||||
ecore_wl2_input_ungrab(ecore_wl2_window_input_get(wl_win),
|
|
||||||
wl_win, 0);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
grab_mouse_win = 0;
|
grab_mouse_win = 0;
|
||||||
}
|
}
|
||||||
|
@ -54,18 +43,6 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win)
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
||||||
ecore_x_keyboard_ungrab();
|
ecore_x_keyboard_ungrab();
|
||||||
#else
|
|
||||||
/* TODO */
|
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
|
|
||||||
{
|
|
||||||
Ecore_Wl2_Window *wl_win;
|
|
||||||
|
|
||||||
wl_win =
|
|
||||||
ecore_wl2_display_window_find(e_comp_wl->ewd, grab_key_win);
|
|
||||||
if (wl_win)
|
|
||||||
ecore_wl2_input_ungrab(ecore_wl2_window_input_get(wl_win),
|
|
||||||
wl_win, 0);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
grab_key_win = 0;
|
grab_key_win = 0;
|
||||||
|
@ -83,16 +60,6 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win)
|
||||||
ret = ecore_x_pointer_grab(mouse_win);
|
ret = ecore_x_pointer_grab(mouse_win);
|
||||||
if (!ret) return 0;
|
if (!ret) return 0;
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
|
|
||||||
{
|
|
||||||
Ecore_Wl2_Window *wl_win;
|
|
||||||
|
|
||||||
wl_win = ecore_wl2_display_window_find(e_comp_wl->ewd, mouse_win);
|
|
||||||
if (wl_win)
|
|
||||||
ecore_wl2_input_grab(ecore_wl2_window_input_get(wl_win),
|
|
||||||
wl_win, 0);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
grab_mouse_win = mouse_win;
|
grab_mouse_win = mouse_win;
|
||||||
}
|
}
|
||||||
|
@ -114,16 +81,6 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
|
|
||||||
{
|
|
||||||
Ecore_Wl2_Window *wl_win;
|
|
||||||
|
|
||||||
wl_win = ecore_wl2_display_window_find(e_comp_wl->ewd, key_win);
|
|
||||||
if (wl_win)
|
|
||||||
ecore_wl2_input_grab(ecore_wl2_window_input_get(wl_win),
|
|
||||||
wl_win, 0);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
grab_key_win = key_win;
|
grab_key_win = key_win;
|
||||||
}
|
}
|
||||||
|
@ -141,16 +98,6 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win)
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
||||||
ecore_x_pointer_ungrab();
|
ecore_x_pointer_ungrab();
|
||||||
#else
|
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
|
|
||||||
{
|
|
||||||
Ecore_Wl2_Window *wl_win;
|
|
||||||
|
|
||||||
wl_win = ecore_wl2_display_window_find(e_comp_wl->ewd, mouse_win);
|
|
||||||
if (wl_win)
|
|
||||||
ecore_wl2_input_ungrab(ecore_wl2_window_input_get(wl_win),
|
|
||||||
wl_win, 0);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
grab_mouse_win = 0;
|
grab_mouse_win = 0;
|
||||||
|
@ -160,16 +107,6 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win)
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
||||||
ecore_x_keyboard_ungrab();
|
ecore_x_keyboard_ungrab();
|
||||||
#else
|
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
|
|
||||||
{
|
|
||||||
Ecore_Wl2_Window *wl_win;
|
|
||||||
|
|
||||||
wl_win = ecore_wl2_display_window_find(e_comp_wl->ewd, key_win);
|
|
||||||
if (wl_win)
|
|
||||||
ecore_wl2_input_grab(ecore_wl2_window_input_get(wl_win),
|
|
||||||
wl_win, 0);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
grab_key_win = 0;
|
grab_key_win = 0;
|
||||||
|
@ -226,10 +163,6 @@ e_grabinput_mouse_win_get(void)
|
||||||
static void
|
static void
|
||||||
_e_grabinput_focus_do(Ecore_Window win, E_Focus_Method method)
|
_e_grabinput_focus_do(Ecore_Window win, E_Focus_Method method)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_WAYLAND
|
|
||||||
Ecore_Wl2_Window *wl_win;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* fprintf(stderr, "focus to %x method %i\n", win, method); */
|
/* fprintf(stderr, "focus to %x method %i\n", win, method); */
|
||||||
switch (method)
|
switch (method)
|
||||||
{
|
{
|
||||||
|
@ -243,15 +176,6 @@ _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method method)
|
||||||
ecore_x_window_focus_at_time(win, ecore_x_current_time_get());
|
ecore_x_window_focus_at_time(win, ecore_x_current_time_get());
|
||||||
ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
|
ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
#ifdef HAVE_WAYLAND
|
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
|
|
||||||
{
|
|
||||||
if ((wl_win = ecore_wl2_display_window_find(e_comp_wl->ewd, win)))
|
|
||||||
{
|
|
||||||
/* FIXME: Need to add an ecore_wl_window_focus function */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -259,14 +183,6 @@ _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method method)
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
if (e_comp_util_has_x())
|
if (e_comp_util_has_x())
|
||||||
ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
|
ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
|
||||||
#else
|
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
|
|
||||||
{
|
|
||||||
if ((wl_win = ecore_wl2_display_window_find(e_comp_wl->ewd, win)))
|
|
||||||
{
|
|
||||||
/* FIXME: Need to add an ecore_wl_window_focus function */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -274,14 +190,6 @@ _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method method)
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
if (e_comp_util_has_x())
|
if (e_comp_util_has_x())
|
||||||
ecore_x_window_focus_at_time(win, ecore_x_current_time_get());
|
ecore_x_window_focus_at_time(win, ecore_x_current_time_get());
|
||||||
#else
|
|
||||||
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
|
|
||||||
{
|
|
||||||
if ((wl_win = ecore_wl2_display_window_find(e_comp_wl->ewd, win)))
|
|
||||||
{
|
|
||||||
/* FIXME: Need to add an ecore_wl_window_focus function */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue