Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_desk.c e_desk.h
Log Message:
More checks if an focus in/out events belong to a border.
Store the active fullscreen window in it's desk.
Don't allow mouse focus out from a fullscreen window.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -3 -r1.302 -r1.303
--- e_border.c 1 Jul 2005 08:33:32 -0000 1.302
+++ e_border.c 1 Jul 2005 10:07:21 -0000 1.303
@@ -1298,7 +1298,7 @@
bd->client_inset.t = 0;
bd->client_inset.b = 0;
- e_desk_black_set(bd->desk, 1);
+ e_desk_fullscreen_set(bd->desk, bd);
bd->layer = 200;
e_border_raise(bd);
@@ -1336,7 +1336,7 @@
bd->client_inset.t = bd->client_inset.st;
bd->client_inset.b = bd->client_inset.sb;
- e_desk_black_set(bd->desk, 0);
+ e_desk_fullscreen_set(bd->desk, NULL);
e_border_move_resize(bd, bd->saved.x, bd->saved.y, bd->saved.w,
bd->saved.h);
ecore_evas_show(bd->bg_ecore_evas);
@@ -3091,12 +3091,15 @@
details[ev->detail]);
}
#endif
- if (grabbed) return 1;
if (ev->event_win == bd->win)
{
e_focus_event_mouse_in(bd);
}
- if (ev->win != bd->event_win) return 1;
+ if ((ev->win != bd->win) &&
+ (ev->win != bd->event_win) &&
+ (ev->event_win != bd->win) &&
+ (ev->event_win != bd->event_win))
+ return 1;
bd->mouse.current.mx = ev->root.x;
bd->mouse.current.my = ev->root.y;
evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, NULL);
@@ -3143,10 +3146,10 @@
details[ev->detail]);
}
#endif
- if (grabbed) return 1;
-
if (ev->event_win == bd->win)
{
+ if (bd->fullscreen)
+ return 1;
if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
(ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR))
return 1;
@@ -3157,7 +3160,11 @@
return 1;
e_focus_event_mouse_out(bd);
}
- if (ev->win != bd->event_win) return 1;
+ if ((ev->win != bd->win) &&
+ (ev->win != bd->event_win) &&
+ (ev->event_win != bd->win) &&
+ (ev->event_win != bd->event_win))
+ return 1;
bd->mouse.current.mx = ev->root.x;
bd->mouse.current.my = ev->root.y;
evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_desk.c 1 Jul 2005 09:24:31 -0000 1.40
+++ e_desk.c 1 Jul 2005 10:07:24 -0000 1.41
@@ -119,10 +119,11 @@
}
}
}
- if (desk->black)
+ if (desk->fullscreen)
{
ecore_evas_show(desk->black_ecore_evas);
e_container_window_raise(desk->zone->container, desk->black_win, 150);
+ e_border_fullscreen(desk->fullscreen);
}
desk->visible = 1;
@@ -139,18 +140,18 @@
}
void
-e_desk_black_set(E_Desk *desk, int set)
+e_desk_fullscreen_set(E_Desk *desk, E_Border *bd)
{
- if ((!desk->black) && (set))
+ if ((!desk->fullscreen) && (bd))
{
ecore_evas_show(desk->black_ecore_evas);
e_container_window_raise(desk->zone->container, desk->black_win, 150);
- desk->black = 1;
+ desk->fullscreen = bd;
}
- else if ((desk->black) && (!set))
+ else if ((desk->fullscreen) && (!bd))
{
ecore_evas_hide(desk->black_ecore_evas);
- desk->black = 0;
+ desk->fullscreen = NULL;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_desk.h 1 Jul 2005 09:24:31 -0000 1.16
+++ e_desk.h 1 Jul 2005 10:07:25 -0000 1.17
@@ -20,7 +20,7 @@
char *name;
int x, y;
char visible : 1;
- char black : 1;
+ E_Border *fullscreen;
Evas_Object *bg_object;
@@ -39,7 +39,7 @@
EAPI E_Desk *e_desk_new(E_Zone *zone, int x, int y);
EAPI void e_desk_name_set(E_Desk *desk, const char *name);
EAPI void e_desk_show(E_Desk *desk);
-EAPI void e_desk_black_set(E_Desk *desk, int set);
+EAPI void e_desk_fullscreen_set(E_Desk *desk, E_Border *bd);
EAPI E_Desk *e_desk_current_get(E_Zone *zone);
EAPI E_Desk *e_desk_at_xy_get(E_Zone *zone, int x, int y);
EAPI E_Desk *e_desk_at_pos_get(E_Zone *zone, int pos);
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs