E CVS: e kwo

[enlightenment-cvs]

Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        menus.c 


Log Message:
Cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -3 -r1.205 -r1.206
--- menus.c     16 Jul 2005 16:57:43 -0000      1.205
+++ menus.c     7 Aug 2005 17:58:48 -0000       1.206
@@ -114,27 +114,6 @@
 static Menu        *active_menu = NULL;
 static MenuItem    *active_item = NULL;
 
-static Menu        *
-FindMenu(Window win)
-{
-   Menu               *menu = NULL;
-   Menu              **menus;
-   int                 i, num;
-
-   menus = (Menu **) ListItemType(&num, LIST_TYPE_MENU);
-   for (i = 0; i < num; i++)
-     {
-       if (menus[i]->win != win)
-          continue;
-       menu = menus[i];
-       break;
-     }
-   if (menus)
-      Efree(menus);
-
-   return menu;
-}
-
 void
 MenuHide(Menu * m)
 {
@@ -336,9 +315,6 @@
 
    m->stuck = 0;
 
-   if (!FindMenu(m->win))
-      AddItem(m, m->name, m->win, LIST_TYPE_MENU);
-
    Mode_menus.just_shown = 1;
 
    m->shown = 1;
@@ -407,7 +383,8 @@
    if (m->name)
       Efree(m->name);
    m->name = Estrdup(name);
-   AddItem(m, m->name, m->win, LIST_TYPE_MENU);
+
+   AddItem(m, m->name, 0, LIST_TYPE_MENU);
 }
 
 void
@@ -1537,16 +1514,16 @@
       return;
 
    m = data->m;
-   ewin = EwinFindByClient(m->win);
-   if (!ewin)
+   ewin = m->ewin;
+   if (!ewin || !EwinFindByPtr(ewin))
       return;
    if (!EoIsShown(ewin))
       return;
 
    mi = data->mi;
    MenuShow(mi->child, 1);
-   ewin2 = EwinFindByClient(mi->child->win);
-   if (!ewin2)
+   ewin2 = mi->child->ewin;
+   if (!ewin2 || !EwinFindByPtr(ewin2))
       return;
 
    EGetGeometry(mi->win, NULL, &mx, &my, &mw, NULL, NULL, NULL);
@@ -1681,39 +1658,19 @@
 static void
 MenuItemEventMouseIn(MenuItem * mi, XEvent * ev)
 {
-   Window              win = ev->xcrossing.window;
-   Menu               *m;
-
-   m = mi->menu;
-
-   if ((win == mi->icon_win) && (ev->xcrossing.detail == NotifyAncestor))
-      goto done;
-   if ((win == mi->win) && (ev->xcrossing.detail == NotifyInferior))
-      goto done;
-
-   MenuActivateItem(m, mi);
+   if (ev->xcrossing.detail == NotifyInferior)
+      return;
 
- done:
-   return;
+   MenuActivateItem(mi->menu, mi);
 }
 
 static void
 MenuItemEventMouseOut(MenuItem * mi, XEvent * ev)
 {
-   Window              win = ev->xcrossing.window;
-   Menu               *m;
-
-   m = mi->menu;
-
-   if ((win == mi->icon_win) && (ev->xcrossing.detail == NotifyAncestor))
-      goto done;
-   if ((win == mi->win) && (ev->xcrossing.detail == NotifyInferior))
-      goto done;
-
-   MenuActivateItem(m, NULL);
+   if (ev->xcrossing.detail == NotifyInferior)
+      return;
 
- done:
-   return;
+   MenuActivateItem(mi->menu, NULL);
 }
 
 static void




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs