Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
fx.c
Log Message:
Fix FX.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/fx.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- fx.c 30 Oct 2005 19:40:49 -0000 1.57
+++ fx.c 6 Dec 2005 18:55:18 -0000 1.58
@@ -90,7 +90,7 @@
{
XGCValues gcv;
- fx_ripple_win = EoGetWin(DesksGetCurrent());
+ fx_ripple_win = DeskGetBackgroundWin(DesksGetCurrent());
fx_ripple_above =
ECreatePixmap(fx_ripple_win, VRoot.w, fx_ripple_waterh * 2,
@@ -105,10 +105,12 @@
FX_ripple_info();
}
+
if (fx_ripple_count == 0)
- XCopyArea(disp, fx_ripple_win, fx_ripple_above, gc, 0,
+ XCopyArea(disp, EoGetWin(DesksGetCurrent()), fx_ripple_above, gc, 0,
VRoot.h - (fx_ripple_waterh * 3), VRoot.w, fx_ripple_waterh * 2,
0, 0);
+
fx_ripple_count++;
if (fx_ripple_count > 32)
fx_ripple_count = 0;
@@ -259,18 +261,24 @@
}
}
}
- fx_raindrops_win = desks.desk[DesksGetCurrent()].win;
+
+ fx_raindrops_win = DeskGetBackgroundWin(DesksGetCurrent());
+
if (gc)
EFreeGC(gc);
if (gc1)
EFreeGC(gc1);
+
gcv.subwindow_mode = IncludeInferiors;
gc = ECreateGC(fx_raindrops_win, GCSubwindowMode, &gcv);
gc1 = ECreateGC(fx_raindrops_win, 0L, &gcv);
+
fx_raindrops_draw =
ECreatePixImg(fx_raindrops_win, fx_raindrop_size, fx_raindrop_size);
+
if (!fx_raindrops_draw)
return;
+
for (i = 0; i < fx_raindrops_number; i++)
{
fx_raindrops[i].buf =
@@ -283,6 +291,7 @@
return;
}
}
+
for (i = 0; i < fx_raindrops_number; i++)
{
fx_raindrops[i].count++;
@@ -412,6 +421,7 @@
fx_raindrop_size, False);
ESync();
}
+
DoIn("FX_RAINDROPS_TIMEOUT", (0.066 /*/ (float)fx_raindrops_number */ ),
FX_raindrops_timeout, 0, NULL);
}
@@ -524,7 +534,7 @@
{
XGCValues gcv;
- fx_wave_win = EoGetWin(DesksGetCurrent());
+ fx_wave_win = DeskGetBackgroundWin(DesksGetCurrent());
fx_wave_above =
ECreatePixmap(fx_wave_win, VRoot.w, FX_WAVE_WATERH * 2, VRoot.depth);
@@ -542,7 +552,7 @@
/* On the zero, grab the desktop again. */
if (fx_wave_count == 0)
{
- XCopyArea(disp, fx_wave_win, fx_wave_above, gc, 0,
+ XCopyArea(disp, EoGetWin(DesksGetCurrent()), fx_wave_above, gc, 0,
VRoot.h - (FX_WAVE_WATERH * 3), VRoot.w, FX_WAVE_WATERH * 2,
0, 0);
}
@@ -690,7 +700,7 @@
if (fx_imagespinner_win == None)
{
- fx_imagespinner_win = EoGetWin(DesksGetCurrent());
+ fx_imagespinner_win = DeskGetBackgroundWin(DesksGetCurrent());
FX_imagespinner_info();
}
@@ -741,7 +751,7 @@
static void
FX_ImageSpinner_Desk(void)
{
- fx_imagespinner_win = EoGetWin(DesksGetCurrent());
+ fx_imagespinner_win = DeskGetBackgroundWin(DesksGetCurrent());
}
static void
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
