diff options
Diffstat (limited to '')
-rw-r--r-- | src/screen.h | 92 |
1 files changed, 43 insertions, 49 deletions
diff --git a/src/screen.h b/src/screen.h index d15be3bb9..f2c54d3da 100644 --- a/src/screen.h +++ b/src/screen.h @@ -9,66 +9,60 @@ #define MAX_SONGNAME_LENGTH 512 -typedef struct -{ - WINDOW *w; - int rows, cols; - int cur_action_id; +typedef struct { + WINDOW *w; + int rows, cols; + int cur_action_id; } window_t; +typedef struct { + window_t top_window; + window_t main_window; + window_t progress_window; + window_t status_window; -typedef struct -{ - window_t top_window; - window_t main_window; - window_t progress_window; - window_t status_window; + /* GTime is equivalent to time_t */ + GTime start_timestamp; + GTime status_timestamp; + GTime input_timestamp; + GTime last_cmd; - /* GTime is equivalent to time_t */ - GTime start_timestamp; - GTime status_timestamp; - GTime input_timestamp; - GTime last_cmd; + int cols, rows; - int cols, rows; + int mode; - int mode; + char *buf; + size_t buf_size; - char *buf; - size_t buf_size; - - char *findbuf; - GList *find_history; - - int painted; + char *findbuf; + GList *find_history; + int painted; } screen_t; -typedef void (*screen_init_fn_t) (WINDOW *w, int cols, int rows); -typedef void (*screen_exit_fn_t) (void); -typedef void (*screen_open_fn_t) (screen_t *screen, mpdclient_t *c); -typedef void (*screen_close_fn_t) (void); -typedef void (*screen_resize_fn_t) (int cols, int rows); -typedef void (*screen_paint_fn_t) (screen_t *screen, mpdclient_t *c); -typedef void (*screen_update_fn_t) (screen_t *screen, mpdclient_t *c); -typedef int (*screen_cmd_fn_t) (screen_t *scr, mpdclient_t *c, command_t cmd); -typedef char * (*screen_title_fn_t) (char *s, size_t size); -typedef list_window_t * (*screen_get_lw_fn_t) (void); - -typedef struct -{ - screen_init_fn_t init; - screen_exit_fn_t exit; - screen_open_fn_t open; - screen_close_fn_t close; - screen_resize_fn_t resize; - screen_paint_fn_t paint; - screen_update_fn_t update; - screen_cmd_fn_t cmd; - screen_title_fn_t get_title; - screen_get_lw_fn_t get_lw; - +typedef void (*screen_init_fn_t)(WINDOW *w, int cols, int rows); +typedef void (*screen_exit_fn_t)(void); +typedef void (*screen_open_fn_t)(screen_t *screen, mpdclient_t *c); +typedef void (*screen_close_fn_t)(void); +typedef void (*screen_resize_fn_t)(int cols, int rows); +typedef void (*screen_paint_fn_t)(screen_t *screen, mpdclient_t *c); +typedef void (*screen_update_fn_t)(screen_t *screen, mpdclient_t *c); +typedef int (*screen_cmd_fn_t)(screen_t *scr, mpdclient_t *c, command_t cmd); +typedef char *(*screen_title_fn_t)(char *s, size_t size); +typedef list_window_t *(*screen_get_lw_fn_t) (void); + +typedef struct { + screen_init_fn_t init; + screen_exit_fn_t exit; + screen_open_fn_t open; + screen_close_fn_t close; + screen_resize_fn_t resize; + screen_paint_fn_t paint; + screen_update_fn_t update; + screen_cmd_fn_t cmd; + screen_title_fn_t get_title; + screen_get_lw_fn_t get_lw; } screen_functions_t; |