Mercurial > emacs
comparison src/dispnew.c @ 31295:d4f918f0b184
(update_frame): Only set display_completed here; use
the update_begin and update_end calls here from update_frame_1.
(update_frame_1): Don't set display_completed here, don't call
update_begin/update_end.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Wed, 30 Aug 2000 14:59:26 +0000 |
parents | 4f0c5eecc5a6 |
children | 2554afbeb88d |
comparison
equal
deleted
inserted
replaced
31294:52f31a08e52f | 31295:d4f918f0b184 |
---|---|
3558 | 3558 |
3559 | 3559 |
3560 /* Update windows. */ | 3560 /* Update windows. */ |
3561 paused_p = update_window_tree (root_window, force_p); | 3561 paused_p = update_window_tree (root_window, force_p); |
3562 update_end (f); | 3562 update_end (f); |
3563 display_completed = !paused_p; | 3563 |
3564 | 3564 #if 0 /* This flush is a performance bottleneck under X, |
3565 /* The flush is a performance bottleneck under X. */ | 3565 and it doesn't seem to be necessary anyway. */ |
3566 #if 0 | |
3567 rif->flush_display (f); | 3566 rif->flush_display (f); |
3568 #endif | 3567 #endif |
3569 } | 3568 } |
3570 else | 3569 else |
3571 { | 3570 { |
3572 /* We are working on frame matrix basis. Set the frame on whose | 3571 /* We are working on frame matrix basis. Set the frame on whose |
3573 frame matrix we operate. */ | 3572 frame matrix we operate. */ |
3574 set_frame_matrix_frame (f); | 3573 set_frame_matrix_frame (f); |
3575 | 3574 |
3576 /* Build F's desired matrix from window matrices. For windows | 3575 /* Build F's desired matrix from window matrices. */ |
3577 whose must_be_updated_p flag is set, desired matrices are | |
3578 made part of the desired frame matrix. For other windows, | |
3579 the current matrix is copied. */ | |
3580 build_frame_matrix (f); | 3576 build_frame_matrix (f); |
3581 | 3577 |
3582 /* Do the update on the frame desired matrix. */ | 3578 /* Update the display */ |
3579 update_begin (f); | |
3583 paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p); | 3580 paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p); |
3584 | 3581 update_end (f); |
3582 | |
3583 if (termscript) | |
3584 fflush (termscript); | |
3585 fflush (stdout); | |
3586 | |
3585 /* Check window matrices for lost pointers. */ | 3587 /* Check window matrices for lost pointers. */ |
3586 IF_DEBUG (check_window_matrix_pointers (root_window)); | 3588 IF_DEBUG (check_window_matrix_pointers (root_window)); |
3587 } | 3589 } |
3588 | 3590 |
3589 /* Reset flags indicating that a window should be updated. */ | 3591 /* Reset flags indicating that a window should be updated. */ |
3590 set_window_update_flags (root_window, 0); | 3592 set_window_update_flags (root_window, 0); |
3593 | |
3594 display_completed = !paused_p; | |
3591 return paused_p; | 3595 return paused_p; |
3592 } | 3596 } |
3593 | 3597 |
3594 | 3598 |
3595 | 3599 |
4716 { | 4720 { |
4717 pause = 1; | 4721 pause = 1; |
4718 goto do_pause; | 4722 goto do_pause; |
4719 } | 4723 } |
4720 | 4724 |
4721 update_begin (f); | |
4722 | |
4723 /* If we cannot insert/delete lines, it's no use trying it. */ | 4725 /* If we cannot insert/delete lines, it's no use trying it. */ |
4724 if (!line_ins_del_ok) | 4726 if (!line_ins_del_ok) |
4725 inhibit_id_p = 1; | 4727 inhibit_id_p = 1; |
4726 | 4728 |
4727 /* See if any of the desired lines are enabled; don't compute for | 4729 /* See if any of the desired lines are enabled; don't compute for |
4873 cursor_to (y, x); | 4875 cursor_to (y, x); |
4874 } | 4876 } |
4875 } | 4877 } |
4876 } | 4878 } |
4877 | 4879 |
4878 update_end (f); | |
4879 | |
4880 if (termscript) | |
4881 fflush (termscript); | |
4882 fflush (stdout); | |
4883 | |
4884 do_pause: | 4880 do_pause: |
4885 | 4881 |
4886 display_completed = !pause; | |
4887 clear_desired_matrices (f); | 4882 clear_desired_matrices (f); |
4888 return pause; | 4883 return pause; |
4889 } | 4884 } |
4890 | 4885 |
4891 | 4886 |