the updated sources

[ncmpc.git] / src / screen.h

diff --git a/src/screen.h b/src/screen.h
index cb4abc83d243f1b69e1cc5ec6ba2f3599ec10512..71489f211e8b584be8da11b80e97b381e7a92fd1 100644 (file)
--- a/src/screen.h
+++ b/src/screen.h
@@ -3,34 +3,20 @@
 #include <ncurses.h>
 #include "list_window.h"
 
-/* minumum window size */
-#define SCREEN_MIN_COLS 14
-#define SCREEN_MIN_ROWS  5
-
 #define IS_PLAYING(s) (s==MPD_STATUS_STATE_PLAY)
 #define IS_PAUSED(s) (s==MPD_STATUS_STATE_PAUSE)
 #define IS_STOPPED(s) (!(IS_PLAYING(s) | IS_PAUSED(s)))
 
-
-typedef enum
-{
-  SCREEN_PLAY_WINDOW = 0,
-  SCREEN_FILE_WINDOW,
-  SCREEN_HELP_WINDOW,
-  SCREEN_KEYDEF_WINDOW,
-  SCREEN_SEARCH_WINDOW
-
-} screen_mode_t;
+#define MAX_SONGNAME_LENGTH   512
 
 typedef struct
 {
   WINDOW *w;
   int rows, cols;
-
+  int cur_action_id;
 } window_t;
 
 
-
 typedef struct
 {
   window_t top_window;
@@ -38,16 +24,15 @@ typedef struct
   window_t progress_window;
   window_t status_window;
 
-  GList *screen_list;
-
-  time_t start_timestamp;
-  time_t status_timestamp;
-  time_t input_timestamp;
-  command_t last_cmd;
+  /* GTime is equivalent to time_t */
+  GTime start_timestamp;
+  GTime status_timestamp;
+  GTime input_timestamp;
+  GTime last_cmd;
 
   int cols, rows;
 
-  screen_mode_t mode;
+  int mode;
 
   char *buf;
   size_t buf_size;
@@ -62,13 +47,13 @@ typedef struct
 
 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, mpd_client_t *c);
+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, mpd_client_t *c);
-typedef void (*screen_update_fn_t) (screen_t *screen, mpd_client_t *c);
-typedef int (*screen_cmd_fn_t) (screen_t *scr, mpd_client_t *c, command_t cmd);
-typedef char * (*screen_title_fn_t) (void);
+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
@@ -87,15 +72,21 @@ typedef struct
 } screen_functions_t;
 
 
-int screen_init(void);
+int screen_init(mpdclient_t *c);
 int screen_exit(void);
 void screen_resize(void);
 void screen_status_message(char *msg);
 void screen_status_printf(char *format, ...);
 char *screen_error(void);
-void screen_paint(mpd_client_t *c);
-void screen_update(mpd_client_t *c);
-void screen_idle(mpd_client_t *c);
-void screen_cmd(mpd_client_t *c, command_t cmd);
+void screen_paint(mpdclient_t *c);
+void screen_update(mpdclient_t *c);
+void screen_idle(mpdclient_t *c);
+void screen_cmd(mpdclient_t *c, command_t cmd);
+
+
+gint get_cur_mode_id();
+int screen_get_mouse_event(mpdclient_t *c,
+                          list_window_t *lw, int lw_length, 
+                          unsigned long *bstate, int *row);
 
 #endif