Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
backgrounds.c eobj.c ewin-ops.c ewins.c slideout.c startup.c
Log Message:
Cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- backgrounds.c 15 Apr 2005 23:59:58 -0000 1.24
+++ backgrounds.c 23 Apr 2005 08:07:25 -0000 1.25
@@ -1120,13 +1120,7 @@
char s[4096];
Esnprintf(s, sizeof(s), "%s.backgrounds", EGetSavePrefix());
- if (ConfigFileLoad(s, NULL, ConfigFileRead, 0))
- {
- /* FIXME - Keep around a bit, and then remove */
- Esnprintf(s, sizeof(s), "%s.misc", EGetSavePrefix());
- Eprintf("Fallback - loading %s\n", s);
- ConfigFileLoad(s, NULL, ConfigFileRead, 0);
- }
+ ConfigFileLoad(s, NULL, ConfigFileRead, 0);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- eobj.c 23 Apr 2005 07:31:15 -0000 1.21
+++ eobj.c 23 Apr 2005 08:07:26 -0000 1.22
@@ -385,7 +385,6 @@
x = ((fx * (1024 - k)) + (tx * k)) >> 10;
y = ((fy * (1024 - k)) + (ty * k)) >> 10;
EobjMove(eo, x, y);
- ecore_x_sync();
k = ETimedLoopNext();
}
@@ -425,7 +424,6 @@
y = ((xy[i].y * (1024 - k)) + ((xy[i].y + dy) * k)) >> 10;
EobjMove(peo[i], x, y);
}
- ecore_x_sync();
k = ETimedLoopNext();
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewin-ops.c 20 Apr 2005 22:49:15 -0000 1.23
+++ ewin-ops.c 23 Apr 2005 08:07:26 -0000 1.24
@@ -111,13 +111,12 @@
tmpx = x;
tmpy = y;
if (Conf.slidemode == 0)
- EMoveWindow(EoGetWin(ewin), tmpx, tmpy);
+ EoMove(ewin, tmpx, tmpy);
else
DrawEwinShape(ewin, Conf.slidemode, tmpx, tmpy,
ewin->client.w, ewin->client.h, firstlast);
if (firstlast == 0)
firstlast = 1;
- ecore_x_sync();
k = ETimedLoopNext();
}
@@ -166,12 +165,11 @@
tmpw = ewin[i]->client.w;
tmph = ewin[i]->client.h;
if (ewin[i]->type == EWIN_TYPE_MENU)
- EMoveWindow(EoGetWin(ewin[i]), tmpx, tmpy);
+ EoMove(ewin[i], tmpx, tmpy);
else
DrawEwinShape(ewin[i], 0, tmpx, tmpy, tmpw, tmph, firstlast);
if (firstlast == 0)
firstlast = 1;
- ecore_x_sync();
}
/* We may loop faster here than originally intended */
k = ETimedLoopNext();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewins.c 23 Apr 2005 07:31:16 -0000 1.45
+++ ewins.c 23 Apr 2005 08:07:27 -0000 1.46
@@ -1920,46 +1920,6 @@
EwinEventVisibility(ewin, ev->xvisibility.state);
break;
-#if 0 /* FIXME - Remove? */
- case DestroyNotify:
- EwinEventDestroy(ewin);
- break;
- case UnmapNotify:
-#if 0
- if (ewin->state == EWIN_STATE_NEW)
- {
- Eprintf("EwinEventUnmap %#lx: Ignoring bogus Unmap event\n",
- ewin->client.win);
- break;
- }
-#endif
- EwinEventUnmap(ewin);
- break;
- case MapNotify:
- EwinEventMap(ewin);
- break;
- case ReparentNotify:
- /* Check if window parent hasn't changed already (compress?) */
- if (WinGetParent(ev->xreparent.window) != ev->xreparent.parent)
- break;
- if (ev->xreparent.parent == VRoot.win)
- EwinEventDestroy(ewin);
- break;
-#endif
-
-#if 0
- case ConfigureRequest:
- if (ev->xconfigurerequest.window == ewin->client.win)
- EwinEventConfigureRequest(ewin, ev);
- break;
- case ResizeRequest:
- if (ev->xresizerequest.window == ewin->client.win)
- EwinEventResizeRequest(ewin, ev);
- break;
- case CirculateRequest:
- EwinEventCirculateRequest(ewin, ev);
- break;
-#endif
case PropertyNotify:
EwinEventPropertyNotify(ewin, ev);
break;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/slideout.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- slideout.c 19 Mar 2005 16:40:16 -0000 1.27
+++ slideout.c 23 Apr 2005 08:07:28 -0000 1.28
@@ -53,7 +53,6 @@
w = ((fw * (1024 - k)) + (tw * k)) >> 10;
h = ((fh * (1024 - k)) + (th * k)) >> 10;
EMoveResizeWindow(win, x, y, w, h);
- ecore_x_sync();
k = ETimedLoopNext();
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- startup.c 17 Apr 2005 13:58:08 -0000 1.53
+++ startup.c 23 Apr 2005 08:07:32 -0000 1.54
@@ -138,7 +138,6 @@
EobjMove(init_win1, -x - xOffset, -y - yOffset);
EobjMove(init_win2, x + xOffset, y + yOffset);
- ecore_x_sync();
k = ETimedLoopNext();
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
