summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moreau <moreaus@gmail.com>2009-01-22 10:52:11 +0900
committerSam Spilsbury <Sam@XPS-SUSE.site>2009-01-22 10:52:11 +0900
commitc39a804b5aeb9106cd1914aa61f38dba52fe412b (patch)
treedeea1c4981b15bf4966d932538c8fb9bfc37c089
parent33de2c9ab42013766613422b4cfcade1808c2964 (diff)
downloadsimple-animations-c39a804b5aeb9106cd1914aa61f38dba52fe412b.tar.gz
simple-animations-c39a804b5aeb9106cd1914aa61f38dba52fe412b.tar.bz2
[PATCH] Global whitespace fixes
-rw-r--r--Makefile10
-rw-r--r--animationsim.c2
-rw-r--r--animationsim.h6
-rw-r--r--animationsim.xml.in28
-rw-r--r--expand-piecewise.c6
-rw-r--r--explode3d.c4
-rw-r--r--flyin.c4
-rw-r--r--sheet.c2
8 files changed, 31 insertions, 31 deletions
diff --git a/Makefile b/Makefile
index d9a07cf..7ef8a59 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
##
# plugin.info file contents
-#
+#
# PLUGIN = foo
# PKG_DEP = pango
# LDFLAGS_ADD = -lGLU
@@ -128,7 +128,7 @@ h-files := $(shell find -name '*.h' 2> /dev/null | grep -v "$(BUILDDIR)/" | s
h-files += $(bcop-target-hdr)
h-files += $(foreach file,$(COMPIZ_HEADERS) $(CHK_HEADERS),$(shell $(ECHO) -n "$(COMPIZ_INC)$(file)"))
-all-c-objs := $(addprefix $(BUILDDIR)/,$(c-objs))
+all-c-objs := $(addprefix $(BUILDDIR)/,$(c-objs))
all-c-objs += $(bcop-target-src:.c=.lo)
# additional files
@@ -238,7 +238,7 @@ $(BUILDDIR)/%_options.c: $(BUILDDIR)/%.xml
else \
$(ECHO) "bcop'ing $< -> $@"; \
fi
- @$(BCOP) --source=$@ $<
+ @$(BCOP) --source=$@ $<
@if [ '$(color)' != 'no' ]; then \
$(ECHO) -e "\r\033[0mbcop'ing : \033[34m$< -> $@\033[0m"; \
fi
@@ -352,7 +352,7 @@ clean:
@if [ '$(color)' != 'no' ]; then \
$(ECHO) -e "\r\033[0mremoving : \033[34m./$(BUILDDIR)\033[0m"; \
fi
-
+
install: $(DESTDIR) all
@if [ '$(color)' != 'no' ]; then \
@@ -448,7 +448,7 @@ install: $(DESTDIR) all
done \
fi
-uninstall:
+uninstall:
@if [ -e $(DESTDIR)/lib$(PLUGIN).so ]; then \
if [ '$(color)' != 'no' ]; then \
$(ECHO) -n -e "\033[0;1;5muninstall \033[0m: \033[0;31m$(DESTDIR)/lib$(PLUGIN).so\033[0m"; \
diff --git a/animationsim.c b/animationsim.c
index a52b83a..dc07344 100644
--- a/animationsim.c
+++ b/animationsim.c
@@ -65,7 +65,7 @@ static const CompMetadataOptionInfo animEgScreenOptionInfo[] = {
{ "bounce_number", "int", 0, 0, 0 },
{ "bounce_fade", "bool", 0, 0, 0 },
{ "flyin_direction", "int", 0, 0, 0 },
- { "flyin_direction_x", "float", 0, 0, 0 },
+ { "flyin_direction_x", "float", 0, 0, 0 },
{ "flyin_direction_y", "float", 0, 0, 0 },
{ "flyin_fade", "bool", 0, 0, 0 },
{ "flyin_distance", "float", 0, 0, 0 },
diff --git a/animationsim.h b/animationsim.h
index ad0a655..80c1d20 100644
--- a/animationsim.h
+++ b/animationsim.h
@@ -26,7 +26,7 @@ typedef enum
ANIMSIM_SCREEN_OPTION_BOUNCE_NUMBER,
ANIMSIM_SCREEN_OPTION_BOUNCE_FADE,
ANIMSIM_SCREEN_OPTION_FLYIN_DIRECTION,
- ANIMSIM_SCREEN_OPTION_FLYIN_DIRECTION_X,
+ ANIMSIM_SCREEN_OPTION_FLYIN_DIRECTION_X,
ANIMSIM_SCREEN_OPTION_FLYIN_DIRECTION_Y,
ANIMSIM_SCREEN_OPTION_FLYIN_FADE,
ANIMSIM_SCREEN_OPTION_FLYIN_DISTANCE,
@@ -201,7 +201,7 @@ fxBounceUpdateWindowTransform (CompWindow *w,
void
fxSheetsInitGrid (CompWindow *w,
- int *gridWidth,
+ int *gridWidth,
int *gridHeight);
Bool
@@ -230,7 +230,7 @@ fxExpandAnimProgress (CompWindow *w);
void
fxExpandUpdateWindowTransform (CompWindow *w,
CompTransform *wTransform);
-
+
/* expandPW.c */
Bool
diff --git a/animationsim.xml.in b/animationsim.xml.in
index b815c0b..7ea6404 100644
--- a/animationsim.xml.in
+++ b/animationsim.xml.in
@@ -45,19 +45,19 @@
<min>0</min>
<max>4</max>
</option>
- <option name="flyin_direction_x" type="float">
- <_short>UD Direction X</_short>
- <_long>Direction and Distance X for user defined fly in</_long>
- <default>0</default>
- <min>-1000</min>
- <max>1000</max>
- </option>
- <option name="flyin_direction_y" type="float">
- <_short>UD Direction Y</_short>
- <_long>Direction and Distance Y for user defined fly in</_long>
- <default>0</default>
- <min>-1000</min>
- <max>1000</max>
+ <option name="flyin_direction_x" type="float">
+ <_short>UD Direction X</_short>
+ <_long>Direction and Distance X for user defined fly in</_long>
+ <default>0</default>
+ <min>-1000</min>
+ <max>1000</max>
+ </option>
+ <option name="flyin_direction_y" type="float">
+ <_short>UD Direction Y</_short>
+ <_long>Direction and Distance Y for user defined fly in</_long>
+ <default>0</default>
+ <min>-1000</min>
+ <max>1000</max>
</option>
<option name="flyin_fade" type="bool">
<_short>Fade</_short>
@@ -208,6 +208,6 @@
<_name>Expand Piecewise</_name>
</restriction>
</extension>
-
+
</plugin>
</compiz>
diff --git a/expand-piecewise.c b/expand-piecewise.c
index 8a2ac4c..96c6fc3 100644
--- a/expand-piecewise.c
+++ b/expand-piecewise.c
@@ -59,7 +59,7 @@ applyExpandPWTransform (CompWindow *w)
float initialXScale = animGetI (w, ANIMSIM_SCREEN_OPTION_EXPANDPW_INITIAL_HORIZ) / (float) w->width;
float initialYScale = animGetI (w, ANIMSIM_SCREEN_OPTION_EXPANDPW_INITIAL_VERT) / (float) w->height;
-
+
// animation movement
matrixTranslate (transform, WIN_X (w) + WIN_W (w) / 2.0f,
WIN_Y (w) + WIN_H (w) / 2.0f,
@@ -70,7 +70,7 @@ applyExpandPWTransform (CompWindow *w)
float switchPointP;
float switchPointN;
float delay = animGetF (w, ANIMSIM_SCREEN_OPTION_EXPANDPW_DELAY);
-
+
if(animGetB (w, ANIMSIM_SCREEN_OPTION_EXPANDPW_HORIZ_FIRST))
{
switchPointP = w->width / (float) (w->width + w->height) + w->height / (float) (w->width + w->height) * delay;
@@ -87,7 +87,7 @@ applyExpandPWTransform (CompWindow *w)
if(switchPointP >= 1.0f) switchPointP = 1.0f - DELTA;
if(switchPointN <= 0.0f) switchPointN = 0.0f + DELTA;
xScale = initialXScale + (1.0f - initialXScale) * (forwardProgress > switchPointP ? (forwardProgress - switchPointP)/(1.0f-switchPointP) : 0.0f);
- yScale = initialYScale + (1.0f - initialYScale) * (forwardProgress < switchPointN ? 1.0f - (switchPointN - forwardProgress)/switchPointN : 1.0f);
+ yScale = initialYScale + (1.0f - initialYScale) * (forwardProgress < switchPointN ? 1.0f - (switchPointN - forwardProgress)/switchPointN : 1.0f);
}
matrixScale (transform, xScale, yScale, 0.0f);
diff --git a/explode3d.c b/explode3d.c
index da5d5d4..6e9006f 100644
--- a/explode3d.c
+++ b/explode3d.c
@@ -50,7 +50,7 @@ fxExplodeInit (CompWindow * w)
{
case PolygonTessRect:
if (!ad->animAddonFunc->tessellateIntoRectangles
- (w,
+ (w,
animGetI (w, ANIMEG_SCREEN_OPTION_EXPLODE_GRIDSIZE_X),
animGetI (w, ANIMEG_SCREEN_OPTION_EXPLODE_GRIDSIZE_Y),
animGetF (w, ANIMEG_SCREEN_OPTION_EXPLODE_THICKNESS)))
@@ -58,7 +58,7 @@ fxExplodeInit (CompWindow * w)
break;
case PolygonTessHex:
if (!ad->animAddonFunc->tessellateIntoHexagons
- (w,
+ (w,
animGetI (w, ANIMEG_SCREEN_OPTION_EXPLODE_GRIDSIZE_X),
animGetI (w, ANIMEG_SCREEN_OPTION_EXPLODE_GRIDSIZE_Y),
animGetF (w, ANIMEG_SCREEN_OPTION_EXPLODE_THICKNESS)))
diff --git a/flyin.c b/flyin.c
index 695f9c6..7320c49 100644
--- a/flyin.c
+++ b/flyin.c
@@ -78,8 +78,8 @@ applyFlyinTransform (CompWindow *w)
offsetY = 0;
break;
case 4:
- offsetX = animGetF (w, ANIMSIM_SCREEN_OPTION_FLYIN_DIRECTION_X);
- offsetY = animGetF (w, ANIMSIM_SCREEN_OPTION_FLYIN_DIRECTION_Y);
+ offsetX = animGetF (w, ANIMSIM_SCREEN_OPTION_FLYIN_DIRECTION_X);
+ offsetY = animGetF (w, ANIMSIM_SCREEN_OPTION_FLYIN_DIRECTION_Y);
break;
}
diff --git a/sheet.c b/sheet.c
index bf09bac..67403d5 100644
--- a/sheet.c
+++ b/sheet.c
@@ -282,7 +282,7 @@ fxSheetsModelStep (CompWindow *w, float time)
if (forwardProgress < preShapePhaseEnd)
object->position.x =
(1 - preShapeProgress) * origx + preShapeProgress * targetx;
- else
+ else
object->position.x = targetx;
if (object->position.y < iconFarEndY)