mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-01 00:54:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1628_editor_CJK_fix'

Browse Source 
* 1628_editor_CJK_fix:
  Merged code of two functions edit_move_up() and edit_move_down()
  Ticket #1628 (fix for drawing CJK chars)
This commit is contained in:
Ilia Maslakov 2009-12-10 09:31:07 +03:00
commit 3d8938a468
2 changed files with 54 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
edit/edit-impl.h
View File

@ -170,7 +170,7 @@ void edit_scroll_downward (WEdit * edit, int i);
void edit_scroll_right (WEdit * edit, int i);
void edit_scroll_left (WEdit * edit, int i);
void edit_move_up (WEdit * edit, unsigned long i, int scroll);
void edit_move_down (WEdit * edit, int i, int scroll);
void edit_move_down (WEdit * edit, unsigned long i, int scroll);
void edit_move_to_prev_col (WEdit *edit, long p);
int edit_get_col (WEdit * edit);
long edit_bol (WEdit * edit, long current);

95
edit/edit.c
View File

@ -1752,28 +1752,6 @@ edit_move_to_prev_col (WEdit * edit, long p)
}
}
/* move i lines */
void edit_move_up (WEdit * edit, unsigned long i, int scroll)
{
unsigned long p, l = edit->curs_line;
if (i > l)
i = l;
if (i) {
if (i > 1)
edit->force |= REDRAW_PAGE;
if (scroll)
edit_scroll_upward (edit, i);
p = edit_bol (edit, edit->curs1);
edit_cursor_move (edit, (p = edit_move_backward (edit, p, i)) - edit->curs1);
edit_move_to_prev_col (edit, p);
edit->search_start = edit->curs1;
edit->found_len = 0;
}
}
static int
is_blank (WEdit *edit, long offset)
{
@ -1867,26 +1845,6 @@ static void edit_move_up_paragraph (WEdit * edit, int scroll)
edit_move_up (edit, edit->curs_line - i, scroll);
}
/* move i lines */
void edit_move_down (WEdit * edit, int i, int scroll)
{
long p, l = edit->total_lines - edit->curs_line;
if (i > l)
i = l;
if (i) {
if (i > 1)
edit->force |= REDRAW_PAGE;
if (scroll)
edit_scroll_downward (edit, i);
p = edit_bol (edit, edit->curs1);
edit_cursor_move (edit, (p = edit_move_forward (edit, p, i, 0)) - edit->curs1);
edit_move_to_prev_col (edit, p);
edit->search_start = edit->curs1;
edit->found_len = 0;
}
}
/* moves down until a blank line is reached, or until just
before a non-blank line is reached */
static void edit_move_down_paragraph (WEdit * edit, int scroll)
@ -2162,6 +2120,46 @@ static void edit_left_char_move_cmd (WEdit * edit)
}
}
/** Up or down cursor moving.
direction = TRUE - move up
= FALSE - move down
*/
static void
edit_move_updown (WEdit * edit, unsigned long i, int scroll, gboolean direction) {
unsigned long p;
unsigned long l = (direction)
? edit->curs_line
: edit->total_lines - edit->curs_line;
if (i > l)
i = l;
if (i == 0)
return;
if (i > 1)
edit->force |= REDRAW_PAGE;
if (scroll)
edit_scroll_upward (edit, i);
p = edit_bol (edit, edit->curs1);
p = (direction)
? edit_move_backward (edit, p, i)
: edit_move_forward (edit, p, i, 0);
edit_cursor_move (edit, p - edit->curs1);
edit_move_to_prev_col (edit, p);
/* search start of current multibyte char (like CJK) */
edit_right_char_move_cmd (edit);
edit_left_char_move_cmd (edit);
edit->search_start = edit->curs1;
edit->found_len = 0;
}
static void edit_right_delete_word (WEdit * edit)
{
int c1, c2;
@ -3337,3 +3335,16 @@ edit_stack_free (void)
edit_stack_iterator++)
g_free (edit_history_moveto[edit_stack_iterator].filename);
}
/* move i lines */
void edit_move_up (WEdit * edit, unsigned long i, int scroll)
{
edit_move_updown (edit, i, scroll, TRUE);
}
/* move i lines */
void edit_move_down (WEdit * edit, unsigned long i, int scroll)
{
edit_move_updown (edit, i, scroll, FALSE);
}