diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2008-09-02 10:28:17 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2008-09-02 10:49:12 +0100 |
commit | a5d33bcbb43cd1738e45b803c1aa968aff55e7ab (patch) | |
tree | 51db966141e4613d1e7edeb341abb19cf6d2a7e9 /src/cairo-xlib-private.h | |
parent | 939b836bfa95df759aca96936bb9a6d89d3130b8 (diff) | |
download | cairo-a5d33bcbb43cd1738e45b803c1aa968aff55e7ab.tar.gz |
[xlib] Keep a pointer to the cairo_xlib_display_t on the surface.
Cleanup the code somewhat by passing cairo_xlib_display_t around
internally as opposed to a Display and then having to lookup the
corresponding cairo_xlib_display_t each time.
[To get a cairo_xlib_display_t from a Display is a list traversal under
mutex (though the element we're looking for is most likely at the start),
but to get the Display is just a lockless pointer dereference.]
Diffstat (limited to 'src/cairo-xlib-private.h')
-rw-r--r-- | src/cairo-xlib-private.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cairo-xlib-private.h b/src/cairo-xlib-private.h index e9622780e..e381e584d 100644 --- a/src/cairo-xlib-private.h +++ b/src/cairo-xlib-private.h @@ -53,7 +53,7 @@ typedef void (*cairo_xlib_notify_resource_func) (Display *, XID); struct _cairo_xlib_hook { cairo_xlib_hook_t *prev, *next; /* private */ - void (*func) (Display *display, void *data); + void (*func) (cairo_xlib_display_t *display, void *data); }; struct _cairo_xlib_display { @@ -113,11 +113,11 @@ _cairo_xlib_display_reference (cairo_xlib_display_t *info); cairo_private void _cairo_xlib_display_destroy (cairo_xlib_display_t *info); -cairo_private cairo_bool_t -_cairo_xlib_add_close_display_hook (Display *display, cairo_xlib_hook_t *hook); +cairo_private void +_cairo_xlib_add_close_display_hook (cairo_xlib_display_t *display, cairo_xlib_hook_t *hook); cairo_private void -_cairo_xlib_remove_close_display_hook (Display *display, cairo_xlib_hook_t *hook); +_cairo_xlib_remove_close_display_hook (cairo_xlib_display_t *display, cairo_xlib_hook_t *hook); cairo_private cairo_status_t _cairo_xlib_display_queue_work (cairo_xlib_display_t *display, @@ -136,7 +136,7 @@ _cairo_xlib_display_get_xrender_format (cairo_xlib_display_t *display, cairo_format_t format); cairo_private cairo_xlib_screen_info_t * -_cairo_xlib_screen_info_get (Display *display, Screen *screen); +_cairo_xlib_screen_info_get (cairo_xlib_display_t *display, Screen *screen); cairo_private cairo_xlib_screen_info_t * _cairo_xlib_screen_info_reference (cairo_xlib_screen_info_t *info); |