Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
focus.c warp.c
Log Message:
Fix "focus prev". Enable using up/down arrow keys with focus list.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- focus.c 9 Jul 2005 22:55:56 -0000 1.109
+++ focus.c 13 Jul 2005 19:39:22 -0000 1.110
@@ -179,7 +179,7 @@
return;
ewin = NULL;
- for (i = 0; i < num; i++)
+ for (i = 1; i < num; i++)
{
if (!FocusEwinValid(lst[i], 1, 0, 0) || lst[i]->props.skip_focuslist)
continue;
@@ -1055,7 +1055,10 @@
}
else if (!strncmp(cmd, "prev", 2))
{
- FocusGetPrevEwin();
+ if (Conf.warplist.enable)
+ WarpFocus(-1);
+ else
+ FocusGetPrevEwin();
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- warp.c 9 Jul 2005 22:55:56 -0000 1.72
+++ warp.c 13 Jul 2005 19:39:22 -0000 1.73
@@ -193,7 +193,9 @@
}
}
+ /* FIXME - Check shape */
EShapePropagate(warpFocusWindow->win);
+ EobjChangeShape(warpFocusWindow);
EFlush();
}
@@ -348,6 +350,8 @@
static void
WarpFocusHandleEvent(XEvent * ev, void *prm __UNUSED__)
{
+ KeySym key;
+
switch (ev->type)
{
#if 0 /* Not necessary when sampling keycode in
events.c */
@@ -357,8 +361,21 @@
break;
#endif
case KeyRelease:
- if (warpFocusWindow->shown && ev->xkey.keycode != warpFocusKey)
- WarpFocusFinish();
+ if (!warpFocusWindow->shown || ev->xkey.keycode == warpFocusKey)
+ break;
+ key = XLookupKeysym(&ev->xkey, 0);
+ switch (key)
+ {
+ default:
+ WarpFocusFinish();
+ break;
+ case XK_Down:
+ WarpFocus(1);
+ break;
+ case XK_Up:
+ WarpFocus(-1);
+ break;
+ }
break;
case ButtonRelease:
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
