isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

2008-05-14 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* tests/test-events.c: Clean up a bit, and print out more
	messages when pressing one of the rectangles.

	* tests/test-threads.c: Be more verbose in the console, and
	apply another behaviour on the rectangle, to show that we
	are not blocking.
This commit is contained in:
Emmanuele Bassi 2008-05-14 16:47:38 +00:00
parent 677a202407
commit 99b303dbcc
3 changed files with 89 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-05-14 Emmanuele Bassi <ebassi@openedhand.com>
* tests/test-events.c: Clean up a bit, and print out more
messages when pressing one of the rectangles.
* tests/test-threads.c: Be more verbose in the console, and
apply another behaviour on the rectangle, to show that we
are not blocking.
2008-05-14 Øyvind Kolås <pippin@o-hand.com> 2008-05-14 Øyvind Kolås <pippin@o-hand.com>
* clutter/cogl/gles/cogl.c: (_cogl_features_init): do not set * clutter/cogl/gles/cogl.c: (_cogl_features_init): do not set

63
tests/test-events.c
View File

@ -27,6 +27,9 @@ blue_button_cb (ClutterActor *actor,
g_object_set (stage, "fullscreen", IsFullScreen, NULL); g_object_set (stage, "fullscreen", IsFullScreen, NULL);
g_print ("*** Fullscreen %s ***\n",
IsFullScreen ? "enabled" : "disabled");
return FALSE; return FALSE;
} }
@ -43,15 +46,19 @@ red_button_cb (ClutterActor *actor,
clutter_set_motion_events_enabled (IsMotion); clutter_set_motion_events_enabled (IsMotion);
g_print ("*** Per actor motion events %s ***\n",
IsMotion ? "enabled" : "disabled");
return FALSE; return FALSE;
} }
static gboolean static gboolean
capture_cb (ClutterActor *actor, capture_cb (ClutterActor *actor,
ClutterEvent *event, ClutterEvent *event,
gpointer data) gpointer data)
{ {
printf("captured event for type '%s'\n", G_OBJECT_TYPE_NAME(actor)); g_print ("* captured event for type '%s' *\n",
G_OBJECT_TYPE_NAME (actor));
return FALSE; return FALSE;
} }
@ -63,9 +70,7 @@ key_focus_in_cb (ClutterActor *actor,
ClutterActor *focus_box = CLUTTER_ACTOR(data); ClutterActor *focus_box = CLUTTER_ACTOR(data);
if (actor == clutter_stage_get_default ()) if (actor == clutter_stage_get_default ())
{ clutter_actor_hide (focus_box);
clutter_actor_hide (focus_box);
}
else else
{ {
clutter_actor_set_position (focus_box, clutter_actor_set_position (focus_box,
@ -94,30 +99,30 @@ input_cb (ClutterActor *actor,
len = g_unichar_to_utf8 (clutter_keysym_to_unicode (event->key.keyval), len = g_unichar_to_utf8 (clutter_keysym_to_unicode (event->key.keyval),
keybuf); keybuf);
keybuf[len] = '\0'; keybuf[len] = '\0';
printf ("[%s] KEY PRESS '%s'", source, keybuf); g_print ("[%s] KEY PRESS '%s'", source, keybuf);
break; break;
case CLUTTER_KEY_RELEASE: case CLUTTER_KEY_RELEASE:
len = g_unichar_to_utf8 (clutter_keysym_to_unicode (event->key.keyval), len = g_unichar_to_utf8 (clutter_keysym_to_unicode (event->key.keyval),
keybuf); keybuf);
keybuf[len] = '\0'; keybuf[len] = '\0';
printf ("[%s] KEY RELEASE '%s'", source, keybuf); g_print ("[%s] KEY RELEASE '%s'", source, keybuf);
break; break;
case CLUTTER_MOTION: case CLUTTER_MOTION:
printf("[%s] MOTION", source); g_print ("[%s] MOTION", source);
break; break;
case CLUTTER_ENTER: case CLUTTER_ENTER:
printf("[%s] ENTER", source); g_print ("[%s] ENTER", source);
break; break;
case CLUTTER_LEAVE: case CLUTTER_LEAVE:
printf("[%s] LEAVE", source); g_print ("[%s] LEAVE", source);
break; break;
case CLUTTER_BUTTON_PRESS: case CLUTTER_BUTTON_PRESS:
printf("[%s] BUTTON PRESS (click count:%i)", g_print ("[%s] BUTTON PRESS (click count:%i)",
source, event->button.click_count); source, event->button.click_count);
break; break;
case CLUTTER_BUTTON_RELEASE: case CLUTTER_BUTTON_RELEASE:
printf("[%s] BUTTON RELEASE (click count:%i)", g_print ("[%s] BUTTON RELEASE (click count:%i)",
source, event->button.click_count); source, event->button.click_count);
if (clutter_event_get_source (event) == CLUTTER_ACTOR (stage)) if (clutter_event_get_source (event) == CLUTTER_ACTOR (stage))
clutter_stage_set_key_focus (stage, NULL); clutter_stage_set_key_focus (stage, NULL);
@ -126,29 +131,29 @@ input_cb (ClutterActor *actor,
clutter_stage_set_key_focus (stage, actor); clutter_stage_set_key_focus (stage, actor);
break; break;
case CLUTTER_SCROLL: case CLUTTER_SCROLL:
printf("[%s] BUTTON SCROLL (click count:%i)", g_print ("[%s] BUTTON SCROLL (click count:%i)",
source, event->button.click_count); source, event->button.click_count);
break; break;
case CLUTTER_STAGE_STATE: case CLUTTER_STAGE_STATE:
printf("[%s] STAGE STATE", source); g_print ("[%s] STAGE STATE", source);
break; break;
case CLUTTER_DESTROY_NOTIFY: case CLUTTER_DESTROY_NOTIFY:
printf("[%s] DESTROY NOTIFY", source); g_print ("[%s] DESTROY NOTIFY", source);
break; break;
case CLUTTER_CLIENT_MESSAGE: case CLUTTER_CLIENT_MESSAGE:
printf("[%s] CLIENT MESSAGE\n", source); g_print ("[%s] CLIENT MESSAGE", source);
break; break;
case CLUTTER_DELETE: case CLUTTER_DELETE:
printf("[%s] DELETE", source); g_print ("[%s] DELETE", source);
break; break;
case CLUTTER_NOTHING: case CLUTTER_NOTHING:
return FALSE; return FALSE;
} }
if (clutter_event_get_source (event) == actor) if (clutter_event_get_source (event) == actor)
printf(" *source*"); g_print (" *source*");
printf("\n"); g_printf("\n");
return FALSE; return FALSE;
} }
@ -197,7 +202,8 @@ main (int argc, char *argv[])
focus_box); focus_box);
/* Toggle motion - enter/leave capture */ /* Toggle motion - enter/leave capture */
g_signal_connect (actor, "button-press-event", G_CALLBACK (red_button_cb), NULL); g_signal_connect (actor, "button-press-event",
G_CALLBACK (red_button_cb), NULL);
clutter_stage_set_key_focus (CLUTTER_STAGE (stage), actor); clutter_stage_set_key_focus (CLUTTER_STAGE (stage), actor);
@ -227,7 +233,8 @@ main (int argc, char *argv[])
g_signal_connect (actor, "focus-in", G_CALLBACK (key_focus_in_cb), g_signal_connect (actor, "focus-in", G_CALLBACK (key_focus_in_cb),
focus_box); focus_box);
/* Fullscreen */ /* Fullscreen */
g_signal_connect (actor, "button-press-event", G_CALLBACK (blue_button_cb), NULL); g_signal_connect (actor, "button-press-event",
G_CALLBACK (blue_button_cb), NULL);
/* non reactive */ /* non reactive */
actor = clutter_rectangle_new_with_color (&ncol); actor = clutter_rectangle_new_with_color (&ncol);
@ -252,8 +259,8 @@ main (int argc, char *argv[])
/* note group not reactive */ /* note group not reactive */
group = clutter_group_new (); group = clutter_group_new ();
clutter_container_add (CLUTTER_CONTAINER(group), actor, NULL); clutter_container_add (CLUTTER_CONTAINER (group), actor, NULL);
clutter_container_add (CLUTTER_CONTAINER(stage), group, NULL); clutter_container_add (CLUTTER_CONTAINER (stage), group, NULL);
clutter_actor_set_position (group, 100, 350); clutter_actor_set_position (group, 100, 350);
clutter_actor_show_all (group); clutter_actor_show_all (group);

68
tests/test-threads.c
View File

@ -64,9 +64,11 @@ update_label_idle (gpointer data)
text = g_strdup_printf ("Count to %d", update->count); text = g_strdup_printf ("Count to %d", update->count);
clutter_label_set_text (CLUTTER_LABEL (update->thread_data->label), text); clutter_label_set_text (CLUTTER_LABEL (update->thread_data->label), text);
clutter_actor_set_width (update->thread_data->label, -1);
g_free (text); g_free (text);
g_free (update); g_free (update);
return FALSE; return FALSE;
} }
@ -82,18 +84,27 @@ do_something_very_slow (void)
for (i = 0; i < 100; i++) for (i = 0; i < 100; i++)
{ {
/* sleep for a while */ gint msecs;
g_usleep((rand() / (RAND_MAX / 3) + 1) * 1000000);
if ((i % 10) == 0) msecs = 1 + (int) (1000.0 * rand () / ((RAND_MAX + 1.0) / 3));
/* sleep for a while */
g_usleep (msecs * 1000);
if ((i % 10) == 0)
{ {
TestUpdate *update; TestUpdate *update;
update = g_new (TestUpdate, 1); update = g_new (TestUpdate, 1);
update->count = i; update->count = i;
update->thread_data = data; update->thread_data = data;
g_print ("updating the label: %d\n", update->count);
clutter_threads_add_idle (update_label_idle, update); clutter_threads_add_idle (update_label_idle, update);
} }
g_print ("slept to %d msecs\n", msecs);
} }
} }
@ -114,6 +125,7 @@ test_thread_func (gpointer user_data)
static ClutterTimeline *timeline = NULL; static ClutterTimeline *timeline = NULL;
static ClutterActor *count_label = NULL; static ClutterActor *count_label = NULL;
static ClutterActor *help_label = NULL;
static void static void
on_key_press_event (ClutterStage *stage, on_key_press_event (ClutterStage *stage,
@ -125,6 +137,8 @@ on_key_press_event (ClutterStage *stage,
switch (clutter_key_event_symbol (event)) switch (clutter_key_event_symbol (event))
{ {
case CLUTTER_s: case CLUTTER_s:
clutter_label_set_text (CLUTTER_LABEL (help_label), "Press 'q' to quit");
clutter_timeline_start (timeline); clutter_timeline_start (timeline);
data = test_thread_data_new (); data = test_thread_data_new ();
@ -143,49 +157,55 @@ int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
ClutterActor *stage; ClutterActor *stage;
ClutterActor *label;
ClutterActor *rect; ClutterActor *rect;
ClutterColor stage_color = { 0xcc, 0xcc, 0xcc, 0xff }; ClutterColor stage_color = { 0xcc, 0xcc, 0xcc, 0xff };
ClutterColor rect_color = { 0xee, 0x55, 0x55, 0x99 }; ClutterColor rect_color = { 0xee, 0x55, 0x55, 0x99 };
ClutterBehaviour *behaviour; ClutterBehaviour *r_behaviour, *p_behaviour;
const ClutterKnot knots[] = {
{ 75, 150 },
{ 400, 150 }
};
g_thread_init (NULL); g_thread_init (NULL);
clutter_threads_init (); clutter_threads_init ();
clutter_threads_enter ();
clutter_init (&argc, &argv); clutter_init (&argc, &argv);
stage = clutter_stage_get_default (); stage = clutter_stage_get_default ();
clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
clutter_actor_set_size (stage, 800, 600); clutter_actor_set_size (stage, 600, 200);
count_label = clutter_label_new_with_text ("Mono 16", "Counter"); count_label = clutter_label_new_with_text ("Mono 12", "Counter");
clutter_actor_set_position (count_label, 350, 50); clutter_actor_set_position (count_label, 350, 50);
clutter_actor_show (count_label);
label = clutter_label_new_with_text ("Mono 16", "Press 's' to start"); help_label = clutter_label_new_with_text ("Mono 12", "Press 's' to start");
clutter_actor_set_position (label, 50, 50); clutter_actor_set_position (help_label, 50, 50);
clutter_actor_show (label);
rect = clutter_rectangle_new_with_color (&rect_color); rect = clutter_rectangle_new_with_color (&rect_color);
clutter_actor_set_position (rect, 150, 150); clutter_actor_set_position (rect, 75, 150);
clutter_actor_set_size (rect, 25, 25); clutter_actor_set_size (rect, 50, 50);
clutter_actor_show (rect); clutter_actor_set_anchor_point (rect, 25, 25);
clutter_container_add (CLUTTER_CONTAINER (stage), clutter_container_add (CLUTTER_CONTAINER (stage),
count_label, label, count_label, help_label,
rect, rect,
NULL); NULL);
timeline = clutter_timeline_new (150, 50); timeline = clutter_timeline_new (150, 50);
clutter_timeline_set_loop (timeline, TRUE); clutter_timeline_set_loop (timeline, TRUE);
behaviour = clutter_behaviour_rotate_new (clutter_alpha_new_full (timeline, r_behaviour = clutter_behaviour_rotate_new (clutter_alpha_new_full (timeline,
CLUTTER_ALPHA_RAMP_INC,
NULL, NULL),
CLUTTER_Z_AXIS,
CLUTTER_ROTATE_CW,
0.0, 360.0);
clutter_behaviour_apply (r_behaviour, rect);
p_behaviour = clutter_behaviour_path_new (clutter_alpha_new_full (timeline,
CLUTTER_ALPHA_SINE, CLUTTER_ALPHA_SINE,
NULL, NULL), NULL, NULL),
CLUTTER_Z_AXIS, knots,
CLUTTER_ROTATE_CW, G_N_ELEMENTS (knots));
0.0, 360.0); clutter_behaviour_apply (p_behaviour, rect);
clutter_behaviour_apply (behaviour, rect);
g_signal_connect (stage, g_signal_connect (stage,
"button-press-event", G_CALLBACK (clutter_main_quit), "button-press-event", G_CALLBACK (clutter_main_quit),
@ -196,10 +216,12 @@ main (int argc, char *argv[])
clutter_actor_show (stage); clutter_actor_show (stage);
clutter_threads_enter ();
clutter_main (); clutter_main ();
clutter_threads_leave (); clutter_threads_leave ();
g_object_unref (behaviour); g_object_unref (p_behaviour);
g_object_unref (r_behaviour);
g_object_unref (timeline); g_object_unref (timeline);
return EXIT_SUCCESS; return EXIT_SUCCESS;