Complete Disobedience transition to event_ from _monitor.

[disorder] / disobedience / disobedience.h

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 884ebfe2827620960c283d69ab3f1d7be29ca3da..452526d9fd8f26ca818070dcc70e227db7d4bdd2 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2006-2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,13 +24,9 @@
 #ifndef DISOBEDIENCE_H
 #define DISOBEDIENCE_H
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
-#include <stdio.h>
 #include <time.h>
-#include <string.h>
-#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <math.h>
@@ -49,6 +45,8 @@
 #include "configuration.h"
 #include "hash.h"
 #include "selection.h"
+#include "kvp.h"
+#include "eventdist.h"
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -75,6 +73,10 @@ struct callbackdata {
     struct choosenode *choosenode;      /* gtkchoose.c got_files/got_dirs */
     struct queuelike *ql;               /* gtkqueue.c queuelike_completed */
     struct prefdata *f;                 /* properties.c */
+    const char *user;                   /* users.c */
+    struct {
+      const char *user, *email;         /* users.c */
+    } edituser;
   } u;
 };
 
@@ -86,8 +88,10 @@ struct callbackdata {
 struct tabtype {
   int (*properties_sensitive)(GtkWidget *tab);
   int (*selectall_sensitive)(GtkWidget *tab);
+  int (*selectnone_sensitive)(GtkWidget *tab);
   void (*properties_activate)(GtkWidget *tab);
   void (*selectall_activate)(GtkWidget *tab);
+  void (*selectnone_activate)(GtkWidget *tab);
 };
 
 /** @brief Button definitions */
@@ -95,6 +99,7 @@ struct button {
   const gchar *stock;
   void (*clicked)(GtkButton *button, gpointer userdata);
   const char *tip;
+  GtkWidget *widget;
 };
 
 /* Variables --------------------------------------------------------------- */
@@ -117,8 +122,6 @@ extern GtkItemFactory *mainmenufactory;
 
 extern const disorder_eclient_log_callbacks log_callbacks;
 
-typedef void monitor_callback(void *u);
-
 /* Functions --------------------------------------------------------------- */
 
 disorder_eclient *gtkclient(void);
@@ -133,15 +136,17 @@ void properties(int ntracks, const char **tracks);
 
 void properties_reset(void);
 
-GtkWidget *scroll_widget(GtkWidget *child, const char *name);
+GtkWidget *scroll_widget(GtkWidget *child);
 /* Wrap a widget up for scrolling */
 
+GtkWidget *frame_widget(GtkWidget *w, const char *title);
+
 GdkPixbuf *find_image(const char *name);
 /* Get the pixbuf for an image.  Returns a null pointer if it cannot be
  * found. */
 
 void popup_msg(GtkMessageType mt, const char *msg);
-/* Pop up a message */
+void popup_submsg(GtkWidget *parent, GtkMessageType mt, const char *msg);
 
 void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
 
@@ -155,13 +160,11 @@ void progress_window_progress(struct progress_window *pw,
 
 GtkWidget *iconbutton(const char *path, const char *tip);
 
-GtkWidget *create_buttons(const struct button *buttons,
+GtkWidget *create_buttons(struct button *buttons,
                           size_t nbuttons);
-
-void register_monitor(monitor_callback *callback,
-                      void *u,
-                      unsigned long mask);
-/* Register a state monitor */
+GtkWidget *create_buttons_box(struct button *buttons,
+                              size_t nbuttons,
+                              GtkWidget *box);
 
 /** @brief Type signature for a reset callback */
 typedef void reset_callback(void);
@@ -183,16 +186,14 @@ void menu_update(int page);
 /* Called whenever the main menu might need to change.  PAGE is the current
  * page if known or -1 otherwise. */
 
+void users_set_sensitive(int sensitive);
 
 /* Controls */
 
 GtkWidget *control_widget(void);
 /* Make the controls widget */
 
-void volume_update(void);
-/* Called whenever we think the volume control has changed */
-
-void control_monitor(void *u);
+extern int suppress_actions;
 
 /* Queue/Recent/Added */
 
@@ -202,14 +203,9 @@ GtkWidget *added_widget(void);
 /* Create widgets for displaying the queue, the recently played list and the
  * newly added tracks list */
 
-void queue_update(void);
-void recent_update(void);
-void added_update(void);
-/* Called whenever we think the queue, recent or newly-added list might have
- * changed */
-
 void queue_select_all(struct queuelike *ql);
-/* Select all on some queue */
+void queue_select_none(struct queuelike *ql);
+/* Select all/none on some queue */
 
 void queue_properties(struct queuelike *ql);
 /* Pop up properties of selected items in some queue */
@@ -222,7 +218,6 @@ void namepart_update(const char *track,
                      const char *part);
 /* Called when a namepart might have changed */
 
-
 /* Choose */
 
 GtkWidget *choose_widget(void);
@@ -231,16 +226,48 @@ GtkWidget *choose_widget(void);
 void choose_update(void);
 /* Called when we think the choose tree might need updating */
 
+void play_completed(void *v,
+                    const char *error);
+
 /* Login details */
 
 void login_box(void);
 
+GtkWidget *login_window;
+
+/* User management */
+
+void manage_users(void);
+
+/* Help */
+
+void popup_help(void);
+
 /* RTP */
 
 int rtp_running(void);
 void start_rtp(void);
 void stop_rtp(void);
 
+/* Settings */
+
+void init_styles(void);
+extern GtkStyle *layout_style;
+extern GtkStyle *title_style;
+extern GtkStyle *even_style;
+extern GtkStyle *odd_style;
+extern GtkStyle *active_style;
+extern GtkStyle *tool_style;
+extern GtkStyle *search_style;
+extern GtkStyle *drag_style;
+
+extern const char *browser;
+
+void save_settings(void);
+void load_settings(void);
+void set_tool_colors(GtkWidget *w);
+void popup_settings(void);
+
 /* Widget leakage debugging rubbish ---------------------------------------- */
 
 #if MDEBUG