isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-14 22:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a dependency on libcm when building with compositor.

Browse Source 
Fri Jan 13 14:40:19 2006  Søren Sandmann  <sandmann@redhat.com>

	* configure.in: Add a dependency on libcm when building with
	compositor.

	* src/window.c (meta_window_hide): Make this function static.

	* src/window.c (implement_showing): Use meta_compositor_minimize()
	to do a weird minimize effect.

	* src/compositor.[ch]: Beginning of new GL based compositor.

	* src/screen.h (struct _MetaScreen): Add void pointer to
	compositor data.

	* src/screen.c (meta_screen_new): Remove obsolete compositor
	stuff; initialize compositor_data. Don't composite manage screen
	out of this function.

	* src/errors.c (x_error_handler): Check that display is non-NULL
	before using it. Add comment about how that can happen.

	* src/display.c (meta_display_{begin,end}_grab_op): Remove
	explicity damage of windows.

	* src/display.c (meta_display_open): Composite manage all the
	screens.
This commit is contained in:
Søren Sandmann
2006-01-13 19:41:01 +00:00
committed by Søren Sandmann Pedersen
parent 0eab7bd14c
commit fea6191473
9 changed files with 602 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/errors.c
View File

@ -97,7 +97,6 @@ meta_error_trap_pop_internal (MetaDisplay *display,
XErrorEvent *);
restored_error_handler = XSetErrorHandler (x_error_handler);
g_assert (restored_error_handler == x_error_handler);
/* remove this */
display->error_trap_handler = NULL;
@ -183,8 +182,11 @@ x_error_handler (Display *xdisplay,
XGetErrorText (xdisplay, error->error_code, buf, 63);
display = meta_display_for_x_display (xdisplay);
if (display->error_traps > 0)
/* Display can be NULL here because the compositing manager
* has its own Display, but Xlib only has one global error handler
*/
if (display && display->error_traps > 0)
{
/* we're in an error trap, chain to the trap handler
* saved from GDK