nosquash: remove a bunch of unnecessary ecore-x calls from modules

9 files changed, 21 insertions, 23 deletions

diff --git a/src/modules/appmenu/e_mod_appmenu_render.c b/src/modules/appmenu/e_mod_appmenu_render.c
index 654fef4cc5..5a4fe9d918 100644
--- a/src/modules/appmenu/e_mod_appmenu_render.c
+++ b/src/modules/appmenu/e_mod_appmenu_render.c
@@ -86,8 +86,7 @@ item_menu_open(E_DBusMenu_Item *item, E_Gadcon *gadcon)
 
    ecore_evas_pointer_xy_get(e_comp_get(gadcon)->ee, &x, &y);
    zone = e_comp_zone_xy_get(e_comp_get(gadcon), x, y);
-   e_menu_activate_mouse(m, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN,
-                         ecore_x_current_time_get());
+   e_menu_activate_mouse(m, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN, 0);
 }
 
 static void
diff --git a/src/modules/bluez4/e_mod_main.c b/src/modules/bluez4/e_mod_main.c
index a6a4c45382..5152525cdf 100644
--- a/src/modules/bluez4/e_mod_main.c
+++ b/src/modules/bluez4/e_mod_main.c
@@ -454,8 +454,7 @@ _ebluez4_menu_new(Instance *inst)
 
    ecore_evas_pointer_xy_get(e_comp_get(inst->gcc)->ee, &x, &y);
    zone = e_comp_zone_xy_get(e_comp_get(inst->gcc), x, y);
-   e_menu_activate_mouse(m, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN,
-                         ecore_x_current_time_get());
+   e_menu_activate_mouse(m, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN, 0);
 }
 
 static void
diff --git a/src/modules/everything/evry_plug_windows.c b/src/modules/everything/evry_plug_windows.c
index 43d321d1b0..9de1cf19f4 100644
--- a/src/modules/everything/evry_plug_windows.c
+++ b/src/modules/everything/evry_plug_windows.c
@@ -407,7 +407,7 @@ _act_border(Evry_Action *act)
              else if (warp_to_y >= (ec->zone->y + ec->zone->h - 1))
                warp_to_y = (ec->zone->y + ec->zone->h + ec->y) / 2;
 
-             ecore_x_pointer_warp(ec->zone->comp->win, warp_to_x, warp_to_y);
+             ecore_evas_pointer_warp(ec->zone->comp->ee, warp_to_x, warp_to_y);
           }
         /* e_client_focus_set_with_pointer(ec); */
      }
diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c
index 898c95cb6d..4d08727033 100644
--- a/src/modules/fileman/e_fwin_nav.c
+++ b/src/modules/fileman/e_fwin_nav.c
@@ -514,7 +514,7 @@ _cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
 
    m = e_menu_new();
    m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
-   ecore_x_pointer_xy_get(zone->comp->win, &x, &y);
+   ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
    e_menu_activate_mouse(m, zone, x, y, 1, 1,
                          E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
    evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
diff --git a/src/modules/syscon/e_syscon_gadget.c b/src/modules/syscon/e_syscon_gadget.c
index 9aa415b470..00e4f766e8 100644
--- a/src/modules/syscon/e_syscon_gadget.c
+++ b/src/modules/syscon/e_syscon_gadget.c
@@ -74,7 +74,7 @@ _cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
    e_menu_item_toggle_set(mi, syscon_config->menu);
    e_menu_item_callback_set(mi, _cb_menu_change, inst);
    m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
-   ecore_x_pointer_xy_get(zone->comp->win, &x, &y);
+   ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
    e_menu_activate_mouse(m, zone, x, y, 1, 1,
                          E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
    evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
@@ -221,8 +221,7 @@ _cb_shutdown_show(void *data, Evas_Object *obj __UNUSED__, const char *emission
              break;
           }
         e_gadcon_locked_set(inst->gcc->gadcon, EINA_TRUE);
-        e_menu_activate_mouse(inst->menu, zone, x, y, w, h, dir,
-                              ecore_x_current_time_get());
+        e_menu_activate_mouse(inst->menu, zone, x, y, w, h, dir, 0);
      }
 }
 
diff --git a/src/modules/systray/e_mod_notifier_host.c b/src/modules/systray/e_mod_notifier_host.c
index dc0d722568..df24792b16 100644
--- a/src/modules/systray/e_mod_notifier_host.c
+++ b/src/modules/systray/e_mod_notifier_host.c
@@ -157,9 +157,8 @@ _item_menu_new(Notifier_Item_Icon *ii)
    e_menu_post_deactivate_callback_set(m, _menu_post_deactivate, gadcon);
 
    zone = e_util_zone_current_get(e_manager_current_get());
-   ecore_x_pointer_xy_get(zone->comp->win, &x, &y);
-   e_menu_activate_mouse(m, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN,
-                         ecore_x_current_time_get());
+   ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
+   e_menu_activate_mouse(m, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN, 0);
 }
 
 void
diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c
index c5a3cf76ae..f5fcb2d230 100644
--- a/src/modules/tiling/e_mod_tiling.c
+++ b/src/modules/tiling/e_mod_tiling.c
@@ -2004,7 +2004,7 @@ _move_right_rows_or_down_cols(E_Client *ec, Eina_Bool check_moving_anims)
     if (check_moving_anims)
         _check_moving_anims(ec_1, extra_1, stack);
 
-    ecore_x_pointer_warp(_G.tinfo->desk->zone->comp->win,
+    ecore_evas_pointer_warp(_G.tinfo->desk->zone->comp->ee,
                          extra_1->expected.x + extra_1->expected.w/2,
                          extra_1->expected.y + extra_1->expected.h/2);
 }
@@ -2064,7 +2064,7 @@ _move_left_rows_or_up_cols(E_Client *ec, Eina_Bool check_moving_anims)
     if (check_moving_anims)
         _check_moving_anims(ec_1, extra_1, stack);
 
-    ecore_x_pointer_warp(_G.tinfo->desk->zone->comp->win,
+    ecore_evas_pointer_warp(_G.tinfo->desk->zone->comp->ee,
                          extra_1->expected.x + extra_1->expected.w/2,
                          extra_1->expected.y + extra_1->expected.h/2);
 }
@@ -2150,7 +2150,7 @@ _move_up_rows_or_left_cols(E_Client *ec, Eina_Bool check_moving_anims)
         }
         if (check_moving_anims)
             _check_moving_anims(ec, extra, 0);
-        ecore_x_pointer_warp(_G.tinfo->desk->zone->comp->win,
+        ecore_evas_pointer_warp(_G.tinfo->desk->zone->comp->ee,
                              extra->expected.x + extra->expected.w/2,
                              extra->expected.y + extra->expected.h/2);
         return;
@@ -2197,7 +2197,7 @@ _move_up_rows_or_left_cols(E_Client *ec, Eina_Bool check_moving_anims)
     if (check_moving_anims)
         _check_moving_anims(ec, extra, stack - 1);
 
-    ecore_x_pointer_warp(_G.tinfo->desk->zone->comp->win,
+    ecore_evas_pointer_warp(_G.tinfo->desk->zone->comp->ee,
                          extra->expected.x + extra->expected.w/2,
                          extra->expected.y + extra->expected.h/2);
 }
@@ -2328,7 +2328,7 @@ _move_down_rows_or_right_cols(E_Client *ec, Eina_Bool check_moving_anims)
             _check_moving_anims(ec, extra, stack);
     }
 
-    ecore_x_pointer_warp(_G.tinfo->desk->zone->comp->win,
+    ecore_evas_pointer_warp(_G.tinfo->desk->zone->comp->ee,
                          extra->expected.x + extra->expected.w/2,
                          extra->expected.y + extra->expected.h/2);
 }
@@ -3081,7 +3081,7 @@ _warp_timer(void *data __UNUSED__)
         _G.warp_x = (_G.warp_x * (1.0 - spd)) + (_G.warp_to_x * spd);
         _G.warp_y = (_G.warp_y * (1.0 - spd)) + (_G.warp_to_y * spd);
 
-        ecore_x_pointer_warp(_G.tinfo->desk->zone->comp->win,
+        ecore_evas_pointer_warp(_G.tinfo->desk->zone->comp->ee,
                              _G.warp_x, _G.warp_y);
 
         if (abs(_G.warp_x - _G.old_warp_x) <= 1
@@ -3104,7 +3104,7 @@ _action_go(E_Client *data __UNUSED__,
 
     _G.warp_to_x = ec->x + (ec->w / 2);
     _G.warp_to_y = ec->y + (ec->h / 2);
-    ecore_x_pointer_xy_get(_G.tinfo->desk->zone->comp->win,
+    ecore_evas_pointer_xy_get(_G.tinfo->desk->zone->comp->ee,
                            &_G.warp_x, &_G.warp_y);
     e_client_focus_latest_set(ec);
     _G.warp_timer = ecore_timer_add(0.01, _warp_timer, NULL);
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index 555cadcad0..974d301b87 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -1092,7 +1092,7 @@ _e_winlist_restore_desktop(void)
         e_config->winlist_list_show_other_screen_windows))
      e_desk_show(_last_desk);
    if (e_config->winlist_warp_while_selecting)
-     ecore_x_pointer_warp(_winlist_zone->comp->win,
+     ecore_evas_pointer_warp(_winlist_zone->comp->ee,
                           _last_pointer_x, _last_pointer_y);
    _e_winlist_deactivate();
    _win_selected = NULL;
diff --git a/src/modules/wizard/page_150.c b/src/modules/wizard/page_150.c
index 53ea3ab0c9..20c55bf3c9 100644
--- a/src/modules/wizard/page_150.c
+++ b/src/modules/wizard/page_150.c
@@ -48,6 +48,8 @@ wizard_page_show(E_Wizard_Page *pg)
 {
    Evas_Object *o, *of, *ob;
    Ecore_Evas *ee;
+
+#ifndef WAYLAND_ONLY
    Ecore_X_Window_Attributes att;
 
    if (!ecore_x_composite_query()) return 0;
@@ -57,13 +59,13 @@ wizard_page_show(E_Wizard_Page *pg)
    ecore_x_window_attributes_get(ecore_x_window_root_first_get(), &att);
    if ((att.depth <= 8)) return 0;
 
+   gl_avail = ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11);
+#endif
+
    o = e_widget_list_add(pg->evas, 1, 0);
    e_wizard_title_set(_("Compositing"));
 
 
-   gl_avail = ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11);
-
-
    of = e_widget_framelist_add(pg->evas, _("Settings"), 0);
    if (gl_avail)
      {