Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c desktops.c edge.c evhandlers.c globals.c icccm.c
ipc.c menus.c pager.c
Log Message:
Enable showing some menu info for debug (+tidy up some menu state stuff).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -3 -r1.315 -r1.316
--- E.h 5 Aug 2004 23:08:33 -0000 1.315
+++ E.h 7 Aug 2004 21:00:08 -0000 1.316
@@ -1211,6 +1211,14 @@
} grabs;
struct
{
+ int current_depth;
+ Menu *list[256];
+ char clicked;
+ Window cover_win;
+ Window win_covered;
+ } menus;
+ struct
+ {
char master; /* We are the master E */
char single; /* No slaves */
char window; /* Running in virtual root window */
@@ -1254,11 +1262,6 @@
Colormap current_cmap;
Slideout *slideout;
Window context_win;
- char cur_menu_mode;
- int cur_menu_depth;
- Menu *cur_menu[256];
- Window menu_cover_win;
- Window menu_win_covered;
#if 1 /* Should be removed */
int context_w, context_h;
#endif
@@ -2325,6 +2328,7 @@
/* menus.c */
void MenusInit(void);
void MenusHide(void);
+int MenusActive(void);
MenuStyle *MenuStyleCreate(void);
Menu *MenuCreate(const char *name);
void MenuDestroy(Menu * m);
@@ -2801,7 +2805,6 @@
extern char themepath[FILEPATH_LEN_MAX];
extern char no_overwrite;
-extern char clickmenu;
extern int child_count;
extern pid_t *e_children;
extern int numlock_mask;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- actions.c 26 Jul 2004 18:54:49 -0000 1.174
+++ actions.c 7 Aug 2004 21:00:08 -0000 1.175
@@ -581,7 +581,7 @@
if (!params)
EDBUG_RETURN(0);
- if (Mode.cur_menu_depth > 0)
+ if (MenusActive())
EDBUG_RETURN(0);
#if 0 /* FIXME: Incorrect placement if in deskslide */
@@ -613,7 +613,7 @@
#endif
if (Mode.button)
- clickmenu = 1;
+ Mode.menus.clicked = 1;
sscanf((char *)params, "%1000s %1000s", s, s2);
if (!strcmp(s, "deskmenu"))
@@ -640,11 +640,11 @@
if (((ewin) && (ewin->win == Mode.context_win))
|| (ewin = FindEwinByChildren(Mode.context_win)))
{
- if ((ewin) && (Mode.cur_menu_depth > 0) && (Mode.cur_menu[0]))
- ewin->shownmenu = MenuWindow(Mode.cur_menu[0]);
+ if ((ewin) && (Mode.menus.current_depth > 0) && (Mode.menus.list[0]))
+ ewin->shownmenu = MenuWindow(Mode.menus.list[0]);
}
- if (Mode.cur_menu_depth == 0)
+ if (!MenusActive())
EDBUG_RETURN(0);
EDBUG_RETURN(1);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- desktops.c 3 Aug 2004 19:35:37 -0000 1.96
+++ desktops.c 7 Aug 2004 21:00:08 -0000 1.97
@@ -1140,8 +1140,8 @@
continue;
_APPEND_TO_WIN_LIST(ewin->win);
- if (ewin->win == Mode.menu_win_covered)
- _APPEND_TO_WIN_LIST(Mode.menu_cover_win);
+ if (ewin->win == Mode.menus.win_covered)
+ _APPEND_TO_WIN_LIST(Mode.menus.cover_win);
}
/* Non-sticky, "below" buttons */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/edge.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edge.c 29 Jun 2004 13:19:23 -0000 1.7
+++ edge.c 7 Aug 2004 21:00:08 -0000 1.8
@@ -32,7 +32,7 @@
int ax, ay, aw, ah, dx, dy, dax, day;
EWin *ewin;
- if (Mode.cur_menu_mode > 0)
+ if (MenusActive())
return;
if (!Conf.edge_flip_resistance)
return;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -3 -r1.173 -r1.174
--- evhandlers.c 15 Jul 2004 23:31:01 -0000 1.173
+++ evhandlers.c 7 Aug 2004 21:00:08 -0000 1.174
@@ -151,7 +151,7 @@
if (Mode.mode != MODE_NONE)
EDBUG_RETURN_;
- if ((Mode.cur_menu_mode) && (!clickmenu))
+ if (MenusActive() && (!Mode.menus.clicked))
{
unsigned int bmask = 0, evmask;
@@ -169,7 +169,7 @@
else if (ev->xbutton.button == 5)
bmask = Button5Mask;
if (bmask != evmask)
- clickmenu = 1;
+ Mode.menus.clicked = 1;
else
{
EDBUG_RETURN_;
@@ -221,7 +221,7 @@
if (double_click)
ev->xbutton.time = 0;
- if ( /*!clickmenu && */ BordersEventMouseDown(ev))
+ if ( /*!Mode.menus.clicked && */ BordersEventMouseDown(ev))
goto done;
if (ButtonsEventMouseDown(ev))
@@ -304,13 +304,13 @@
Mode.context_win = Mode.last_bpress;
if ((((float)(ev->xbutton.time - Mode.last_time) / 1000) < 0.5)
- && (Mode.cur_menu_depth > 0) && (!clickmenu))
+ && (MenusActive()) && (!Mode.menus.clicked))
{
- clickmenu = 1;
+ Mode.menus.clicked = 1;
Mode.justclicked = 1;
}
- if ( /*!clickmenu && */ BordersEventMouseUp(ev))
+ if ( /*!Mode.menus.clicked && */ BordersEventMouseUp(ev))
goto done;
if (Mode.action_inhibit)
@@ -380,7 +380,7 @@
ActionsHandleMotion();
#define SCROLL_RATIO 2/3
- if (((Mode.cur_menu_mode) || (clickmenu)) && (Mode.cur_menu_depth > 0))
+ if ((MenusActive() || (Mode.menus.clicked)))
{
int i, offx = 0, offy = 0, xdist = 0, ydist = 0;
EWin *ewin;
@@ -428,7 +428,7 @@
menu_scroll_dist = 13;
}
- if (Mode.cur_menu_depth > 0)
+ if (Mode.menus.current_depth > 0)
{
int x1, y1, x2, y2;
@@ -438,11 +438,11 @@
y2 = y_org - 1;
/* work out the minimum and maximum extents of our */
/* currently active menus */
- for (i = 0; i < Mode.cur_menu_depth; i++)
+ for (i = 0; i < Mode.menus.current_depth; i++)
{
- if (Mode.cur_menu[i])
+ if (Mode.menus.list[i])
{
- ewin = FindEwinByMenu(Mode.cur_menu[i]);
+ ewin = FindEwinByMenu(Mode.menus.list[i]);
if (ewin)
{
if (ewin->x < x1)
@@ -500,19 +500,19 @@
if (xdist > my_height)
xdist = my_height * SCROLL_RATIO;
- if (Mode.cur_menu_depth)
+ if (Mode.menus.current_depth)
{
#ifdef HAS_XINERAMA
- ewin = FindEwinByMenu(Mode.cur_menu[0]);
+ ewin = FindEwinByMenu(Mode.menus.list[0]);
if (ewin->head == head_num)
{
#endif
- for (i = 0; i < Mode.cur_menu_depth; i++)
+ for (i = 0; i < Mode.menus.current_depth; i++)
{
menus[i] = NULL;
- if (Mode.cur_menu[i])
+ if (Mode.menus.list[i])
{
- ewin = FindEwinByMenu(Mode.cur_menu[i]);
+ ewin = FindEwinByMenu(Mode.menus.list[i]);
if (ewin)
{
menus[i] = ewin;
@@ -524,7 +524,8 @@
}
}
SlideEwinsTo(menus, fx, fy, tx, ty,
- Mode.cur_menu_depth, Conf.shadespeed);
+ Mode.menus.current_depth,
+ Conf.shadespeed);
if (((xdist != 0) || (ydist != 0))
&& (Conf.warpmenus))
XWarpPointer(disp, None, None, 0, 0, 0, 0, xdist,
@@ -568,7 +569,7 @@
if (MenusEventMouseIn(ev))
goto done;
- if ( /*!clickmenu && */ BordersEventMouseIn(ev))
+ if ( /*!Mode.menus.clicked && */ BordersEventMouseIn(ev))
goto done;
if (ButtonsEventMouseIn(ev))
@@ -604,7 +605,7 @@
if (MenusEventMouseOut(ev))
goto done;
- if ( /*!clickmenu && */ BordersEventMouseOut(ev))
+ if ( /*!Mode.menus.clicked && */ BordersEventMouseOut(ev))
goto done;
if (ButtonsEventMouseOut(ev))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/globals.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- globals.c 25 Jul 2004 09:34:43 -0000 1.39
+++ globals.c 7 Aug 2004 21:00:09 -0000 1.40
@@ -42,7 +42,6 @@
char themepath[FILEPATH_LEN_MAX];
char no_overwrite = 0;
-char clickmenu = 0;
int child_count = 0;
pid_t *e_children = NULL;
int numlock_mask = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icccm.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- icccm.c 30 Jul 2004 23:28:42 -0000 1.77
+++ icccm.c 7 Aug 2004 21:00:09 -0000 1.78
@@ -443,7 +443,7 @@
EDBUG_RETURN_;
}
- if (Mode.cur_menu_mode)
+ if (MenusActive())
EDBUG_RETURN_;
ICCCM_GetColormap(ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -3 -r1.175 -r1.176
--- ipc.c 5 Aug 2004 23:08:34 -0000 1.175
+++ ipc.c 7 Aug 2004 21:00:09 -0000 1.176
@@ -5844,10 +5844,10 @@
IpcPrintf("stuff:\n");
if (Mode.focuswin)
- IpcPrintf(" mode.focuswin - %#lx\n", Mode.focuswin->client.win);
+ IpcPrintf("Focus - win=%#lx\n", Mode.focuswin->client.win);
- if (Mode.cur_menu_mode)
- IpcPrintf(" cur_menu_mode is set\n");
+ IpcPrintf("Menus - depthe=%d, clicked=%d\n",
+ Mode.menus.current_depth, Mode.menus.clicked);
IpcPrintf("Pointer grab on=%d win=%#lx\n",
Mode.grabs.pointer_grab_active, Mode.grabs.pointer_grab_window);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -3 -r1.148 -r1.149
--- menus.c 2 Aug 2004 18:52:51 -0000 1.148
+++ menus.c 7 Aug 2004 21:00:09 -0000 1.149
@@ -388,7 +388,7 @@
}
m->shown = 1;
- if (Mode.cur_menu_depth == 0)
+ if (Mode.menus.current_depth == 0)
{
XSync(disp, False);
GrabKeyboard(m->win);
@@ -1488,56 +1488,6 @@
fclose(f);
}
-#if 0 /* We travelled up the tree. Why? Leaving this around
for now. */
-static void
-FileMenuUpdate(int val, void *data)
-{
- Menu *m, *mm;
- time_t lastmod = 0;
- char s[4096];
-
- m = (Menu *) data;
- if (!m)
- return;
- if (!FindItem((char *)m, m->win, LIST_FINDBY_POINTER, LIST_TYPE_MENU))
- return;
- /* if the menu is up dont update */
- if (((Mode.cur_menu_mode) || (clickmenu)) && (Mode.cur_menu_depth > 0))
- {
- Esnprintf(s, sizeof(s), "__.%s", m->name);
- DoIn(s, 2.0, FileMenuUpdate, 0, m);
- return;
- }
- mm = m;
- if (m->ref_menu)
- mm = m->ref_menu;
- if (!exists(m->data))
- {
- MenuHide(m);
- MenuEmpty(m);
- return;
- }
- if (m->data)
- lastmod = moddate(m->data);
- if (lastmod > m->last_change)
- {
- m->last_change = lastmod;
- if (m == mm)
- {
- Esnprintf(s, sizeof(s), "__.%s", m->name);
- DoIn(s, 2.0, FileMenuUpdate, 0, m);
- }
- MenuEmpty(mm);
- FillFlatFileMenu(mm, mm->style, mm->name, mm->data, mm);
- MenuRepack(mm);
- return;
- }
- Esnprintf(s, sizeof(s), "__.%s", m->name);
- DoIn(s, 2.0, FileMenuUpdate, 0, m);
- val = 0;
-}
-#else
-
static void
FileMenuUpdate(int val __UNUSED__, void *data)
{
@@ -1553,7 +1503,8 @@
return;
/* if the menu is up dont update */
- if (((Mode.cur_menu_mode) || (clickmenu)) && (Mode.cur_menu_depth > 0))
+ if ((MenusActive() || (Mode.menus.clicked))
+ && (Mode.menus.current_depth > 0))
goto done;
if (!exists(m->data))
@@ -1577,7 +1528,6 @@
Esnprintf(s, sizeof(s), "__.%s", m->name);
DoIn(s, 5.0, FileMenuUpdate, 0, m);
}
-#endif
Menu *
MenuCreateFromGnome(const char *name, MenuStyle * ms, const char *dir)
@@ -1947,33 +1897,33 @@
EWin *ewin;
ewin = FindEwinByMenu(m);
- if ((ewin) && (!Mode.menu_cover_win))
+ if ((ewin) && (!Mode.menus.cover_win))
{
Window parent;
Window wl[2];
parent = desks.desk[ewin->desktop].win;
- Mode.menu_cover_win =
+ Mode.menus.cover_win =
ECreateEventWindow(parent, 0, 0, VRoot.w, VRoot.h);
- Mode.menu_win_covered = ewin->win;
- wl[0] = Mode.menu_win_covered;
- wl[1] = Mode.menu_cover_win;
- XSelectInput(disp, Mode.menu_cover_win,
+ Mode.menus.win_covered = ewin->win;
+ wl[0] = Mode.menus.win_covered;
+ wl[1] = Mode.menus.cover_win;
+ XSelectInput(disp, Mode.menus.cover_win,
ButtonPressMask | ButtonReleaseMask | EnterWindowMask |
LeaveWindowMask);
XRestackWindows(disp, wl, 2);
- EMapWindow(disp, Mode.menu_cover_win);
+ EMapWindow(disp, Mode.menus.cover_win);
}
}
void
MenuHideMasker(void)
{
- if (Mode.menu_cover_win)
+ if (Mode.menus.cover_win)
{
- EDestroyWindow(disp, Mode.menu_cover_win);
- Mode.menu_cover_win = 0;
- Mode.menu_win_covered = 0;
+ EDestroyWindow(disp, Mode.menus.cover_win);
+ Mode.menus.cover_win = 0;
+ Mode.menus.win_covered = 0;
}
}
@@ -1987,19 +1937,18 @@
m = FindItem(name, 0, LIST_FINDBY_NAME, LIST_TYPE_MENU);
if (m)
{
- Mode.cur_menu_mode = 1;
XUngrabPointer(disp, CurrentTime);
if (!FindEwinByMenu(m)) /* Don't show if already shown */
MenuShow(m, 0);
- Mode.cur_menu[0] = m;
- Mode.cur_menu_depth = 1;
+ Mode.menus.list[0] = m;
+ Mode.menus.current_depth = 1;
MenuShowMasker(m);
m->ref_count++;
}
else
{
- Mode.cur_menu[0] = NULL;
- Mode.cur_menu_depth = 0;
+ Mode.menus.list[0] = NULL;
+ Mode.menus.current_depth = 0;
MenuHideMasker();
}
@@ -2049,11 +1998,11 @@
{
MenuHide(m);
ok = 0;
- for (i = 0; i < Mode.cur_menu_depth; i++)
+ for (i = 0; i < Mode.menus.current_depth; i++)
{
if (ok)
- MenuHide(Mode.cur_menu[i]);
- if (Mode.cur_menu[i] == m)
+ MenuHide(Mode.menus.list[i]);
+ if (Mode.menus.list[i] == m)
ok = 1;
}
MenuHideMasker();
@@ -2115,8 +2064,8 @@
MoveEwin(ewin, lx, ly);
ShowEwin(ewin);
}
- Mode.cur_menu[0] = m;
- Mode.cur_menu_depth = 1;
+ Mode.menus.list[0] = m;
+ Mode.menus.current_depth = 1;
MenuShowMasker(m);
}
@@ -2144,21 +2093,19 @@
*pms = ms;
}
- Mode.cur_menu_mode = 1;
-
*pm = m = RefreshInternalMenu(m, ms, mcf);
if (m)
{
if (!FindEwinByMenu(m))
MenuShow(m, 0);
- Mode.cur_menu[0] = m;
- Mode.cur_menu_depth = 1;
+ Mode.menus.list[0] = m;
+ Mode.menus.current_depth = 1;
MenuShowMasker(m);
}
else
{
- Mode.cur_menu[0] = NULL;
- Mode.cur_menu_depth = 0;
+ Mode.menus.list[0] = NULL;
+ Mode.menus.current_depth = 0;
MenuHideMasker();
}
@@ -2201,8 +2148,8 @@
MoveEwin(ewin, lx, ly);
ShowEwin(ewin);
}
- Mode.cur_menu[0] = task_menu[desk];
- Mode.cur_menu_depth = 1;
+ Mode.menus.list[0] = task_menu[desk];
+ Mode.menus.current_depth = 1;
MenuShowMasker(task_menu[desk]);
}
EDBUG_RETURN(task_menu[desk]);
@@ -2254,15 +2201,14 @@
{
int i;
- for (i = 0; i < Mode.cur_menu_depth; i++)
+ for (i = 0; i < Mode.menus.current_depth; i++)
{
- if (!Mode.cur_menu[i]->stuck)
- MenuHide(Mode.cur_menu[i]);
+ if (!Mode.menus.list[i]->stuck)
+ MenuHide(Mode.menus.list[i]);
}
MenuHideMasker();
- Mode.cur_menu_depth = 0;
- Mode.cur_menu_mode = 0;
- clickmenu = 0;
+ Mode.menus.current_depth = 0;
+ Mode.menus.clicked = 0;
#if 0
/* If all done properly this shouldn't be necessary... */
@@ -2272,6 +2218,12 @@
#endif
}
+int
+MenusActive(void)
+{
+ return Mode.menus.current_depth;
+}
+
Window
MenuWindow(Menu * m)
{
@@ -2421,8 +2373,6 @@
if (mi == NULL)
goto done;
- Mode.cur_menu_mode = 1;
-
mi->state = STATE_CLICKED;
MenuDrawItem(m, mi, 1);
@@ -2432,8 +2382,8 @@
unsigned int mw, mh;
EWin *ewin2;
- Mode.cur_menu[0] = m;
- Mode.cur_menu_depth = 1;
+ Mode.menus.list[0] = m;
+ Mode.menus.current_depth = 1;
MenuShowMasker(m);
XUngrabPointer(disp, CurrentTime);
ewin = FindEwinByMenu(m);
@@ -2454,7 +2404,7 @@
ShowEwin(ewin2);
if (Conf.menuslide)
EwinUnShade(ewin2);
- Mode.cur_menu[Mode.cur_menu_depth++] = mi->child;
+ Mode.menus.list[Mode.menus.current_depth++] = mi->child;
}
#else
ewin2 = FindEwinByMenu(mi->child);
@@ -2489,7 +2439,7 @@
}
}
- if ((Mode.cur_menu_mode) && (!clickmenu))
+ if (MenusActive() && (!Mode.menus.clicked))
{
if (!m)
{
@@ -2518,7 +2468,7 @@
return 1;
}
- if ((Mode.cur_menu_mode) && (!Mode.justclicked))
+ if (MenusActive() && (!Mode.justclicked))
{
MenusHide();
return 1;
@@ -2543,9 +2493,9 @@
event_mask = (on) ? MENU_ITEM_EVENT_MASK : 0;
- for (i = 0; i < Mode.cur_menu_depth; i++)
+ for (i = 0; i < Mode.menus.current_depth; i++)
{
- m = Mode.cur_menu[i];
+ m = Mode.menus.list[i];
if (!m)
continue;
@@ -2588,8 +2538,8 @@
if (Conf.menuslide)
EwinUnShade(ewin2);
- if (Mode.cur_menu[Mode.cur_menu_depth - 1] != mi->child)
- Mode.cur_menu[Mode.cur_menu_depth++] = mi->child;
+ if (Mode.menus.list[Mode.menus.current_depth - 1] != mi->child)
+ Mode.menus.list[Mode.menus.current_depth++] = mi->child;
if (Conf.menusonscreen)
{
@@ -2607,12 +2557,12 @@
ydist = VRoot.h - (ewin2->y + ewin2->h);
if ((xdist != 0) || (ydist != 0))
{
- for (i = 0; i < Mode.cur_menu_depth; i++)
+ for (i = 0; i < Mode.menus.current_depth; i++)
{
menus[i] = NULL;
- if (Mode.cur_menu[i])
+ if (Mode.menus.list[i])
{
- ewin = FindEwinByMenu(Mode.cur_menu[i]);
+ ewin = FindEwinByMenu(Mode.menus.list[i]);
if (ewin)
{
menus[i] = ewin;
@@ -2626,7 +2576,7 @@
/* Disable menu item events while sliding */
MenusSetEvents(0);
- SlideEwinsTo(menus, fx, fy, tx, ty, Mode.cur_menu_depth,
+ SlideEwinsTo(menus, fx, fy, tx, ty, Mode.menus.current_depth,
Conf.shadespeed);
MenusSetEvents(1);
@@ -2661,23 +2611,23 @@
RemoveTimerEvent("SUBMENU_SHOW");
- for (i = 0; i < Mode.cur_menu_depth; i++)
+ for (i = 0; i < Mode.menus.current_depth; i++)
{
- if (Mode.cur_menu[i] == m)
+ if (Mode.menus.list[i] == m)
{
if ((!mi->child) ||
- ((mi->child) && (Mode.cur_menu[i + 1] != mi->child)))
+ ((mi->child) && (Mode.menus.list[i + 1] != mi->child)))
{
- for (j = i + 1; j < Mode.cur_menu_depth; j++)
- MenuHide(Mode.cur_menu[j]);
- Mode.cur_menu_depth = i + 1;
- i = Mode.cur_menu_depth;
+ for (j = i + 1; j < Mode.menus.current_depth; j++)
+ MenuHide(Mode.menus.list[j]);
+ Mode.menus.current_depth = i + 1;
+ i = Mode.menus.current_depth;
break;
}
}
}
- if ((mi->child) && (!mi->child->shown) && (Mode.cur_menu_mode))
+ if ((mi->child) && (!mi->child->shown) && MenusActive())
{
EWin *ewin;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- pager.c 25 Jul 2004 09:34:43 -0000 1.103
+++ pager.c 7 Aug 2004 21:00:10 -0000 1.104
@@ -1021,7 +1021,7 @@
if (!Conf.pagers.title || (ewin == tt_ewin))
return;
- if (Mode.cur_menu_depth) /* Don't show Tooltip when menu is up */
+ if (MenusActive()) /* Don't show Tooltip when menu is up */
return;
tt = FindItem("PAGER", 0, LIST_FINDBY_NAME, LIST_TYPE_TOOLTIP);
@@ -1073,7 +1073,7 @@
char pq;
ImageClass *ic = NULL;
- if (Mode.cur_menu_depth) /* Don't show HiWin when menu is up */
+ if (MenusActive()) /* Don't show HiWin when menu is up */
return;
pq = Mode.queue_up;
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
