Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_zone.c
Log Message:
fix that pussy properly!
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -3 -r1.301 -r1.302
--- e_border.c 1 Jul 2005 08:26:06 -0000 1.301
+++ e_border.c 1 Jul 2005 08:33:32 -0000 1.302
@@ -2648,6 +2648,9 @@
bd->resize_mode = RESIZE_TL;
bd->cur_mouse_action = e_action_find("window_resize");
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
e_object_ref(E_OBJECT(bd->cur_mouse_action));
GRAV_SET(bd, ECORE_X_GRAVITY_SE);
@@ -2659,6 +2662,9 @@
bd->resize_mode = RESIZE_T;
bd->cur_mouse_action = e_action_find("window_resize");
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
e_object_ref(E_OBJECT(bd->cur_mouse_action));
GRAV_SET(bd, ECORE_X_GRAVITY_S);
@@ -2670,6 +2676,9 @@
bd->resize_mode = RESIZE_TR;
bd->cur_mouse_action = e_action_find("window_resize");
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
e_object_ref(E_OBJECT(bd->cur_mouse_action));
GRAV_SET(bd, ECORE_X_GRAVITY_SW);
@@ -2681,6 +2690,9 @@
bd->resize_mode = RESIZE_R;
bd->cur_mouse_action = e_action_find("window_resize");
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
e_object_ref(E_OBJECT(bd->cur_mouse_action));
GRAV_SET(bd, ECORE_X_GRAVITY_W);
@@ -2692,6 +2704,9 @@
bd->resize_mode = RESIZE_BR;
bd->cur_mouse_action = e_action_find("window_resize");
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
e_object_ref(E_OBJECT(bd->cur_mouse_action));
GRAV_SET(bd, ECORE_X_GRAVITY_NW);
@@ -2703,6 +2718,9 @@
bd->resize_mode = RESIZE_B;
bd->cur_mouse_action = e_action_find("window_resize");
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
e_object_ref(E_OBJECT(bd->cur_mouse_action));
GRAV_SET(bd, ECORE_X_GRAVITY_N);
@@ -2714,6 +2732,9 @@
bd->resize_mode = RESIZE_BL;
bd->cur_mouse_action = e_action_find("window_resize");
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
e_object_ref(E_OBJECT(bd->cur_mouse_action));
GRAV_SET(bd, ECORE_X_GRAVITY_NE);
@@ -2725,6 +2746,9 @@
bd->resize_mode = RESIZE_L;
bd->cur_mouse_action = e_action_find("window_resize");
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
e_object_ref(E_OBJECT(bd->cur_mouse_action));
GRAV_SET(bd, ECORE_X_GRAVITY_E);
@@ -2736,6 +2760,9 @@
bd->moving = 1;
bd->cur_mouse_action = e_action_find("window_move");
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
e_object_ref(E_OBJECT(bd->cur_mouse_action));
}
@@ -3117,19 +3144,7 @@
}
#endif
if (grabbed) return 1;
- if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
- (ev->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR))
- {
- if (bd->cur_mouse_action)
- {
- if (bd->cur_mouse_action->func.end_mouse)
- bd->cur_mouse_action->func.end_mouse(E_OBJECT(bd), "", ev);
- else if (bd->cur_mouse_action->func.end)
- bd->cur_mouse_action->func.end(E_OBJECT(bd), "");
- e_object_unref(E_OBJECT(bd->cur_mouse_action));
- bd->cur_mouse_action = NULL;
- }
- }
+
if (ev->event_win == bd->win)
{
if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
@@ -3183,6 +3198,9 @@
bd->cur_mouse_action =
e_bindings_mouse_down_event_handle(E_BINDING_CONTEXT_BORDER,
E_OBJECT(bd), ev);
+ if ((!bd->cur_mouse_action->func.end_mouse) &&
+ (!bd->cur_mouse_action->func.end))
+ bd->cur_mouse_action = NULL;
if (bd->cur_mouse_action)
e_object_ref(E_OBJECT(bd->cur_mouse_action));
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- e_zone.c 1 Jul 2005 08:20:04 -0000 1.62
+++ e_zone.c 1 Jul 2005 08:33:32 -0000 1.63
@@ -574,6 +574,9 @@
zone->cur_mouse_action =
e_bindings_mouse_down_event_handle(E_BINDING_CONTEXT_ZONE,
E_OBJECT(zone), ev2);
+ if ((!zone->cur_mouse_action->func.end_mouse) &&
+ (!zone->cur_mouse_action->func.end))
+ zone->cur_mouse_action = NULL;
if (zone->cur_mouse_action)
e_object_ref(E_OBJECT(zone->cur_mouse_action));
}
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
