X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/7c30fc7526b3f761d1b4d1c9d3a51842569529e2..83fb99f9459f4f6a270d2b75c8dd0137d2f2ccde:/disobedience/disobedience.c diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c index 5e32d2e..818128d 100644 --- a/disobedience/disobedience.c +++ b/disobedience/disobedience.c @@ -78,6 +78,12 @@ static int nop_in_flight; /** @brief True if an rtp-address command is in flight */ static int rtp_address_in_flight; +/** @brief True if a rights lookup is in flight */ +static int rights_lookup_in_flight; + +/** @brief Current rights bitmap */ +rights_type last_rights; + /** @brief Global tooltip group */ GtkTooltips *tips; @@ -90,6 +96,8 @@ int rtp_supported; /** @brief True if RTP play is enabled */ int rtp_is_running; +static void check_rtp_address(void); + /* Window creation --------------------------------------------------------- */ /* Note that all the client operations kicked off from here will only complete @@ -110,11 +118,16 @@ static gboolean delete_event(GtkWidget attribute((unused)) *widget, * * Updates the menu settings to correspond to the new page. */ -static void tab_switched(GtkNotebook attribute((unused)) *notebook, +static void tab_switched(GtkNotebook *notebook, GtkNotebookPage attribute((unused)) *page, guint page_num, gpointer attribute((unused)) user_data) { menu_update(page_num); + GtkWidget *const tab = gtk_notebook_get_nth_page(notebook, page_num); + const struct tabtype *const t = g_object_get_data(G_OBJECT(tab), "type"); + assert(t != 0); + if(t->selected) + t->selected(); } /** @brief Create the report box */ @@ -182,109 +195,46 @@ static void make_toplevel_window(void) { gtk_widget_set_style(toplevel, tool_style); } -#if MDEBUG -static int widget_count, container_count; - -static void count_callback(GtkWidget *w, - gpointer attribute((unused)) data) { - ++widget_count; - if(GTK_IS_CONTAINER(w)) { - ++container_count; - gtk_container_foreach(GTK_CONTAINER(w), count_callback, 0); - } -} - -static void count_widgets(void) { - widget_count = 0; - container_count = 1; - if(toplevel) - gtk_container_foreach(GTK_CONTAINER(toplevel), count_callback, 0); - fprintf(stderr, "widget count: %8d container count: %8d\n", - widget_count, container_count); -} -#endif +static void userinfo_rights_completed(void attribute((unused)) *v, + const char *error, + const char *value) { + rights_type r; -#if MTRACK -const char *mtag = "init"; -static hash *mtrack_hash; - -static int *mthfind(const char *tag) { - static const int zero = 0; - int *cp = hash_find(mtrack_hash, tag); - if(!cp) { - hash_add(mtrack_hash, tag, &zero, HASH_INSERT); - cp = hash_find(mtrack_hash, tag); + if(error) { + popup_protocol_error(0, error); + r = 0; + } else { + if(parse_rights(value, &r, 0)) + r = 0; } - return cp; -} - -static void *trap_malloc(size_t n) { - void *ptr = malloc(n + sizeof(char *)); - - *(const char **)ptr = mtag; - ++*mthfind(mtag); - return (char *)ptr + sizeof(char *); -} - -static void trap_free(void *ptr) { - const char *tag; - if(!ptr) - return; - ptr = (char *)ptr - sizeof(char *); - tag = *(const char **)ptr; - --*mthfind(tag); - free(ptr); -} - -static void *trap_realloc(void *ptr, size_t n) { - if(!ptr) - return trap_malloc(n); - if(!n) { - trap_free(ptr); - return 0; + /* If rights have changed, signal everything that cares */ + if(r != last_rights) { + last_rights = r; + ++suppress_actions; + event_raise("rights-changed", 0); + --suppress_actions; } - ptr = (char *)ptr - sizeof(char *); - ptr = realloc(ptr, n + sizeof(char *)); - *(const char **)ptr = mtag; - return (char *)ptr + sizeof(char *); -} - -static int report_tags_callback(const char *key, void *value, - void attribute((unused)) *u) { - fprintf(stderr, "%16s: %d\n", key, *(int *)value); - return 0; + rights_lookup_in_flight = 0; } -static void report_tags(void) { - hash_foreach(mtrack_hash, report_tags_callback, 0); - fprintf(stderr, "\n"); -} - -static const GMemVTable glib_memvtable = { - trap_malloc, - trap_realloc, - trap_free, - 0, - 0, - 0 -}; -#endif - /** @brief Called occasionally */ static gboolean periodic_slow(gpointer attribute((unused)) data) { - D(("periodic")); + D(("periodic_slow")); /* Expire cached data */ cache_expire(); /* Update everything to be sure that the connection to the server hasn't * mysteriously gone stale on us. */ all_update(); -#if MDEBUG - count_widgets(); - fprintf(stderr, "cache size: %zu\n", cache_count()); -#endif -#if MTRACK - report_tags(); -#endif + /* Periodically check what our rights are */ + if(!rights_lookup_in_flight) { + rights_lookup_in_flight = 1; + disorder_eclient_userinfo(client, + userinfo_rights_completed, + config->username, "rights", + 0); + } + /* Recheck RTP status too */ + check_rtp_address(); return TRUE; /* don't remove me */ } @@ -408,8 +358,9 @@ void logged_in(void) { disorder_eclient_close(logclient); rtp_supported = 0; event_raise("logged-in", 0); - /* Might be a new server so re-check */ - check_rtp_address(); + /* Force the periodic checks */ + periodic_slow(0); + periodic_fast(0); } int main(int argc, char **argv) { @@ -420,10 +371,6 @@ int main(int argc, char **argv) { /* garbage-collect PCRE's memory */ pcre_malloc = xmalloc; pcre_free = xfree; -#if MTRACK - mtrack_hash = hash_new(sizeof (int)); - g_mem_set_vtable((GMemVTable *)&glib_memvtable); -#endif if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); gtkok = gtk_init_check(&argc, &argv); while((n = getopt_long(argc, argv, "hVc:dtHC", options, 0)) >= 0) { @@ -450,7 +397,7 @@ int main(int argc, char **argv) { || !(logclient = gtkclient())) return 1; /* already reported an error */ /* periodic operations (e.g. expiring the cache, checking local volume) */ - g_timeout_add(600000/*milliseconds*/, periodic_slow, 0); + g_timeout_add(10000/*milliseconds*/, periodic_slow, 0); g_timeout_add(1000/*milliseconds*/, periodic_fast, 0); /* global tooltips */ tips = gtk_tooltips_new(); @@ -466,14 +413,14 @@ int main(int argc, char **argv) { 0/*notify*/); /* Start monitoring the log */ disorder_eclient_log(logclient, &log_callbacks, 0); - /* See if RTP play supported */ - check_rtp_address(); + /* Initiate all the checks */ + periodic_slow(0); + periodic_fast(0); suppress_actions = 0; /* If no password is set yet pop up a login box */ if(!config->password) login_box(); D(("enter main loop")); - MTAG("misc"); g_main_loop_run(mainloop); return 0; }