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

add checks for HAVE_SHAPE where appropriate. fix type error which was

Browse Source 
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:
Thomas Thurman 2008-06-29 03:23:08 +00:00 committed by Thomas James Alexander Thurman
parent 6039694eff
commit b3549979c6
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2008-06-28 Thomas Thurman <tthurman@gnome.org>
Some refactoring, simplifying, and commenting of the non-composited Some refactoring, simplifying, and commenting of the non-composited

2
src/compositor/compositor-xrender.c
View File

@ -2802,8 +2802,10 @@ xrender_process_event (MetaCompositor *compositor,
default: default:
if (event->type == meta_display_get_damage_event_base (xrc->display) + XDamageNotify) if (event->type == meta_display_get_damage_event_base (xrc->display) + XDamageNotify)
process_damage (xrc, (XDamageNotifyEvent *) event); process_damage (xrc, (XDamageNotifyEvent *) event);
#ifdef HAVE_SHAPE
else if (event->type == meta_display_get_shape_event_base (xrc->display) + ShapeNotify) else if (event->type == meta_display_get_shape_event_base (xrc->display) + ShapeNotify)
process_shape (xrc, (XShapeEvent *) event); process_shape (xrc, (XShapeEvent *) event);
#endif /* HAVE_SHAPE */
else else
{ {
meta_error_trap_pop (xrc->display, FALSE); meta_error_trap_pop (xrc->display, FALSE);

2
src/core/display.c
View File

@ -5166,9 +5166,11 @@ meta_display_get_damage_event_base (MetaDisplay *display)
#endif #endif
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
#ifdef HAVE_SHAPE
int int
meta_display_get_shape_event_base (MetaDisplay *display) meta_display_get_shape_event_base (MetaDisplay *display)
{ {
return display->shape_event_base; return display->shape_event_base;
} }
#endif #endif
#endif

2
src/core/xprops.c
View File

@ -1051,7 +1051,7 @@ meta_prop_get_values (MetaDisplay *display,
&results.type, &results.format, &results.type, &results.format,
&results.n_items, &results.n_items,
&results.bytes_after, &results.bytes_after,
(gchar **)&results.prop) != Success || (unsigned char **)(&results.prop)) != Success ||
results.type == None) results.type == None)
{ {
values[i].type = META_PROP_VALUE_INVALID; values[i].type = META_PROP_VALUE_INVALID;