Ticket #2287: 0001-Save-bookmarks-of-internal-edit-in-filepos.patch

lib/util.c

@@ -1457 +1457 @@
  * If there is no stored data, return line 1 and col 0.
  */
 void
-load_file_position (const char *filename, long *line, long *column, off_t * offset)
+load_file_position (const char *filename, long *line, long *column, off_t * offset, long *bookmarks, int num_bookmarks)
 {
     char *fn;
     FILE *f;
-    char buf[MC_MAXPATHLEN + 20];
+    char buf[MC_MAXPATHLEN + 100];
     int len;
 
     /* defaults */
@@ -1476 +1476 @@
     if (!f)
         return;
 
+    if (bookmarks != NULL)
+        bookmarks[0] = -1;
+
     len = strlen (filename);
 
     while (fgets (buf, sizeof (buf), f))
@@ -1496 +1499 @@
         if (strchr (p, ' '))
             continue;
 
-        pos_tokens = g_strsplit_set (p, ";", 3);
+
+        pos_tokens = g_strsplit_set (p, ";", 3 + num_bookmarks);
         if (pos_tokens[0] != NULL)
         {
             *line = strtol (pos_tokens[0], NULL, 10);
@@ -1504 +1508 @@
             {
                 *column = strtol (pos_tokens[1], NULL, 10);
                 if (pos_tokens[2] != NULL)
+                {
+                    int i;
                     *offset = strtoll (pos_tokens[2], NULL, 10);
+                    for (i = 0; i < num_bookmarks; i++)
+                    {
+                        if (pos_tokens[3+i] != NULL)
+                            bookmarks[i] = strtol (pos_tokens[3+i], NULL, 10);
+                        else
+                        {
+                            bookmarks[i] = -1;
+                            break;
+                        }
+                    }
+                }
                 else
                     *offset = 0;
             }
@@ -1528 +1545 @@
 /* Save position for the given file */
 #define TMP_SUFFIX ".tmp"
 void
-save_file_position (const char *filename, long line, long column, off_t offset)
+save_file_position (const char *filename, long line, long column, off_t offset, long *bookmarks)
 {
     static int filepos_max_saved_entries = 0;
     char *fn, *tmp_fn;
     FILE *f, *tmp_f;
-    char buf[MC_MAXPATHLEN + 20];
+    char buf[MC_MAXPATHLEN + 100];
     int i = 1;
     gsize len;
 
@@ -1563 +1580 @@
     /* put the new record */
     if (line != 1 || column != 0)
     {
-        if (fprintf (f, "%s %ld;%ld;%llu\n", filename, line, column, (unsigned long long) offset) <
+        if (fprintf (f, "%s %ld;%ld;%llu", filename, line, column, (unsigned long long) offset) <
             0)
             goto write_position_error;
+        if (bookmarks != NULL)
+        {
+            for ( ; *bookmarks != -1; bookmarks++)
+            {
+                if (fprintf (f, ";%ld", *bookmarks) < 0)
+                   goto write_position_error;
+            }
+        }
+        if (fprintf (f, "\n") < 0)
+            goto write_position_error;
     }
 
     while (fgets (buf, sizeof (buf), tmp_f))

lib/util.h

@@ -232 +232 @@
 /* Position saving and restoring */
 
 /* Load position for the given filename */
-void load_file_position (const char *filename, long *line, long *column, off_t * offset);
+void load_file_position (const char *filename, long *line, long *column, off_t * offset, long *bookmarks, int num_bookmarks);
 /* Save position for the given filename */
-void save_file_position (const char *filename, long line, long column, off_t offset);
+void save_file_position (const char *filename, long line, long column, off_t offset, long *bookmarks);
 
 
 /* OS specific defines */

src/editor/bookmark.c

@@ -223 +223 @@
         }
     }
 }
+
+/* prepare line positions of bookmarks to be saved to file */
+long * book_mark_serialize(WEdit * edit, int max_bookmarks, int color)
+{
+    if (edit->book_mark) {
+        struct _book_mark *p;
+    int i;
+    long *serialized = (long*)g_malloc ((max_bookmarks + 1) * sizeof(long));
+    if (serialized != NULL) {
+        for (p = book_mark_find(edit, 0), i = 0; p != NULL && i < max_bookmarks; p = p->next)
+            if (p->c == color && p->line != -1) {
+            serialized[i] = p->line;
+            i++;
+            }
+    serialized[i] = -1;
+    return serialized;
+    }
+    }
+    return NULL;
+}
+
+/* restore bookmarks from saved line positions */
+void book_mark_restore(WEdit * edit, long *bookmarks, int color)
+{
+    for ( ; *bookmarks != -1; bookmarks++)
+        book_mark_insert (edit, *bookmarks, color);
+}

src/editor/edit-impl.h

@@ -280 +280 @@
 void book_mark_flush (WEdit * edit, int c);
 void book_mark_inc (WEdit * edit, int line);
 void book_mark_dec (WEdit * edit, int line);
+long *book_mark_serialize(WEdit * edit, int max_bookmarks, int color);
+void book_mark_restore(WEdit * edit, long *bookmarks, int color);
 
 int line_is_blank (WEdit * edit, long line);
 int edit_indent_width (WEdit * edit, long p);

src/editor/edit.c

@@ -757 +757 @@
     return 0;
 }
 
+#define MAX_SAVED_BOOKMARKS 10
+
 /* Restore saved cursor position in the file */
 static void
 edit_load_position (WEdit * edit)
 {
     char *filename;
-    long line, column;
+    long line, column, *bookmarks;
     off_t offset;
 
     if (!edit->filename || !*edit->filename)
         return;
 
     filename = vfs_canon (edit->filename);
-    load_file_position (filename, &line, &column, &offset);
+    bookmarks = g_malloc( MAX_SAVED_BOOKMARKS * sizeof(long));
+
+    load_file_position (filename, &line, &column, &offset, bookmarks, MAX_SAVED_BOOKMARKS);
     g_free (filename);
 
     if (line > 0)
@@ -782 +786 @@
         edit_cursor_move (edit, offset);
         line = edit->curs_line;
     }
+
+    book_mark_restore(edit, bookmarks, BOOK_MARK_COLOR);
+    g_free(bookmarks);
+
     edit_move_to_prev_col (edit, edit_bol (edit, edit->curs1));
     edit_move_display (edit, line - (edit->num_widget_lines / 2));
 }
@@ -791 +799 @@
 edit_save_position (WEdit * edit)
 {
     char *filename;
+    long *bookmarks;
 
     if (!edit->filename || !*edit->filename)
         return;
 
     filename = vfs_canon (edit->filename);
-    save_file_position (filename, edit->curs_line + 1, edit->curs_col, edit->curs1);
+
+    bookmarks = book_mark_serialize(edit, MAX_SAVED_BOOKMARKS, BOOK_MARK_COLOR);
+
+    save_file_position (filename, edit->curs_line + 1, edit->curs_col, edit->curs1, bookmarks);
     g_free (filename);
 }
 

src/viewer/lib.c

@@ -233 +233 @@
     {
         char *canon_fname;
         canon_fname = vfs_canon (view->filename);
-        save_file_position (canon_fname, -1, 0, view->dpy_start);
+        save_file_position (canon_fname, -1, 0, view->dpy_start, NULL);
         g_free (canon_fname);
     }
 

src/viewer/mcviewer.c

@@ -411 +411 @@
         off_t new_offset;
 
         canon_fname = vfs_canon (view->filename);
-        load_file_position (canon_fname, &line, &col, &new_offset);
+        load_file_position (canon_fname, &line, &col, &new_offset, NULL, 0);
         new_offset = min (new_offset, mcview_get_filesize (view));
         view->dpy_start = mcview_bol (view, new_offset);
         g_free (canon_fname);