Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c borders.c menus.c pager.c
Log Message:
Aaargh - fix bad fixes (hopefully).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -3 -r1.186 -r1.187
--- E.h 20 Jan 2004 17:17:36 -0000 1.186
+++ E.h 21 Jan 2004 22:14:10 -0000 1.187
@@ -1738,6 +1738,7 @@
EWin *GetEwinPointerInClient(void);
EWin *GetFocusEwin(void);
EWin *GetContextEwin(void);
+void SetContextEwin(EWin * ewin);
void SlideEwinTo(EWin * ewin, int fx, int fy, int tx, int ty,
int speed);
void SlideEwinsTo(EWin ** ewin, int *fx, int *fy, int *tx,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -3 -r1.132 -r1.133
--- actions.c 20 Jan 2004 17:17:36 -0000 1.132
+++ actions.c 21 Jan 2004 22:14:10 -0000 1.133
@@ -370,13 +370,8 @@
if (af->need_ewin)
{
if (ewin == NULL)
- {
- if (params)
- ewin = FindItem(NULL, atoi((char *)params), LIST_FINDBY_ID,
- LIST_TYPE_EWIN);
- else
- ewin = GetContextEwin();
- }
+ ewin = GetContextEwin();
+
if (ewin == NULL)
return -1;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- borders.c 20 Jan 2004 17:17:36 -0000 1.125
+++ borders.c 21 Jan 2004 22:14:10 -0000 1.126
@@ -194,6 +194,15 @@
}
void
+SetContextEwin(EWin * ewin)
+{
+ EDBUG(4, "SetContextEwin");
+ if (!ewin || (!ewin->menu && !mode.cur_menu_mode))
+ mode.context_ewin = ewin;
+ EDBUG_RETURN_;
+}
+
+void
SlideEwinTo(EWin * ewin, int fx, int fy, int tx, int ty, int speed)
{
int k, spd, x, y, min, tmpx, tmpy, tmpw, tmph;
@@ -3086,6 +3095,7 @@
static void
BorderWinpartEventEnter(XEvent * ev, EWin * ewin, int j)
{
+ SetContextEwin(ewin);
if (ewin->bits[j].state == STATE_CLICKED)
ewin->bits[j].left = 0;
else
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- menus.c 20 Jan 2004 17:17:36 -0000 1.98
+++ menus.c 21 Jan 2004 22:14:11 -0000 1.99
@@ -2325,7 +2325,6 @@
if (clickmenu)
{
MenusHide();
- mode.context_ewin = NULL;
return 1;
}
}
@@ -2351,7 +2350,6 @@
&& (ewin->menu))
{
ewin->menu->stuck = 1;
- mode.context_ewin = ewin;
i = ewin->border->num_winparts;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- pager.c 19 Jan 2004 22:30:32 -0000 1.58
+++ pager.c 21 Jan 2004 22:14:11 -0000 1.59
@@ -874,7 +874,6 @@
static Menu *p_menu = NULL, *pw_menu = NULL;
MenuItem *mi;
EWin *ewin;
- char s[1024];
int ax, ay;
if (!conf.pagers.enable)
@@ -885,21 +884,25 @@
{
if (pw_menu)
MenuDestroy(pw_menu);
+
+ SetContextEwin(ewin);
+
pw_menu = MenuCreate("__DESK_WIN_MENU");
MenuAddTitle(pw_menu, _("Window Options"));
MenuAddStyle(pw_menu, "DEFAULT");
- Esnprintf(s, sizeof(s), "%i", (unsigned)ewin->client.win);
- mi = MenuItemCreate(_("Iconify"), NULL, ACTION_ICONIFY, s, NULL);
+ mi = MenuItemCreate(_("Iconify"), NULL, ACTION_ICONIFY, NULL, NULL);
MenuAddItem(pw_menu, mi);
- mi = MenuItemCreate(_("Close"), NULL, ACTION_KILL, s, NULL);
+ mi = MenuItemCreate(_("Close"), NULL, ACTION_KILL, NULL, NULL);
MenuAddItem(pw_menu, mi);
- mi = MenuItemCreate(_("Annihilate"), NULL, ACTION_KILL_NASTY, s, NULL);
+ mi =
+ MenuItemCreate(_("Annihilate"), NULL, ACTION_KILL_NASTY, NULL, NULL);
MenuAddItem(pw_menu, mi);
- mi = MenuItemCreate(_("Stick / Unstick"), NULL, ACTION_STICK, s, NULL);
+ mi =
+ MenuItemCreate(_("Stick / Unstick"), NULL, ACTION_STICK, NULL, NULL);
MenuAddItem(pw_menu, mi);
ActionsCall(ACTION_SHOW_MENU, NULL, "named __DESK_WIN_MENU");
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
