brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* clutter/x11/clutter-event-x11.c (event_translate): Remove the
	cheap Expose event compression, as it seems to play games when a
	composite manager is running. It's also not really needed, as
	the redraw queue will avoid redraws too close to each other
	anyway.

	* clutter/x11/clutter-stage-x11.c:
	(clutter_stage_x11_show), (clutter_stage_x11_hide): Do not chain
	up just to set the flags. This fixes a critical warning coming
	from ClutterActor::hide() default implementation.
This commit is contained in:
Emmanuele Bassi 2008-05-13 10:21:25 +00:00
parent 54e2fd14ae
commit 6022344a80
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2008-05-13 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/x11/clutter-event-x11.c (event_translate): Remove the
cheap Expose event compression, as it seems to play games when a
composite manager is running. It's also not really needed, as
the redraw queue will avoid redraws too close to each other
anyway.
* clutter/x11/clutter-stage-x11.c:
(clutter_stage_x11_show), (clutter_stage_x11_hide): Do not chain
up just to set the flags. This fixes a critical warning coming
from ClutterActor::hide() default implementation.
2008-05-13 Ivan Leben <ivan.leben@o-hand.com> 2008-05-13 Ivan Leben <ivan.leben@o-hand.com>
* clutter/cogl/gl/cogl-defines.h.in: * clutter/cogl/gl/cogl-defines.h.in:

15
clutter/x11/clutter-event-x11.c
View File

@ -502,19 +502,8 @@ event_translate (ClutterBackend *backend,
case Expose: case Expose:
{ {
XEvent foo_xev; CLUTTER_NOTE (MULTISTAGE, "expose for stage: %p, redrawing", stage);
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
/* Cheap compress */
while (XCheckTypedWindowEvent (backend_x11->xdpy,
xevent->xexpose.window,
Expose,
&foo_xev));
/* FIXME: need to make stage an 'actor' so can que
* a paint direct from there rather than hack here...
*/
CLUTTER_NOTE (MULTISTAGE, "expose for stage:%p, redrawing", stage);
clutter_redraw (stage);
res = FALSE; res = FALSE;
} }
break; break;

8
clutter/x11/clutter-stage-x11.c
View File

@ -128,8 +128,7 @@ clutter_stage_x11_show (ClutterActor *actor)
XMapWindow (stage_x11->xdpy, stage_x11->xwin); XMapWindow (stage_x11->xdpy, stage_x11->xwin);
} }
/* chain up */ CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_MAPPED);
CLUTTER_ACTOR_CLASS (clutter_stage_x11_parent_class)->show (actor);
} }
static void static void
@ -137,11 +136,10 @@ clutter_stage_x11_hide (ClutterActor *actor)
{ {
ClutterStageX11 *stage_x11 = CLUTTER_STAGE_X11 (actor); ClutterStageX11 *stage_x11 = CLUTTER_STAGE_X11 (actor);
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_MAPPED);
if (stage_x11->xwin) if (stage_x11->xwin)
XUnmapWindow (stage_x11->xdpy, stage_x11->xwin); XUnmapWindow (stage_x11->xdpy, stage_x11->xwin);
/* chain up */
CLUTTER_ACTOR_CLASS (clutter_stage_x11_parent_class)->hide (actor);
} }
void void