2007-04-25 Emmanuele Bassi <ebassi@openedhand.com>

Merge from clutter.git/master

	* clutter/glx/clutter-event-glx.c:
	* clutter/glx/clutter-stage-glx.c: Implement the _NET_WM_PING
	protocol handling on the main stage window.

	* clutter/clutter-stage.h:
	* clutter/clutter-stage.c:
	* clutter/clutter-main.c: Handle CLUTTER_DELETE events internally,
	by calling clutter_main_quit(), and remove the ::delete-event
	signal from ClutterStage; clean up the signal emission sequence
	for the events: emit the ::event signal before emitting any signal
	and the ::event-after signal after the signal has been emitted; move
	the signal emission calls inside ClutterStage so we can call
	g_signal_emit() instead of g_signal_emit_by_name(), thus sparing us
	a lookup for each event.

	* examples/test.c: Remove ::delete-event signal handling.
This commit is contained in:
Emmanuele Bassi
2007-04-25 14:22:24 +00:00
parent 296649e865
commit a7a511ce79
10 changed files with 184 additions and 80 deletions

View File

@ -331,6 +331,7 @@ clutter_stage_show_cursor
clutter_stage_hide_cursor
clutter_stage_get_actor_at_pos
clutter_stage_snapshot
clutter_stage_event
<SUBSECTION Standard>
CLUTTER_STAGE
CLUTTER_IS_STAGE

View File

@ -80,16 +80,15 @@ Macro evaluating to the height of the #ClutterStage
@clutterstage: the object which received the signal.
@arg1:
<!-- ##### SIGNAL ClutterStage::delete-event ##### -->
<!-- ##### SIGNAL ClutterStage::event ##### -->
<para>
</para>
@clutterstage: the object which received the signal.
@Param2:
@Returns:
@arg1:
<!-- ##### SIGNAL ClutterStage::event ##### -->
<!-- ##### SIGNAL ClutterStage::event-after ##### -->
<para>
</para>
@ -160,6 +159,7 @@ Macro evaluating to the height of the #ClutterStage
@set_offscreen:
@draw_to_pixbuf:
@event:
@event_after:
@button_press_event:
@button_release_event:
@scroll_event:
@ -167,7 +167,6 @@ Macro evaluating to the height of the #ClutterStage
@key_release_event:
@motion_event:
@stage_state_event:
@delete_event:
@_clutter_stage1:
@_clutter_stage2:
@_clutter_stage3:
@ -257,3 +256,13 @@ Macro evaluating to the height of the #ClutterStage
@Returns:
<!-- ##### FUNCTION clutter_stage_event ##### -->
<para>
</para>
@stage:
@event:
@Returns: