discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ed51a3ea6113c847748d5a1234b031b7e18d6e55
commit ed51a3ea6113c847748d5a1234b031b7e18d6e55
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Wed Jan 6 13:02:41 2016 -0500
remove wayland function usage from grabinput methods
these never did anythng useful and no longer even compile
---
src/bin/e_grabinput.c | 92 ---------------------------------------------------
1 file changed, 92 deletions(-)
diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c
index ff764f1..a67d39f 100644
--- a/src/bin/e_grabinput.c
+++ b/src/bin/e_grabinput.c
@@ -35,17 +35,6 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse,
Ecore_Window key_win)
#ifndef HAVE_WAYLAND_ONLY
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
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
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
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
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
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);
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
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;
}
}
-#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
grab_key_win = key_win;
}
@@ -141,16 +98,6 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window
key_win)
#ifndef HAVE_WAYLAND_ONLY
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
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
grab_mouse_win = 0;
@@ -160,16 +107,6 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window
key_win)
#ifndef HAVE_WAYLAND_ONLY
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
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
grab_key_win = 0;
@@ -226,10 +163,6 @@ e_grabinput_mouse_win_get(void)
static void
_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); */
switch (method)
{
@@ -244,29 +177,12 @@ _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method
method)
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
break;
case E_FOCUS_METHOD_GLOBALLY_ACTIVE:
#ifndef HAVE_WAYLAND_ONLY
if (e_comp_util_has_x())
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
break;
@@ -274,14 +190,6 @@ _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method
method)
#ifndef HAVE_WAYLAND_ONLY
if (e_comp_util_has_x())
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
break;
--
