Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c borders.c ewmh.c
Log Message:
Move KillEwin code back where it belongs.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -3 -r1.244 -r1.245
--- E.h 9 Apr 2004 13:45:59 -0000 1.244
+++ E.h 10 Apr 2004 10:43:54 -0000 1.245
@@ -1653,7 +1653,6 @@
#define EWIN_CHANGE_DESKTOP (1<<3)
#define EWIN_CHANGE_LAYER (1<<4)
-void KillEwin(EWin * ewin, int nogroup);
void EwinRefresh(EWin * ewin);
void EwinUpdateAfterMoveResize(EWin * ewin, int resize);
void ResizeEwin(EWin * ewin, int w, int h);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -3 -r1.152 -r1.153
--- actions.c 9 Apr 2004 12:59:54 -0000 1.152
+++ actions.c 10 Apr 2004 10:43:55 -0000 1.153
@@ -1401,22 +1401,44 @@
edummy = NULL;
}
+static void
+DoKill(EWin * ewin, const void *params __UNUSED__, int nogroup)
+{
+ EWin **gwins;
+ int num, num_groups, i, j;
+
+ if (!ewin)
+ EDBUG_RETURN_;
+
+ gwins = ListWinGroupMembersForEwin(ewin, ACTION_KILL, nogroup, &num);
+ for (i = 0; i < num; i++)
+ {
+ num_groups = gwins[i]->num_groups;
+ for (j = 0; j < num_groups; j++)
+ RemoveEwinFromGroup(gwins[i], gwins[i]->groups[0]);
+ ICCCM_Delete(gwins[i]);
+ SoundPlay("SOUND_WINDOW_CLOSE");
+ }
+ if (gwins)
+ Efree(gwins);
+
+ EDBUG_RETURN_;
+}
+
static int
doKill(EWin * ewin, const void *params)
{
EDBUG(6, "doKill");
- KillEwin(ewin, 0);
+ DoKill(ewin, params, 0);
EDBUG_RETURN(0);
- params = NULL;
}
static int
doKillNoGroup(EWin * ewin, const void *params)
{
EDBUG(6, "doKillNoGroup");
- KillEwin(ewin, 1);
+ DoKill(ewin, params, 1);
EDBUG_RETURN(0);
- params = NULL;
}
static int
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- borders.c 9 Apr 2004 13:45:59 -0000 1.164
+++ borders.c 10 Apr 2004 10:43:55 -0000 1.165
@@ -30,31 +30,6 @@
EWin *AdoptInternal(Window win, Border * border, int type);
void
-KillEwin(EWin * ewin, int nogroup)
-{
- EWin **gwins;
- int num, num_groups, i, j;
-
- if (!ewin)
- EDBUG_RETURN_;
- gwins = ListWinGroupMembersForEwin(ewin, ACTION_KILL, nogroup, &num);
- if (gwins)
- {
- for (i = 0; i < num; i++)
- {
- num_groups = gwins[i]->num_groups;
- for (j = 0; j < num_groups; j++)
- RemoveEwinFromGroup(gwins[i], gwins[i]->groups[0]);
- ICCCM_Delete(gwins[i]);
- SoundPlay("SOUND_WINDOW_CLOSE");
- }
- Efree(gwins);
- }
- EDBUG_RETURN_;
-
-}
-
-void
DetermineEwinFloat(EWin * ewin, int dx, int dy)
{
char dofloat = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ewmh.c 8 Apr 2004 12:54:45 -0000 1.43
+++ ewmh.c 10 Apr 2004 10:43:55 -0000 1.44
@@ -743,7 +743,7 @@
}
else if (event->message_type == _NET_CLOSE_WINDOW)
{
- KillEwin(ewin, 0);
+ ActionsCall(ACTION_KILL, ewin, NULL);
}
else if (event->message_type == _NET_WM_DESKTOP)
{
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
