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

compile with compositor enabled

Browse Source
This commit is contained in:
Kang Jeong-Hee 2005-12-14 12:47:35 +00:00
parent 013c8b82db
commit 6a9242b192
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-12-13 Kang Jeong-Hee <Keizi@mail.co.kr>
* src/compositor.c: replace old call to width and height
of MetaScreen struct with rect.width and rect.height.
Now compile ok.
* src/delete.c: make an int variable into unsigned int.
Now compile warning has gone.
2005-12-12 Elijah Newren <newren@gmail.com> 2005-12-12 Elijah Newren <newren@gmail.com>
* configure.in: post-release version bump to 2.13.8 * configure.in: post-release version bump to 2.13.8

20
src/compositor.c
View File

@ -336,8 +336,8 @@ paint_screen (MetaCompositor *compositor,
r.x = 0; r.x = 0;
r.y = 0; r.y = 0;
r.width = screen->width; r.width = screen->rect.width;
r.height = screen->height; r.height = screen->rect.height;
region = XFixesCreateRegion (xdisplay, &r, 1); region = XFixesCreateRegion (xdisplay, &r, 1);
} }
@ -351,8 +351,8 @@ paint_screen (MetaCompositor *compositor,
} }
buffer_pixmap = XCreatePixmap (xdisplay, screen->xroot, buffer_pixmap = XCreatePixmap (xdisplay, screen->xroot,
screen->width, screen->rect.width,
screen->height, screen->rect.height,
DefaultDepth (xdisplay, DefaultDepth (xdisplay,
screen->number)); screen->number));
@ -360,7 +360,7 @@ paint_screen (MetaCompositor *compositor,
XSetForeground (xdisplay, gc, WhitePixel (xdisplay, screen->number)); XSetForeground (xdisplay, gc, WhitePixel (xdisplay, screen->number));
XFixesSetGCClipRegion (xdisplay, gc, 0, 0, region); XFixesSetGCClipRegion (xdisplay, gc, 0, 0, region);
XFillRectangle (xdisplay, buffer_pixmap, gc, 0, 0, XFillRectangle (xdisplay, buffer_pixmap, gc, 0, 0,
screen->width, screen->height); screen->rect.width, screen->rect.height);
format = XRenderFindVisualFormat (xdisplay, format = XRenderFindVisualFormat (xdisplay,
DefaultVisual (xdisplay, DefaultVisual (xdisplay,
@ -473,7 +473,7 @@ paint_screen (MetaCompositor *compositor,
XRenderComposite (xdisplay, PictOpSrc, buffer_picture, None, XRenderComposite (xdisplay, PictOpSrc, buffer_picture, None,
screen->root_picture, screen->root_picture,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
screen->width, screen->height); screen->rect.width, screen->rect.height);
XFixesDestroyRegion (xdisplay, region); XFixesDestroyRegion (xdisplay, region);
XFreePixmap (xdisplay, buffer_pixmap); XFreePixmap (xdisplay, buffer_pixmap);
@ -782,8 +782,8 @@ process_expose (MetaCompositor *compositor,
r.x = 0; r.x = 0;
r.y = 0; r.y = 0;
r.width = screen->width; r.width = screen->rect.width;
r.height = screen->height; r.height = screen->rect.height;
region = XFixesCreateRegion (compositor->display->xdisplay, &r, 1); region = XFixesCreateRegion (compositor->display->xdisplay, &r, 1);
merge_and_destroy_damage_region (compositor, screen, region); merge_and_destroy_damage_region (compositor, screen, region);
@ -1288,8 +1288,8 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
/* Damage the whole screen */ /* Damage the whole screen */
r.x = 0; r.x = 0;
r.y = 0; r.y = 0;
r.width = screen->width; r.width = screen->rect.width;
r.height = screen->height; r.height = screen->rect.height;
merge_and_destroy_damage_region (compositor, merge_and_destroy_damage_region (compositor,
screen, screen,

2
src/delete.c
View File

@ -248,7 +248,7 @@ io_from_ping_dialog (GIOChannel *channel,
if (condition & G_IO_IN) if (condition & G_IO_IN)
{ {
char *str; char *str;
int len; unsigned int len;
GError *err; GError *err;
/* Go ahead and block for all data from child */ /* Go ahead and block for all data from child */