X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=b9e6860cfcae20bd155603579cd5f4ed4a86edcc;hb=24fbad1fafb0e7c0cd65afb199a29a8676db5b5e;hp=1518bd618e1be511401b273d3cdbc569b4269530;hpb=e986bbe93fab2d002797bf40983d91ceb76a133c;p=prss.git

diff --git a/src/main.c b/src/main.c
index 1518bd6..b9e6860 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,8 +29,10 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+#include <config.h>
 #include "http.h"
-#include "log.h"
+#include <plog.h>
+#include <pstr.h>
 #include "ttrss.h"
 #include "ttrss_ws.h"
 #include "webbrowser.h"
@@ -41,7 +43,7 @@ static GSettings *settings;
 static GtkPaned *w_panel;
 static GtkLabel *w_headline_title;
 static GtkLabel *w_headline_date;
-
+static GtkWindow *window;
 static int model_state;
 
 enum {
@@ -281,12 +283,25 @@ static struct headline *get_selected_headline(GtkTreeIter *iter)
 	return NULL;
 }
 
+static char *headline_to_markup(struct headline *h)
+{
+	return strrepg(h->title, "&", "&amp;");
+}
+
 static char *headline_get_formated_headline(struct headline *h)
 {
+	char *tmp, *res;
+
+	tmp = headline_to_markup(h);
+
 	if (h->unread)
-		return g_strdup_printf("<b>%s</b>", h->title);
+		res = g_strdup_printf("<b>%s</b>", tmp);
 	else
-		return strdup(h->title);
+		res = strdup(tmp);
+
+	free(tmp);
+
+	return res;
 }
 
 static char *headline_get_date(struct headline *h)
@@ -366,7 +381,7 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	struct headline *headline;
-	char *str, *date;
+	char *str, *date, *title;
 
 	log_debug("headline_cursor_changed_cbk()");
 
@@ -376,7 +391,9 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 	headline = get_selected_headline(&iter);
 
 	if (headline) {
-		gtk_label_set_text(w_headline_title, headline->title);
+		title = headline_to_markup(headline);
+		gtk_label_set_markup(w_headline_title, title);
+
 		gtk_label_set_text(w_headline_date, ctime(&headline->date));
 
 		str = ttrss_get_headline_content(headline);
@@ -397,11 +414,12 @@ int headline_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		date = headline_get_date(headline);
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
-				   COL_HEADLINE_TITLE, headline->title,
+				   COL_HEADLINE_TITLE, title,
 				   COL_HEADLINE_DATE, date,
 				   COL_HEADLINE_EPOCH_TIME, headline->date,
 				   -1);
 		free(date);
+		free(title);
 	} else {
 		log_debug("headline not found");
 	}
@@ -444,11 +462,29 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
 	}
 }
 
+static void save_settings()
+{
+	int w, h, x, y;
+
+	gtk_window_get_size(window, &w, &h);
+	gtk_window_get_position(window, &x, &y);
+
+	log_debug("save_settings(): x=%d, y=%d, w=%d, h=%d", x, y, w, h);
+
+	g_settings_set_int(settings, "window-x", x);
+	g_settings_set_int(settings, "window-y", y);
+	g_settings_set_int(settings, "window-width", w);
+	g_settings_set_int(settings, "window-height", h);
+
+	g_settings_sync();
+}
+
 gboolean
 window_delete_event_cbk(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
 	log_debug("window_delete_event_cbk");
 
+	save_settings();
 	gtk_main_quit();
 
 	return TRUE;
@@ -458,6 +494,7 @@ void quit_activate_cbk(GtkWidget *menu_item, gpointer data)
 {
 	log_debug("quit_activate_cbk");
 
+	save_settings();
 	gtk_main_quit();
 }
 
@@ -504,7 +541,7 @@ static void log_init()
 
 int main(int argc, char **argv)
 {
-	GtkWidget *window, *panh;
+	GtkWidget *panh;
 	GtkBuilder *builder;
 	int optc, cmdok, opti;
 
@@ -560,7 +597,16 @@ int main(int argc, char **argv)
 		(builder,
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "prss.glade",
 		 NULL);
-	window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
+	window = GTK_WINDOW(gtk_builder_get_object(builder, "window"));
+
+	gtk_window_set_default_size
+		(window,
+		 g_settings_get_int(settings, "window-width"),
+		 g_settings_get_int(settings, "window-height"));
+	gtk_window_move(window,
+			g_settings_get_int(settings, "window-x"),
+			g_settings_get_int(settings, "window-y"));
+
 	w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
 							  "feed_tree"));
 	w_headlinetree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
@@ -576,11 +622,14 @@ int main(int argc, char **argv)
 
 	panh = GTK_WIDGET(gtk_builder_get_object(builder, "webkit_window"));
 
+	webbrowser_init(GTK_STATUSBAR(gtk_builder_get_object
+				      (builder, "statusbar")));
+
 	gtk_container_add(GTK_CONTAINER(panh), web_get_widget());
 
 	g_object_unref(G_OBJECT(builder));
 
-	gtk_widget_show_all(window);
+	gtk_widget_show_all(GTK_WIDGET(window));
 	update_layout();
 
 	gtk_main();