Two simple patches to get rid of the fake_mouse_up calls (and its log polluter).
One for E and its core modules, the other for E-MODULES-EXTRA.
Index: src/bin/e_fm.c
===================================================================
--- src/bin/e_fm.c (revision 36177)
+++ src/bin/e_fm.c (working copy)
@@ -5177,8 +5177,6 @@
{
if (!ic->selected) _e_fm2_mouse_1_handler(ic, 0, ev->modifiers);
_e_fm2_icon_menu(ic, ic->sd->obj, ev->timestamp);
- e_util_evas_fake_mouse_up_later(evas_object_evas_get(ic->sd->obj),
- ev->button);
}
}
@@ -5432,8 +5430,6 @@
e_drag_xdnd_start(d,
ic->drag.x + ic->x + ic->sd->x - ic->sd->pos.x,
ic->drag.y + ic->y + ic->sd->y - ic->sd->pos.y);
- e_util_evas_fake_mouse_up_later(evas_object_evas_get(ic->sd->obj),
- 1);
}
}
}
@@ -5708,8 +5704,6 @@
else if (ev->button == 3)
{
_e_fm2_menu(sd->obj, ev->timestamp);
- e_util_evas_fake_mouse_up_later(evas_object_evas_get(sd->obj),
- ev->button);
}
}
Index: src/bin/e_gadcon.c
===================================================================
--- src/bin/e_gadcon.c (revision 36177)
+++ src/bin/e_gadcon.c (working copy)
@@ -1695,7 +1695,6 @@
}
e_menu_activate_mouse(mn, zone, cx, cy, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(gcc->gadcon->evas, ev->button);
}
}
@@ -2305,8 +2304,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(gcc->gadcon->evas,
- ev->button);
}
else if (ev->button == 1)
{
Index: src/bin/e_border.c
===================================================================
--- src/bin/e_border.c (revision 36177)
+++ src/bin/e_border.c (working copy)
@@ -5314,7 +5314,6 @@
e_drag_resize(drag, w, h);
e_drag_start(drag, bd->drag.x, bd->drag.y);
- e_util_evas_fake_mouse_up_later(bd->bg_evas, 1);
}
bd->drag.start = 0;
}
Index: src/bin/e_actions.c
===================================================================
--- src/bin/e_actions.c (revision 36177)
+++ src/bin/e_actions.c (working copy)
@@ -1468,7 +1468,6 @@
e_menu_post_deactivate_callback_set(m, _e_actions_cb_menu_end, NULL);
e_menu_activate_mouse(m, zone, x, y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->time);
- e_util_container_fake_mouse_up_all_later(zone->container);
}
}
}
Index: src/bin/e_entry.c
===================================================================
--- src/bin/e_entry.c (revision 36177)
+++ src/bin/e_entry.c (working copy)
@@ -545,7 +545,6 @@
e_menu_activate_mouse(sd->popup, e_util_zone_current_get(man),
x, y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, event->timestamp);
- e_util_evas_fake_mouse_up_later(e, event->button);
}
#ifdef HAVE_ECORE_IMF
Index: src/bin/e_toolbar.c
===================================================================
--- src/bin/e_toolbar.c (revision 36177)
+++ src/bin/e_toolbar.c (working copy)
@@ -290,7 +290,6 @@
ecore_x_pointer_xy_get(zone->container->win, &x, &y);
e_menu_activate_mouse(mn, zone, x, y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(tbar->gadcon->evas, ev->button);
}
static void
Index: src/bin/e_shelf.c
===================================================================
--- src/bin/e_shelf.c (revision 36177)
+++ src/bin/e_shelf.c (working copy)
@@ -1233,7 +1233,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(es->gadcon->evas, ev->button);
break;
}
}
Index: src/bin/e_utils.c
===================================================================
--- src/bin/e_utils.c (revision 36177)
+++ src/bin/e_utils.c (working copy)
@@ -18,61 +18,16 @@
EAPI int starting = 1;
EAPI int stopping = 0;
-typedef struct _E_Util_Fake_Mouse_Up_Info E_Util_Fake_Mouse_Up_Info;
-
-struct _E_Util_Fake_Mouse_Up_Info
-{
- Evas *evas;
- int button;
-};
-
/* local subsystem functions */
static int _e_util_cb_delayed_del(void *data);
-static void _e_util_container_fake_mouse_up_cb(void *data);
static int _e_util_wakeup_cb(void *data);
/* local subsystem globals */
static Ecore_Timer *_e_util_dummy_timer = NULL;
/* externally accessible functions */
-EAPI void
-e_util_container_fake_mouse_up_later(E_Container *con, int button)
-{
- E_OBJECT_CHECK(con);
- E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
- printf("FIXME: NO MORE CONTAINER FAKE UP! MUST REMOVE CODE\n");
- e_util_evas_fake_mouse_up_later(con->bg_evas, button);
-}
-
EAPI void
-e_util_container_fake_mouse_up_all_later(E_Container *con)
-{
- E_OBJECT_CHECK(con);
- E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
-
- e_util_container_fake_mouse_up_later(con, 1);
- e_util_container_fake_mouse_up_later(con, 2);
- e_util_container_fake_mouse_up_later(con, 3);
-}
-
-EAPI void
-e_util_evas_fake_mouse_up_later(Evas *e, int button)
-{
- E_Util_Fake_Mouse_Up_Info *info;
-
- printf("FIXME: NO MORE FAKE UP! MUST REMOVE CODE\n");
- return;
- info = calloc(1, sizeof(E_Util_Fake_Mouse_Up_Info));
- if (info)
- {
- info->evas = e;
- info->button = button;
- ecore_job_add(_e_util_container_fake_mouse_up_cb, info);
- }
-}
-
-EAPI void
e_util_wakeup(void)
{
if (_e_util_dummy_timer) return;
@@ -981,20 +936,6 @@
return 0;
}
-static void
-_e_util_container_fake_mouse_up_cb(void *data)
-{
- E_Util_Fake_Mouse_Up_Info *info;
-
- info = data;
- if (info)
- {
- evas_event_feed_mouse_up(info->evas, info->button, EVAS_BUTTON_NONE,
- ecore_x_current_time_get(), NULL);
- free(info);
- }
-}
-
static int
_e_util_wakeup_cb(void *data)
{
Index: src/modules/temperature/e_mod_main.c
===================================================================
--- src/modules/temperature/e_mod_main.c (revision 36177)
+++ src/modules/temperature/e_mod_main.c (working copy)
@@ -315,8 +315,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(inst->gcc->gadcon->evas,
- ev->button);
}
}
Index: src/modules/pager/e_mod_main.c
===================================================================
--- src/modules/pager/e_mod_main.c (revision 36177)
+++ src/modules/pager/e_mod_main.c (working copy)
@@ -819,7 +819,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(inst->gcc->gadcon->evas, ev->button);
}
}
@@ -1881,8 +1880,6 @@
pw->drag.from_pager = pw->desk->pager;
pw->drag.from_pager->dragging = 1;
pw->drag.in_pager = 0;
- e_util_evas_fake_mouse_up_later(evas_object_evas_get(pw->desk->pager->o_table),
- pw->drag.button);
}
}
}
@@ -2287,8 +2284,6 @@
pd->drag.from_pager = pd->pager;
pd->drag.from_pager->dragging = 1;
pd->drag.in_pager = 0;
- e_util_evas_fake_mouse_up_later(evas_object_evas_get(pd->pager->o_table),
- pd->drag.button);
}
}
Index: src/modules/cpufreq/e_mod_main.c
===================================================================
--- src/modules/cpufreq/e_mod_main.c (revision 36177)
+++ src/modules/cpufreq/e_mod_main.c (working copy)
@@ -297,8 +297,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(inst->gcc->gadcon->evas,
- ev->button);
}
}
Index: src/modules/battery/e_mod_main.c
===================================================================
--- src/modules/battery/e_mod_main.c (revision 36177)
+++ src/modules/battery/e_mod_main.c (working copy)
@@ -181,8 +181,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(inst->gcc->gadcon->evas,
- ev->button);
}
if (ev->button == 1)
_battery_cb_warning_popup_hide(data, e, obj, event_info);
Index: src/modules/ibar/e_mod_main.c
===================================================================
--- src/modules/ibar/e_mod_main.c (revision 36177)
+++ src/modules/ibar/e_mod_main.c (working copy)
@@ -327,8 +327,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(b->inst->gcc->gadcon->evas,
- ev->button);
}
}
@@ -847,8 +845,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(ic->ibar->inst->gcc->gadcon->evas,
- ev->button);
}
}
@@ -921,8 +917,6 @@
e_drag_resize(d, w, h);
e_drag_start(d, ic->drag.x, ic->drag.y);
- e_util_evas_fake_mouse_up_later(ic->ibar->inst->gcc->gadcon->evas,
- 1);
ic->ibar->icons = evas_list_remove(ic->ibar->icons, ic);
_ibar_resize_handle(ic->ibar);
_gc_orient(ic->ibar->inst->gcc);
Index: src/modules/gadman/e_mod_gadman.c
===================================================================
--- src/modules/gadman/e_mod_gadman.c (revision 36177)
+++ src/modules/gadman/e_mod_gadman.c (working copy)
@@ -807,8 +807,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(gcc->gadcon->evas,
- ev->button);
}
}
Index: src/modules/start/e_mod_main.c
===================================================================
--- src/modules/start/e_mod_main.c (revision 36177)
+++ src/modules/start/e_mod_main.c (working copy)
@@ -212,8 +212,6 @@
x, y, w, h,
dir, ev->timestamp);
edje_object_signal_emit(inst->o_button, "e,state,focused", "e");
- e_util_evas_fake_mouse_up_later(inst->gcc->gadcon->evas,
- ev->button);
}
}
}
Index: src/modules/ibox/e_mod_main.c
===================================================================
--- src/modules/ibox/e_mod_main.c (revision 36177)
+++ src/modules/ibox/e_mod_main.c (working copy)
@@ -321,7 +321,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(b->inst->gcc->gadcon->evas, ev->button);
}
}
@@ -720,8 +719,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(ic->ibox->inst->gcc->gadcon->evas,
- ev->button);
}
}
@@ -774,8 +771,6 @@
e_drag_resize(d, w, h);
e_drag_start(d, ic->drag.x, ic->drag.y);
- e_util_evas_fake_mouse_up_later(ic->ibox->inst->gcc->gadcon->evas,
- 1);
e_object_ref(E_OBJECT(ic->border));
ic->ibox->icons = evas_list_remove(ic->ibox->icons, ic);
_ibox_resize_handle(ic->ibox);
Index: efm_path/src/e_mod_main.c
===================================================================
--- efm_path/src/e_mod_main.c (revision 36177)
+++ efm_path/src/e_mod_main.c (working copy)
@@ -329,5 +329,4 @@
ecore_x_pointer_xy_get(zone->container->win, &x, &y);
e_menu_activate_mouse(mn, zone, x, y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(e, ev->button);
}
Index: notification/src/e_mod_box.c
===================================================================
--- notification/src/e_mod_box.c (revision 36177)
+++ notification/src/e_mod_box.c (working copy)
@@ -687,7 +687,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(b->inst->gcc->gadcon->evas, ev->button);
}
}
@@ -836,8 +835,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(ic->n_box->inst->gcc->gadcon->evas,
- ev->button);
}
}
Index: efm_nav/src/e_mod_main.c
===================================================================
--- efm_nav/src/e_mod_main.c (revision 36177)
+++ efm_nav/src/e_mod_main.c (working copy)
@@ -263,7 +263,6 @@
ecore_x_pointer_xy_get(zone->container->win, &x, &y);
e_menu_activate_mouse(mn, zone, x, y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(e, ev->button);
}
static void
Index: news/src/module/news_item.c
===================================================================
--- news/src/module/news_item.c (revision 36177)
+++ news/src/module/news_item.c (working copy)
@@ -344,7 +344,6 @@
cx, cy, 1, 1,
E_MENU_POP_DIRECTION_DOWN,
ecore_x_current_time_get());
- e_util_container_fake_mouse_up_all_later(zone->container);
break;
}
}
Index: emu/src/modules/emu/e_mod_main.c
===================================================================
--- emu/src/modules/emu/e_mod_main.c (revision 36177)
+++ emu/src/modules/emu/e_mod_main.c (working copy)
@@ -817,7 +817,6 @@
// e_menu_activate_mouse(emu_face->face->menu,
// e_zone_current_get(emu_face->face->con), ev->output.x, ev->output.y, 1, 1, E_MENU_POP_DIRECTION_AUTO,
// ev->timestamp);
-// e_util_container_fake_mouse_up_all_later(emu_face->face->con);
// }
/*else*/ if (ev->button == 1)
{ /* Left click default menu. */
@@ -885,7 +884,6 @@
}
// e_menu_activate_mouse(menu->menu->menu, e_zone_current_get(emu_face->face->con), ev->output.x, ev->output.y, 1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
e_menu_activate_mouse(menu->menu->menu, e_util_zone_current_get(e_manager_current_get()), x, y, w, h, dir, ev->timestamp);
-// e_util_container_fake_mouse_up_all_later(emu_face->face->con);
edje_object_signal_emit(emu_face->o_button, "active", "");
evas_event_feed_mouse_up(emu_face->gcc->gadcon->evas, ev->button, EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
Index: net/src/e_mod_net.c
===================================================================
--- net/src/e_mod_net.c (revision 36177)
+++ net/src/e_mod_net.c (working copy)
@@ -179,7 +179,6 @@
e_util_zone_current_get(e_manager_current_get()),
x + ev->output.x, y + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(inst->gcc->gadcon->evas, ev->button);
}
}
Index: iiirk/src/e_mod_main.c
===================================================================
--- iiirk/src/e_mod_main.c (revision 36177)
+++ iiirk/src/e_mod_main.c (working copy)
@@ -375,7 +375,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(b->inst->gcc->gadcon->evas, ev->button);
}
}
@@ -793,8 +792,6 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_evas_fake_mouse_up_later(ic->iiirk->inst->gcc->gadcon->evas,
- ev->button);
}
}
@@ -870,8 +867,6 @@
e_drag_resize(d, w, h);
e_drag_start(d, ic->drag.x, ic->drag.y);
- e_util_evas_fake_mouse_up_later(ic->iiirk->inst->gcc->gadcon->evas,
- 1);
e_object_ref(E_OBJECT(ic->border));
ic->iiirk->icons = evas_list_remove(ic->iiirk->icons, ic);
if (ic->border->desktop) e_order_remove(ic->iiirk->apps, ic->border->desktop);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
