Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h menus.c
Log Message:
Fix stuck menus, cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -3 -r1.360 -r1.361
--- E.h 7 Feb 2005 23:44:57 -0000 1.360
+++ E.h 8 Feb 2005 21:11:12 -0000 1.361
@@ -1936,7 +1936,6 @@
void EDisplayMemUse(void);
/* menus.c */
-MenuStyle *MenuStyleCreate(const char *name);
int MenuStyleConfigLoad(FILE * fs);
Menu *MenuCreate(const char *name, const char *title,
@@ -1945,7 +1944,6 @@
void MenuHide(Menu * m);
void MenuEmpty(Menu * m);
void MenuRepack(Menu * m);
-void MenuRealize(Menu * m);
MenuItem *MenuItemCreate(const char *text, ImageClass * ic,
const char *action_params, Menu * child);
void MenuSetName(Menu * m, const char *name);
@@ -1965,14 +1963,6 @@
MenuStyle * ms));
int MenusActive(void);
-void MenusHide(void);
-void MenusShowNamed(const char *name);
-void MenusDestroyLoaded(void);
-int MenusEventKeyPress(XEvent * ev);
-int MenusEventMouseDown(XEvent * ev);
-int MenusEventMouseUp(XEvent * ev);
-int MenusEventMouseIn(XEvent * ev);
-int MenusEventMouseOut(XEvent * ev);
/* menus-misc.c */
Menu *MenuCreateFromDirectory(const char *name, Menu * parent,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- menus.c 2 Feb 2005 17:12:00 -0000 1.164
+++ menus.c 8 Feb 2005 21:12:08 -0000 1.165
@@ -96,6 +96,7 @@
EnterWindowMask | LeaveWindowMask /* | PointerMotionMask */
static void MenuRedraw(Menu * m);
+static void MenuRealize(Menu * m);
static void MenuActivateItem(Menu * m, MenuItem * mi);
static void MenuDrawItem(Menu * m, MenuItem * mi, char shape);
@@ -103,6 +104,8 @@
static void MenuItemHandleEvents(XEvent * ev, void *mi);
static void MenuMaskerHandleEvents(XEvent * ev, void *prm);
+static void MenusHide(void);
+
static Menu *active_menu = NULL;
static MenuItem *active_item = NULL;
@@ -398,7 +401,7 @@
ms->name = Estrdup(name);
}
-MenuStyle *
+static MenuStyle *
MenuStyleCreate(const char *name)
{
MenuStyle *ms;
@@ -642,7 +645,7 @@
m->items[m->num - 1] = item;
}
-void
+static void
MenuRealize(Menu * m)
{
int i, maxh = 0, maxw = 0;
@@ -1009,32 +1012,7 @@
}
}
-void
-MenusShowNamed(const char *name)
-{
- Menu *m;
-
- m = FindItem(name, 0, LIST_FINDBY_NAME, LIST_TYPE_MENU);
- if (m)
- {
- if (!FindEwinByMenu(m)) /* Don't show if already shown */
- MenuShow(m, 0);
-#if 0
- Mode_menus.list[0] = m;
- Mode_menus.current_depth = 1;
- MenuShowMasker(m);
- m->ref_count++;
- }
- else
- {
- Mode_menus.list[0] = NULL;
- Mode_menus.current_depth = 0;
- MenuHideMasker();
-#endif
- }
-}
-
-void
+static void
MenusDestroyLoaded(void)
{
Menu *menu;
@@ -1066,30 +1044,6 @@
while (found_one);
}
-#if 0 /* Unused */
-void
-MenusHideByWindow(Window win)
-{
- Menu *m;
- int i, ok;
-
- m = FindMenu(win);
- if (m)
- {
- MenuHide(m);
- ok = 0;
- for (i = 0; i < Mode_menus.current_depth; i++)
- {
- if (ok)
- MenuHide(Mode_menus.list[i]);
- if (Mode_menus.list[i] == m)
- ok = 1;
- }
- MenuHideMasker();
- }
-}
-#endif
-
/*
* Internal menus
*/
@@ -1139,6 +1093,35 @@
return m;
}
+static void
+MenusShowNamed(const char *name)
+{
+ Menu *m;
+
+ /* Hide any menus currently up */
+ if (MenusActive())
+ MenusHide();
+
+ m = FindItem(name, 0, LIST_FINDBY_NAME, LIST_TYPE_MENU);
+ if (m)
+ {
+ if (!FindEwinByMenu(m)) /* Don't show if already shown */
+ MenuShow(m, 0);
+#if 0
+ Mode_menus.list[0] = m;
+ Mode_menus.current_depth = 1;
+ MenuShowMasker(m);
+ m->ref_count++;
+ }
+ else
+ {
+ Mode_menus.list[0] = NULL;
+ Mode_menus.current_depth = 0;
+ MenuHideMasker();
+#endif
+ }
+}
+
void
ShowInternalMenu(Menu ** pm, MenuStyle ** pms, const char *style,
Menu * (mcf) (const char *name, MenuStyle * ms))
@@ -1146,6 +1129,10 @@
Menu *m = *pm;
MenuStyle *ms = *pms;
+ /* Hide any menus currently up */
+ if (MenusActive())
+ MenusHide();
+
if (!ms)
{
ms = FindItem(style, 0, LIST_FINDBY_NAME, LIST_TYPE_MENU_STYLE);
@@ -1181,7 +1168,7 @@
return Mode_menus.current_depth;
}
-void
+static void
MenusHide(void)
{
int i;
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
