mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

go home

Browse Source
This commit is contained in:
Ilia Maslakov 2009-05-06 14:22:54 +00:00
parent 074337e0df
commit ab7d8daba2
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
edit/bookmark.c
View File

@ -316,7 +316,8 @@ int book_mark_collapse_query (GList * list, const int line,
return 0;
}
int book_mark_get_collapse_state (GList * list, const int line)
int book_mark_get_collapse_state (GList * list, const int line,
struct collapsed_lines *cl)
{
int start_line;
int end_line;
@ -326,6 +327,12 @@ int book_mark_get_collapse_state (GList * list, const int line)
c = book_mark_collapse_query (list, line, &start_line, &end_line, &state);
if ( c == 0 )
return C_LINES_DEFAULT;
if ( cl ) {
cl->start_line = start_line;
cl->end_line = end_line;
cl->state = state;
}
if ( line == start_line ) {
if ( state )
return C_LINES_COLLAPSED;

3
edit/edit.h
View File

@ -255,7 +255,8 @@ int book_mark_collapse_query (GList *list, const int line,
int *start_line,
int *end_line,
int *state);
int book_mark_get_collapse_state (GList *list, const int line);
int book_mark_get_collapse_state (GList *list, const int line,
struct collapsed_lines *cl);
void book_mark_collapse_inc (GList * list, int line);
void book_mark_collapse_dec (GList * list, int line);

19
edit/editdraw.c
View File

@ -590,6 +590,9 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
int collapsed = 0;
int collapse_state = 0;
unsigned long cur_line;
struct collapsed_lines *cl;
cl = g_new0 (struct collapsed_lines, 1);
/*
* If the position of the page has not moved then we can draw the cursor
* character only. This will prevent line flicker when using arrow keys.
@ -608,7 +611,10 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
if (key_pending (edit))
goto exit_render;
cur_line = edit->start_line + row;
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line);
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line, cl);
if ( collapse_state = C_LINES_COLLAPSED ) {
//row -= cl->end_line - cl->start_line - 1;
}
if ( collapse_state != C_LINES_MIDDLE_C ) {
edit_draw_this_line (edit, b, row, start_column, end_column, collapse_state);
}
@ -627,7 +633,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
if (key_pending (edit))
goto exit_render;
cur_line = edit->start_line + row;
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line);
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line, cl);
if ( collapse_state != C_LINES_MIDDLE_C ) {
edit_draw_this_line (edit, b, row, start_column, end_column,
collapse_state);
@ -643,7 +649,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
if (key_pending (edit))
goto exit_render;
cur_line = edit->start_line + curs_row;
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line);
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line, cl);
if ( collapse_state != C_LINES_MIDDLE_C ) {
edit_draw_this_line (edit, b, curs_row, start_column, end_column,
collapse_state);
@ -657,7 +663,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
if (key_pending (edit))
goto exit_render;
cur_line = edit->start_line + row;
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line);
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line, cl);
if ( collapse_state != C_LINES_MIDDLE_C ) {
edit_draw_this_line (edit, b, row, start_column, end_column, collapse_state);
}
@ -673,7 +679,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
if (key_pending (edit))
goto exit_render;
cur_line = edit->start_line + row;
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line);
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line, cl);
if ( collapse_state != C_LINES_MIDDLE_C ) {
edit_draw_this_line (edit, b, row, start_column, end_column, collapse_state);
}
@ -687,7 +693,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
if (key_pending (edit))
goto exit_render;
cur_line = edit->start_line + row;
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line);
collapse_state = book_mark_get_collapse_state(edit->collapsed, cur_line, cl);
if ( collapse_state != C_LINES_MIDDLE_C ) {
edit_draw_this_line (edit, b, row, start_column, end_column, collapse_state);
}
@ -710,6 +716,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
prev_curs = edit->curs1;
exit_render:
g_free(cl);
edit->screen_modified = 0;
return;
}