Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h ewins.c focus.c
Log Message:
Avoid useless operations on destroyed windows.
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -3 -r1.555 -r1.556
--- E.h 21 May 2006 12:17:57 -0000 1.555
+++ E.h 2 Jun 2006 22:53:22 -0000 1.556
@@ -700,7 +700,7 @@
#define FOCUS_ENTER 4
#define FOCUS_LEAVE 5
#define FOCUS_EWIN_NEW 6
-#define FOCUS_EWIN_GONE 7
+#define FOCUS_EWIN_UNMAP 7
#define FOCUS_DESK_ENTER 8
#define FOCUS_DESK_LEAVE 9
#define FOCUS_NEXT 10
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -3 -r1.166 -r1.167
--- ewins.c 1 Jun 2006 20:18:40 -0000 1.166
+++ ewins.c 2 Jun 2006 22:53:22 -0000 1.167
@@ -1001,7 +1001,7 @@
{
/* The frame has been unmapped */
- FocusToEWin(ewin, FOCUS_EWIN_GONE);
+ FocusToEWin(ewin, FOCUS_EWIN_UNMAP);
if (ewin == Mode.mouse_over_ewin)
Mode.mouse_over_ewin = NULL;
if (ewin == Mode.context_ewin)
===================================================================
RCS file: /cvs/e/e16/e/src/focus.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -3 -r1.150 -r1.151
--- focus.c 3 May 2006 20:52:15 -0000 1.150
+++ focus.c 2 Jun 2006 22:53:23 -0000 1.151
@@ -328,7 +328,7 @@
return;
break;
- case FOCUS_EWIN_GONE:
+ case FOCUS_EWIN_UNMAP:
if (Mode.focuswin)
return;
ewin = FocusEwinSelect();
@@ -473,14 +473,15 @@
focus_pending_ewin = ewin;
break;
- case FOCUS_EWIN_GONE:
+ case FOCUS_EWIN_UNMAP:
focus_pending_why = why;
focus_pending_ewin = NULL;
if (ewin == Mode.focuswin)
{
Mode.focuswin = NULL;
focus_is_set = 0;
- FocusEwinSetActive(ewin, 0);
+ if (!EoIsGone(ewin))
+ FocusEwinSetActive(ewin, 0);
}
if (ewin == focus_pending_new)
focus_pending_new = NULL;
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
