aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00
Code Activity

patch 8.0.0349: redrawing errors with GTK 3

Browse Source 
Problem:    Redrawing errors with GTK 3.
Solution:   When updating, first clear all rectangles and then draw them.
            (Kazunobu Kuriyama, Christian Ludwig, closes #848)
This commit is contained in:
Bram Moolenaar
2017-02-23 12:20:35 +01:00
parent b7a59906d7
commit fe344a9875
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui_gtk_x11.c
View File

@@ -630,6 +630,7 @@ static void gui_gtk_window_clear(GdkWindow *win);
static void static void
gui_gtk3_redraw(int x, int y, int width, int height) gui_gtk3_redraw(int x, int y, int width, int height)
{ {
/* Range checks are left to gui_redraw_block() */
gui_redraw_block(Y_2_ROW(y), X_2_COL(x), gui_redraw_block(Y_2_ROW(y), X_2_COL(x),
Y_2_ROW(y + height - 1), X_2_COL(x + width - 1), Y_2_ROW(y + height - 1), X_2_COL(x + width - 1),
GUI_MON_NOCLEAR); GUI_MON_NOCLEAR);
@@ -684,12 +685,20 @@ draw_event(GtkWidget *widget UNUSED,
if (list->status != CAIRO_STATUS_CLIP_NOT_REPRESENTABLE) if (list->status != CAIRO_STATUS_CLIP_NOT_REPRESENTABLE)
{ {
int i; int i;
/* First clear all the blocks and then redraw them. Just in case
* some blocks overlap. */
for (i = 0; i < list->num_rectangles; i++) for (i = 0; i < list->num_rectangles; i++)
{ {
const cairo_rectangle_t rect = list->rectangles[i]; const cairo_rectangle_t rect = list->rectangles[i];
gui_mch_clear_block(Y_2_ROW(rect.y), 1, gui_mch_clear_block(Y_2_ROW((int)rect.y), 0,
Y_2_ROW(rect.y + rect.height - 1), Columns); Y_2_ROW((int)(rect.y + rect.height)) - 1, Columns - 1);
}
for (i = 0; i < list->num_rectangles; i++)
{
const cairo_rectangle_t rect = list->rectangles[i];
if (blink_mode) if (blink_mode)
gui_gtk3_redraw(rect.x, rect.y, rect.width, rect.height); gui_gtk3_redraw(rect.x, rect.y, rect.width, rect.height);
@@ -6709,8 +6718,14 @@ gui_mch_flush(void)
* (row2, col2) inclusive. * (row2, col2) inclusive.
*/ */
void void
gui_mch_clear_block(int row1, int col1, int row2, int col2) gui_mch_clear_block(int row1arg, int col1arg, int row2arg, int col2arg)
{ {
int col1 = check_col(col1arg);
int col2 = check_col(col2arg);
int row1 = check_row(row1arg);
int row2 = check_row(row2arg);
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,0,0)
if (gtk_widget_get_window(gui.drawarea) == NULL) if (gtk_widget_get_window(gui.drawarea) == NULL)
return; return;

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
349,
/**/ /**/
348, 348,
/**/ /**/