Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h icccm.c borders.c
Log Message:
Trivial cleanups of ICCCM_Adopt... functions.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- E.h 12 Jul 2003 07:52:03 -0000 1.126
+++ E.h 12 Jul 2003 08:22:57 -0000 1.127
@@ -2051,8 +2051,8 @@
void ICCCM_DeIconify(EWin * ewin);
void ICCCM_MatchSize(EWin * ewin);
void ICCCM_Configure(EWin * ewin);
-void ICCCM_AdoptStart(EWin * ewin, Window win);
-void ICCCM_Adopt(EWin * ewin, Window win);
+void ICCCM_AdoptStart(EWin * ewin);
+void ICCCM_Adopt(EWin * ewin);
void ICCCM_Withdraw(EWin * ewin);
void ICCCM_Cmap(EWin * ewin);
void ICCCM_Focus(EWin * ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icccm.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- icccm.c 12 Jul 2003 07:57:41 -0000 1.36
+++ icccm.c 12 Jul 2003 08:22:58 -0000 1.37
@@ -396,28 +396,27 @@
}
void
-ICCCM_AdoptStart(EWin * ewin, Window win)
+ICCCM_AdoptStart(EWin * ewin)
{
+ Window win = ewin->client.win;
+
EDBUG(6, "ICCCM_AdoptStart");
if (!ewin->internal)
- {
- XAddToSaveSet(disp, win);
- }
+ XAddToSaveSet(disp, win);
EDBUG_RETURN_;
}
void
-ICCCM_Adopt(EWin * ewin, Window win)
+ICCCM_Adopt(EWin * ewin)
{
static Atom a = 0;
+ Window win = ewin->client.win;
unsigned long c[2];
XWindowAttributes att;
EDBUG(6, "ICCCM_Adopt");
if (!ewin->internal)
- {
- XSetWindowBorderWidth(disp, win, 0);
- }
+ XSetWindowBorderWidth(disp, win, 0);
EReparentWindow(disp, win, ewin->win_container, 0, 0);
XGetWindowAttributes(disp, win, &att);
XSelectInput(disp, win,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- borders.c 22 May 2003 19:19:38 -0000 1.95
+++ borders.c 12 Jul 2003 08:22:58 -0000 1.96
@@ -1264,7 +1264,7 @@
GrabX();
ewin = CreateEwin();
ewin->client.win = win;
- ICCCM_AdoptStart(ewin, win);
+ ICCCM_AdoptStart(ewin);
ICCCM_GetTitle(ewin, 0);
ICCCM_GetHints(ewin, 0);
ICCCM_GetInfo(ewin, 0);
@@ -1286,7 +1286,7 @@
SetEwinToBorder(ewin, b);
ICCCM_MatchSize(ewin);
- ICCCM_Adopt(ewin, win);
+ ICCCM_Adopt(ewin);
HintsSetWindowState(ewin);
UngrabX();
if (ewin->shaded)
@@ -1329,7 +1329,7 @@
break;
}
- ICCCM_AdoptStart(ewin, win);
+ ICCCM_AdoptStart(ewin);
ICCCM_GetTitle(ewin, 0);
ICCCM_GetInfo(ewin, 0);
ICCCM_GetShapeInfo(ewin);
@@ -1368,7 +1368,7 @@
SetEwinToBorder(ewin, b);
ICCCM_MatchSize(ewin);
- ICCCM_Adopt(ewin, win);
+ ICCCM_Adopt(ewin);
HintsSetWindowState(ewin);
UngrabX();
if (ewin->shaded)
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
