This email list is read-only. Emails sent to this list will be discarded
----------------------------------
apple/apple.c | 45 ++++++++++++++++++++++---------
colortext/main.c | 60 +++++++++++++++++++++--------------------
squares/main.c | 68 +++++++++++++++++++++++++++++-----------------
squares/squares.desktop | 4 +-
4 files changed, 108 insertions(+), 69 deletions(-)
New commits:
commit b511204b43f6e956530a869bcf039a5d4809376b
Author: Felicia Decker <[EMAIL PROTECTED]>
Date: Wed Aug 13 11:36:01 2008 -0700
Fixed all warnings during make.
Changed window title and .desktop of Squares to reflect new name change.
Diff in this email is a maximum of 400 lines.
diff --git a/apple/apple.c b/apple/apple.c
index 0409a4d..d3ebef0 100644
--- a/apple/apple.c
+++ b/apple/apple.c
@@ -60,7 +60,6 @@ ClutterTimeline *timeline_rotation = NULL;
-
/**
Adds each actor (apple piece = square) to it's respective
ring/ellipse of the apple. Each ellipse's x coord of the
@@ -132,47 +131,59 @@ void add_to_ellipse_behaviour(ClutterTimeline
*timeline_rotation,
break;
case RING11:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 340, 565, 100, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 340, 565, 100, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING12:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 380, 540, 100, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 380, 540, 100, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING13:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 420, 500, 100, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 420, 500, 100, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING14:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 460, 440, 100, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 460, 440, 100, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING15:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 500, 370, 100, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 500, 370, 100, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING16:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 500, 300, 50, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 500, 300, 50, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING17:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 500, 210, 50, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 500, 210, 50, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case RING18:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 480, 110, 30, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 480, 110, 30, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
break;
case STEM:
- behaviour = clutter_behaviour_rotate_new(alpha, CLUTTER_Y_AXIS,
CLUTTER_ROTATE_CW, start_angle, start_angle);
+ behaviour = clutter_behaviour_rotate_new(alpha, CLUTTER_Y_AXIS,
+ CLUTTER_ROTATE_CW, start_angle, start_angle);
break;
default:
behaviour = clutter_behaviour_ellipse_new(
- alpha, ELLIPSE_X, 480, 110, 30, CLUTTER_ROTATE_CW, start_angle,
start_angle);
+ alpha, ELLIPSE_X, 480, 110, 30, CLUTTER_ROTATE_CW, start_angle,
+ start_angle);
}
clutter_behaviour_apply(behaviour, actor);
-
+ return;
}
+
+
/**
Sets up a zigzag path for the caterpillar to follow.
Also scales the caterpillar to start out small and
@@ -283,6 +294,7 @@ void setup_path(ClutterActor *actor, ClutterTimeline
*timeline)
}
+
/**
Initializes each apple piece/square to the correct color, size,
and opacity. The actor is added to the stage and added to a
@@ -458,6 +470,7 @@ void init_apples()
}
+
/**
Load image and return clutter actor
*/
@@ -490,6 +503,7 @@ ClutterActor *get_actor_from_image (const char *file_name)
}
+
/**
Loads the stem image from a file, sets the
position of the stem and adds the actor
@@ -509,6 +523,7 @@ int init_stem()
}
+
/**
Loads the leaf image from a file, sets
the position of the leaf and adds the
@@ -528,6 +543,7 @@ int init_leaf()
}
+
/**
Loads the caterpillar image from a file,
sets the position of the actor and adds
@@ -546,6 +562,8 @@ int init_caterpillar(ClutterTimeline *timeline)
return 0;
}
+
+
/**
When the caterpillar reaches the end of the path, a
text bubble is loaded.
@@ -561,6 +579,8 @@ void path_complete(ClutterTimeline *timeline, gpointer data)
return;
}
+
+
int main(int argc, char *argv[])
{
ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff };
@@ -578,7 +598,6 @@ int main(int argc, char *argv[])
ClutterTimeline *path_timeline = clutter_timeline_new(100, 10);
g_signal_connect(path_timeline, "completed", G_CALLBACK(path_complete),
NULL);
-
init_apples();
int rval = 0;
diff --git a/colortext/main.c b/colortext/main.c
index 0b16bb9..9da476a 100644
--- a/colortext/main.c
+++ b/colortext/main.c
@@ -2,6 +2,7 @@
#include <clutter/clutter.h>
#include <stdlib.h>
+#include <string.h>
#include <time.h>
#define FILENAME "/usr/local/share/colortext/word_file"
@@ -101,7 +102,7 @@ void give_random_letter(ClutterActor *label)
case 122: text = "z"; break;
default: text = "a";
}
- clutter_label_set_text(label, text);
+ clutter_label_set_text((ClutterLabel*)label, text);
return;
}//end give_random_letter
@@ -129,8 +130,9 @@ void display_word()
for (k = 4; k < NUM_ACTORS; k++)
{
if (curr_char != ' '){
- clutter_label_set_text(actors[k], &curr_char);
- clutter_label_set_color(actors[k], &colors[color_word]);
+ clutter_label_set_text((ClutterLabel*)actors[k],
(gchar*)&curr_char);
+ clutter_label_set_color((ClutterLabel*)actors[k],
+ &colors[color_word]);
curr_char = fgetc(fp);
}
else {
@@ -161,7 +163,7 @@ void randomize_the_letters(ClutterTimeline *timeline, guint
frame_num)
for (i = 0; i < NUM_ACTORS; i++)
{
give_random_letter(actors[i]);
- clutter_label_set_color(actors[i], &letter_color);
+ clutter_label_set_color((ClutterLabel*)actors[i], &letter_color);
}
return;
} //end randomize_the_letters
@@ -299,33 +301,33 @@ void end_effect()
for (k = 1; k < NUM_ACTORS; k++)
{
- clutter_label_set_color(actors[k], &colors[k]);
+ clutter_label_set_color((ClutterLabel*)actors[k], &colors[k]);
}
ClutterColor color_black = { 0xff, 0xff, 0xff, 0xff };
- clutter_label_set_color(actors[0], &color_black);
- clutter_label_set_color(actors[NUM_ACTORS - 1], &color_black);
-
- clutter_label_set_text(actors[0], "{");
- clutter_label_set_text(actors[1], "c");
- clutter_label_set_text(actors[2], "o");
- clutter_label_set_text(actors[3], "l");
- clutter_label_set_text(actors[4], "o");
- clutter_label_set_text(actors[5], "r");
- clutter_label_set_text(actors[6], "s");
- clutter_label_set_text(actors[7], "o");
- clutter_label_set_text(actors[8], "f");
- clutter_label_set_text(actors[9], "t");
- clutter_label_set_text(actors[10], "h");
- clutter_label_set_text(actors[11], "e");
- clutter_label_set_text(actors[12], "r");
- clutter_label_set_text(actors[13], "a");
- clutter_label_set_text(actors[14], "i");
- clutter_label_set_text(actors[15], "n");
- clutter_label_set_text(actors[16], "b");
- clutter_label_set_text(actors[17], "o");
- clutter_label_set_text(actors[18], "w");
- clutter_label_set_text(actors[19], "}");
+ clutter_label_set_color((ClutterLabel*)actors[0], &color_black);
+ clutter_label_set_color((ClutterLabel*)actors[NUM_ACTORS - 1], &color_black);
+
+ clutter_label_set_text((ClutterLabel*)actors[0], "{");
+ clutter_label_set_text((ClutterLabel*)actors[1], "c");
+ clutter_label_set_text((ClutterLabel*)actors[2], "o");
+ clutter_label_set_text((ClutterLabel*)actors[3], "l");
+ clutter_label_set_text((ClutterLabel*)actors[4], "o");
+ clutter_label_set_text((ClutterLabel*)actors[5], "r");
+ clutter_label_set_text((ClutterLabel*)actors[6], "s");
+ clutter_label_set_text((ClutterLabel*)actors[7], "o");
+ clutter_label_set_text((ClutterLabel*)actors[8], "f");
+ clutter_label_set_text((ClutterLabel*)actors[9], "t");
+ clutter_label_set_text((ClutterLabel*)actors[10], "h");
+ clutter_label_set_text((ClutterLabel*)actors[11], "e");
+ clutter_label_set_text((ClutterLabel*)actors[12], "r");
+ clutter_label_set_text((ClutterLabel*)actors[13], "a");
+ clutter_label_set_text((ClutterLabel*)actors[14], "i");
+ clutter_label_set_text((ClutterLabel*)actors[15], "n");
+ clutter_label_set_text((ClutterLabel*)actors[16], "b");
+ clutter_label_set_text((ClutterLabel*)actors[17], "o");
+ clutter_label_set_text((ClutterLabel*)actors[18], "w");
+ clutter_label_set_text((ClutterLabel*)actors[19], "}");
}//end end_effect
@@ -364,7 +366,7 @@ int main(int argc, char *argv[])
stage = clutter_stage_get_default();
clutter_actor_set_size(stage, 1024, 600);
clutter_stage_set_color(CLUTTER_STAGE(stage), &stage_color);
- clutter_stage_set_title(stage, "Color Text");
+ clutter_stage_set_title((ClutterStage*)stage, "Color Text");
init_actors();
init_colors();
diff --git a/squares/main.c b/squares/main.c
index 4b4434a..fd8c9b9 100644
--- a/squares/main.c
+++ b/squares/main.c
@@ -3,10 +3,12 @@
#define LOWER_BOUND 50
#define UPPER_BOUND 255
-ClutterActor *stage, *black_square, *red_square_1, *red_square_2,
*red_square_3, *red_square_4;
+ClutterActor *stage, *black_square, *red_square_1, *red_square_2,
+ *red_square_3, *red_square_4;
ClutterActor *start_button, *start_shadow, *start_label;
-ClutterTimeline *button_press_timeline, *button_release_timeline,
*growth_timeline, *button_reshow_timeline;
+ClutterTimeline *button_press_timeline, *button_release_timeline,
+ *growth_timeline, *button_reshow_timeline;
ClutterEffectTemplate *button_press_movement, *button_release_movement;
@@ -37,7 +39,8 @@ void rotate_square()
where the viewer can still see the rotating
black square behind the 4 red ones.
*/
-void start_square_growing(ClutterTimeline *timeline, gint frame_num, gpointer
data)
+void start_square_growing(ClutterTimeline *timeline, gint frame_num,
+ gpointer data)
{
if (square_size == UPPER_BOUND){
@@ -119,7 +122,8 @@ void start_square_growing(ClutterTimeline *timeline, gint
frame_num, gpointer da
When the cursor enters the start button, change
the start button's color.
*/
-gboolean on_button_enter(ClutterActor *actor, ClutterEvent *event, gpointer
data)
+gboolean on_button_enter(ClutterActor *actor, ClutterEvent *event,
+ gpointer data)
{
ClutterColor color_red = { 0xff, 0x00, 0x00, 0xff };
clutter_rectangle_set_color(CLUTTER_RECTANGLE(start_button), &color_red);
@@ -133,7 +137,8 @@ gboolean on_button_enter(ClutterActor *actor, ClutterEvent
*event, gpointer data
When the cursor leaves the start button, change
the button color back to it's original color.
*/
-gboolean on_button_leave(ClutterActor *actor, ClutterEvent *event, gpointer
data)
+gboolean on_button_leave(ClutterActor *actor, ClutterEvent *event,
+ gpointer data)
{
ClutterColor color_white = { 0xff, 0xff, 0xff, 0xff };
clutter_rectangle_set_color(CLUTTER_RECTANGLE(start_button), &color_white);
@@ -150,7 +155,8 @@ gboolean on_button_leave(ClutterActor *actor, ClutterEvent
*event, gpointer data
Then move the start button and text southwest to simulate a button
press.
*/
-gboolean on_button_press(ClutterActor *actor, ClutterEvent *event, gpointer
data)
+gboolean on_button_press(ClutterActor *actor, ClutterEvent *event,
+ gpointer data)
{
if (square_size >= 75){
square_size = LOWER_BOUND;
@@ -200,7 +206,8 @@ void hide_button(ClutterActor *actor, gpointer data)
the simulation begins. The red squares grow to
a maximum width and height before stopping.
*/
-gboolean on_button_release(ClutterActor *actor, ClutterEvent *event, gpointer
data)
+gboolean on_button_release(ClutterActor *actor, ClutterEvent *event,
+ gpointer data)
{
ClutterColor color_white = { 0xff, 0xff, 0xff, 0xff };
clutter_rectangle_set_color(CLUTTER_RECTANGLE(start_button), &color_white);
@@ -211,11 +218,11 @@ gboolean on_button_release(ClutterActor *actor,
ClutterEvent *event, gpointer da
clutter_timeline_start(growth_timeline);
button_release_timeline = clutter_effect_move(button_release_movement,
- actor, 205, 450,
-
(ClutterEffectCompleteFunc)hide_button,
- NULL);
+ actor, 205, 450,
+ (ClutterEffectCompleteFunc)hide_button,
+ NULL);
button_release_timeline = clutter_effect_move(button_release_movement,
- start_label, 232, 460, NULL,
NULL);
+ start_label, 232, 460, NULL, NULL);
clutter_timeline_start(button_reshow_timeline);
return TRUE;
@@ -252,7 +259,7 @@ int main(int argc, char *argv[])
ClutterColor color_black = { 0x00, 0x00, 0x00, 0xff };
ClutterColor color_red = { 0xff, 0x00, 0x00, 0xff };
clutter_stage_set_color(CLUTTER_STAGE(stage), &stage_color);
- clutter_stage_set_title(CLUTTER_STAGE(stage), "Rotating Square");
+ clutter_stage_set_title(CLUTTER_STAGE(stage), "Squares");
clutter_actor_show(stage);
/* Tab */
@@ -266,7 +273,7 @@ int main(int argc, char *argv[])
/* Border square shadow */
ClutterActor *border_shadow = clutter_rectangle_new_with_color(&color_black);
- clutter_actor_set_opacity (border_shadow, 400);
+ clutter_actor_set_opacity (border_shadow, 255);
clutter_actor_set_size (border_shadow, 455, 455);
clutter_actor_set_position (border_shadow, 502, 77);
clutter_container_add_actor (CLUTTER_CONTAINER(stage), border_shadow);
@@ -320,14 +327,16 @@ int main(int argc, char *argv[])
/* Rotation timeline for black square */
ClutterTimeline *rotation_timeline = clutter_timeline_new(50, 50);
button_reshow_timeline = clutter_timeline_new_for_duration(10000);
- g_signal_connect(rotation_timeline, "new-frame", G_CALLBACK(rotate_square),
NULL);
- g_signal_connect(button_reshow_timeline, "completed",
G_CALLBACK(show_button), NULL);
+ g_signal_connect(rotation_timeline, "new-frame", G_CALLBACK(rotate_square),
+ NULL);
+ g_signal_connect(button_reshow_timeline, "completed",
G_CALLBACK(show_button),
+ NULL);
clutter_timeline_set_loop(rotation_timeline, TRUE);
clutter_timeline_start(rotation_timeline);
/* start shadow */
start_shadow = clutter_rectangle_new_with_color(&color_black);
- clutter_actor_set_opacity (start_shadow, 400);
+ clutter_actor_set_opacity (start_shadow, 255);
clutter_actor_set_size (start_shadow, 100, 50);
clutter_actor_set_position (start_shadow, 200, 455);
clutter_container_add_actor (CLUTTER_CONTAINER(stage), start_shadow);
@@ -338,21 +347,28 @@ int main(int argc, char *argv[])
start_button = clutter_rectangle_new_with_color(&color_white);
clutter_actor_set_size(start_button, 100, 50);
clutter_actor_set_position(start_button, 205, 450);
- clutter_rectangle_set_border_color (CLUTTER_RECTANGLE(start_button),
&color_black);
+ clutter_rectangle_set_border_color (CLUTTER_RECTANGLE(start_button),
+ &color_black);
clutter_rectangle_set_border_width (CLUTTER_RECTANGLE(start_button), 1);
clutter_container_add_actor(CLUTTER_CONTAINER(stage), start_button);
button_press_timeline = clutter_timeline_new(2, 30);
- button_press_movement = clutter_effect_template_new(button_press_timeline,
CLUTTER_ALPHA_RAMP_INC);
+ button_press_movement = clutter_effect_template_new(button_press_timeline,
+ CLUTTER_ALPHA_RAMP_INC);
button_release_timeline = clutter_timeline_new(2, 3);
- button_release_movement =
clutter_effect_template_new(button_release_timeline, CLUTTER_ALPHA_RAMP_INC);
+ button_release_movement = clutter_effect_template_new(
+ button_release_timeline, CLUTTER_ALPHA_RAMP_INC);
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
