[geany/geany] f5262a: Use Scintilla's MOVESELECTEDLINES{UP, DOWN} commands.

[Eugene Arshinov]

Branch:      refs/heads/master
Author:      Eugene Arshinov <earshinov at gmail.com>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Mon, 20 Feb 2012 18:58:13
Commit:      f5262a453ed7fbc4ab5f4387a066a597d147c8e9
             https://github.com/geany/geany/commit/f5262a453ed7fbc4ab5f4387a066a597d147c8e9

Log Message:
-----------
Use Scintilla's MOVESELECTEDLINES{UP,DOWN} commands.


Modified Paths:
--------------
    src/keybindings.c
    src/sciwrappers.c
    src/sciwrappers.h

Modified: src/keybindings.c
35 files changed, 2 insertions(+), 33 deletions(-)
===================================================================
@@ -1916,37 +1916,6 @@ static void delete_lines(GeanyEditor *editor)
 }
 
 
-static void move_lines(GeanyEditor *editor, gboolean down)
-{
-	ScintillaObject *sci = editor->sci;
-	gchar *text;
-	gint pos, line, len;
-
-	sci_start_undo_action(sci);
-	editor_select_lines(editor, FALSE);
-	len = sci_get_selected_text_length(sci);
-
-	pos = sci_get_selection_start(sci);
-	line = sci_get_line_from_position(sci, pos);
-	if (down)
-		line++;
-	else
-		line--;
-
-	text = sci_get_selection_contents(sci);
-	sci_clear(sci);
-
-	pos = sci_get_position_from_line(sci, line);
-	sci_insert_text(sci, pos, text);
-	g_free(text);
-
-	sci_set_current_position(sci, pos, TRUE);
-	sci_set_selection_end(sci, pos + len - 1);
-
-	sci_end_undo_action(sci);
-}
-
-
 /* common function for editor keybindings, only valid when scintilla has focus. */
 static gboolean cb_func_editor_action(guint key_id)
 {
@@ -2029,10 +1998,10 @@ static gboolean cb_func_editor_action(guint key_id)
 			return editor_complete_word_part(doc->editor);
 
 		case GEANY_KEYS_EDITOR_MOVELINEUP:
-			move_lines(doc->editor, FALSE);
+			sci_move_selected_lines_up(doc->editor->sci);
 			break;
 		case GEANY_KEYS_EDITOR_MOVELINEDOWN:
-			move_lines(doc->editor, TRUE);
+			sci_move_selected_lines_down(doc->editor->sci);
 			break;
 	}
 	return TRUE;


Modified: src/sciwrappers.c
10 files changed, 10 insertions(+), 0 deletions(-)
===================================================================
@@ -1250,3 +1250,13 @@ gint sci_text_width(ScintillaObject *sci, gint styleNumber, const gchar *text)
 {
 	return (gint) SSM(sci, SCI_TEXTWIDTH, (uptr_t) styleNumber, (sptr_t) text);
 }
+
+void sci_move_selected_lines_down(ScintillaObject *sci)
+{
+	SSM(sci, SCI_MOVESELECTEDLINESDOWN, 0, 0);
+}
+
+void sci_move_selected_lines_up(ScintillaObject *sci)
+{
+	SSM(sci, SCI_MOVESELECTEDLINESUP, 0, 0);
+}


Modified: src/sciwrappers.h
3 files changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -184,4 +184,7 @@
 void				sci_lines_join				(ScintillaObject *sci);
 gint				sci_text_width				(ScintillaObject *sci, gint styleNumber, const gchar *text);
 
+void				sci_move_selected_lines_down    (ScintillaObject *sci);
+void				sci_move_selected_lines_up      (ScintillaObject *sci);
+
 #endif



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).