From 304f32fa988815c2780c709235724e94651d02ba Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Fri, 7 Nov 2014 10:14:05 -0600 Subject: Fix up old libminui to compile Implement some needed updates to libminui to make it compile for healthd. Note that res_create_multi_display_surface is not fully implemented so healthd may still have issues with displaying some graphics. Will update later when we are able to test these changes. Change-Id: Ic1095a998f5dfe7e36a08384c86da28e0524a03f --- minui/minui.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'minui/minui.h') diff --git a/minui/minui.h b/minui/minui.h index 103318aa7..4c629c1b5 100644 --- a/minui/minui.h +++ b/minui/minui.h @@ -56,7 +56,7 @@ unsigned int gr_get_height(gr_surface surface); // see http://www.mjmwired.net/kernel/Documentation/input/ for info. struct input_event; -typedef int (*ev_callback)(int fd, short revents, void *data); +typedef int (*ev_callback)(int fd, uint32_t epevents, void *data); typedef int (*ev_set_key_callback)(int code, int value, void *data); int ev_init(ev_callback input_cb, void *data); @@ -71,19 +71,33 @@ int ev_sync_key_state(ev_set_key_callback set_key_cb, void *data); */ int ev_wait(int timeout); -int ev_get_input(int fd, short revents, struct input_event *ev); +int ev_get_input(int fd, uint32_t epevents, struct input_event *ev); void ev_dispatch(void); +int ev_get_epollfd(void); // Resources // Returns 0 if no error, else negative. int res_create_surface(const char* name, gr_surface* pSurface); + +// Load an array of display surfaces from a single PNG image. The PNG +// should have a 'Frames' text chunk whose value is the number of +// frames this image represents. The pixel data itself is interlaced +// by row. +int res_create_multi_display_surface(const char* name, + int* frames, gr_surface** pSurface); + int res_create_localized_surface(const char* name, gr_surface* pSurface); void res_free_surface(gr_surface surface); static inline int res_create_display_surface(const char* name, gr_surface* pSurface) { return res_create_surface(name, pSurface); } +// These are new graphics functions from 5.0 that were not available in +// 4.4 that are required by charger and healthd +void gr_clear(); + + #ifdef __cplusplus } #endif -- cgit v1.2.3