Mercurial > emacs
comparison src/dispnew.c @ 34279:7ab25b4a077c
(adjust_glyph_matrix): Don't reuse a window's current
matrix if the window's left position has changed; we need to
redraw it in this case.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Wed, 06 Dec 2000 15:46:27 +0000 |
parents | e55480843a8e |
children | 7c8d2cec3d08 |
comparison
equal
deleted
inserted
replaced
34278:323b8ec8dada | 34279:7ab25b4a077c |
---|---|
548 || right != matrix->right_margin_glyphs); | 548 || right != matrix->right_margin_glyphs); |
549 | 549 |
550 if (!marginal_areas_changed_p | 550 if (!marginal_areas_changed_p |
551 && !fonts_changed_p | 551 && !fonts_changed_p |
552 && !header_line_changed_p | 552 && !header_line_changed_p |
553 && matrix->window_left_x == XFASTINT (w->left) | |
553 && matrix->window_top_y == XFASTINT (w->top) | 554 && matrix->window_top_y == XFASTINT (w->top) |
554 && matrix->window_height == window_height | 555 && matrix->window_height == window_height |
555 && matrix->window_vscroll == w->vscroll | 556 && matrix->window_vscroll == w->vscroll |
556 && matrix->window_width == window_width) | 557 && matrix->window_width == window_width) |
557 return; | 558 return; |
684 | 685 |
685 /* Optimize the case that only the height has changed (C-x 2, | 686 /* Optimize the case that only the height has changed (C-x 2, |
686 upper window). Invalidate all rows that are no longer part | 687 upper window). Invalidate all rows that are no longer part |
687 of the window. */ | 688 of the window. */ |
688 if (!marginal_areas_changed_p | 689 if (!marginal_areas_changed_p |
690 && matrix->window_left_x == XFASTINT (w->left) | |
689 && matrix->window_top_y == XFASTINT (w->top) | 691 && matrix->window_top_y == XFASTINT (w->top) |
690 && matrix->window_width == window_box_width (w, -1)) | 692 && matrix->window_width == window_box_width (w, -1)) |
691 { | 693 { |
692 i = 0; | 694 i = 0; |
693 while (matrix->rows[i].enabled_p | 695 while (matrix->rows[i].enabled_p |
719 | 721 |
720 /* Record the top y location and height of W at the time the matrix | 722 /* Record the top y location and height of W at the time the matrix |
721 was last adjusted. This is used to optimize redisplay above. */ | 723 was last adjusted. This is used to optimize redisplay above. */ |
722 if (w) | 724 if (w) |
723 { | 725 { |
726 matrix->window_left_x = XFASTINT (w->left); | |
724 matrix->window_top_y = XFASTINT (w->top); | 727 matrix->window_top_y = XFASTINT (w->top); |
725 matrix->window_height = window_height; | 728 matrix->window_height = window_height; |
726 matrix->window_width = window_width; | 729 matrix->window_width = window_width; |
727 matrix->window_vscroll = w->vscroll; | 730 matrix->window_vscroll = w->vscroll; |
728 } | 731 } |