X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-terminal%2Fgrdev.h;h=35d6eb2abf1346bc28e6c9e87e55dabe87a5bfb0;hp=5f745aaad4e060957d306416c00dc2e35ce08f63;hb=adeba5008eac3105ae59256dedd087ebe006a9e6;hpb=f2a15d86ccd0729e1442f40679cd393417e1e177 diff --git a/src/libsystemd-terminal/grdev.h b/src/libsystemd-terminal/grdev.h index 5f745aaad..35d6eb2ab 100644 --- a/src/libsystemd-terminal/grdev.h +++ b/src/libsystemd-terminal/grdev.h @@ -93,9 +93,15 @@ struct grdev_fb { uint32_t width; uint32_t height; uint32_t format; - uint64_t age; int32_t strides[4]; void *maps[4]; + + union { + void *ptr; + uint64_t u64; + } data; + + void (*free_fn) (void *ptr); }; struct grdev_display_target { @@ -105,25 +111,28 @@ struct grdev_display_target { uint32_t height; unsigned int rotate; unsigned int flip; - const grdev_fb *fb; + grdev_fb *front; + grdev_fb *back; }; void grdev_display_set_userdata(grdev_display *display, void *userdata); void *grdev_display_get_userdata(grdev_display *display); const char *grdev_display_get_name(grdev_display *display); +uint32_t grdev_display_get_width(grdev_display *display); +uint32_t grdev_display_get_height(grdev_display *display); bool grdev_display_is_enabled(grdev_display *display); void grdev_display_enable(grdev_display *display); void grdev_display_disable(grdev_display *display); -const grdev_display_target *grdev_display_next_target(grdev_display *display, const grdev_display_target *prev, uint64_t minage); -void grdev_display_flip_target(grdev_display *display, const grdev_display_target *target, uint64_t age); +const grdev_display_target *grdev_display_next_target(grdev_display *display, const grdev_display_target *prev); +void grdev_display_flip_target(grdev_display *display, const grdev_display_target *target); -#define GRDEV_DISPLAY_FOREACH_TARGET(_display, _t, _minage) \ - for ((_t) = grdev_display_next_target((_display), NULL, (_minage)); \ - (_t); \ - (_t) = grdev_display_next_target((_display), (_t), (_minage))) +#define GRDEV_DISPLAY_FOREACH_TARGET(_display, _t) \ + for ((_t) = grdev_display_next_target((_display), NULL); \ + (_t); \ + (_t) = grdev_display_next_target((_display), (_t))) /* * Events