Refactor jumplist handling

Author: sebastinas

zathura/jumplist.c

@@ -128,14 +128,14 @@ bool zathura_jumplist_load(zathura_t* zathura, const char* file) {
     return false;
   }
 
-  zathura->jumplist.list = zathura_db_load_jumplist(zathura->database, file);
-
-  if (zathura->jumplist.list == NULL) {
+  girara_list_t* list = zathura_db_load_jumplist(zathura->database, file);
+  if (list == NULL) {
     girara_error("Failed to load the jumplist from the database");
-
     return false;
   }
 
+  girara_list_free(zathura->jumplist.list);
+  zathura->jumplist.list = list;
   zathura->jumplist.size = girara_list_size(zathura->jumplist.list);
 
   if (zathura->jumplist.size != 0) {
@@ -149,3 +149,23 @@ bool zathura_jumplist_load(zathura_t* zathura, const char* file) {
 
   return true;
 }
+
+void zathura_jumplist_init(zathura_t* zathura, size_t max_size) {
+  zathura->jumplist.max_size = max_size;
+  zathura->jumplist.list     = girara_list_new_with_free(g_free);
+  zathura->jumplist.size     = 0;
+  zathura->jumplist.cur      = NULL;
+}
+
+void zathura_jumplist_clear(zathura_t* zathura) {
+  if (zathura == NULL) {
+    return;
+  }
+
+  /* remove jump list */
+  girara_list_iterator_free(zathura->jumplist.cur);
+  zathura->jumplist.cur = NULL;
+  girara_list_free(zathura->jumplist.list);
+  zathura->jumplist.list = NULL;
+  zathura->jumplist.size = 0;
+}

zathura/jumplist.h

@@ -75,4 +75,19 @@ void zathura_jumplist_trim(zathura_t* zathura);
  */
 bool zathura_jumplist_load(zathura_t* zathura, const char* file);
 
+/**
+ * Init jumplist with a maximum size
+ *
+ * @param zathura The zathura session
+ * @param max_size maximum jumplist size (or 0 for unbounded lists)
+ */
+void zathura_jumplist_init(zathura_t* zathura, size_t max_size);
+
+/**
+ * Clear jumplist
+ *
+ * @param zathura The zathura session
+ */
+void zathura_jumplist_clear(zathura_t* zathura);
+
 #endif

zathura/zathura.c

@@ -384,16 +384,6 @@ static void init_database(zathura_t* zathura) {
 }
 #endif
 
-static void init_jumplist(zathura_t* zathura) {
-  int jumplist_size = 20;
-  girara_setting_get(zathura->ui.session, "jumplist-size", &jumplist_size);
-
-  zathura->jumplist.max_size = jumplist_size < 0 ? 0 : jumplist_size;
-  zathura->jumplist.list     = NULL;
-  zathura->jumplist.size     = 0;
-  zathura->jumplist.cur      = NULL;
-}
-
 static void init_shortcut_helpers(zathura_t* zathura) {
   zathura->shortcut.mouse.x = 0;
   zathura->shortcut.mouse.y = 0;
@@ -439,7 +429,9 @@ bool zathura_init(zathura_t* zathura) {
                                                          (girara_free_function_t)zathura_bookmark_free);
 
   /* jumplist */
-  init_jumplist(zathura);
+  int jumplist_size = 20;
+  girara_setting_get(zathura->ui.session, "jumplist-size", &jumplist_size);
+  zathura_jumplist_init(zathura, MAX(jumplist_size, 0));
 
   /* CSS for index mode */
   if (init_css(zathura) == false) {
@@ -524,13 +516,7 @@ void zathura_free(zathura_t* zathura) {
   g_free(zathura->config.cache_dir);
 
   /* free jumplist */
-  if (zathura->jumplist.cur != NULL) {
-    girara_list_iterator_free(zathura->jumplist.cur);
-  }
-
-  if (zathura->jumplist.list != NULL) {
-    girara_list_free(zathura->jumplist.list);
-  }
+  zathura_jumplist_clear(zathura);
 
   g_free(zathura);
 }
@@ -1192,7 +1178,6 @@ bool document_open(zathura_t* zathura, const char* path, const char* uri, const
     /* jumplist */
     if (zathura_jumplist_load(zathura, file_path) == false) {
       girara_debug("Failed to load jumplist.");
-      zathura->jumplist.list = girara_list_new2(g_free);
     }
 
     /* quickmarks */
@@ -1202,8 +1187,7 @@ bool document_open(zathura_t* zathura, const char* path, const char* uri, const
     }
   } else {
     /* create fallback lists */
-    zathura->jumplist.list = girara_list_new2(g_free);
-    zathura->global.marks  = girara_list_new2(g_free);
+    zathura->global.marks = girara_list_new2(g_free);
   }
 
   if (zathura->jumplist.list == NULL || zathura->global.marks == NULL) {
@@ -1466,12 +1450,7 @@ bool document_close(zathura_t* zathura, bool keep_monitor) {
     zathura->global.marks = NULL;
   }
 
-  /* remove jump list */
-  girara_list_iterator_free(zathura->jumplist.cur);
-  zathura->jumplist.cur = NULL;
-  girara_list_free(zathura->jumplist.list);
-  zathura->jumplist.list = NULL;
-  zathura->jumplist.size = 0;
+  zathura_jumplist_clear(zathura);
 
   /* release render thread */
   g_clear_object(&zathura->sync.render_thread);