X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fmain.c;h=c9f15a97f1b42e94c950675d7ff430055c208777;hp=4365e11230b8d542f41b91c611ae419fd508cb7d;hb=47231117238180500e22522eb470530bad381dd1;hpb=646cde735b54f33fd935535c97bace0d9971beb6 diff --git a/src/main.c b/src/main.c index 4365e11..c9f15a9 100644 --- a/src/main.c +++ b/src/main.c @@ -22,17 +22,18 @@ #include #include -#include "ttrss.h" #include #include #include -#include "phttp.h" +#include "http.h" +#include "ttrss.h" #include "webbrowser.h" static const char *program_name; static GSettings *settings; +static int model_state; static struct option long_options[] = { {"version", no_argument, 0, 'v'}, @@ -85,9 +86,13 @@ void update() g_settings_get_string(settings, "password")); model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview)); - gtk_list_store_clear(GTK_LIST_STORE(model)); - for (feeds = ttrss_get_feeds(); *feeds; feeds++) { + printf("update(): clear feed tree\n"); + model_state = 1; + gtk_list_store_clear(GTK_LIST_STORE(model)); + printf("update(): clear feed tree done\n"); + feeds = ttrss_get_feeds(); + while(feeds && *feeds) { if ((*feeds)->unread) title = g_strdup_printf("%s (%d)", (*feeds)->title, @@ -104,15 +109,24 @@ void update() 1, (*feeds), -1); free(title); + feeds++; } + model_state = 0; + printf("refresh done\n"); } +void refresh_clicked_cbk(GtkWidget *btn, gpointer data) +{ + printf("refresh_clicked_cbk\n"); + update(); +} + void settings_activate_cbk(GtkWidget *menu_item, gpointer data) { GtkDialog *diag; GtkBuilder *builder; - GtkEntry *e; + GtkEntry *login, *url, *pwd; printf("settings_activate_cbk\n"); @@ -125,16 +139,28 @@ void settings_activate_cbk(GtkWidget *menu_item, gpointer data) diag = GTK_DIALOG(gtk_builder_get_object(builder, "settings_dialog")); - e = GTK_ENTRY(gtk_builder_get_object(builder, "url_entry")); - gtk_entry_set_text(e, g_settings_get_string(settings, "url")); + url = GTK_ENTRY(gtk_builder_get_object(builder, "url_entry")); + gtk_entry_set_text(url, g_settings_get_string(settings, "url")); - e = GTK_ENTRY(gtk_builder_get_object(builder, "login_entry")); - gtk_entry_set_text(e, g_settings_get_string(settings, "user")); + login = GTK_ENTRY(gtk_builder_get_object(builder, "login_entry")); + gtk_entry_set_text(login, g_settings_get_string(settings, "user")); - e = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry")); - gtk_entry_set_text(e, g_settings_get_string(settings, "password")); + pwd = GTK_ENTRY(gtk_builder_get_object(builder, "password_entry")); + gtk_entry_set_text(pwd, g_settings_get_string(settings, "password")); - printf("%d\n", gtk_dialog_run(diag)); + if (gtk_dialog_run(diag)) { + g_settings_set_string(settings, + "password", + gtk_entry_get_text(pwd)); + g_settings_set_string(settings, + "url", + gtk_entry_get_text(url)); + g_settings_set_string(settings, + "user", + gtk_entry_get_text(login)); + + update(); + } gtk_widget_destroy(GTK_WIDGET(diag)); @@ -163,8 +189,11 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) headline_model = gtk_tree_view_get_model(w_headlineview); headline_store = GTK_LIST_STORE(headline_model); + model_state = 1; gtk_list_store_clear(headline_store); - for (headlines = feed->headlines; *headlines; headlines++) { + + headlines = ttrss_get_headlines(feed); + while (headlines && *headlines) { gtk_list_store_append(headline_store, &iter); if ((*headlines)->unread) @@ -180,8 +209,11 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) -1); free(title); + + headlines++; } + model_state = 0; gtk_tree_path_free(path); } @@ -190,13 +222,17 @@ int feed_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) { - printf("headline_cursor_changed_cbk\n"); - GtkTreePath *path; GtkTreeViewColumn *cols; GtkTreeIter iter; GtkTreeModel *model; struct headline *headline; + const char *str; + + printf("headline_cursor_changed_cbk\n"); + + if (model_state) + return TRUE; gtk_tree_view_get_cursor(treeview, &path, &cols); @@ -205,7 +241,22 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) gtk_tree_model_get_iter(model, &iter, path); gtk_tree_model_get(model, &iter, 1, &headline, -1); - web_load(((struct headline *)headline)->content); + str = ttrss_get_headline_content(headline); + + if (str) + web_load(str); + else + web_load(""); + + if (headline->unread) { + ttrss_set_article_unread(headline->id, 0); + headline->unread = 0; + } + + gtk_list_store_set(GTK_LIST_STORE(model), + &iter, + 0, headline->title, + -1); gtk_tree_path_free(path); } @@ -213,6 +264,37 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data) return TRUE; } +void headline_row_activated_cbk(GtkWidget *widget, gpointer data) +{ + GdkScreen *screen; + GError *error; + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + struct feed *feed; + const char *url; + + printf("headline_row_activated_cbk\n"); + + selection = gtk_tree_view_get_selection(w_headlineview); + model = gtk_tree_view_get_model(w_headlineview); + + if (gtk_tree_selection_get_selected(selection, &model, &iter)) { + gtk_tree_model_get(model, &iter, 1, &feed, -1); + url = feed->url; + + if (gtk_widget_has_screen (widget)) + screen = gtk_widget_get_screen(widget); + else + screen = gdk_screen_get_default(); + + printf("%s\n", url); + + error = NULL; + gtk_show_uri(screen, url, gtk_get_current_event_time(), &error); + } +} + gboolean window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data) { @@ -260,7 +342,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - phttp_init(); + http_init(); gtk_init(NULL, NULL); settings = g_settings_new("prss"); @@ -286,8 +368,6 @@ int main(int argc, char **argv) gtk_widget_show_all(window); - update(); - gtk_main(); exit(EXIT_SUCCESS);