Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_border.c e_desk.c e_int_menus.c
Log Message:
and respect focus lock out flag more
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- e_actions.c 8 Jul 2008 14:00:53 -0000 1.118
+++ e_actions.c 11 Aug 2008 01:22:33 -0000 1.119
@@ -984,7 +984,8 @@
e_zone_desk_flip_by(bd->zone, to_x - dx, to_y - dy);
/* send the border to the required desktop. */
e_border_desk_set(bd, desk);
- e_border_focus_set(bd, 1, 1);
+ if (!bd->lock_focus_out)
+ e_border_focus_set(bd, 1, 1);
}
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -3 -r1.653 -r1.654
--- e_border.c 7 Aug 2008 07:08:16 -0000 1.653
+++ e_border.c 11 Aug 2008 01:22:33 -0000 1.654
@@ -1371,7 +1371,8 @@
// printf(" 2accept:%i take:%i\n", bd->client.icccm.accepts_focus,
bd->client.icccm.take_focus);
if ((!bd->client.icccm.accepts_focus) &&
(!bd->client.icccm.take_focus)) return;
-
+ if (bd->lock_focus_out) return;
+
/* Try to grab the pointer to make sure it's not "in use" */
if (!ecore_x_pointer_grab(bd->zone->container->win))
return;
@@ -1412,6 +1413,7 @@
if ((!bd->client.icccm.accepts_focus) &&
(!bd->client.icccm.take_focus))
return;
+ if ((set) && (focus) && (bd->lock_focus_out)) return;
/* dont focus an iconified window. that's silly! */
if ((focus) && (bd->iconic))
return;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- e_desk.c 7 Jul 2008 01:03:33 -0000 1.73
+++ e_desk.c 11 Aug 2008 01:22:33 -0000 1.74
@@ -367,7 +367,8 @@
if ((!bd->iconic) && (bd->visible) && (bd->desk == desk))
{
/* this was the window last focused in this desktop */
- e_border_focus_set(bd, 1, 1);
+ if (!bd->lock_focus_out)
+ e_border_focus_set(bd, 1, 1);
break;
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -3 -r1.233 -r1.234
--- e_int_menus.c 25 Mar 2008 16:48:14 -0000 1.233
+++ e_int_menus.c 11 Aug 2008 01:22:33 -0000 1.234
@@ -1461,7 +1461,8 @@
e_border_move(bd, bd->zone->x + ((bd->zone->w - bd->w) / 2),
bd->zone->y + ((bd->zone->h - bd->h) / 2));
e_border_raise(bd);
- e_border_focus_set(bd, 1, 1);
+ if (!bd->lock_focus_out)
+ e_border_focus_set(bd, 1, 1);
}
static void
-------------------------------------------------------------------------
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-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
