Ticket #319: flow_insert_col.diff

edit/edit.c

@@ -70 +70 @@
 int option_edit_left_extreme = 0;
 int option_edit_top_extreme = 0;
 int option_edit_bottom_extreme = 0;
+int flow_insert_col = -1;
 
 const char *option_whole_chars_search = "0123456789abcdefghijklmnopqrstuvwxyz_";
 char *option_backup_ext = NULL;
@@ -267 +268 @@
     char *p;
     if ((p = edit_get_filter (filename))) {
         FILE *f;
-        long current = edit->curs1;
         f = (FILE *) popen (p, "r");
         if (f) {
             edit_insert_stream (edit, f);
-            edit_cursor_move (edit, current - edit->curs1);
             if (pclose (f) > 0) {
                 GString *errmsg = g_string_new (NULL);
                 g_string_sprintf (errmsg, _(" Error reading from pipe: %s "), p);
@@ -291 +290 @@
         g_free (p);
     } else {
         int i, file, blocklen;
-        long current = edit->curs1;
         unsigned char *buf;
         if ((file = mc_open (filename, O_RDONLY | O_BINARY)) == -1)
             return 0;
@@ -300 +298 @@
             for (i = 0; i < blocklen; i++)
                 edit_insert (edit, buf[i]);
         }
-        edit_cursor_move (edit, current - edit->curs1);
         g_free (buf);
         mc_close (file);
         if (blocklen)
@@ -2125 +2122 @@
         edit_push_key_press (edit);
 
     edit_execute_cmd (edit, command, char_for_insertion);
+        
+    if (CK_Beginning_Of_Text == command || CK_End_Of_Text == command
+            || CK_Page_Up == command || CK_Page_Down == command
+            || CK_Up == command || CK_Down == command) {
+        if (flow_insert_col >= 0) {
+            edit->force |= REDRAW_COMPLETELY;
+            edit_update_screen (edit);
+            if ((edit_eol (edit, edit->curs1) - edit_bol (edit, edit->curs1)) > flow_insert_col) {
+                edit_cursor_move (edit, flow_insert_col - edit->curs_col);
+                edit->force |= REDRAW_COMPLETELY;
+                edit_update_screen (edit);
+            }
+        }
+    } else if (CK_XStore != command && CK_XCut != command 
+            && CK_XPaste != command) {
+        flow_insert_col = -1;
+    }
     if (column_highlighting)
         edit->force |= REDRAW_PAGE;
 }
@@ -2453 +2467 @@
         break;
 
     case CK_XStore:
-        edit_copy_to_X_buf_cmd (edit);
+        edit_copy_to_X_buf_cmd (edit, &flow_insert_col);
         break;
     case CK_XCut:
         edit_cut_to_X_buf_cmd (edit);
+        flow_insert_col = edit_get_col (edit);
         break;
     case CK_XPaste:
         edit_paste_from_X_buf_cmd (edit);

edit/editcmd.c

@@ -2291 +2291 @@
     edit_error_dialog (_(" Error "), _(" This function is not implemented. "));
 }
 
-int edit_copy_to_X_buf_cmd (WEdit * edit)
+int edit_copy_to_X_buf_cmd (WEdit * edit, int *flow_insert_col)
 {
     long start_mark, end_mark;
     if (eval_marks (edit, &start_mark, &end_mark))
@@ -2300 +2300 @@
         edit_error_dialog (_(" Copy to clipboard "), get_sys_error (_(" Unable to save to file. ")));
         return 1;
     }
+    if (start_mark == edit->mark1)
+        *flow_insert_col = edit->column1;
+    else
+        *flow_insert_col = edit->column2;
+
     edit_mark_cmd (edit, 1);
     return 0;
 }

edit/edit.h

@@ -197 +197 @@
 int edit_load_macro_cmd (WEdit * edit, struct macro macro[], int *n, int k);
 void edit_delete_macro_cmd (WEdit * edit);
 
-int edit_copy_to_X_buf_cmd (WEdit * edit);
+int edit_copy_to_X_buf_cmd (WEdit * edit, int *flow_insert_col);
 int edit_cut_to_X_buf_cmd (WEdit * edit);
 void edit_paste_from_X_buf_cmd (WEdit * edit);