mirror of
https://github.com/brl/mutter.git
synced 2024-11-21 15:40:41 -05:00
add checks for HAVE_SHAPE where appropriate. fix type error which was
2008-06-28 Thomas Thurman <tthurman@gnome.org> * src/core/display.c, src/compositor/compositor-xrender.c: add checks for HAVE_SHAPE where appropriate. * src/core/xprops.c: fix type error which was causing warnings. svn path=/trunk/; revision=3772
This commit is contained in:
parent
6039694eff
commit
b3549979c6
@ -1,3 +1,9 @@
|
||||
2008-06-28 Thomas Thurman <tthurman@gnome.org>
|
||||
|
||||
* src/core/display.c, src/compositor/compositor-xrender.c: add checks
|
||||
for HAVE_SHAPE where appropriate.
|
||||
* src/core/xprops.c: fix type error which was causing warnings.
|
||||
|
||||
2008-06-28 Thomas Thurman <tthurman@gnome.org>
|
||||
|
||||
Some refactoring, simplifying, and commenting of the non-composited
|
||||
|
@ -2802,8 +2802,10 @@ xrender_process_event (MetaCompositor *compositor,
|
||||
default:
|
||||
if (event->type == meta_display_get_damage_event_base (xrc->display) + XDamageNotify)
|
||||
process_damage (xrc, (XDamageNotifyEvent *) event);
|
||||
#ifdef HAVE_SHAPE
|
||||
else if (event->type == meta_display_get_shape_event_base (xrc->display) + ShapeNotify)
|
||||
process_shape (xrc, (XShapeEvent *) event);
|
||||
#endif /* HAVE_SHAPE */
|
||||
else
|
||||
{
|
||||
meta_error_trap_pop (xrc->display, FALSE);
|
||||
|
@ -5166,9 +5166,11 @@ meta_display_get_damage_event_base (MetaDisplay *display)
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_COMPOSITE_EXTENSIONS
|
||||
#ifdef HAVE_SHAPE
|
||||
int
|
||||
meta_display_get_shape_event_base (MetaDisplay *display)
|
||||
{
|
||||
return display->shape_event_base;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
@ -1051,7 +1051,7 @@ meta_prop_get_values (MetaDisplay *display,
|
||||
&results.type, &results.format,
|
||||
&results.n_items,
|
||||
&results.bytes_after,
|
||||
(gchar **)&results.prop) != Success ||
|
||||
(unsigned char **)(&results.prop)) != Success ||
|
||||
results.type == None)
|
||||
{
|
||||
values[i].type = META_PROP_VALUE_INVALID;
|
||||
|
Loading…
Reference in New Issue
Block a user