Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h borders.c evhandlers.c
Log Message:
Fixups after border code shuffle.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -3 -r1.181 -r1.182
--- E.h 13 Jan 2004 20:01:43 -0000 1.181
+++ E.h 16 Jan 2004 15:34:56 -0000 1.182
@@ -1767,6 +1767,7 @@
int BordersEventMouseUp(XEvent * ev);
int BordersEventMouseIn(XEvent * ev);
int BordersEventMouseOut(XEvent * ev);
+int BordersEventMouseOut2(XEvent * ev);
/* windowmatch.c functions */
WindowMatch *CreateWindowMatch(char *name);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- borders.c 12 Jan 2004 20:43:17 -0000 1.120
+++ borders.c 16 Jan 2004 15:34:56 -0000 1.121
@@ -3191,6 +3191,14 @@
}
}
+static void
+BorderWinpartEventLeave2(XEvent * ev, EWin * ewin, int j)
+{
+ ewin->bits[j].left = 0;
+ ewin->bits[j].state = STATE_NORMAL;
+ ChangeEwinWinpart(ewin, j);
+}
+
static int
BordersEvent(XEvent * ev, border_event_func_t * func)
{
@@ -3244,3 +3252,9 @@
{
return BordersEvent(ev, BorderWinpartEventLeave);
}
+
+int
+BordersEventMouseOut2(XEvent * ev)
+{
+ return BordersEvent(ev, BorderWinpartEventLeave2);
+}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -3 -r1.139 -r1.140
--- evhandlers.c 13 Jan 2004 20:01:44 -0000 1.139
+++ evhandlers.c 16 Jan 2004 15:34:57 -0000 1.140
@@ -1381,7 +1381,7 @@
if (double_click)
ev->xbutton.time = 0;
- if (!clickmenu && BordersEventMouseDown(ev))
+ if ( /*!clickmenu && */ BordersEventMouseDown(ev))
goto exit;
if (ButtonsEventMouseDown(ev))
@@ -1443,31 +1443,15 @@
pslideout = mode.slideout;
-#if 0 /* Do we need this? */
+ doActionEnd();
+
if ((last_bpress) && (last_bpress != win))
{
- ewin = FindEwinByChildren(last_bpress);
- if (ewin)
- {
- for (j = 0; j < ewin->border->num_winparts; j++)
- {
- if (last_bpress == ewin->bits[j].win)
- {
- if ((ewin->bits[j].state == STATE_CLICKED)
- && (!ewin->bits[j].left))
- ewin->bits[j].state = STATE_HILITED;
- else
- ewin->bits[j].state = STATE_NORMAL;
- ewin->bits[j].left = 0;
- ChangeEwinWinpart(ewin, j);
- break;
- }
- }
- }
+ ev->xbutton.window = last_bpress;
+ BordersEventMouseOut2(ev);
+ ev->xbutton.window = win;
}
-#endif
- doActionEnd();
if (mode.place)
{
mode.place = 0;
@@ -1494,7 +1478,7 @@
mode.justclicked = 1;
}
- if (!clickmenu && BordersEventMouseUp(ev))
+ if ( /*!clickmenu && */ BordersEventMouseUp(ev))
goto exit;
if (mode.action_inhibit)
@@ -1566,7 +1550,7 @@
if (MenusEventMouseIn(ev))
goto exit;
- if (!clickmenu && BordersEventMouseIn(ev))
+ if ( /*!clickmenu && */ BordersEventMouseIn(ev))
goto exit;
if (ButtonsEventMouseIn(ev))
@@ -1602,7 +1586,7 @@
ICCCM_Cmap(NULL);
- if (!clickmenu && BordersEventMouseOut(ev))
+ if ( /*!clickmenu && */ BordersEventMouseOut(ev))
goto exit;
if (ButtonsEventMouseOut(ev))
-------------------------------------------------------
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
