|
From: Araki K. <j00...@ip...> - 2001-12-05 12:02:34
|
mlterm-rtl-2 patch(bug fix for mlterm-rtl-1) is attached.
--
kiken
j00...@ip...
--- src/ml_image.c Wed Dec 5 20:19:23 2001
+++ src/ml_image.c Wed Dec 5 20:18:24 2001
@@ -1122,7 +1122,7 @@
if( line->num_of_filled_chars == 0 ||
( size_except_end_space = ml_get_num_of_filled_chars_except_end_space( line)) == 0)
{
- return 0 ;
+ continue ;
}
ml_str_copy( src , line->chars , size_except_end_space) ;
@@ -1159,6 +1159,8 @@
ml_imgline_set_modified( line) ;
}
}
+
+ ml_str_final( src , image->num_of_cols) ;
return 1 ;
}
--- src/ml_term_screen.c Wed Dec 5 20:19:23 2001
+++ src/ml_term_screen.c Wed Dec 5 20:18:25 2001
@@ -3435,16 +3435,12 @@
ml_char_t * ch ;
ml_image_line_t * line ;
int result ;
- int x ;
- int y ;
ml_restore_selected_region_color( &termscr->sel) ;
exit_backscroll_mode( termscr) ;
ml_cursor_go_back( termscr->image , WRAPAROUND) ;
- y = ml_convert_row_to_y( termscr , termscr->image->cursor.row) ;
-
if( ( line = ml_image_get_line( termscr->image , termscr->image->cursor.row)) == NULL ||
ml_imgline_is_empty( line))
{
@@ -3453,16 +3449,13 @@
goto end ;
}
- x = ml_convert_char_index_to_x( line , termscr->image->cursor.char_index) ;
-
ch = ml_cursor_get_char( termscr->image) ;
-
+
if( ( result = ml_char_combine( ch , bytes , ch_size , font , font_decor ,
fg_color , bg_color)))
{
- ml_window_draw_str( &termscr->window , ch , 1 , x , y ,
- ml_line_height( termscr->font_man) ,
- ml_line_height_to_baseline( termscr->font_man)) ;
+ ml_imgline_update_change_char_index( line , termscr->image->cursor.col ,
+ termscr->image->cursor.col , 0) ;
}
end:
|