2007-01-23 Matthew Allum <mallum@openedhand.com>
* Makefile.am: * clutter.pc.in: * clutter/Makefile.am: * clutter/clutter-backend-glx.c: * clutter/clutter-backend-glx.h: * clutter/clutter-event.c: * clutter/clutter-feature.c: * clutter/clutter-group.c: * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-stage-glx.c: * clutter/clutter-stage-glx.h: * clutter/clutter-stage.c: * clutter/clutter-stage.h: * clutter/clutter-util.c: * clutter/clutter-util.h: * clutter/pango/pangoclutter-render.c: * configure.ac: * examples/Makefile.am: Initial work in supporting different GL backends (ie. GLX/EGL/DirectFB etc). Currently just GLX supported and now mostly self contained. * TODO: Add a note about caching glenables
This commit is contained in:
@ -34,43 +34,6 @@
|
||||
#include "clutter-util.h"
|
||||
#include "clutter-main.h"
|
||||
|
||||
static int TrappedErrorCode = 0;
|
||||
static int (*old_error_handler) (Display *, XErrorEvent *);
|
||||
|
||||
static int
|
||||
error_handler(Display *xdpy,
|
||||
XErrorEvent *error)
|
||||
{
|
||||
TrappedErrorCode = error->error_code;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* clutter_util_trap_x_errors:
|
||||
*
|
||||
* Trap X errors so they don't cause an abort.
|
||||
*/
|
||||
void
|
||||
clutter_util_trap_x_errors(void)
|
||||
{
|
||||
TrappedErrorCode = 0;
|
||||
old_error_handler = XSetErrorHandler(error_handler);
|
||||
}
|
||||
|
||||
/**
|
||||
* clutter_util_untrap_x_errors:
|
||||
*
|
||||
* Stop trapping X errors.
|
||||
*
|
||||
* Return value: 0 if there was no error, or the last X error that occurred.
|
||||
*/
|
||||
int
|
||||
clutter_util_untrap_x_errors(void)
|
||||
{
|
||||
XSetErrorHandler(old_error_handler);
|
||||
return TrappedErrorCode;
|
||||
}
|
||||
|
||||
/**
|
||||
* clutter_util_next_p2:
|
||||
* @a: Value to get the next power
|
||||
|
Reference in New Issue
Block a user