Some refactoring, Cinnamon struct, defconfig rather than just config

1 files changed, 11 insertions, 9 deletions

diff --git a/main.c b/main.c
index a6b012f..d5321a0 100644
--- a/main.c
+++ b/main.c
@@ -73,29 +73,31 @@ int main(int argc, char *argv[]) {
 #endif
 	gtk_init(&argc, &argv);
     
+	Cinnamon cinnamon = {0};
+
 	/* Create a new window and set default size */
-	GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	cinnamon.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	/* Size constants defined in config.h */
-	gtk_window_set_default_size(GTK_WINDOW(window), WINDOW_WIDTH, WINDOW_HEIGHT);
-	g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
+	gtk_window_set_default_size(GTK_WINDOW(cinnamon.window), WINDOW_WIDTH, WINDOW_HEIGHT);
+	g_signal_connect(cinnamon.window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 
-	GtkWidget *notebook = gtk_notebook_new();
-	gtk_container_add(GTK_CONTAINER(window), notebook);
+	cinnamon.notebook = gtk_notebook_new();
+	gtk_container_add(GTK_CONTAINER(cinnamon.window), cinnamon.notebook);
 
 
 	/* Create initial tab */
 	GtkWidget *webview = webkit_web_view_new();
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), webview, gtk_label_new("New Tab"));
+	gtk_notebook_append_page(GTK_NOTEBOOK(cinnamon.notebook), webview, gtk_label_new("New Tab"));
 	/* HOMEPAGE defined in config.h */
 	webkit_web_view_load_uri(WEBKIT_WEB_VIEW(webview), HOMEPAGE);
 
 	/* handle keypresses */
-	g_signal_connect(window, "key-press-event", G_CALLBACK(on_key_press), notebook);
+	g_signal_connect(cinnamon.window, "key-press-event", G_CALLBACK(on_key_press), &cinnamon);
 
 	/* handle tab changes */
-	g_signal_connect(webview, "notify::title", G_CALLBACK(on_title_changed), notebook);
+	g_signal_connect(webview, "notify::title", G_CALLBACK(on_title_changed), cinnamon.notebook);
 
-	gtk_widget_show_all(window);
+	gtk_widget_show_all(cinnamon.window);
 	gtk_main();
 
 	return 0;