Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h focus.c warp.c
Log Message:
Fix raise-on-next focus.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -3 -r1.192 -r1.193
--- E.h 2 Feb 2004 19:32:25 -0000 1.192
+++ E.h 2 Feb 2004 19:42:35 -0000 1.193
@@ -1853,16 +1853,18 @@
void PropagateShapes(Window win);
/* focus.c functions */
-#define FOCUS_SET 0
-#define FOCUS_NONE 1
-#define FOCUS_ENTER 2
-#define FOCUS_LEAVE 3
-#define FOCUS_EWIN_NEW 4
-#define FOCUS_EWIN_GONE 5
-#define FOCUS_DESK_ENTER 6
-#define FOCUS_DESK_LEAVE 7
-#define FOCUS_WARP_DONE 8
-#define FOCUS_CLICK 9
+#define FOCUS_SET 0
+#define FOCUS_NONE 1
+#define FOCUS_ENTER 2
+#define FOCUS_LEAVE 3
+#define FOCUS_EWIN_NEW 4
+#define FOCUS_EWIN_GONE 5
+#define FOCUS_DESK_ENTER 6
+#define FOCUS_DESK_LEAVE 7
+#define FOCUS_NEXT 8
+#define FOCUS_WARP_NEXT 9
+#define FOCUS_WARP_DONE 10
+#define FOCUS_CLICK 11
void FocusGetNextEwin(void);
void FocusGetPrevEwin(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- focus.c 1 Feb 2004 11:28:05 -0000 1.43
+++ focus.c 2 Feb 2004 19:42:35 -0000 1.44
@@ -98,7 +98,7 @@
ewin = lst[i];
Efree(lst);
- FocusToEWin(ewin, FOCUS_SET);
+ FocusToEWin(ewin, FOCUS_NEXT);
EDBUG_RETURN_;
}
@@ -211,6 +211,10 @@
EDBUG_RETURN_;
break;
+ case FOCUS_WARP_NEXT:
+ why = FOCUS_NEXT;
+ break;
+
case FOCUS_WARP_DONE:
break;
}
@@ -255,12 +259,11 @@
}
}
- if (conf.focus.raise_on_next_focus ||
+ if ((conf.focus.raise_on_next_focus && (why == FOCUS_NEXT)) ||
(conf.focus.raise_after_next_focus && (why == FOCUS_WARP_DONE)))
RaiseEwin(ewin);
- if ((conf.focus.warp_on_next_focus && why != FOCUS_ENTER &&
- why != FOCUS_CLICK && why != FOCUS_DESK_ENTER) ||
+ if ((conf.focus.warp_on_next_focus && (why == FOCUS_NEXT)) ||
(conf.focus.warp_after_next_focus && (why == FOCUS_WARP_DONE)))
{
if (ewin != mode.mouse_over_win)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- warp.c 1 Feb 2004 11:28:06 -0000 1.32
+++ warp.c 2 Feb 2004 19:42:35 -0000 1.33
@@ -130,7 +130,7 @@
if (!FindItem((char *)ewin, 0, LIST_FINDBY_POINTER, LIST_TYPE_EWIN))
ewin = NULL;
if (ewin)
- FocusToEWin(ewin, FOCUS_SET);
+ FocusToEWin(ewin, FOCUS_WARP_NEXT);
WarpFocusShowTitle(ewin);
Efree(lst);
}
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
